diff --git a/gradle.properties b/gradle.properties index 729ceba..201effe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Universal AppleCommander version number. Used for: # - Naming JAR file. # - The build will insert this into a file that is read at run time as well. -version=1.6.0-PRE +version=1.5.1-PRE # Dependency versions shkVersion=1.2.2 diff --git a/src/main/java/com/webcodepro/applecommander/storage/DirectoryEntry.java b/src/main/java/com/webcodepro/applecommander/storage/DirectoryEntry.java index 7bb352e..6e4d248 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/DirectoryEntry.java +++ b/src/main/java/com/webcodepro/applecommander/storage/DirectoryEntry.java @@ -40,7 +40,7 @@ public interface DirectoryEntry { * return value should always be a list - a directory * with 0 entries returns an empty list. */ - public List getFiles() throws DiskException; + public List getFiles() throws DiskException; /** * Create a new FileEntry. diff --git a/src/main/java/com/webcodepro/applecommander/storage/FormattedDisk.java b/src/main/java/com/webcodepro/applecommander/storage/FormattedDisk.java index 56e5dc4..7d1d72a 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/FormattedDisk.java +++ b/src/main/java/com/webcodepro/applecommander/storage/FormattedDisk.java @@ -268,7 +268,7 @@ public abstract class FormattedDisk extends Disk implements DirectoryEntry { * Returns a null if specific filename is not located. */ public FileEntry getFile(String filename) throws DiskException { - List files = getFiles(); + List files = getFiles(); return getFile(files, filename.trim()); } @@ -277,7 +277,7 @@ public abstract class FormattedDisk extends Disk implements DirectoryEntry { * Note that in the instance of a system with directories (ie, ProDOS), * this really returns the first file with the given filename. */ - protected FileEntry getFile(List files, String filename) throws DiskException { + protected FileEntry getFile(List files, String filename) throws DiskException { FileEntry theFileEntry = null; if (files != null) { for (FileEntry entry : files) { diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFormatDisk.java index 43e5387..49e79c8 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFormatDisk.java +++ b/src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFormatDisk.java @@ -89,7 +89,8 @@ public class PascalFormatDisk extends FormattedDisk { bitmap.set(block); } // process through all files and mark those blocks as used - for (PascalFileEntry entry : getFiles()) { + for (FileEntry fileEntry : getFiles()) { + PascalFileEntry entry = (PascalFileEntry) fileEntry; for (int block=entry.getFirstBlock(); block getFiles() { - List list = new ArrayList<>(); + public List getFiles() { + List list = new ArrayList<>(); byte[] directory = readDirectory(); // process directory blocks: int entrySize = ENTRY_SIZE; @@ -300,10 +301,11 @@ public class PascalFormatDisk extends FormattedDisk { * Return the number of free blocks. */ public int getFreeBlocks() { - List files = getFiles(); + List files = getFiles(); int blocksFree = getBlocksOnDisk() - 6; if (files != null) { - for (PascalFileEntry entry : files) { + for (FileEntry fileEntry : files) { + PascalFileEntry entry = (PascalFileEntry) fileEntry; blocksFree-= entry.getBlocksUsed(); } } @@ -367,10 +369,11 @@ public class PascalFormatDisk extends FormattedDisk { * Return the number of used blocks. */ public int getUsedBlocks() { - List files = getFiles(); + List files = getFiles(); int blocksUsed = 6; if (files != null) { - for (PascalFileEntry entry : files) { + for (FileEntry fileEntry : files) { + PascalFileEntry entry = (PascalFileEntry) fileEntry; blocksUsed+= entry.getBlocksUsed(); } } diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosDirectoryEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosDirectoryEntry.java index 0b4605e..22978c7 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosDirectoryEntry.java +++ b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosDirectoryEntry.java @@ -24,6 +24,7 @@ import java.util.List; import com.webcodepro.applecommander.storage.DirectoryEntry; import com.webcodepro.applecommander.storage.DiskException; import com.webcodepro.applecommander.storage.DiskFullException; +import com.webcodepro.applecommander.storage.FileEntry; /** * Implement directory functionality. @@ -62,7 +63,7 @@ public class ProdosDirectoryEntry extends ProdosFileEntry implements DirectoryEn * with 0 entries returns an empty list. * @throws DiskException */ - public List getFiles() throws DiskException { + public List getFiles() throws DiskException { return getDisk().getFiles(getSubdirectoryHeader().getFileEntryBlock()); } diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFormatDisk.java index 0a18d3c..54c1831 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFormatDisk.java +++ b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFormatDisk.java @@ -261,7 +261,7 @@ public class ProdosFormatDisk extends FormattedDisk { * @throws DiskException * @see com.webcodepro.applecommander.storage.FormattedDisk#getFiles() */ - public List getFiles() throws DiskException { + public List getFiles() throws DiskException { return getFiles(VOLUME_DIRECTORY_BLOCK); } @@ -269,8 +269,8 @@ public class ProdosFormatDisk extends FormattedDisk { * Build a list of files, starting in the given block number. * This works for the master as well as the subdirectories. */ - protected List getFiles(int blockNumber) throws DiskException { - List files = new ArrayList<>(); + protected List getFiles(int blockNumber) throws DiskException { + List files = new ArrayList<>(); final Set visits = new HashSet<>(); while (blockNumber != 0) { // Prevents a recursive catalog crawling. diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/rdos/RdosFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/rdos/RdosFormatDisk.java index 5306261..dab0e95 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/os/rdos/RdosFormatDisk.java +++ b/src/main/java/com/webcodepro/applecommander/storage/os/rdos/RdosFormatDisk.java @@ -102,10 +102,11 @@ public class RdosFormatDisk extends FormattedDisk { bitmap.set(b); } // for each file, mark the blocks used - for (RdosFileEntry fileEntry : getFiles()) { + for (FileEntry fileEntry : getFiles()) { if (!fileEntry.isDeleted()) { - for (int b=0; b getFiles() { - List files = new ArrayList<>(); + public List getFiles() { + List files = new ArrayList<>(); for (int b=13; b<23; b++) { byte[] data = readRdosBlock(b); for (int i=0; i files, String directory) throws IOException, DiskException { + static void writeFiles(List files, String directory) throws IOException, DiskException { for (FileEntry entry : files) { if ((entry != null) && (!entry.isDeleted()) && (!entry.isDirectory())) { FileFilter ff = entry.getSuggestedFilter(); @@ -493,7 +493,7 @@ public class ac { * file with the given filename. */ @Deprecated - static FileEntry getEntry(List files, String fileName) throws DiskException { + static FileEntry getEntry(List files, String fileName) throws DiskException { if (files != null) { for (FileEntry entry : files) { String entryName = entry.getFilename(); @@ -523,7 +523,7 @@ public class ac { FormattedDisk formattedDisk = formattedDisks[i]; System.out.print(args[d] + " "); System.out.println(formattedDisk.getDiskName()); - List files = formattedDisk.getFiles(); + List files = formattedDisk.getFiles(); if (files != null) { showFiles(files, "", display); //$NON-NLS-1$ } @@ -547,7 +547,7 @@ public class ac { * system with directories (e.g. ProDOS), this really returns the first file * with the given filename. */ - static void showFiles(List files, String indent, int display) throws DiskException { + static void showFiles(List files, String indent, int display) throws DiskException { for (FileEntry entry : files) { if (!entry.isDeleted()) { List data = entry.getFileColumnData(display); @@ -728,7 +728,7 @@ public class ac { } public FileEntry getEntry(FormattedDisk formattedDisk) throws DiskException { - List files = formattedDisk.getFiles(); + List files = formattedDisk.getFiles(); FileEntry entry = null; for (int i = 0; i < path.length - 1; i++) { String dirName = path[i]; @@ -754,7 +754,7 @@ public class ac { if (path.length == 1) { return formattedDisk.createFile(); } - List files = formattedDisk.getFiles(); + List files = formattedDisk.getFiles(); DirectoryEntry dir = null, parentDir = null; for (int i = 0; i < path.length - 1; i++) { String dirName = path[i]; diff --git a/src/main/java/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java b/src/main/java/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java index edfbaf6..2d54009 100644 --- a/src/main/java/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java +++ b/src/main/java/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java @@ -164,7 +164,7 @@ public class DiskExplorerTab { private int currentFormat = FormattedDisk.FILE_DISPLAY_STANDARD; private boolean formatChanged; - private List currentFileList; + private List currentFileList; private Map columnWidths = new HashMap<>(); private boolean showDeletedFiles; @@ -261,7 +261,7 @@ public class DiskExplorerTab { if (disks[i].canHaveDirectories()) { try { - Iterator files = disks[i].getFiles().iterator(); + Iterator files = disks[i].getFiles().iterator(); while (files.hasNext()) { FileEntry entry = (FileEntry) files.next(); if (entry.isDirectory()) { @@ -880,7 +880,7 @@ public class DiskExplorerTab { /** * Display files in the fileTable. */ - protected void fillFileTable(List fileList) { + protected void fillFileTable(List fileList) { int[] weights = sashForm.getWeights(); if (formatChanged) { @@ -1469,7 +1469,7 @@ public class DiskExplorerTab { TreeItem selection = directoryTree.getSelection()[0]; Object data = selection.getData(); DirectoryEntry directory = (DirectoryEntry) data; - List fileList = directory.getFiles(); + List fileList = directory.getFiles(); formatChanged = (currentFormat != newFormat); if (formatChanged || !fileList.equals(currentFileList)) { @@ -2093,7 +2093,7 @@ public class DiskExplorerTab { return viewFileItem; } - protected List getCurrentFileList() { + protected List getCurrentFileList() { return currentFileList; } diff --git a/src/test/java/com/webcodepro/applecommander/storage/DiskHelperTest.java b/src/test/java/com/webcodepro/applecommander/storage/DiskHelperTest.java index e5470d5..af14e97 100644 --- a/src/test/java/com/webcodepro/applecommander/storage/DiskHelperTest.java +++ b/src/test/java/com/webcodepro/applecommander/storage/DiskHelperTest.java @@ -139,7 +139,7 @@ public class DiskHelperTest { FormattedDisk formattedDisk = formattedDisks[i]; System.out.println(); System.out.println(formattedDisk.getDiskName()); - List files = formattedDisk.getFiles(); + List files = formattedDisk.getFiles(); if (files != null) { showFiles(files, ""); //$NON-NLS-1$ } @@ -155,7 +155,7 @@ public class DiskHelperTest { return formattedDisks; } - protected void showFiles(List files, String indent) throws DiskException { + protected void showFiles(List files, String indent) throws DiskException { for (int i=0; i files = formattedDisk.getFiles(); + List files = formattedDisk.getFiles(); if (files != null) { showFiles(files, "", false); //$NON-NLS-1$ } @@ -405,7 +405,7 @@ public class DiskWriterTest { /** * Display a list of files. */ - protected void showFiles(List files, String indent, boolean showDeleted) throws DiskException { + protected void showFiles(List files, String indent, boolean showDeleted) throws DiskException { for (int i=0; i files = disk.getFiles(); + List files = disk.getFiles(); for (int i=0; i files = disk.getFiles(); + List files = disk.getFiles(); for (int i=0; i files = formattedDisk.getFiles(); + List files = formattedDisk.getFiles(); assertNotNull(files); assertEquals(1, files.size()); ProdosFileEntry file = (ProdosFileEntry)files.get(0);