From d7f8231717f14a28869f8a1b76f4670f17ff2cef Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Wed, 15 Jan 2014 05:20:00 +0000
Subject: [PATCH] More code cleanup

---
 .../util/storage/StorageImmediatelySerialized.java   | 12 ++++++------
 .../forge/util/storage/StorageNestedFolders.java     | 12 ++++++------
 .../java/forge/util/storage/StorageReaderBase.java   |  3 +--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java b/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java
index f385f8f0872..ca3ab2a6d7a 100644
--- a/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java
+++ b/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java
@@ -66,10 +66,10 @@ public class StorageImmediatelySerialized<T> extends StorageBase<T> {
      * @see forge.util.storage.StorageBase#add(T)
      */
     @Override
-    public final void add(final T deck) {
-        String name = serializer.getItemKey(deck);
-        this.map.put(name, deck);
-        this.serializer.save(deck);
+    public final void add(final T item) {
+        String name = serializer.getItemKey(item);
+        this.map.put(name, item);
+        this.serializer.save(item);
     }
 
     /*
@@ -78,8 +78,8 @@ public class StorageImmediatelySerialized<T> extends StorageBase<T> {
      * @see forge.util.storage.StorageBase#delete(java.lang.String)
      */
     @Override
-    public final void delete(final String deckName) {
-        this.serializer.erase(this.map.remove(deckName));
+    public final void delete(final String itemName) {
+        this.serializer.erase(this.map.remove(itemName));
     }
 
     /* (non-Javadoc)
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 af80d34b0e9..49d3c9e8291 100644
--- a/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java
+++ b/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java
@@ -11,7 +11,7 @@ public class StorageNestedFolders<T> extends StorageBase<IStorage<T>> {
     public StorageNestedFolders(File thisFolder, Iterable<File> subfolders, Function<File, IStorage<T>> factory) {
         super("<Subfolders>", new HashMap<String, IStorage<T>>());
         this.thisFolder = thisFolder;
-        for (File sf : subfolders ) {
+        for (File sf : subfolders) {
             IStorage<T> newUnit = factory.apply(sf);
             map.put(sf.getName(), newUnit);
         }
@@ -20,8 +20,8 @@ public class StorageNestedFolders<T> extends StorageBase<IStorage<T>> {
     // need code implementations for folder create/delete operations
     
     @Override
-    public void add(IStorage<T> deck) {
-        File subdir = new File(thisFolder, deck.getName());
+    public void add(IStorage<T> item) {
+        File subdir = new File(thisFolder, item.getName());
         subdir.mkdir();
         
         // TODO: save recursivelly the passed IStorage 
@@ -29,9 +29,9 @@ public class StorageNestedFolders<T> extends StorageBase<IStorage<T>> {
     }
     
     @Override
-    public void delete(String deckName) {
-        File subdir = new File(thisFolder, deckName);
-        IStorage<T> f = map.remove(deckName);
+    public void delete(String itemName) {
+        File subdir = new File(thisFolder, itemName);
+        IStorage<T> f = map.remove(itemName);
         
         // TODO: Clear all that files from disk
         if (f != null) {
diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderBase.java b/forge-core/src/main/java/forge/util/storage/StorageReaderBase.java
index 9d343ca3ed5..4e66d6408b4 100644
--- a/forge-core/src/main/java/forge/util/storage/StorageReaderBase.java
+++ b/forge-core/src/main/java/forge/util/storage/StorageReaderBase.java
@@ -8,7 +8,6 @@ import com.google.common.collect.ImmutableList;
 import forge.util.IItemReader;
 
 public abstract class StorageReaderBase<T> implements IItemReader<T> {
-    
     protected final Function<? super T, String> keySelector;
     public StorageReaderBase(final Function<? super T, String> keySelector0) {
         keySelector = keySelector0;
@@ -19,7 +18,7 @@ public abstract class StorageReaderBase<T> implements IItemReader<T> {
         // TODO Auto-generated method stub
         return ImmutableList.of();
     }
-    
+
     @Override
     public IItemReader<T> getReaderForFolder(File subfolder) {
         throw new UnsupportedOperationException("This reader is not supposed to have nested folders");