Apple-2-Tools/dmolony-DiskBrowser
1
0
Fork 0
mirror of https://github.com/dmolony/DiskBrowser.git synced 2025-01-11 19:29:47 +00:00
Code Issues Projects Releases Wiki Activity

show empty blocks

Browse Source
This commit is contained in:
Denis Molony 2016-02-26 10:43:44 +11:00
parent 60de0f2f4c
commit 54f037b2aa
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/bytezone/diskbrowser/cpm/CPMDisk.java
View File

@ -35,9 +35,6 @@ public class CPMDisk extends AbstractFormattedDisk
getDisk ().setEmptyByte ((byte) 0xE5);
setSectorTypes ();
// byte[] sectorBuffer = disk.readSector (0, 0); // Boot sector
// bootSector = new BootSector (disk, sectorBuffer, "CPM");
byte[] buffer = disk.readSector (0, 8);
String text = new String (buffer, 16, 24);
if ("DIR ERA TYPESAVEREN USER".equals (text))
@ -48,9 +45,12 @@ public class CPMDisk extends AbstractFormattedDisk
for (int sector = 0; sector < 8; sector++)
{
DiskAddress da = disk.getDiskAddress (3, sector);
sectorTypes[da.getBlock ()] = catalogSector;
if (disk.isSectorEmpty (da))
break;
sectorTypes[da.getBlock ()] = catalogSector;
buffer = disk.readSector (da);
for (int i = 0; i < buffer.length; i += 32)
{
if (buffer[i] != 0 && buffer[i] != (byte) 0xE5)
@ -60,7 +60,8 @@ public class CPMDisk extends AbstractFormattedDisk
DirectoryEntry entry = new DirectoryEntry (this, buffer, i);
SectorType sectorType = getSectorType (entry.getType ());
for (DiskAddress block : entry.getSectors ())
sectorTypes[block.getBlock ()] = sectorType;
if (!disk.isSectorEmpty (block))
sectorTypes[block.getBlock ()] = sectorType;
DirectoryEntry parent = findParent (entry);
if (parent == null)
@ -76,7 +77,7 @@ public class CPMDisk extends AbstractFormattedDisk
}
}
root.setUserObject (getCatalog ());
root.setUserObject (getCatalog ()); // override the disk's default display
makeNodeVisible (root.getFirstLeaf ());
}

5
src/com/bytezone/diskbrowser/cpm/DirectoryEntry.java
View File

@ -50,7 +50,10 @@ public class DirectoryEntry implements AppleFileSource
int blockNumber = b * 4 + 48;
for (int i = 0; i < 4; i++)
blocks.add (new AppleDiskAddress (blockNumber + i, disk));
{
AppleDiskAddress da = new AppleDiskAddress (blockNumber + i, disk);
blocks.add (da);
}
}
}

3
src/com/bytezone/diskbrowser/disk/AbstractFormattedDisk.java
View File

@ -158,7 +158,8 @@ public abstract class AbstractFormattedDisk implements FormattedDisk
(DefaultMutableTreeNode) catalogTree.getModel ().getRoot ();
DefaultAppleFileSource afs =
new DefaultAppleFileSource (getName (), disk.toString (), this);
root.setUserObject (afs);
if (root.getUserObject () == null)
root.setUserObject (afs);
}
@Override