From 8393bc02e4b43bf52ae43d11339428df778fb035 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Mon, 20 Jan 2014 09:13:13 +0000 Subject: [PATCH] remove ItemPoolView class, instead a read-only pool will be an instance of same class, but backed with an unmodifiable map --- .gitattributes | 1 - .../main/java/forge/card/UnOpenedProduct.java | 4 +- forge-core/src/main/java/forge/deck/Deck.java | 5 +- .../deck/generation/DeckGenerator2Color.java | 5 +- .../deck/generation/DeckGenerator3Color.java | 5 +- .../deck/generation/DeckGenerator5Color.java | 5 +- .../deck/generation/DeckGeneratorBase.java | 6 +- .../generation/DeckGeneratorMonoColor.java | 5 +- .../src/main/java/forge/util/ItemPool.java | 171 +++++++++++++- .../main/java/forge/util/ItemPoolView.java | 216 ------------------ .../forge/gui/deckchooser/DeckgenUtil.java | 3 +- .../gui/deckchooser/GenerateThemeDeck.java | 5 +- .../controllers/CEditorCommander.java | 5 +- .../controllers/CEditorConstructed.java | 3 +- .../controllers/CEditorDraftingProcess.java | 4 +- .../controllers/CEditorQuestCardShop.java | 3 +- .../controllers/CProbabilities.java | 3 +- .../deckeditor/controllers/CStatistics.java | 5 +- .../gui/toolbox/itemmanager/ItemManager.java | 22 +- .../toolbox/itemmanager/ItemManagerModel.java | 3 +- .../itemmanager/filters/DeckColorFilter.java | 4 +- .../filters/DeckStatTypeFilter.java | 4 +- .../itemmanager/filters/StatTypeFilter.java | 4 +- .../toolbox/itemmanager/views/ItemColumn.java | 10 +- .../main/java/forge/limited/BoosterDraft.java | 10 +- .../java/forge/limited/CustomLimited.java | 5 +- .../java/forge/limited/IBoosterDraft.java | 4 +- .../forge/limited/LimitedDeckBuilder.java | 3 +- .../main/java/forge/quest/QuestUtilCards.java | 7 +- .../java/forge/quest/data/QuestAssets.java | 3 +- .../test/java/forge/BoosterDraft1Test.java | 5 +- .../src/test/java/forge/BoosterDraftTest.java | 9 +- .../deck/generate/Generate2ColorDeckTest.java | 4 +- .../deck/generate/Generate3ColorDeckTest.java | 5 +- .../deck/generate/Generate5ColorDeckTest.java | 5 +- 35 files changed, 234 insertions(+), 327 deletions(-) delete mode 100644 forge-core/src/main/java/forge/util/ItemPoolView.java diff --git a/.gitattributes b/.gitattributes index a3e17f8cbee..74c58220c92 100644 --- a/.gitattributes +++ b/.gitattributes @@ -92,7 +92,6 @@ forge-core/src/main/java/forge/util/IItemReader.java -text forge-core/src/main/java/forge/util/IItemSerializer.java -text forge-core/src/main/java/forge/util/ItemPool.java -text forge-core/src/main/java/forge/util/ItemPoolSorter.java -text -forge-core/src/main/java/forge/util/ItemPoolView.java -text forge-core/src/main/java/forge/util/Lang.java -text forge-core/src/main/java/forge/util/MyRandom.java svneol=native#text/plain forge-core/src/main/java/forge/util/PredicateString.java -text diff --git a/forge-core/src/main/java/forge/card/UnOpenedProduct.java b/forge-core/src/main/java/forge/card/UnOpenedProduct.java index 960779f4f44..6ffaac442c9 100644 --- a/forge-core/src/main/java/forge/card/UnOpenedProduct.java +++ b/forge-core/src/main/java/forge/card/UnOpenedProduct.java @@ -13,7 +13,7 @@ import com.google.common.collect.Iterables; import forge.StaticData; import forge.item.PaperCard; import forge.item.SealedProduct; -import forge.util.ItemPoolView; +import forge.util.ItemPool; public class UnOpenedProduct implements IUnOpenedProduct { @@ -38,7 +38,7 @@ public class UnOpenedProduct implements IUnOpenedProduct { } // Invoke this constructor only if you are sure that the pool is not equal to deafult carddb - public UnOpenedProduct(SealedProduct.Template template, ItemPoolView pool) { + public UnOpenedProduct(SealedProduct.Template template, ItemPool pool) { this(template, pool.toFlatList()); } diff --git a/forge-core/src/main/java/forge/deck/Deck.java b/forge-core/src/main/java/forge/deck/Deck.java index de3df860190..b92e7c1472d 100644 --- a/forge-core/src/main/java/forge/deck/Deck.java +++ b/forge-core/src/main/java/forge/deck/Deck.java @@ -45,8 +45,9 @@ import forge.item.PaperCard; import forge.item.IPaperCard; import forge.util.FileSection; import forge.util.FileUtil; +import forge.util.ItemPool; import forge.util.ItemPoolSorter; -import forge.util.ItemPoolView; + /** @@ -210,7 +211,7 @@ public class Deck extends DeckBase implements Iterable writeCardPool(final ItemPoolView pool) { + private static List writeCardPool(final ItemPool pool) { List> main2sort = Lists.newArrayList(pool); Collections.sort(main2sort, ItemPoolSorter.BY_NAME_THEN_SET); final List out = new ArrayList(); diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGenerator2Color.java b/forge-core/src/main/java/forge/deck/generation/DeckGenerator2Color.java index e27b9ece6cd..5c3cbd9aac8 100644 --- a/forge-core/src/main/java/forge/deck/generation/DeckGenerator2Color.java +++ b/forge-core/src/main/java/forge/deck/generation/DeckGenerator2Color.java @@ -26,8 +26,7 @@ import com.google.common.collect.Lists; import forge.card.ColorSet; import forge.card.ICardDatabase; import forge.card.MagicColor; -import forge.item.PaperCard; -import forge.util.ItemPoolView; +import forge.deck.CardPool; /** *

