Moved Coordinate.

This commit is contained in:
a2geek committed 2026-10-06 18:49:52 -05:00
1 parent d6aa9ad1c2
commit 9bb0115c00
11 files changed
+29 -14

No files matched your search

@@ -20,7 +20,6 @@
package io.github.applecommander.acx.command;
import com.webcodepro.applecommander.util.AppleUtil;
import com.webcodepro.applecommander.util.Range;
import io.github.applecommander.acx.base.ReadOnlyDiskContextCommandOptions;
import io.github.applecommander.acx.converter.IntegerTypeConverter;
import io.github.applecommander.acx.converter.RangeTypeConverter;
@@ -38,6 +37,7 @@ import org.applecommander.hint.Hint;
import org.applecommander.util.Container;
import org.applecommander.util.DataBuffer;
import org.applecommander.util.InformationGroup;
import org.applecommander.util.Range;
import picocli.CommandLine.ArgGroup;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
@@ -379,7 +379,7 @@ public class DumpCommand extends ReadOnlyDiskContextCommandOptions {
private Range sectors;
public boolean isBootSector() {
return tracks.getFirst() == 0 && tracks.getLast() == 0 && sectors.getFirst() == 0 && sectors.getLast() == 0;
return tracks.first() == 0 && tracks.last() == 0 && sectors.first() == 0 && sectors.last() == 0;
}
}
public static class NibbleTrackRangeSelection {
@@ -22,8 +22,8 @@ package com.webcodepro.applecommander.storage.os.dos33;
import com.webcodepro.applecommander.storage.DiskConstants;
import com.webcodepro.applecommander.storage.FileEntry;
import com.webcodepro.applecommander.util.AppleUtil;
import org.applecommander.device.Coordinate;
import org.applecommander.device.TrackSectorDevice;
import org.applecommander.os.Coordinate;
import org.applecommander.os.DiskCheck;
import org.applecommander.util.DataBuffer;
@@ -23,7 +23,7 @@ import com.webcodepro.applecommander.storage.*;
import com.webcodepro.applecommander.storage.filters.*;
import com.webcodepro.applecommander.util.AppleUtil;
import com.webcodepro.applecommander.util.TextBundle;
import org.applecommander.os.Coordinate;
import org.applecommander.device.Coordinate;
import java.text.NumberFormat;
import java.util.ArrayList;
@@ -22,11 +22,7 @@ package com.webcodepro.applecommander.storage.os.dos33;
import com.webcodepro.applecommander.storage.*;
import com.webcodepro.applecommander.util.AppleUtil;
import com.webcodepro.applecommander.util.TextBundle;
import org.applecommander.device.BlockDevice;
import org.applecommander.device.BlockToTrackSectorAdapter;
import org.applecommander.device.TrackSectorDevice;
import org.applecommander.device.TrackSectorToBlockStrategy;
import org.applecommander.os.Coordinate;
import org.applecommander.device.*;
import org.applecommander.source.Source;
import org.applecommander.util.Container;
import org.applecommander.util.DataBuffer;
@@ -22,7 +22,7 @@ package com.webcodepro.applecommander.storage.os.prodos;
import com.webcodepro.applecommander.storage.DirectoryEntry;
import com.webcodepro.applecommander.storage.DiskException;
import org.applecommander.device.BlockDevice;
import org.applecommander.os.Coordinate;
import org.applecommander.device.Coordinate;
import org.applecommander.os.DiskCheck;
import org.applecommander.util.DataBuffer;
@@ -23,7 +23,7 @@ import com.webcodepro.applecommander.storage.*;
import com.webcodepro.applecommander.util.AppleUtil;
import com.webcodepro.applecommander.util.TextBundle;
import org.applecommander.device.BlockDevice;
import org.applecommander.os.Coordinate;
import org.applecommander.device.Coordinate;
import org.applecommander.source.Source;
import org.applecommander.util.Container;
import org.applecommander.util.DataBuffer;
@@ -17,7 +17,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package org.applecommander.os;
package org.applecommander.device;
/// A simplistic set of Coordinates. Note that block only matches to block while track and sector have
/// two forms that match against each other.
@@ -21,7 +21,6 @@ package org.applecommander.device;
import com.webcodepro.applecommander.util.Range;
import org.applecommander.capability.Capability;
import org.applecommander.os.Coordinate;
import org.applecommander.os.DiskCheck;
import org.applecommander.util.DataBuffer;
@@ -0,0 +1,18 @@
package org.applecommander.exception;
public class DirectoryFullException extends RuntimeException {
public DirectoryFullException() {
}
public DirectoryFullException(String fmt, Object ...args) {
super(String.format(fmt, args));
}
public DirectoryFullException(String message, Throwable cause) {
super(message, cause);
}
public DirectoryFullException(Throwable cause) {
super(cause);
}
}
@@ -19,6 +19,8 @@
*/
package org.applecommander.os;
import org.applecommander.device.Coordinate;
import java.util.List;
import java.util.Optional;
@@ -17,7 +17,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package org.applecommander.os;
package org.applecommander.device;
import org.junit.jupiter.api.Test;