From b5c3beda84b735aec5e2769183d4705c03f347a4 Mon Sep 17 00:00:00 2001 From: Denis Molony Date: Fri, 26 Feb 2016 14:51:15 +1100 Subject: [PATCH] tidying --- src/com/bytezone/diskbrowser/cpm/CPMCatalogSector.java | 6 ++++++ src/com/bytezone/diskbrowser/cpm/DirectoryEntry.java | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/com/bytezone/diskbrowser/cpm/CPMCatalogSector.java b/src/com/bytezone/diskbrowser/cpm/CPMCatalogSector.java index ec91896..9e47fb2 100644 --- a/src/com/bytezone/diskbrowser/cpm/CPMCatalogSector.java +++ b/src/com/bytezone/diskbrowser/cpm/CPMCatalogSector.java @@ -21,13 +21,19 @@ public class CPMCatalogSector extends AbstractSector { if (buffer[i] == (byte) 0xE5) break; + addText (text, buffer, i, 1, "User number"); addText (text, buffer, i + 1, 4, "File name : " + new String (buffer, i + 1, 8)); + addText (text, buffer, i + 5, 4, ""); addText (text, buffer, i + 9, 3, "File type : " + new String (buffer, i + 9, 3)); addText (text, buffer, i + 12, 1, "Extent counter LO"); addText (text, buffer, i + 13, 1, "Reserved"); addText (text, buffer, i + 14, 1, "Extent counter HI"); addText (text, buffer, i + 15, 1, "Record count"); + + for (int j = 0; j < 4; j++) + addText (text, buffer, i + 16 + j * 4, 4, ""); + text.append ("\n"); } diff --git a/src/com/bytezone/diskbrowser/cpm/DirectoryEntry.java b/src/com/bytezone/diskbrowser/cpm/DirectoryEntry.java index b0a1d09..5cc8dfd 100644 --- a/src/com/bytezone/diskbrowser/cpm/DirectoryEntry.java +++ b/src/com/bytezone/diskbrowser/cpm/DirectoryEntry.java @@ -98,11 +98,15 @@ public class DirectoryEntry implements AppleFileSource int blocks = ((rc & 0xF0) >> 3) + (((rc & 0x0F) + 7) / 8); String bytes = HexFormatter.getHexString (blockList, 0, 16); bytes = bytes.replaceAll ("00", " "); + String text = String.format ("%3d %-8s %-3s %02X %02X %02X %02X %s", userNumber, name, type, ex, s2, s1, rc, bytes); for (DirectoryEntry entry : entries) text = text + "\n" + entry.line (); + if (ex != 0) + text = " " + text.substring (20); + return text; }