From f154da0e58fd53e23e0a9774174e48f5833ca99d Mon Sep 17 00:00:00 2001 From: a2geek Date: Thu, 8 Oct 2026 12:58:39 -0500 Subject: [PATCH] Moved ProdosAttributes into transfer package. --- .../org/applecommander/javafx/settings/ExportOption.java | 2 +- .../applecommander/javafx/settings/ExportOptionTest.java | 4 ++-- .../applecommander/storage/DiskFileStoreAdapter.java | 3 ++- .../archive/shrinkit/ShrinkitFileEntry.java | 4 ++-- .../java/org/applecommander/archive/zip/ZipFileEntry.java | 8 ++++++-- .../main/java/org/applecommander/filestore/FileEntry.java | 1 + .../org/applecommander/filestore/WritableDirectory.java | 1 + .../org/applecommander/os/gamedos/GamedosDirectory.java | 1 + .../org/applecommander/os/gamedos/GamedosFileEntry.java | 4 ++-- .../{filestore => transfer}/ProdosAttributes.java | 2 +- 10 files changed, 19 insertions(+), 11 deletions(-) rename lib/ac-api/src/main/java/org/applecommander/{filestore => transfer}/ProdosAttributes.java (98%) diff --git a/app/gui-javafx/src/main/java/org/applecommander/javafx/settings/ExportOption.java b/app/gui-javafx/src/main/java/org/applecommander/javafx/settings/ExportOption.java index 07e8fec7..be2d2f0b 100644 --- a/app/gui-javafx/src/main/java/org/applecommander/javafx/settings/ExportOption.java +++ b/app/gui-javafx/src/main/java/org/applecommander/javafx/settings/ExportOption.java @@ -21,7 +21,7 @@ package org.applecommander.javafx.settings; import org.applecommander.applesingle.AppleSingle; import org.applecommander.filestore.FileEntry; -import org.applecommander.filestore.ProdosAttributes; +import org.applecommander.transfer.ProdosAttributes; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/app/gui-javafx/src/test/java/org/applecommander/javafx/settings/ExportOptionTest.java b/app/gui-javafx/src/test/java/org/applecommander/javafx/settings/ExportOptionTest.java index 7ed0e51f..1a695227 100644 --- a/app/gui-javafx/src/test/java/org/applecommander/javafx/settings/ExportOptionTest.java +++ b/app/gui-javafx/src/test/java/org/applecommander/javafx/settings/ExportOptionTest.java @@ -23,7 +23,7 @@ import com.google.common.primitives.Bytes; import org.applecommander.filestore.Directory; import org.applecommander.filestore.FileEntry; import org.applecommander.filestore.FileStore; -import org.applecommander.filestore.ProdosAttributes; +import org.applecommander.transfer.ProdosAttributes; import org.applecommander.util.DataBuffer; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -105,7 +105,7 @@ public class ExportOptionTest { .unlocked() .TXT() .name(baseFilename) - .build()); + .get()); FileEntry fileEntry = builder.get(); List results = exportOption.copyToPath(directory, fileEntry); diff --git a/lib/ac-api/src/main/java/com/webcodepro/applecommander/storage/DiskFileStoreAdapter.java b/lib/ac-api/src/main/java/com/webcodepro/applecommander/storage/DiskFileStoreAdapter.java index dd2ea85d..77868d52 100644 --- a/lib/ac-api/src/main/java/com/webcodepro/applecommander/storage/DiskFileStoreAdapter.java +++ b/lib/ac-api/src/main/java/com/webcodepro/applecommander/storage/DiskFileStoreAdapter.java @@ -40,6 +40,7 @@ import org.applecommander.device.Device; import org.applecommander.device.TrackSectorDevice; import org.applecommander.filestore.*; import org.applecommander.filestore.FileEntry; +import org.applecommander.transfer.ProdosAttributes; import org.applecommander.usage.BlockUsage; import org.applecommander.usage.DiskUsage; import org.applecommander.usage.DiskUsage.UsageType; @@ -276,7 +277,7 @@ public class DiskFileStoreAdapter implements FileStore { } default -> throw new IllegalStateException("Unexpected file entry: " + fileEntry.getClass().getName()); } - return builder.build(); + return builder.get(); } @Override public void setDataFork(DataBuffer fileData) { diff --git a/lib/ac-api/src/main/java/org/applecommander/archive/shrinkit/ShrinkitFileEntry.java b/lib/ac-api/src/main/java/org/applecommander/archive/shrinkit/ShrinkitFileEntry.java index 44289fec..62d36d16 100644 --- a/lib/ac-api/src/main/java/org/applecommander/archive/shrinkit/ShrinkitFileEntry.java +++ b/lib/ac-api/src/main/java/org/applecommander/archive/shrinkit/ShrinkitFileEntry.java @@ -22,11 +22,11 @@ package org.applecommander.archive.shrinkit; import org.applecommander.filestore.ContentType; import org.applecommander.filestore.FileEntry; import org.applecommander.filestore.FileStore; -import org.applecommander.filestore.ProdosAttributes; import org.applecommander.shrinkit.HeaderBlock; import org.applecommander.shrinkit.ThreadFormat; import org.applecommander.shrinkit.ThreadKind; import org.applecommander.shrinkit.ThreadRecord; +import org.applecommander.transfer.ProdosAttributes; import org.applecommander.util.Container; import org.applecommander.util.DataBuffer; import org.applecommander.util.FileMagic; @@ -179,7 +179,7 @@ public class ShrinkitFileEntry implements FileEntry { .fileType((int)headerBlock.getFileType()) .creation(getCreateWhen()) .modification(getModWhen()) - .build(); + .get(); } @Override diff --git a/lib/ac-api/src/main/java/org/applecommander/archive/zip/ZipFileEntry.java b/lib/ac-api/src/main/java/org/applecommander/archive/zip/ZipFileEntry.java index 5dfa0153..04a6eab9 100644 --- a/lib/ac-api/src/main/java/org/applecommander/archive/zip/ZipFileEntry.java +++ b/lib/ac-api/src/main/java/org/applecommander/archive/zip/ZipFileEntry.java @@ -19,7 +19,11 @@ */ package org.applecommander.archive.zip; -import org.applecommander.filestore.*; +import org.applecommander.filestore.ContentType; +import org.applecommander.filestore.Directory; +import org.applecommander.filestore.FileEntry; +import org.applecommander.filestore.FileStore; +import org.applecommander.transfer.ProdosAttributes; import org.applecommander.util.Container; import org.applecommander.util.DataBuffer; import org.applecommander.util.FileMagic; @@ -128,7 +132,7 @@ public class ZipFileEntry implements FileEntry { .BIN(0x0000) .creation(new Date(getCreationTime().toMillis())) .modification(new Date(getLastModifiedTime().toMillis())) - .build(); + .get(); } @Override diff --git a/lib/ac-api/src/main/java/org/applecommander/filestore/FileEntry.java b/lib/ac-api/src/main/java/org/applecommander/filestore/FileEntry.java index 94888f7e..53891b9f 100644 --- a/lib/ac-api/src/main/java/org/applecommander/filestore/FileEntry.java +++ b/lib/ac-api/src/main/java/org/applecommander/filestore/FileEntry.java @@ -19,6 +19,7 @@ */ package org.applecommander.filestore; +import org.applecommander.transfer.ProdosAttributes; import org.applecommander.util.Container; import org.applecommander.util.DataBuffer; diff --git a/lib/ac-api/src/main/java/org/applecommander/filestore/WritableDirectory.java b/lib/ac-api/src/main/java/org/applecommander/filestore/WritableDirectory.java index ed4aa01f..c36363a2 100644 --- a/lib/ac-api/src/main/java/org/applecommander/filestore/WritableDirectory.java +++ b/lib/ac-api/src/main/java/org/applecommander/filestore/WritableDirectory.java @@ -20,6 +20,7 @@ package org.applecommander.filestore; import org.applecommander.capability.Capability; +import org.applecommander.transfer.ProdosAttributes; /// A WritableDirectory is a Directory that allows general directory modification. /// Since not all directories can perform all tasks, check the capability first, diff --git a/lib/ac-api/src/main/java/org/applecommander/os/gamedos/GamedosDirectory.java b/lib/ac-api/src/main/java/org/applecommander/os/gamedos/GamedosDirectory.java index 8611ecfa..53027689 100644 --- a/lib/ac-api/src/main/java/org/applecommander/os/gamedos/GamedosDirectory.java +++ b/lib/ac-api/src/main/java/org/applecommander/os/gamedos/GamedosDirectory.java @@ -24,6 +24,7 @@ import org.applecommander.device.TrackSectorDevice; import org.applecommander.exception.DirectoryFullException; import org.applecommander.exception.FileExistsException; import org.applecommander.filestore.*; +import org.applecommander.transfer.ProdosAttributes; import org.applecommander.util.DataBuffer; import java.util.ArrayList; diff --git a/lib/ac-api/src/main/java/org/applecommander/os/gamedos/GamedosFileEntry.java b/lib/ac-api/src/main/java/org/applecommander/os/gamedos/GamedosFileEntry.java index 3be5e2ac..4ed6e0b6 100644 --- a/lib/ac-api/src/main/java/org/applecommander/os/gamedos/GamedosFileEntry.java +++ b/lib/ac-api/src/main/java/org/applecommander/os/gamedos/GamedosFileEntry.java @@ -24,9 +24,9 @@ import org.applecommander.device.TrackSectorDevice; import org.applecommander.exception.DiskFullException; import org.applecommander.filestore.Directory; import org.applecommander.filestore.FileStore; -import org.applecommander.filestore.ProdosAttributes; import org.applecommander.filestore.WritableFileEntry; import org.applecommander.os.SequentialAllocator; +import org.applecommander.transfer.ProdosAttributes; import org.applecommander.util.Container; import org.applecommander.util.DataBuffer; @@ -165,7 +165,7 @@ public class GamedosFileEntry implements WritableFileEntry, GamedosConstants { case "P" -> builder.BIN(0x2000); case "I" -> builder.INT(); } - return builder.build(); + return builder.get(); } @Override diff --git a/lib/ac-api/src/main/java/org/applecommander/filestore/ProdosAttributes.java b/lib/ac-api/src/main/java/org/applecommander/transfer/ProdosAttributes.java similarity index 98% rename from lib/ac-api/src/main/java/org/applecommander/filestore/ProdosAttributes.java rename to lib/ac-api/src/main/java/org/applecommander/transfer/ProdosAttributes.java index a7df3f51..1dce05f7 100644 --- a/lib/ac-api/src/main/java/org/applecommander/filestore/ProdosAttributes.java +++ b/lib/ac-api/src/main/java/org/applecommander/transfer/ProdosAttributes.java @@ -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.filestore; +package org.applecommander.transfer; import org.applecommander.util.FileMagic;