renamed FolderMap* to Storage* (more neutral, because collections can store something that is not a folder)

.gitattributes

@@ -11428,18 +11428,18 @@ src/main/java/forge/util/FileFinder.java svneol=native#text/plain
 src/main/java/forge/util/FileSection.java -text
 src/main/java/forge/util/FileSectionManual.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/HttpUtil.java svneol=native#text/plain
-src/main/java/forge/util/IFolderMap.java -text
-src/main/java/forge/util/IFolderMapView.java -text
 src/main/java/forge/util/IHasName.java -text
 src/main/java/forge/util/IItemReader.java -text
 src/main/java/forge/util/IItemSerializer.java -text
+src/main/java/forge/util/IStorage.java -text
+src/main/java/forge/util/IStorageView.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/StorageImmediatelySerialized.java svneol=native#text/plain
 src/main/java/forge/util/StorageReaderFile.java -text
 src/main/java/forge/util/StorageReaderFolder.java -text
+src/main/java/forge/util/StorageView.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/card/EditionCollection.java

@@ -20,9 +20,9 @@ package forge.card;
 import java.util.Map;
 import java.util.TreeMap;
 
-import forge.util.FolderMapView;
+import forge.util.StorageView;
 
-public final class EditionCollection extends FolderMapView<CardEdition> {
+public final class EditionCollection extends StorageView<CardEdition> {
 
     private final Map<String,CardEdition> aliasToEdition = new TreeMap<String, CardEdition>();
 

src/main/java/forge/card/FormatCollection.java

@@ -21,13 +21,13 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import forge.game.GameFormat;
-import forge.util.FolderMapView;
+import forge.util.StorageView;
 import forge.util.StorageReaderFile;
 
 /**
  * The Class FormatUtils.
  */
-public final class FormatCollection extends FolderMapView<GameFormat> {
+public final class FormatCollection extends StorageView<GameFormat> {
 
 
 

src/main/java/forge/control/home/ControlConstructed.java

@@ -26,7 +26,7 @@ import forge.game.GameNew;
 import forge.game.GameType;
 import forge.properties.ForgePreferences.FPref;
 import forge.quest.data.QuestEvent;
-import forge.util.IFolderMap;
+import forge.util.IStorage;
 import forge.view.home.ViewConstructed;
 
 /** 
@@ -322,7 +322,7 @@ public class ControlConstructed {
         final List<String> customNames = new ArrayList<String>();
         customNames.clear();
 
-        final IFolderMap<Deck> allDecks = Singletons.getModel().getDecks().getConstructed();
+        final IStorage<Deck> allDecks = Singletons.getModel().getDecks().getConstructed();
         for (final Deck d : allDecks) { customNames.add(d.getName()); }
 
         return oa2sa(customNames.toArray());

src/main/java/forge/deck/CardCollections.java

@@ -22,18 +22,18 @@ import java.io.File;
 import forge.deck.io.DeckGroupSerializer;
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.OldDeckParser;
-import forge.util.FolderMap;
+import forge.util.StorageImmediatelySerialized;
-import forge.util.IFolderMap;
+import forge.util.IStorage;
 
 /**
  * Holds editable maps of decks saved to disk. Adding or removing items to(from)
  * such map turns into immediate file update
  */
 public class CardCollections {
-    private final IFolderMap<Deck> constructed;
+    private final IStorage<Deck> constructed;
-    private final IFolderMap<DeckGroup> draft;
+    private final IStorage<DeckGroup> draft;
-    private final IFolderMap<DeckGroup> sealed;
+    private final IStorage<DeckGroup> sealed;
-    private final IFolderMap<Deck> cube;
+    private final IStorage<Deck> cube;
 
     /**
      * TODO: Write javadoc for Constructor.
@@ -41,10 +41,10 @@ public class CardCollections {
      * @param file the file
      */
     public CardCollections(final File file) {
-        this.constructed = new FolderMap<Deck>(new DeckSerializer(new File(file, "constructed")));
+        this.constructed = new StorageImmediatelySerialized<Deck>(new DeckSerializer(new File(file, "constructed")));
-        this.draft = new FolderMap<DeckGroup>(new DeckGroupSerializer(new File(file, "draft")));
+        this.draft = new StorageImmediatelySerialized<DeckGroup>(new DeckGroupSerializer(new File(file, "draft")));
-        this.sealed = new FolderMap<DeckGroup>(new DeckGroupSerializer(new File(file, "sealed")));
+        this.sealed = new StorageImmediatelySerialized<DeckGroup>(new DeckGroupSerializer(new File(file, "sealed")));
-        this.cube = new FolderMap<Deck>(new DeckSerializer(new File(file, "cube")));
+        this.cube = new StorageImmediatelySerialized<Deck>(new DeckSerializer(new File(file, "cube")));
 
         // remove this after most people have been switched to new layout
         final OldDeckParser oldParser = new OldDeckParser(file, this.constructed, this.draft, this.sealed, this.cube);
@@ -56,7 +56,7 @@ public class CardCollections {
      *
      * @return the constructed
      */
-    public final IFolderMap<Deck> getConstructed() {
+    public final IStorage<Deck> getConstructed() {
         return this.constructed;
     }
 
@@ -65,7 +65,7 @@ public class CardCollections {
      *
      * @return the draft
      */
-    public final IFolderMap<DeckGroup> getDraft() {
+    public final IStorage<DeckGroup> getDraft() {
         return this.draft;
     }
 
@@ -74,7 +74,7 @@ public class CardCollections {
      *
      * @return the cubes
      */
-    public final IFolderMap<Deck> getCubes() {
+    public final IStorage<Deck> getCubes() {
         return this.cube;
     }
 
@@ -83,7 +83,7 @@ public class CardCollections {
      *
      * @return the sealed
      */
-    public IFolderMap<DeckGroup> getSealed() {
+    public IStorage<DeckGroup> getSealed() {
         return this.sealed;
     }
 

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

@@ -34,7 +34,7 @@ import forge.PlayerType;
 import forge.deck.Deck;
 import forge.deck.DeckGroup;
 import forge.util.FileUtil;
-import forge.util.IFolderMap;
+import forge.util.IStorage;
 import forge.util.SectionUtil;
 
 /**
@@ -60,8 +60,8 @@ public class OldDeckParser {
      * @param sealed2 the sealed2
      * @param cube2 the cube2
      */
-    public OldDeckParser(final File file, final IFolderMap<Deck> constructed2, final IFolderMap<DeckGroup> draft2,
+    public OldDeckParser(final File file, final IStorage<Deck> constructed2, final IStorage<DeckGroup> draft2,
-            final IFolderMap<DeckGroup> sealed2, final IFolderMap<Deck> cube2) {
+            final IStorage<DeckGroup> sealed2, final IStorage<Deck> cube2) {
         this.deckDir = file;
         this.sealed = sealed2;
         this.constructed = constructed2;
@@ -74,7 +74,7 @@ public class OldDeckParser {
      *
      * @return the sealed
      */
-    protected final IFolderMap<DeckGroup> getSealed() {
+    protected final IStorage<DeckGroup> getSealed() {
         return this.sealed;
     }
 
@@ -83,7 +83,7 @@ public class OldDeckParser {
      *
      * @return the constructed
      */
-    protected final IFolderMap<Deck> getConstructed() {
+    protected final IStorage<Deck> getConstructed() {
         return this.constructed;
     }
 
@@ -92,7 +92,7 @@ public class OldDeckParser {
      *
      * @return the draft
      */
-    protected final IFolderMap<DeckGroup> getDraft() {
+    protected final IStorage<DeckGroup> getDraft() {
         return this.draft;
     }
 
@@ -101,7 +101,7 @@ public class OldDeckParser {
      *
      * @return the cube
      */
-    protected final IFolderMap<Deck> getCube() {
+    protected final IStorage<Deck> getCube() {
         return this.cube;
     }
 
@@ -114,10 +114,10 @@ public class OldDeckParser {
         return this.deckDir;
     }
 
-    private final IFolderMap<DeckGroup> sealed;
+    private final IStorage<DeckGroup> sealed;
-    private final IFolderMap<Deck> constructed;
+    private final IStorage<Deck> constructed;
-    private final IFolderMap<DeckGroup> draft;
+    private final IStorage<DeckGroup> draft;
-    private final IFolderMap<Deck> cube;
+    private final IStorage<Deck> cube;
     private final File deckDir;
 
     /**

src/main/java/forge/game/limited/CustomLimited.java

@@ -29,7 +29,7 @@ import forge.item.CardPrinted;
 import forge.item.ItemPool;
 import forge.item.ItemPoolView;
 import forge.util.FileSection;
-import forge.util.IFolderMapView;
+import forge.util.IStorageView;
 
 /**
  * <p>
@@ -88,7 +88,7 @@ public class CustomLimited extends DeckBase {
      * @param cubes the cubes
      * @return the custom limited
      */
-    public static CustomLimited parse(final List<String> dfData, final IFolderMapView<Deck> cubes) {
+    public static CustomLimited parse(final List<String> dfData, final IStorageView<Deck> cubes) {
 
         final FileSection data = FileSection.parse(dfData, ":");
 

src/main/java/forge/gui/deckeditor/DeckController.java

@@ -25,7 +25,7 @@ import net.slightlymagic.braids.util.lambda.Lambda0;
 import org.apache.commons.lang3.StringUtils;
 
 import forge.deck.DeckBase;
-import forge.util.IFolderMap;
+import forge.util.IStorage;
 
 /**
  * TODO: Write javadoc for this type.
@@ -37,7 +37,7 @@ public class DeckController<T extends DeckBase> implements IDeckController<T> {
     private T model;
     private boolean saved;
     private boolean modelInStore;
-    private final IFolderMap<T> folder;
+    private final IStorage<T> folder;
     private final DeckEditorBase<?, T> view;
     private final Lambda0<T> newModelCreator;
 
@@ -48,7 +48,7 @@ public class DeckController<T extends DeckBase> implements IDeckController<T> {
      * @param view0 the view0
      * @param newModelCreator0 the new model creator0
      */
-    public DeckController(final IFolderMap<T> folder0, final DeckEditorBase<?, T> view0,
+    public DeckController(final IStorage<T> folder0, final DeckEditorBase<?, T> view0,
             final Lambda0<T> newModelCreator0) {
         this.folder = folder0;
         this.view = view0;

src/main/java/forge/gui/deckeditor/DeckEditorLimited.java

@@ -49,7 +49,7 @@ import forge.gui.deckeditor.elements.TableColumnInfo;
 import forge.gui.deckeditor.elements.TableView;
 import forge.item.CardPrinted;
 import forge.item.InventoryItem;
-import forge.util.IFolderMap;
+import forge.util.IStorage;
 
 /**
  * <p>
@@ -148,7 +148,7 @@ public final class DeckEditorLimited extends DeckEditorBase<CardPrinted, DeckGro
      *
      * @param deckMap the deck map
      */
-    public DeckEditorLimited(final IFolderMap<DeckGroup> deckMap) {
+    public DeckEditorLimited(final IStorage<DeckGroup> deckMap) {
         try {
             this.setFilterBoxes(new FilterCheckBoxes(true));
             this.setTopTableWithCards(new TableView<CardPrinted>("Avaliable Cards", true, true, CardPrinted.class));

src/main/java/forge/gui/home/constructed/CSubmenuCustom.java

@@ -12,7 +12,7 @@ import forge.Command;
 import forge.Singletons;
 import forge.deck.Deck;
 import forge.gui.home.ICSubmenu;
-import forge.util.IFolderMap;
+import forge.util.IStorage;
 
 /** 
  * TODO: Write javadoc for this type.
@@ -68,7 +68,7 @@ public enum CSubmenuCustom implements ICSubmenu {
     @Override
     public void update() {
         final List<String> customNames = new ArrayList<String>();
-        final IFolderMap<Deck> allDecks = Singletons.getModel().getDecks().getConstructed();
+        final IStorage<Deck> allDecks = Singletons.getModel().getDecks().getConstructed();
         for (final Deck d : allDecks) { customNames.add(d.getName()); }
 
         for (JList lst : VSubmenuCustom.SINGLETON_INSTANCE.getLists()) {

src/main/java/forge/model/FModel.java

@@ -49,9 +49,9 @@ import forge.properties.NewConstants;
 import forge.quest.data.QuestEventManager;
 import forge.quest.data.QuestPreferences;
 import forge.util.FileUtil;
-import forge.util.FolderMapView;
+import forge.util.StorageView;
 import forge.util.HttpUtil;
-import forge.util.IFolderMapView;
+import forge.util.IStorageView;
 import forge.view.match.ViewField;
 import forge.view.match.ViewTabber;
 import forge.view.toolbox.FSkin;
@@ -85,8 +85,8 @@ public enum FModel {
 
     private final EditionCollection editions;
     private final FormatCollection formats;
-    private final IFolderMapView<BoosterData> boosters;
+    private final IStorageView<BoosterData> boosters;
-    private final FolderMapView<CardBlock> blocks;
+    private final StorageView<CardBlock> blocks;
     
     // have to implement lazy initialization - at the moment of FModel.ctor()
     // CardDb is not ready yet.
@@ -133,8 +133,8 @@ public enum FModel {
         this.questEventManager = new QuestEventManager();
         this.editions = new EditionCollection();
         this.formats = new FormatCollection("res/blockdata/formats.txt");
-        this.boosters = new FolderMapView<BoosterData>(new BoosterData.Reader("res/blockdata/boosters.txt"));
+        this.boosters = new StorageView<BoosterData>(new BoosterData.Reader("res/blockdata/boosters.txt"));
-        this.blocks = new FolderMapView<CardBlock>(new CardBlock.Reader("res/blockdata/blocks.txt", editions));
+        this.blocks = new StorageView<CardBlock>(new CardBlock.Reader("res/blockdata/blocks.txt", editions));
         
         
         // TODO this single setting from preferences should not be here, or,
@@ -166,7 +166,7 @@ public enum FModel {
         FModel.loadDynamicGamedata();
     }
 
-    public final IFolderMapView<BoosterData> getBoosters() {
+    public final IStorageView<BoosterData> getBoosters() {
         return boosters;
     }
 
@@ -517,7 +517,7 @@ public enum FModel {
         }
     }
 
-    public FolderMapView<CardBlock> getBlocks() {
+    public StorageView<CardBlock> getBlocks() {
         return blocks;
     }
 

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

@@ -34,9 +34,9 @@ import forge.properties.NewConstants;
 import forge.quest.data.QuestPreferences.QPref;
 import forge.quest.data.item.QuestInventory;
 import forge.quest.data.pet.QuestPetManager;
-import forge.util.FolderMapView;
+import forge.util.StorageView;
-import forge.util.IFolderMap;
+import forge.util.IStorage;
-import forge.util.IFolderMapView;
+import forge.util.IStorageView;
 import forge.util.MyRandom;
 
 //when you create QuestDataOld and AFTER you copy the AI decks over
@@ -118,7 +118,7 @@ public final class QuestData {
     /** The my decks. */
     private final HashMap<String, Deck> myDecks = new HashMap<String, Deck>();
 
-    private transient IFolderMap<Deck> decks;
+    private transient IStorage<Deck> decks;
 
     // Cards associated with quest
     /** The card pool. */
@@ -169,7 +169,7 @@ public final class QuestData {
     private transient QuestUtilCards myCards;
 
     // This is used by shop. Had no idea where else to place this
-    private static transient IFolderMapView<PreconDeck> preconManager = new FolderMapView<PreconDeck>(new PreconReader(
+    private static transient IStorageView<PreconDeck> preconManager = new StorageView<PreconDeck>(new PreconReader(
             ForgeProps.getFile(NewConstants.Quest.PRECONS)));
 
     /** The Constant RANK_TITLES. */
@@ -660,7 +660,7 @@ public final class QuestData {
      * 
      * @return the myDecks
      */
-    public IFolderMap<Deck> getMyDecks() {
+    public IStorage<Deck> getMyDecks() {
         return this.decks;
     }
 
@@ -669,7 +669,7 @@ public final class QuestData {
      *
      * @return QuestPreconManager
      */
-    public static IFolderMapView<PreconDeck> getPrecons() {
+    public static IStorageView<PreconDeck> getPrecons() {
         return QuestData.preconManager;
     }
 

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

@@ -23,13 +23,13 @@ import java.util.Iterator;
 import java.util.Map;
 
 import forge.deck.Deck;
-import forge.util.IFolderMap;
+import forge.util.IStorage;
 
 /**
  * TODO: Write javadoc for this type.
  * 
  */
-public class QuestDeckMap implements IFolderMap<Deck> {
+public class QuestDeckMap implements IStorage<Deck> {
 
     /**
      * Instantiates a new quest deck map.
@@ -113,7 +113,7 @@ public class QuestDeckMap implements IFolderMap<Deck> {
      * @see forge.util.IFolderMapView#any(java.lang.String)
      */
     @Override
-    public boolean any(String name) {
+    public boolean contains(String name) {
         return map.containsKey(name);
     }
 

src/main/java/forge/util/IStorage.java

@@ -22,7 +22,7 @@ package forge.util;
  *
  * @param <T> the generic type
  */
-public interface IFolderMap<T extends IHasName> extends IFolderMapView<T> {
+public interface IStorage<T extends IHasName> extends IStorageView<T> {
 
     /**
      * <p>

src/main/java/forge/util/IStorageView.java

@@ -24,7 +24,7 @@ import java.util.Collection;
  *
  * @param <T> the generic type
  */
-public interface IFolderMapView<T> extends Iterable<T> {
+public interface IStorageView<T> extends Iterable<T> {
 
     /**
      * <p>
@@ -43,6 +43,6 @@ public interface IFolderMapView<T> extends Iterable<T> {
      */
     Collection<String> getNames();
     
-    boolean any(final String name);
+    boolean contains(final String name);
 
 }

src/main/java/forge/util/StorageImmediatelySerialized.java

@@ -27,7 +27,7 @@ package forge.util;
  * @author Forge
  * @version $Id$
  */
-public class FolderMap<T extends IHasName> extends FolderMapView<T> implements IFolderMap<T> {
+public class StorageImmediatelySerialized<T extends IHasName> extends StorageView<T> implements IStorage<T> {
 
     private final IItemSerializer<T> serializer;
 
@@ -38,7 +38,7 @@ public class FolderMap<T extends IHasName> extends FolderMapView<T> implements I
      *
      * @param io the io
      */
-    public FolderMap(final IItemSerializer<T> io) {
+    public StorageImmediatelySerialized(final IItemSerializer<T> io) {
         super(io);
         this.serializer = io;
     }

src/main/java/forge/util/StorageView.java

@@ -32,7 +32,7 @@ import java.util.Map;
  * @author Forge
  * @version $Id: DeckManager.java 13590 2012-01-27 20:46:27Z Max mtg $
  */
-public class FolderMapView<T> implements Iterable<T>, IFolderMapView<T> {
+public class StorageView<T> implements Iterable<T>, IStorageView<T> {
     private final Map<String, T> map;
 
     /**
@@ -42,7 +42,7 @@ public class FolderMapView<T> implements Iterable<T>, IFolderMapView<T> {
      *
      * @param io the io
      */
-    public FolderMapView(final IItemReader<T> io) {
+    public StorageView(final IItemReader<T> io) {
         this.map = io.readAll();
     }
 
@@ -94,7 +94,7 @@ public class FolderMapView<T> implements Iterable<T>, IFolderMapView<T> {
      * @see forge.util.IFolderMapView#any(java.lang.String)
      */
     @Override
-    public boolean any(String name) {
+    public boolean contains(String name) {
         return this.map.containsKey(name);
     }
 }