external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Maxmtg
2012-02-24 23:17:36 +00:00
parent b9d4a559f2
commit c21d758e76
17 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/forge/model/FModel.java
View File

@@ -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 FolderMapView<CardBlock> blocks;
private final IStorageView<BoosterData> boosters;
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.blocks = new FolderMapView<CardBlock>(new CardBlock.Reader("res/blockdata/blocks.txt", editions));
this.boosters = new StorageView<BoosterData>(new BoosterData.Reader("res/blockdata/boosters.txt"));
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;
}