From a5a0c510b51b4183d3462af7fd4300f51d181750 Mon Sep 17 00:00:00 2001 From: drdev Date: Wed, 15 Jan 2014 05:48:53 +0000 Subject: [PATCH] More code cleanup --- .../src/main/java/forge/util/storage/IStorage.java | 6 +++--- .../forge/util/storage/StorageNestedFolders.java | 10 +++++----- .../java/forge/util/storage/StorageReaderFile.java | 6 +++--- .../util/storage/StorageReaderFileSections.java | 12 ++++++------ .../java/forge/util/storage/StorageReaderFolder.java | 9 ++++----- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/forge-core/src/main/java/forge/util/storage/IStorage.java b/forge-core/src/main/java/forge/util/storage/IStorage.java index 744bbc8bd1a..0ca5897b340 100644 --- a/forge-core/src/main/java/forge/util/storage/IStorage.java +++ b/forge-core/src/main/java/forge/util/storage/IStorage.java @@ -31,7 +31,7 @@ import forge.util.IHasName; public interface IStorage extends Iterable, IHasName { T get(final String name); - + T find(final Predicate condition); // todo: find(final Predicate condition, boolean recursive). @@ -40,10 +40,10 @@ public interface IStorage extends Iterable, IHasName { boolean contains(final String name); int size(); - + void add(final T deck); void delete(final String deckName); - + IStorage> getFolders(); } \ No newline at end of file diff --git a/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java b/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java index 49d3c9e8291..b3e6e6891f3 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java +++ b/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java @@ -18,21 +18,21 @@ public class StorageNestedFolders extends StorageBase> { } // need code implementations for folder create/delete operations - + @Override public void add(IStorage item) { File subdir = new File(thisFolder, item.getName()); subdir.mkdir(); - - // TODO: save recursivelly the passed IStorage + + // TODO: save recursivelly the passed IStorage throw new UnsupportedOperationException("method is not implemented"); } - + @Override public void delete(String itemName) { File subdir = new File(thisFolder, itemName); IStorage f = map.remove(itemName); - + // TODO: Clear all that files from disk if (f != null) { subdir.delete(); // won't work if not empty; diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderFile.java b/forge-core/src/main/java/forge/util/storage/StorageReaderFile.java index b34910d74dd..068a7a606ae 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageReaderFile.java +++ b/forge-core/src/main/java/forge/util/storage/StorageReaderFile.java @@ -78,9 +78,9 @@ public abstract class StorageReaderFile extends StorageReaderBase { idx++; String newKey = keySelector.apply(item); - if( result.containsKey(newKey)) + if (result.containsKey(newKey)) { System.err.println("StorageReader: Overwriting an object with key " + newKey); - + } result.put(newKey, item); } @@ -93,7 +93,7 @@ public abstract class StorageReaderFile extends StorageReaderBase { * @param line * the line * @return the t - */ + */ protected abstract T read(String line, int idx); /** diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java b/forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java index 300f21d9e4b..ef453283335 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java +++ b/forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java @@ -60,10 +60,10 @@ public abstract class StorageReaderFileSections extends StorageReaderBase int idx = 0; Iterable file = FileUtil.readFile(this.file); - + List accumulator = new ArrayList(); String header = null; - + for (final String s : file) { if (!this.lineContainsObject(s)) { continue; @@ -92,7 +92,7 @@ public abstract class StorageReaderFileSections extends StorageReaderBase String newKey = keySelector.apply(item); if( result.containsKey(newKey)) System.err.println("StorageReader: Overwriting an object with key " + newKey); - + result.put(newKey, item); } } @@ -102,18 +102,18 @@ public abstract class StorageReaderFileSections extends StorageReaderBase private final T readItem(String header, Iterable accumulator, int idx) { final T item = this.read(header, accumulator, idx); if (null != item) return item; - + final String msg = "An object stored in " + this.file.getPath() + " failed to load.\nPlease submit this as a bug with the mentioned file attached."; throw new RuntimeException(msg); } - + /** * TODO: Write javadoc for this method. * * @param line * the line * @return the t - */ + */ protected abstract T read(String title, Iterable body, int idx); /** diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java b/forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java index c3995f48418..bba63d5e7b7 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java +++ b/forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java @@ -54,7 +54,7 @@ public abstract class StorageReaderFolder extends StorageReaderBase { */ public StorageReaderFolder(final File itemDir0, Function keySelector0) { super(keySelector0); - + this.directory = itemDir0; if (this.directory == null) { @@ -75,7 +75,7 @@ public abstract class StorageReaderFolder extends StorageReaderBase { } public final List objectsThatFailedToLoad = new ArrayList(); - + /* (non-Javadoc) * @see forge.util.IItemReader#readAll() */ @@ -92,9 +92,9 @@ public abstract class StorageReaderFolder extends StorageReaderBase { throw new RuntimeException(msg); } String newKey = keySelector.apply(newDeck); - if( result.containsKey(newKey)) + if (result.containsKey(newKey)) { System.err.println("StorageReader: Overwriting an object with key " + newKey); - + } result.put(newKey, newDeck); } catch (final NoSuchElementException ex) { final String message = String.format("%s failed to load because ---- %s", file.getName(), ex.getMessage()); @@ -128,7 +128,6 @@ public abstract class StorageReaderFolder extends StorageReaderBase { @Override public Iterable getSubFolders() { File[] list = this.directory.listFiles(new FileFilter() { - @Override public boolean accept(File file) { return file.isDirectory() && !file.isHidden();