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

Avoid muddying collection with unowned cards

Browse Source
This commit is contained in:
drdev
2016-01-03 04:53:54 +00:00
parent e3cf3b65bd
commit 915a3c32f1
7 changed files with 13 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java
View File

@@ -117,13 +117,6 @@ public final class ItemManagerModel<T extends InventoryItem> {
return infiniteSupply;
}
public boolean allowZero() {
return data.allowZero();
}
public void setAllowZero(boolean allowZero0) {
data.setAllowZero(allowZero0);
}
public CascadeManager getCascadeManager() {
return cascadeManager;
}

29
forge-gui/src/main/java/forge/planarconquest/ConquestData.java
View File

@@ -23,7 +23,6 @@ import forge.card.CardDb;
import forge.item.InventoryItem;
import forge.item.PaperCard;
import forge.itemmanager.ColumnDef;
import forge.itemmanager.IItemManager;
import forge.itemmanager.ItemColumn;
import forge.itemmanager.ItemManagerConfig;
import forge.model.FModel;
@@ -31,7 +30,6 @@ import forge.planarconquest.ConquestPlane.Region;
import forge.planarconquest.ConquestPreferences.CQPref;
import forge.properties.ForgeConstants;
import forge.util.FileUtil;
import forge.util.ItemPool;
import forge.util.XmlReader;
import forge.util.XmlWriter;
@@ -55,7 +53,6 @@ public final class ConquestData {
private ISkinImage planeswalkerToken;
private ConquestLocation currentLocation;
private int aetherShards;
private ConquestCollection collection;
private final File directory;
private final String xmlFilename;
@@ -145,13 +142,6 @@ public final class ConquestData {
return getOrCreatePlaneData(getCurrentPlane());
}
public void populateCollectionManager(IItemManager<PaperCard> manager) {
if (collection == null) {
collection = new ConquestCollection();
}
manager.setPool(collection, true);
}
public Iterable<PaperCard> getUnlockedCards() {
return unlockedCards;
}
@@ -163,9 +153,6 @@ public final class ConquestData {
public void unlockCard(PaperCard card) {
if (unlockedCards.add(card)) {
newCards.add(card);
if (collection != null) {
collection.add(card);
}
}
}
public void unlockCards(Iterable<PaperCard> cards) {
@@ -404,20 +391,4 @@ public final class ConquestData {
}
}
}
@SuppressWarnings("serial")
private class ConquestCollection extends ItemPool<PaperCard> {
private ConquestCollection() {
super(PaperCard.class);
setAllowZero(true);
//initialize to contain all available cards, with unlocked
//having a count of 1 and the rest having a count of 0
for (ConquestPlane plane : ConquestPlane.values()) {
for (PaperCard card : plane.getCardPool().getAllCards()) {
items.put(card, hasUnlockedCard(card) ? 1 : 0);
}
}
}
}
}