Apple-2-Tools/dmolony-DiskBrowser
1
0
Fork 0
mirror of https://github.com/dmolony/DiskBrowser.git synced 2024-06-29 05:29:37 +00:00
Code Issues Projects Releases Wiki Activity

pass Disk first

Browse Source
This commit is contained in:
Denis Molony 2016-07-18 08:35:18 +10:00
parent 06b4a4cfea
commit f33f3f52c0
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ public class DirectoryEntry implements AppleFileSource
blockNumber = (b & 0x7F) * 4; blockNumber = (b & 0x7F) * 4;
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
blocks.add (new AppleDiskAddress (blockNumber + i, disk)); blocks.add (new AppleDiskAddress (disk, blockNumber + i));
} }
} }
@ -99,7 +99,7 @@ public class DirectoryEntry implements AppleFileSource
int blockNumber = b * 4 + 48; int blockNumber = b * 4 + 48;
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
blocks.add (new AppleDiskAddress (blockNumber + i, disk)); blocks.add (new AppleDiskAddress (disk, blockNumber + i));
} }
} }

10
src/com/bytezone/diskbrowser/disk/AppleDisk.java
View File

@ -372,9 +372,9 @@ public class AppleDisk implements Disk
{ {
System.out.println ("Invalid block : " + block); System.out.println ("Invalid block : " + block);
// return null; // return null;
return new AppleDiskAddress (0, this); return new AppleDiskAddress (this, 0);
} }
return new AppleDiskAddress (block, this); return new AppleDiskAddress (this, block);
} }
@Override @Override
@ -385,7 +385,7 @@ public class AppleDisk implements Disk
for (int block : blocks) for (int block : blocks)
{ {
assert (isValidAddress (block)) : "Invalid block : " + block; assert (isValidAddress (block)) : "Invalid block : " + block;
addressList.add (new AppleDiskAddress (block, this)); addressList.add (new AppleDiskAddress (this, block));
} }
return addressList; return addressList;
} }
@ -396,7 +396,7 @@ public class AppleDisk implements Disk
// should this return null for invalid addresses? // should this return null for invalid addresses?
assert (isValidAddress (track, sector)) : "Invalid address : " + track + ", " assert (isValidAddress (track, sector)) : "Invalid address : " + track + ", "
+ sector; + sector;
return new AppleDiskAddress (track, sector, this); return new AppleDiskAddress (this, track, sector);
} }
@Override @Override
@ -505,7 +505,7 @@ public class AppleDisk implements Disk
{ {
blockList = new ArrayList<DiskAddress> (blocks); blockList = new ArrayList<DiskAddress> (blocks);
for (int block = 0; block < blocks; block++) for (int block = 0; block < blocks; block++)
blockList.add (new AppleDiskAddress (block, this)); blockList.add (new AppleDiskAddress (this, block));
} }
return blockList.iterator (); return blockList.iterator ();

4
src/com/bytezone/diskbrowser/disk/AppleDiskAddress.java
View File

@ -7,7 +7,7 @@ public class AppleDiskAddress implements DiskAddress
private final int sector; private final int sector;
public final Disk owner; public final Disk owner;
public AppleDiskAddress (int block, Disk owner) public AppleDiskAddress (Disk owner, int block)
{ {
this.owner = owner; this.owner = owner;
this.block = block; this.block = block;
@ -16,7 +16,7 @@ public class AppleDiskAddress implements DiskAddress
this.sector = block % sectorsPerTrack; this.sector = block % sectorsPerTrack;
} }
public AppleDiskAddress (int track, int sector, Disk owner) public AppleDiskAddress (Disk owner, int track, int sector)
{ {
this.owner = owner; this.owner = owner;
this.track = track; this.track = track;