From 89f315cc534a76f3c4a3e50145d8dbf5e322bff4 Mon Sep 17 00:00:00 2001 From: Denis Molony Date: Mon, 18 Jul 2016 08:42:44 +1000 Subject: [PATCH] helper function --- src/com/bytezone/diskbrowser/disk/AppleDiskAddress.java | 6 ++++++ src/com/bytezone/diskbrowser/disk/DiskAddress.java | 2 ++ src/com/bytezone/diskbrowser/dos/DosTSListSector.java | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/com/bytezone/diskbrowser/disk/AppleDiskAddress.java b/src/com/bytezone/diskbrowser/disk/AppleDiskAddress.java index d256e96..3e0b0ae 100755 --- a/src/com/bytezone/diskbrowser/disk/AppleDiskAddress.java +++ b/src/com/bytezone/diskbrowser/disk/AppleDiskAddress.java @@ -36,6 +36,12 @@ public class AppleDiskAddress implements DiskAddress return this.block - that.getBlock (); } + @Override + public boolean matches (DiskAddress that) + { + return this.block == that.getBlock (); + } + @Override public int getBlock () { diff --git a/src/com/bytezone/diskbrowser/disk/DiskAddress.java b/src/com/bytezone/diskbrowser/disk/DiskAddress.java index 5a34926..0b91398 100755 --- a/src/com/bytezone/diskbrowser/disk/DiskAddress.java +++ b/src/com/bytezone/diskbrowser/disk/DiskAddress.java @@ -9,4 +9,6 @@ public interface DiskAddress extends Comparable public int getSector (); public Disk getDisk (); + + public boolean matches (DiskAddress other); } \ No newline at end of file diff --git a/src/com/bytezone/diskbrowser/dos/DosTSListSector.java b/src/com/bytezone/diskbrowser/dos/DosTSListSector.java index df3e141..f8ca0a1 100755 --- a/src/com/bytezone/diskbrowser/dos/DosTSListSector.java +++ b/src/com/bytezone/diskbrowser/dos/DosTSListSector.java @@ -53,7 +53,7 @@ class DosTSListSector extends AbstractSector public String createText () { DiskAddress da = disk.getDiskAddress (buffer[1], buffer[2]); - String msg = da.compareTo (diskAddress) == 0 ? " (circular reference)" : ""; + String msg = da.matches (diskAddress) ? " (circular reference)" : ""; StringBuilder text = getHeader ("TS List Sector : " + name); addText (text, buffer, 0, 1, "Not used");