renamed StorageReaders

.gitattributes

@@ -11384,11 +11384,9 @@ src/main/java/forge/util/Base64Coder.java svneol=native#text/plain
 src/main/java/forge/util/CopyFiles.java svneol=native#text/plain
 src/main/java/forge/util/FileFinder.java svneol=native#text/plain
 src/main/java/forge/util/FileSection.java -text
-src/main/java/forge/util/FileStorageReader.java -text
 src/main/java/forge/util/FileUtil.java svneol=native#text/plain
 src/main/java/forge/util/FolderMap.java svneol=native#text/plain
 src/main/java/forge/util/FolderMapView.java -text
-src/main/java/forge/util/FolderStorageReader.java -text
 src/main/java/forge/util/HttpUtil.java svneol=native#text/plain
 src/main/java/forge/util/IFolderMap.java -text
 src/main/java/forge/util/IFolderMapView.java -text
@@ -11397,6 +11395,8 @@ src/main/java/forge/util/IItemReader.java -text
 src/main/java/forge/util/IItemSerializer.java -text
 src/main/java/forge/util/MyRandom.java svneol=native#text/plain
 src/main/java/forge/util/SectionUtil.java -text
+src/main/java/forge/util/StorageReaderFile.java -text
+src/main/java/forge/util/StorageReaderFolder.java -text
 src/main/java/forge/util/package-info.java -text
 src/main/java/forge/view/FView.java svneol=native#text/plain
 src/main/java/forge/view/Main.java -text

src/main/java/forge/deck/io/DeckGroupSerializer.java

@@ -26,14 +26,14 @@ import org.apache.commons.lang3.StringUtils;
 import forge.deck.Deck;
 import forge.deck.DeckGroup;
 import forge.util.FileUtil;
-import forge.util.FolderStorageReader;
+import forge.util.StorageReaderFolder;
 import forge.util.IItemSerializer;
 
 /**
  * TODO: Write javadoc for this type.
  * 
  */
-public class DeckGroupSerializer extends FolderStorageReader<DeckGroup> implements IItemSerializer<DeckGroup> {
+public class DeckGroupSerializer extends StorageReaderFolder<DeckGroup> implements IItemSerializer<DeckGroup> {
     /**
      * TODO: Write javadoc for Constructor.
      * @param deckDir0

src/main/java/forge/deck/io/DeckSerializer.java

@@ -36,7 +36,7 @@ import forge.deck.Deck;
 import forge.item.CardPrinted;
 import forge.util.FileSection;
 import forge.util.FileUtil;
-import forge.util.FolderStorageReader;
+import forge.util.StorageReaderFolder;
 import forge.util.IItemSerializer;
 import freemarker.template.Configuration;
 import freemarker.template.DefaultObjectWrapper;
@@ -47,7 +47,7 @@ import freemarker.template.TemplateException;
  * TODO: Write javadoc for this type.
  * 
  */
-public class DeckSerializer extends FolderStorageReader<Deck> implements IItemSerializer<Deck> {
+public class DeckSerializer extends StorageReaderFolder<Deck> implements IItemSerializer<Deck> {
 
     public DeckSerializer(File deckDir0) {
         super(deckDir0);

src/main/java/forge/quest/data/PreconReader.java

@@ -4,13 +4,13 @@ import java.io.File;
 import java.io.FilenameFilter;
 import forge.deck.io.DeckSerializer;
 import forge.item.PreconDeck;
-import forge.util.FolderStorageReader;
+import forge.util.StorageReaderFolder;
 
 /** 
  * TODO: Write javadoc for this type.
  *
  */
-public class PreconReader extends FolderStorageReader<PreconDeck> {
+public class PreconReader extends StorageReaderFolder<PreconDeck> {
 
     /**
      * TODO: Write javadoc for Constructor.

src/main/java/forge/util/StorageReaderFile.java

@@ -32,11 +32,11 @@ import org.apache.commons.lang3.StringUtils;
  * TODO: Write javadoc for this type.
  * 
  */
-public abstract class FileStorageReader<T extends IHasName> implements IItemReader<T> {
+public abstract class StorageReaderFile<T extends IHasName> implements IItemReader<T> {
 
     private final File file;
 
-    public FileStorageReader(File file0) {
+    public StorageReaderFile(File file0) {
         file = file0;
     }
 

src/main/java/forge/util/StorageReaderFolder.java

@@ -36,7 +36,7 @@ import forge.error.ErrorViewer;
  * TODO: Write javadoc for this type.
  * 
  */
-public abstract class FolderStorageReader<T extends IHasName> implements IItemReader<T> {
+public abstract class StorageReaderFolder<T extends IHasName> implements IItemReader<T> {
 
     private final File directory;
 
@@ -45,7 +45,7 @@ public abstract class FolderStorageReader<T extends IHasName> implements IItemRe
     }
 
 
-    public FolderStorageReader(File deckDir0) {
+    public StorageReaderFolder(File deckDir0) {
 
         directory = deckDir0;
 
@@ -90,7 +90,7 @@ public abstract class FolderStorageReader<T extends IHasName> implements IItemRe
                 if (null == newDeck) {
 
                     String msg =  "An object stored in " + file.getPath() + " failed to load.\nPlease submit this as a bug with the mentioned file/directory attached.";
-                    JOptionPane.showMessageDialog(null, msg); //-- This becomes bugged if uncommented, but i need these messages to debug other peoples decks // Max Mtg
+                    JOptionPane.showMessageDialog(null, msg);
                     continue;
                 }
                 result.put(newDeck.getName(), newDeck);
@@ -104,7 +104,7 @@ public abstract class FolderStorageReader<T extends IHasName> implements IItemRe
         if (!decksThatFailedToLoad.isEmpty()) {
             JOptionPane.showMessageDialog(null,
                     StringUtils.join(decksThatFailedToLoad, System.getProperty("line.separator")),
-                    "Some of your decks were not loaded.", JOptionPane.WARNING_MESSAGE);
+                    "Some of your objects were not loaded.", JOptionPane.WARNING_MESSAGE);
         }
 
         return result;