mirror of
https://github.com/AppleCommander/AppleCommander.git
synced 2026-10-24 23:02:27 +00:00
Moved ProdosAttributes into transfer package.
This commit is contained in:
1 parent
efae6425a1
commit
f154da0e58
10 files changed
+19
-11
No files matched your search
@@ -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;
|
||||
|
||||
+2
-2
@@ -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<Path> results = exportOption.copyToPath(directory, fileEntry);
|
||||
|
||||
+2
-1
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
*/
|
||||
package org.applecommander.filestore;
|
||||
|
||||
import org.applecommander.transfer.ProdosAttributes;
|
||||
import org.applecommander.util.Container;
|
||||
import org.applecommander.util.DataBuffer;
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user