@@ -88,7 +87,7 @@ public class DeckGenerator2Color extends DeckGeneratorBase { @Override - public final ItemPoolView getDeck(final int size, final boolean forAi) { + public final CardPool getDeck(final int size, final boolean forAi) { addCreaturesAndSpells(size, cmcRelativeWeights, forAi); // Add lands diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGenerator3Color.java b/forge-core/src/main/java/forge/deck/generation/DeckGenerator3Color.java index e2c1c70d5f7..20ab568ee04 100644 --- a/forge-core/src/main/java/forge/deck/generation/DeckGenerator3Color.java +++ b/forge-core/src/main/java/forge/deck/generation/DeckGenerator3Color.java @@ -26,8 +26,7 @@ import com.google.common.collect.Lists; import forge.card.ColorSet; import forge.card.ICardDatabase; import forge.card.MagicColor; -import forge.item.PaperCard; -import forge.util.ItemPoolView; +import forge.deck.CardPool; import forge.util.MyRandom; /** @@ -97,7 +96,7 @@ public class DeckGenerator3Color extends DeckGeneratorBase { } @Override - public final ItemPoolView getDeck(final int size, final boolean forAi) { + public final CardPool getDeck(final int size, final boolean forAi) { addCreaturesAndSpells(size, cmcLevels, forAi); // Add lands diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGenerator5Color.java b/forge-core/src/main/java/forge/deck/generation/DeckGenerator5Color.java index 44a21c09adb..642b90ec8e7 100644 --- a/forge-core/src/main/java/forge/deck/generation/DeckGenerator5Color.java +++ b/forge-core/src/main/java/forge/deck/generation/DeckGenerator5Color.java @@ -25,8 +25,7 @@ import com.google.common.collect.Lists; import forge.card.ColorSet; import forge.card.ICardDatabase; -import forge.item.PaperCard; -import forge.util.ItemPoolView; +import forge.deck.CardPool; /** *

@@ -60,7 +59,7 @@ public class DeckGenerator5Color extends DeckGeneratorBase { @Override - public final ItemPoolView getDeck(final int size, final boolean forAi) { + public final CardPool getDeck(final int size, final boolean forAi) { addCreaturesAndSpells(size, cmcLevels, forAi); // Add lands diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java index 748f0a3fd92..cc9d32dc34b 100644 --- a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java +++ b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java @@ -38,10 +38,10 @@ import forge.card.ColorSet; import forge.card.ICardDatabase; import forge.card.MagicColor; import forge.card.mana.ManaCost; +import forge.deck.CardPool; import forge.item.PaperCard; import forge.util.Aggregates; import forge.util.ItemPool; -import forge.util.ItemPoolView; import forge.util.MyRandom; /** @@ -59,7 +59,7 @@ public abstract class DeckGeneratorBase { protected boolean useArtifacts = true; protected ColorSet colors; - protected final ItemPool tDeck = new ItemPool(PaperCard.class); + protected final CardPool tDeck = new CardPool(); protected final ICardDatabase cardDb; // 2-colored deck generator has its own constants. The rest works fine with these ones @@ -100,7 +100,7 @@ public abstract class DeckGeneratorBase { tmpDeck.append(String.format("Current deck size: %d... should be %f%n", tDeck.countAll(), size * (getCreatPercentage() + getSpellPercentage()))); } - public ItemPoolView getDeck(final int size, final boolean forAi) { + public CardPool getDeck(final int size, final boolean forAi) { return null; // all but theme deck do override this method } diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorMonoColor.java b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorMonoColor.java index 6be24b8fc0e..52d49a24a90 100644 --- a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorMonoColor.java +++ b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorMonoColor.java @@ -26,8 +26,7 @@ import com.google.common.collect.Lists; import forge.card.ColorSet; import forge.card.ICardDatabase; import forge.card.MagicColor; -import forge.item.PaperCard; -import forge.util.ItemPoolView; +import forge.deck.CardPool; /** *

@@ -79,7 +78,7 @@ public class DeckGeneratorMonoColor extends DeckGeneratorBase { @Override - public final ItemPoolView getDeck(final int size, final boolean forAi) { + public final CardPool getDeck(final int size, final boolean forAi) { addCreaturesAndSpells(size, cmcLevels, forAi); // Add lands diff --git a/forge-core/src/main/java/forge/util/ItemPool.java b/forge-core/src/main/java/forge/util/ItemPool.java index 83c1153048b..7da8fb85ae2 100644 --- a/forge-core/src/main/java/forge/util/ItemPool.java +++ b/forge-core/src/main/java/forge/util/ItemPool.java @@ -17,9 +17,17 @@ */ package forge.util; +import java.util.ArrayList; import java.util.Collections; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import com.google.common.base.Function; +import com.google.common.base.Predicate; + import forge.item.InventoryItem; /** @@ -31,8 +39,32 @@ import forge.item.InventoryItem; * @param * an Object */ -public class ItemPool extends ItemPoolView { +public class ItemPool implements Iterable> { + /** The fn to printed. */ + public final transient Function, T> FN_GET_KEY = new Function, T>() { + @Override + public T apply(final Entry from) { + return from.getKey(); + } + }; + + /** The fn to item name. */ + public final transient Function, String> FN_GET_NAME = new Function, String>() { + @Override + public String apply(final Entry from) { + return from.getKey().getName(); + } + }; + + /** The fn to count. */ + public final transient Function, Integer> FN_GET_COUNT = new Function, Integer>() { + @Override + public Integer apply(final Entry from) { + return from.getValue(); + } + }; + // Constructors here /** * @@ -42,11 +74,11 @@ public class ItemPool extends ItemPoolView { * a T */ public ItemPool(final Class cls) { - super(cls); + this(new Hashtable(), cls); } @SuppressWarnings("unchecked") - public static ItemPool createFrom(final ItemPoolView from, final Class clsHint) { + public static ItemPool createFrom(final ItemPool from, final Class clsHint) { final ItemPool result = new ItemPool(clsHint); if (from != null) { for (final Entry e : from) { @@ -73,6 +105,135 @@ public class ItemPool extends ItemPoolView { return result; } + protected ItemPool(final Map inMap, final Class cls) { + this.items = inMap; + this.myClass = cls; + } + + // Data members + /** The items. */ + protected final Map items; + + /** The my class. */ + private final Class myClass; // class does not keep this in runtime by + // itself + + /** + * iterator. + * + * @return Iterator> + */ + @Override + public final Iterator> iterator() { + return this.items.entrySet().iterator(); + } + + // Items read only operations + /** + * + * contains. + * + * @param item + * a T + * @return boolean + */ + public final boolean contains(final T item) { + if (this.items == null) { + return false; + } + return this.items.containsKey(item); + } + + /** + * + * count. + * + * @param item + * a T + * @return int + */ + public final int count(final T item) { + if (this.items == null) { + return 0; + } + final Integer boxed = this.items.get(item); + return boxed == null ? 0 : boxed.intValue(); + } + + /** + * + * countAll. + * + * @return int + */ + public final int countAll() { + return countAll(null, myClass); + } + + public final int countAll(Predicate condition) { + return countAll(condition, myClass); + } + + public final int countAll(Predicate condition, Class cls) { + int result = 0; + if (this.items != null) { + final boolean isSameClass = cls == myClass; + for (final Entry kv : this) { + final T key = kv.getKey(); + @SuppressWarnings("unchecked") + final U castKey = isSameClass || cls.isInstance(key) ? (U)key : null; + if (null == condition || castKey != null && condition.apply(castKey)) + result += kv.getValue(); + } + } + return result; + } + + /** + * + * countDistinct. + * + * @return int + */ + public final int countDistinct() { + return this.items.size(); + } + + /** + * + * isEmpty. + * + * @return boolean + */ + public final boolean isEmpty() { + return (this.items == null) || this.items.isEmpty(); + } + + /** + * + * toFlatList. + * + * @return List + */ + public final List toFlatList() { + final List result = new ArrayList(); + for (final Entry e : this) { + for (int i = 0; i < e.getValue(); i++) { + result.add(e.getKey()); + } + } + return result; + } + + /** + * Gets the my class. + * + * @return the myClass + */ + public Class getMyClass() { + return this.myClass; + } + // get /** * @@ -80,8 +241,8 @@ public class ItemPool extends ItemPoolView { * * @return a ItemPoolView */ - public ItemPoolView getView() { - return new ItemPoolView(Collections.unmodifiableMap(this.items), this.getMyClass()); + public ItemPool getView() { + return new ItemPool(Collections.unmodifiableMap(this.items), this.getMyClass()); } // Items manipulation diff --git a/forge-core/src/main/java/forge/util/ItemPoolView.java b/forge-core/src/main/java/forge/util/ItemPoolView.java deleted file mode 100644 index d5de0e3530e..00000000000 --- a/forge-core/src/main/java/forge/util/ItemPoolView.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * Forge: Play Magic: the Gathering. - * Copyright (C) 2011 Forge Team - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package forge.util; - -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import com.google.common.base.Function; -import com.google.common.base.Predicate; - -import forge.item.InventoryItem; - - -/** - *

- * ItemPoolView class. - *

- * - * @param - * an InventoryItem - * @author Forge - * @version $Id: ItemPoolView.java 9708 2011-08-09 19:34:12Z jendave $ - */ -public class ItemPoolView implements Iterable> { - - /** The fn to printed. */ - public final transient Function, T> FN_GET_KEY = new Function, T>() { - @Override - public T apply(final Entry from) { - return from.getKey(); - } - }; - - /** The fn to item name. */ - public final transient Function, String> FN_GET_NAME = new Function, String>() { - @Override - public String apply(final Entry from) { - return from.getKey().getName(); - } - }; - - /** The fn to count. */ - public final transient Function, Integer> FN_GET_COUNT = new Function, Integer>() { - @Override - public Integer apply(final Entry from) { - return from.getValue(); - } - }; - - // Constructors - public ItemPoolView(final Class cls) { - this(new Hashtable(), cls); - } - - public ItemPoolView(final Map inMap, final Class cls) { - this.items = inMap; - this.myClass = cls; - } - - // Data members - /** The items. */ - protected final Map items; - - /** The my class. */ - private final Class myClass; // class does not keep this in runtime by - // itself - - /** - * iterator. - * - * @return Iterator> - */ - @Override - public final Iterator> iterator() { - return this.items.entrySet().iterator(); - } - - // Items read only operations - /** - * - * contains. - * - * @param item - * a T - * @return boolean - */ - public final boolean contains(final T item) { - if (this.items == null) { - return false; - } - return this.items.containsKey(item); - } - - /** - * - * count. - * - * @param item - * a T - * @return int - */ - public final int count(final T item) { - if (this.items == null) { - return 0; - } - final Integer boxed = this.items.get(item); - return boxed == null ? 0 : boxed.intValue(); - } - - /** - * - * countAll. - * - * @return int - */ - public final int countAll() { - return countAll(null, myClass); - } - - public final int countAll(Predicate condition) { - return countAll(condition, myClass); - } - - public final int countAll(Predicate condition, Class cls) { - int result = 0; - if (this.items != null) { - final boolean isSameClass = cls == myClass; - for (final Entry kv : this) { - final T key = kv.getKey(); - @SuppressWarnings("unchecked") - final U castKey = isSameClass || cls.isInstance(key) ? (U)key : null; - if (null == condition || castKey != null && condition.apply(castKey)) - result += kv.getValue(); - } - } - return result; - } - - /** - * - * countDistinct. - * - * @return int - */ - public final int countDistinct() { - return this.items.size(); - } - - /** - * - * isEmpty. - * - * @return boolean - */ - public final boolean isEmpty() { - return (this.items == null) || this.items.isEmpty(); - } - - /** - * - * toFlatList. - * - * @return List - */ - public final List toFlatList() { - final List result = new ArrayList(); - for (final Entry e : this) { - for (int i = 0; i < e.getValue(); i++) { - result.add(e.getKey()); - } - } - return result; - } - - /** - * Gets the my class. - * - * @return the myClass - */ - public Class getMyClass() { - return this.myClass; - } - - - /** - * To item list string. - * - * @return the iterable - */ - public Iterable toItemListString() { - final List list = new ArrayList(); - for (final Entry e : this.items.entrySet()) { - list.add(String.format("%d x %s", e.getValue(), e.getKey().getName())); - } - return list; - } -} diff --git a/forge-gui/src/main/java/forge/gui/deckchooser/DeckgenUtil.java b/forge-gui/src/main/java/forge/gui/deckchooser/DeckgenUtil.java index fb1b73d6946..26b1549cd25 100644 --- a/forge-gui/src/main/java/forge/gui/deckchooser/DeckgenUtil.java +++ b/forge-gui/src/main/java/forge/gui/deckchooser/DeckgenUtil.java @@ -24,7 +24,6 @@ import forge.quest.QuestEvent; import forge.quest.QuestEventChallenge; import forge.quest.QuestEventDuel; import forge.util.Aggregates; -import forge.util.ItemPoolView; import forge.util.Lang; import forge.util.MyRandom; import forge.util.storage.IStorage; @@ -72,7 +71,7 @@ public class DeckgenUtil { } gen.setSingleton(Singletons.getModel().getPreferences().getPrefBoolean(FPref.DECKGEN_SINGLETONS)); gen.setUseArtifacts(Singletons.getModel().getPreferences().getPrefBoolean(FPref.DECKGEN_ARTIFACTS)); - ItemPoolView cards = gen == null ? null : gen.getDeck(60, forAi); + CardPool cards = gen == null ? null : gen.getDeck(60, forAi); if (null == deckName) { deckName = Lang.joinHomogenous(Arrays.asList(selection)); diff --git a/forge-gui/src/main/java/forge/gui/deckchooser/GenerateThemeDeck.java b/forge-gui/src/main/java/forge/gui/deckchooser/GenerateThemeDeck.java index d4f9cf8228c..b81c02caec1 100644 --- a/forge-gui/src/main/java/forge/gui/deckchooser/GenerateThemeDeck.java +++ b/forge-gui/src/main/java/forge/gui/deckchooser/GenerateThemeDeck.java @@ -23,11 +23,10 @@ import java.util.List; import java.util.Random; import forge.Singletons; +import forge.deck.CardPool; import forge.deck.generation.DeckGeneratorBase; import forge.error.BugReporter; -import forge.item.PaperCard; import forge.util.FileUtil; -import forge.util.ItemPoolView; import forge.util.MyRandom; /** @@ -95,7 +94,7 @@ public class GenerateThemeDeck extends DeckGeneratorBase { * a int. * @return a {@link forge.CardList} object. */ - public final ItemPoolView getThemeDeck(final String themeName, final int size) { + public final CardPool getThemeDeck(final String themeName, final int size) { String s = ""; // read theme file diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java index 2dfdb3ccea7..aa581450d36 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java @@ -42,7 +42,6 @@ import forge.gui.toolbox.itemmanager.views.SColumnUtil; import forge.gui.toolbox.itemmanager.views.ItemColumn; import forge.item.PaperCard; import forge.util.ItemPool; -import forge.util.ItemPoolView; /** * Child controller for constructed deck editor UI. @@ -60,8 +59,8 @@ public final class CEditorCommander extends ACEditorBase { private DragCell deckGenParent = null; private List allSections = new ArrayList(); - private final ItemPoolView commanderPool; - private final ItemPoolView normalPool; + private final ItemPool commanderPool; + private final ItemPool normalPool; //=========== Constructor /** diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java index ca242e5f006..72d916f83ef 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java @@ -39,7 +39,6 @@ import forge.gui.toolbox.itemmanager.views.SColumnUtil; import forge.gui.toolbox.itemmanager.views.ItemColumn; import forge.item.PaperCard; import forge.util.ItemPool; -import forge.util.ItemPoolView; /** * Child controller for constructed deck editor UI. @@ -54,7 +53,7 @@ import forge.util.ItemPoolView; public final class CEditorConstructed extends ACEditorBase { private final DeckController controller; private final List allSections = new ArrayList(); - private final ItemPoolView normalPool, avatarPool, planePool, schemePool; + private final ItemPool normalPool, avatarPool, planePool, schemePool; //=========== Constructor /** diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java index b42dbe0466e..4fa2aae176e 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java @@ -37,7 +37,7 @@ import forge.gui.toolbox.itemmanager.views.SColumnUtil; import forge.item.PaperCard; import forge.limited.BoosterDraft; import forge.limited.IBoosterDraft; -import forge.util.ItemPoolView; +import forge.util.ItemPool; /** * Updates the deck editor UI as necessary draft selection mode. @@ -132,7 +132,7 @@ public class CEditorDraftingProcess extends ACEditorBase { * @param list * a {@link forge.CardList} object. */ - private void showChoices(final ItemPoolView list) { + private void showChoices(final ItemPool list) { int packNumber = ((BoosterDraft) boosterDraft).getCurrentBoosterIndex() + 1; this.getCatalogManager().setCaption("Pack " + packNumber + " - Cards"); diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java index a04c6c6841b..1c8c95ace82 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java @@ -65,7 +65,6 @@ import forge.item.TournamentPack; import forge.quest.QuestController; import forge.quest.io.ReadPriceList; import forge.util.ItemPool; -import forge.util.ItemPoolView; /** * Child controller for quest card shop UI. @@ -97,7 +96,7 @@ public final class CEditorQuestCardShop extends ACEditorBase cardsForSale; + private ItemPool cardsForSale; private final ItemPool fullCatalogCards = ItemPool.createFrom(Singletons.getMagicDb().getCommonCards().getAllCards(), InventoryItem.class); private boolean showingFullCatalog = false; diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CProbabilities.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CProbabilities.java index cc73958d6a8..c4ec931d51f 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CProbabilities.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CProbabilities.java @@ -15,7 +15,6 @@ import forge.gui.framework.ICDoc; import forge.item.PaperCard; import forge.item.InventoryItem; import forge.util.ItemPool; -import forge.util.ItemPoolView; import forge.util.MyRandom; /** @@ -68,7 +67,7 @@ public enum CProbabilities implements ICDoc { if (ed == null) { return new ArrayList(); } - final ItemPoolView deck = ItemPool.createFrom(ed.getDeckManager().getPool(), PaperCard.class); + final ItemPool deck = ItemPool.createFrom(ed.getDeckManager().getPool(), PaperCard.class); final List cardProbabilities = new ArrayList(); diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CStatistics.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CStatistics.java index b7880fcd934..9e3c9c9058b 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CStatistics.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CStatistics.java @@ -19,7 +19,6 @@ import forge.gui.toolbox.itemmanager.SItemManagerUtil; import forge.item.PaperCard; import forge.item.InventoryItem; import forge.util.ItemPool; -import forge.util.ItemPoolView; /** @@ -57,7 +56,7 @@ public enum CStatistics implements ICDoc { analyze(); } - private void setLabelValue(JLabel label, ItemPoolView deck, Predicate predicate, int total) { + private void setLabelValue(JLabel label, ItemPool deck, Predicate predicate, int total) { int tmp = deck.countAll(Predicates.compose(predicate, PaperCard.FN_GET_RULES)); label.setText(tmp + " (" + SItemManagerUtil.calculatePercentage(tmp, total) + "%)"); } @@ -70,7 +69,7 @@ public enum CStatistics implements ICDoc { if (ed == null) { return; } - final ItemPoolView deck = ItemPool.createFrom(ed.getDeckManager().getPool(), PaperCard.class); + final ItemPool deck = ItemPool.createFrom(ed.getDeckManager().getPool(), PaperCard.class); int total = deck.countAll(); diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java index 2636932a023..e70752b794b 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java @@ -66,7 +66,6 @@ import forge.gui.toolbox.itemmanager.views.ItemView; import forge.item.InventoryItem; import forge.util.Aggregates; import forge.util.ItemPool; -import forge.util.ItemPoolView; import forge.util.ReflectionUtil; @@ -383,7 +382,7 @@ public abstract class ItemManager extends JPanel { * * @return ItemPoolView */ - public ItemPoolView getPool() { + public ItemPool getPool() { return this.pool; } @@ -397,15 +396,6 @@ public abstract class ItemManager extends JPanel { this.setPool(ItemPool.createFrom(items, this.genericType), false); } - /** - * - * Sets the item pool. - * - * @param poolView - */ - public void setPool(final ItemPoolView poolView) { - this.setPool(poolView, false); - } /** * @@ -414,17 +404,11 @@ public abstract class ItemManager extends JPanel { * @param poolView * @param infinite */ - public void setPool(final ItemPoolView poolView, boolean infinite) { + public void setPool(final ItemPool poolView, boolean infinite) { this.setPoolImpl(ItemPool.createFrom(poolView, this.genericType), infinite); } - /** - * - * Sets the item pool. - * - * @param pool0 - */ public void setPool(final ItemPool pool0) { this.setPoolImpl(pool0, false); } @@ -708,7 +692,7 @@ public abstract class ItemManager extends JPanel { * * @return ItemPoolView */ - public ItemPoolView getFilteredItems() { + public ItemPool getFilteredItems() { return this.model.getItems(); } diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManagerModel.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManagerModel.java index 90306dec2b5..f097f4bee9c 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManagerModel.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManagerModel.java @@ -24,7 +24,6 @@ import java.util.Map.Entry; import forge.item.InventoryItem; import forge.util.ItemPool; -import forge.util.ItemPoolView; /** *

@@ -107,7 +106,7 @@ public final class ItemManagerModel { * * @return ItemPoolView */ - public ItemPoolView getItems() { + public ItemPool getItems() { return this.data.getView(); } diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckColorFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckColorFilter.java index 04bb393ac6c..25f10561551 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckColorFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckColorFilter.java @@ -8,7 +8,7 @@ import forge.deck.Deck; import forge.gui.toolbox.itemmanager.ItemManager; import forge.gui.toolbox.itemmanager.SItemManagerUtil.StatTypes; import forge.util.BinaryUtil; -import forge.util.ItemPoolView; +import forge.util.ItemPool; /** * TODO: Write javadoc for this type. @@ -121,7 +121,7 @@ public class DeckColorFilter extends StatTypeFilter { @Override public void afterFiltersApplied() { - final ItemPoolView items = itemManager.getFilteredItems(); + final ItemPool items = itemManager.getFilteredItems(); buttonMap.get(StatTypes.DECK_WHITE).setText(String.valueOf(items.countAll(IS_WHITE, Deck.class))); buttonMap.get(StatTypes.DECK_BLUE).setText(String.valueOf(items.countAll(IS_BLUE, Deck.class))); diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckStatTypeFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckStatTypeFilter.java index c7ca1f64e61..b636a7e5941 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckStatTypeFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckStatTypeFilter.java @@ -10,7 +10,7 @@ import forge.gui.toolbox.itemmanager.ItemManager; import forge.gui.toolbox.itemmanager.SItemManagerUtil; import forge.item.InventoryItem; import forge.item.PaperCard; -import forge.util.ItemPoolView; +import forge.util.ItemPool; public abstract class DeckStatTypeFilter extends StatTypeFilter { public DeckStatTypeFilter(ItemManager itemManager0) { @@ -24,7 +24,7 @@ public abstract class DeckStatTypeFilter extends StatTypeFilter { @Override public void afterFiltersApplied() { - final ItemPoolView items = itemManager.getFilteredItems(); + final ItemPool items = itemManager.getFilteredItems(); for (Map.Entry btn : buttonMap.entrySet()) { if (btn.getKey().predicate != null) { diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/StatTypeFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/StatTypeFilter.java index e3edfe3218a..9470601b67f 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/StatTypeFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/StatTypeFilter.java @@ -15,7 +15,7 @@ import forge.gui.toolbox.itemmanager.SItemManagerUtil.StatTypes; import forge.item.InventoryItem; import forge.item.ItemPredicate; import forge.item.PaperCard; -import forge.util.ItemPoolView; +import forge.util.ItemPool; public abstract class StatTypeFilter extends ToggleButtonsFilter { protected final Map buttonMap; @@ -118,7 +118,7 @@ public abstract class StatTypeFilter extends ToggleButt @Override public void afterFiltersApplied() { - final ItemPoolView items = itemManager.getFilteredItems(); + final ItemPool items = itemManager.getFilteredItems(); FLabel btnPackOrDeck = buttonMap.get(StatTypes.PACK_OR_DECK); if (btnPackOrDeck != null) { //support special pack/deck case diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemColumn.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemColumn.java index 446a7369769..a69e012cf7f 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemColumn.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemColumn.java @@ -34,7 +34,6 @@ import forge.card.CardRarity; import forge.card.CardRules; import forge.card.ColorSet; import forge.card.mana.ManaCost; -import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckSection; import forge.game.GameFormat; @@ -491,7 +490,7 @@ public class ItemColumn extends TableColumn { private static final Pattern AE_FINDER = Pattern.compile("AE", Pattern.LITERAL); private static String toType(final InventoryItem i) { - return i instanceof PaperCard ? ((IPaperCard)i).getRules().getType().toString() : i.getItemType(); + return i instanceof IPaperCard ? ((IPaperCard)i).getRules().getType().toString() : i.getItemType(); } private static IPaperCard toCard(final InventoryItem i) { @@ -551,12 +550,7 @@ public class ItemColumn extends TableColumn { } private static int toDeckCount(final InventoryItem i, DeckSection section) { Deck deck = toDeck(i); - if (deck == null) { return -1; } - CardPool cards = deck.get(section); - if (cards == null) { return -1; } - int count = cards.countAll(); - if (count == 0) { return -1; } - return count; + return deck != null && deck.has(section) ? deck.get(section).countAll() : -1; } } } diff --git a/forge-gui/src/main/java/forge/limited/BoosterDraft.java b/forge-gui/src/main/java/forge/limited/BoosterDraft.java index e0d8de80c4e..12057f0040b 100644 --- a/forge-gui/src/main/java/forge/limited/BoosterDraft.java +++ b/forge-gui/src/main/java/forge/limited/BoosterDraft.java @@ -36,6 +36,7 @@ import forge.Singletons; import forge.card.CardEdition; import forge.card.IUnOpenedProduct; import forge.card.UnOpenedProduct; +import forge.deck.CardPool; import forge.deck.Deck; import forge.game.card.Card; import forge.gui.GuiChoose; @@ -48,7 +49,6 @@ import forge.properties.NewConstants; import forge.util.FileUtil; import forge.util.HttpUtil; import forge.util.ItemPool; -import forge.util.ItemPoolView; import forge.util.storage.IStorage; /** @@ -153,7 +153,7 @@ public final class BoosterDraft implements IBoosterDraft { } private void setupCustomDraft(final CustomLimited draft) { - final ItemPoolView dPool = draft.getCardPool(); + final ItemPool dPool = draft.getCardPool(); if (dPool == null) { throw new RuntimeException("BoosterGenerator : deck not found"); } @@ -203,13 +203,15 @@ public final class BoosterDraft implements IBoosterDraft { * @return a {@link forge.CardList} object. */ @Override - public ItemPoolView nextChoice() { + public CardPool nextChoice() { if (this.pack.get(this.getCurrentBoosterIndex()).size() == 0) { this.pack = this.get8BoosterPack(); } this.computerChoose(); - return ItemPool.createFrom(this.pack.get(this.getCurrentBoosterIndex()), PaperCard.class); + CardPool result = new CardPool(); + result.addAllFlat(this.pack.get(this.getCurrentBoosterIndex())); + return result; } /** diff --git a/forge-gui/src/main/java/forge/limited/CustomLimited.java b/forge-gui/src/main/java/forge/limited/CustomLimited.java index d4589b4853c..d9070d182ad 100644 --- a/forge-gui/src/main/java/forge/limited/CustomLimited.java +++ b/forge-gui/src/main/java/forge/limited/CustomLimited.java @@ -32,7 +32,6 @@ import forge.item.PaperCard; import forge.item.SealedProduct; import forge.util.FileSection; import forge.util.ItemPool; -import forge.util.ItemPoolView; import forge.util.TextUtil; import forge.util.storage.IStorage; @@ -63,7 +62,7 @@ public class CustomLimited extends DeckBase { /** The Num packs. */ private int numPacks = 3; - private transient ItemPoolView cardPool; + private transient ItemPool cardPool; /** The Land set code. */ private String landSetCode = CardEdition.Predicates.getRandomSetWithAllBasicLands(Singletons.getMagicDb().getEditions()).getCode(); @@ -153,7 +152,7 @@ public class CustomLimited extends DeckBase { * * @see forge.item.CardCollectionBase#getCardPool() */ - public ItemPoolView getCardPool() { + public ItemPool getCardPool() { return this.cardPool; } diff --git a/forge-gui/src/main/java/forge/limited/IBoosterDraft.java b/forge-gui/src/main/java/forge/limited/IBoosterDraft.java index 1d216ea1552..e0af1085c94 100644 --- a/forge-gui/src/main/java/forge/limited/IBoosterDraft.java +++ b/forge-gui/src/main/java/forge/limited/IBoosterDraft.java @@ -18,9 +18,9 @@ package forge.limited; import forge.card.CardEdition; +import forge.deck.CardPool; import forge.deck.Deck; import forge.item.PaperCard; -import forge.util.ItemPoolView; /** *

@@ -38,7 +38,7 @@ public interface IBoosterDraft { * * @return a {@link forge.CardList} object. */ - ItemPoolView nextChoice(); + CardPool nextChoice(); /** *

diff --git a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java index c0537adb21d..b40b8460da5 100644 --- a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java @@ -33,7 +33,6 @@ import forge.deck.DeckSection; import forge.deck.generation.DeckGeneratorBase; import forge.item.PaperCard; import forge.item.IPaperCard; -import forge.util.ItemPoolView; import forge.util.MyRandom; /** @@ -97,7 +96,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase{ } @Override - public ItemPoolView getDeck(int size, boolean forAi) { + public CardPool getDeck(int size, boolean forAi) { return buildDeck().getMain(); } diff --git a/forge-gui/src/main/java/forge/quest/QuestUtilCards.java b/forge-gui/src/main/java/forge/quest/QuestUtilCards.java index 78825dec349..8c3fb0a8f10 100644 --- a/forge-gui/src/main/java/forge/quest/QuestUtilCards.java +++ b/forge-gui/src/main/java/forge/quest/QuestUtilCards.java @@ -55,7 +55,6 @@ import forge.quest.data.QuestPreferences.DifficultyPrefs; import forge.quest.data.QuestPreferences.QPref; import forge.util.Aggregates; import forge.util.ItemPool; -import forge.util.ItemPoolView; import forge.util.MyRandom; /** @@ -87,7 +86,7 @@ public final class QuestUtilCards { * @param usedFormat currently enforced game format, if any * @return the item pool view */ - public static ItemPoolView generateBasicLands(final int nBasic, final int nSnow, final GameFormatQuest usedFormat) { + public static ItemPool generateBasicLands(final int nBasic, final int nSnow, final GameFormatQuest usedFormat) { final ICardDatabase db = Singletons.getMagicDb().getCommonCards(); final ItemPool pool = new ItemPool(PaperCard.class); @@ -591,7 +590,7 @@ public final class QuestUtilCards { * * @return the shop list */ - public ItemPoolView getShopList() { + public ItemPool getShopList() { if (this.qa.getShopList().isEmpty()) { this.generateCardsInShop(); } @@ -603,7 +602,7 @@ public final class QuestUtilCards { * * @return the new cards */ - public ItemPoolView getNewCards() { + public ItemPool getNewCards() { return this.qa.getNewCardList(); } diff --git a/forge-gui/src/main/java/forge/quest/data/QuestAssets.java b/forge-gui/src/main/java/forge/quest/data/QuestAssets.java index 6c1a3bcaa52..996d4800691 100644 --- a/forge-gui/src/main/java/forge/quest/data/QuestAssets.java +++ b/forge-gui/src/main/java/forge/quest/data/QuestAssets.java @@ -31,7 +31,6 @@ import forge.quest.QuestUtilCards; import forge.quest.bazaar.QuestItemType; import forge.quest.data.QuestPreferences.QPref; import forge.util.ItemPool; -import forge.util.ItemPoolView; /** */ public class QuestAssets { @@ -171,7 +170,7 @@ public class QuestAssets { if (useFormat != null && !useFormat.hasSnowLands()) { snowLands = 0; } - final ItemPoolView lands = QuestUtilCards.generateBasicLands( + final ItemPool lands = QuestUtilCards.generateBasicLands( prefs.getPrefInt(QPref.STARTING_BASIC_LANDS), snowLands, useFormat); this.getCardPool().addAll(lands); } diff --git a/forge-gui/src/test/java/forge/BoosterDraft1Test.java b/forge-gui/src/test/java/forge/BoosterDraft1Test.java index 6b94b585c5a..5e93297561d 100644 --- a/forge-gui/src/test/java/forge/BoosterDraft1Test.java +++ b/forge-gui/src/test/java/forge/BoosterDraft1Test.java @@ -2,10 +2,9 @@ package forge; import org.testng.annotations.Test; -import forge.item.PaperCard; +import forge.deck.CardPool; import forge.limited.BoosterDraft; import forge.limited.LimitedPoolType; -import forge.util.ItemPoolView; /** * Unit test for simple App. @@ -23,7 +22,7 @@ public class BoosterDraft1Test { public void boosterDraft1Test1() throws Exception { final BoosterDraft draft = new BoosterDraft(LimitedPoolType.Full); while (draft.hasNextChoice()) { - final ItemPoolView list = draft.nextChoice(); + final CardPool list = draft.nextChoice(); System.out.println(list.countAll()); draft.setChoice(list.toFlatList().get(0)); } diff --git a/forge-gui/src/test/java/forge/BoosterDraftTest.java b/forge-gui/src/test/java/forge/BoosterDraftTest.java index 7bdc75800f1..32cc6728e9a 100644 --- a/forge-gui/src/test/java/forge/BoosterDraftTest.java +++ b/forge-gui/src/test/java/forge/BoosterDraftTest.java @@ -5,13 +5,12 @@ import java.util.List; import org.testng.annotations.Test; import forge.card.BoosterGenerator; +import forge.deck.CardPool; import forge.deck.Deck; import forge.game.card.Card; import forge.item.PaperCard; import forge.item.SealedProduct; import forge.limited.IBoosterDraft; -import forge.util.ItemPool; -import forge.util.ItemPoolView; /** *

@@ -48,10 +47,12 @@ public class BoosterDraftTest implements IBoosterDraft { * @return a {@link forge.CardList} object. */ @Override - public ItemPoolView nextChoice() { + public CardPool nextChoice() { this.n--; SealedProduct.Template booster = Singletons.getMagicDb().getBoosters().get("M11"); - return ItemPool.createFrom(BoosterGenerator.getBoosterPack(booster), PaperCard.class); + CardPool result = new CardPool(); + result.addAllFlat(BoosterGenerator.getBoosterPack(booster)); + return result; } /** {@inheritDoc} */ diff --git a/forge-gui/src/test/java/forge/deck/generate/Generate2ColorDeckTest.java b/forge-gui/src/test/java/forge/deck/generate/Generate2ColorDeckTest.java index 172a0844fea..428fe152189 100644 --- a/forge-gui/src/test/java/forge/deck/generate/Generate2ColorDeckTest.java +++ b/forge-gui/src/test/java/forge/deck/generate/Generate2ColorDeckTest.java @@ -7,7 +7,7 @@ import forge.Singletons; import forge.card.CardDb; import forge.deck.generation.DeckGenerator2Color; import forge.item.PaperCard; -import forge.util.ItemPoolView; +import forge.util.ItemPool; /** * Created by IntelliJ IDEA. User: dhudson @@ -22,7 +22,7 @@ public class Generate2ColorDeckTest { public void generate2ColorDeckTest1() { CardDb cardDb = Singletons.getMagicDb().getCommonCards(); final DeckGenerator2Color gen = new DeckGenerator2Color(cardDb, "white", "blue"); - final ItemPoolView cardList = gen.getDeck(60, false); + final ItemPool cardList = gen.getDeck(60, false); Assert.assertNotNull(cardList); } } diff --git a/forge-gui/src/test/java/forge/deck/generate/Generate3ColorDeckTest.java b/forge-gui/src/test/java/forge/deck/generate/Generate3ColorDeckTest.java index 905ed8c2140..c7022590e95 100644 --- a/forge-gui/src/test/java/forge/deck/generate/Generate3ColorDeckTest.java +++ b/forge-gui/src/test/java/forge/deck/generate/Generate3ColorDeckTest.java @@ -5,9 +5,8 @@ import org.testng.annotations.Test; import forge.Singletons; import forge.card.CardDb; +import forge.deck.CardPool; import forge.deck.generation.DeckGenerator3Color; -import forge.item.PaperCard; -import forge.util.ItemPoolView; /** * Created by IntelliJ IDEA. User: dhudson @@ -22,7 +21,7 @@ public class Generate3ColorDeckTest { public void generate3ColorDeckTest1() { CardDb cardDb = Singletons.getMagicDb().getCommonCards(); final DeckGenerator3Color gen = new DeckGenerator3Color(cardDb, "white", "blue", "black"); - final ItemPoolView cardList = gen.getDeck(60, false); + final CardPool cardList = gen.getDeck(60, false); Assert.assertNotNull(cardList); } } diff --git a/forge-gui/src/test/java/forge/deck/generate/Generate5ColorDeckTest.java b/forge-gui/src/test/java/forge/deck/generate/Generate5ColorDeckTest.java index a880df8e75e..e1b71c18f33 100644 --- a/forge-gui/src/test/java/forge/deck/generate/Generate5ColorDeckTest.java +++ b/forge-gui/src/test/java/forge/deck/generate/Generate5ColorDeckTest.java @@ -5,9 +5,8 @@ import org.testng.annotations.Test; import forge.Singletons; import forge.card.CardDb; +import forge.deck.CardPool; import forge.deck.generation.DeckGenerator5Color; -import forge.item.PaperCard; -import forge.util.ItemPoolView; /** * Created by IntelliJ IDEA. User: dhudson @@ -22,7 +21,7 @@ public class Generate5ColorDeckTest { public void generate5ColorDeckTest1() { CardDb cardDb = Singletons.getMagicDb().getCommonCards(); final DeckGenerator5Color gen = new DeckGenerator5Color(cardDb); - final ItemPoolView cardList = gen.getDeck(60, false); + final CardPool cardList = gen.getDeck(60, false); Assert.assertNotNull(cardList); } }