From 922956086cba8a1737a3fb824a1b4ac2a98ce661 Mon Sep 17 00:00:00 2001 From: Denis Molony Date: Thu, 25 Feb 2016 21:49:10 +1100 Subject: [PATCH] tidying --- .../diskbrowser/pascal/FileEntry.java | 65 +++++++++---------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/src/com/bytezone/diskbrowser/pascal/FileEntry.java b/src/com/bytezone/diskbrowser/pascal/FileEntry.java index 96639a3..1d879d8 100644 --- a/src/com/bytezone/diskbrowser/pascal/FileEntry.java +++ b/src/com/bytezone/diskbrowser/pascal/FileEntry.java @@ -50,45 +50,36 @@ class FileEntry extends CatalogEntry byte[] buffer = getExactBuffer (); - // try + switch (fileType) { - switch (fileType) - { - case 3: - file = new PascalText (name, buffer); - break; - case 2: - file = new PascalCode (name, buffer); - break; - case 4: - file = new PascalInfo (name, buffer); - break; - case 0: - // volume - break; - case 5: - // data - if (name.equals ("SYSTEM.CHARSET")) - { - file = new Charset (name, buffer); - break; - } - if (name.equals ("WT")) // only testing - { - file = new WizardryTitle (name, buffer); - break; - } - // intentional fall-through - default: - // unknown + case 3: + file = new PascalText (name, buffer); + break; + + case 2: + file = new PascalCode (name, buffer); + break; + + case 4: + file = new PascalInfo (name, buffer); + break; + + case 0: // volume + break; + + case 5: // data + if (name.equals ("SYSTEM.CHARSET")) + file = new Charset (name, buffer); + else if (name.equals ("WT")) // only testing + file = new WizardryTitle (name, buffer); + else file = new DefaultAppleFile (name, buffer); - } + break; + + default: // unknown + file = new DefaultAppleFile (name, buffer); } - // catch (Exception e) - // { - // file = new ErrorMessageFile (name, buffer, e); - // e.printStackTrace (); - // } + return file; } @@ -96,6 +87,7 @@ class FileEntry extends CatalogEntry { byte[] buffer = parent.getDisk ().readSectors (blocks); byte[] exactBuffer; + if (bytesUsedInLastBlock < 512) { int exactLength = buffer.length - 512 + bytesUsedInLastBlock; @@ -104,6 +96,7 @@ class FileEntry extends CatalogEntry } else exactBuffer = buffer; + return exactBuffer; } } \ No newline at end of file