diff --git a/resources/buildNumber b/resources/buildNumber index bfca9a3..f6eb46e 100755 --- a/resources/buildNumber +++ b/resources/buildNumber @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Mon Aug 31 19:34:22 AEST 2015 -build.number=630 +#Sun Dec 13 21:01:46 AEDT 2015 +build.number=631 diff --git a/src/com/bytezone/diskbrowser/applefile/BootSector.java b/src/com/bytezone/diskbrowser/applefile/BootSector.java index 5deca09..af71eff 100644 --- a/src/com/bytezone/diskbrowser/applefile/BootSector.java +++ b/src/com/bytezone/diskbrowser/applefile/BootSector.java @@ -24,7 +24,7 @@ public class BootSector extends AbstractSector // The first byte in the buffer is the number of sectors to read in (minus 1) int sectors = buffer[0] & 0xFF; // System.out.printf ("Sectors to read : %d%n", (sectors + 1)); - if (sectors > 0) + if (sectors > 0 && sectors < 10) // probably not what I think it is { int bufferSize = buffer.length * (sectors + 1); byte[] newBuffer = new byte[bufferSize]; diff --git a/src/com/bytezone/diskbrowser/disk/AbstractSector.java b/src/com/bytezone/diskbrowser/disk/AbstractSector.java index b630968..e1e6f1f 100755 --- a/src/com/bytezone/diskbrowser/disk/AbstractSector.java +++ b/src/com/bytezone/diskbrowser/disk/AbstractSector.java @@ -63,7 +63,7 @@ public abstract class AbstractSector implements DataSource text.append (title + newLine2); text.append ("Offset Value Description" + newLine); text.append ("======= =========== " - + "===============================================================" + newLine); + + "===============================================================" + newLine); return text; } @@ -86,16 +86,17 @@ public abstract class AbstractSector implements DataSource switch (size) { case 1: - text.append (String - .format ("%03X %02X %s%n", offset, b[offset], desc)); + text.append (String.format ("%03X %02X %s%n", offset, b[offset], + desc)); break; case 2: - text.append (String.format ("%03X-%03X %02X %02X %s%n", offset, offset + 1, - b[offset], b[offset + 1], desc)); + text.append (String.format ("%03X-%03X %02X %02X %s%n", offset, + offset + 1, b[offset], b[offset + 1], desc)); break; case 3: text.append (String.format ("%03X-%03X %02X %02X %02X %s%n", offset, - offset + 2, b[offset], b[offset + 1], b[offset + 2], desc)); + offset + 2, b[offset], b[offset + 1], b[offset + 2], + desc)); break; case 4: text.append (String.format ("%03X-%03X %02X %02X %02X %02X %s%n", offset, @@ -108,16 +109,15 @@ public abstract class AbstractSector implements DataSource } protected void addTextAndDecimal (StringBuilder text, byte[] b, int offset, int size, - String desc) + String desc) { if (size == 1) desc += " (" + (b[offset] & 0xFF) + ")"; else if (size == 2) desc += " (" + ((b[offset + 1] & 0xFF) * 256 + (b[offset] & 0xFF)) + ")"; else if (size == 3) - desc += - String.format (" (%,d)", ((b[offset + 2] & 0xFF) * 65536) - + ((b[offset + 1] & 0xFF) * 256) + (b[offset] & 0xFF)); + desc += String.format (" (%,d)", ((b[offset + 2] & 0xFF) * 65536) + + ((b[offset + 1] & 0xFF) * 256) + (b[offset] & 0xFF)); addText (text, b, offset, size, desc); } } \ No newline at end of file