This commit is contained in:
Denis Molony
2016-02-25 21:49:10 +11:00
parent 6d211906e7
commit 922956086c

View File

@@ -50,45 +50,36 @@ class FileEntry extends CatalogEntry
byte[] buffer = getExactBuffer (); byte[] buffer = getExactBuffer ();
// try switch (fileType)
{ {
switch (fileType) case 3:
{ file = new PascalText (name, buffer);
case 3: break;
file = new PascalText (name, buffer);
break; case 2:
case 2: file = new PascalCode (name, buffer);
file = new PascalCode (name, buffer); break;
break;
case 4: case 4:
file = new PascalInfo (name, buffer); file = new PascalInfo (name, buffer);
break; break;
case 0:
// volume case 0: // volume
break; break;
case 5:
// data case 5: // data
if (name.equals ("SYSTEM.CHARSET")) if (name.equals ("SYSTEM.CHARSET"))
{ file = new Charset (name, buffer);
file = new Charset (name, buffer); else if (name.equals ("WT")) // only testing
break; file = new WizardryTitle (name, buffer);
} else
if (name.equals ("WT")) // only testing
{
file = new WizardryTitle (name, buffer);
break;
}
// intentional fall-through
default:
// unknown
file = new DefaultAppleFile (name, buffer); 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; return file;
} }
@@ -96,6 +87,7 @@ class FileEntry extends CatalogEntry
{ {
byte[] buffer = parent.getDisk ().readSectors (blocks); byte[] buffer = parent.getDisk ().readSectors (blocks);
byte[] exactBuffer; byte[] exactBuffer;
if (bytesUsedInLastBlock < 512) if (bytesUsedInLastBlock < 512)
{ {
int exactLength = buffer.length - 512 + bytesUsedInLastBlock; int exactLength = buffer.length - 512 + bytesUsedInLastBlock;
@@ -104,6 +96,7 @@ class FileEntry extends CatalogEntry
} }
else else
exactBuffer = buffer; exactBuffer = buffer;
return exactBuffer; return exactBuffer;
} }
} }