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

Show regular and variant cards in Workshop

Browse Source
This commit is contained in:
drdev
2013-11-23 05:03:07 +00:00
parent 2ab5f19f79
commit e30c4532b8
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-core/src/main/java/forge/StaticData.java
View File

@@ -1,6 +1,7 @@
package forge;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
@@ -10,6 +11,7 @@ import forge.card.CardEdition;
import forge.card.CardRules;
import forge.card.PrintSheet;
import forge.item.FatPack;
import forge.item.PaperCard;
import forge.item.SealedProduct;
import forge.util.storage.IStorage;
import forge.util.storage.StorageBase;
@@ -99,4 +101,10 @@ public class StaticData {
public CardDb getVariantCards() {
return variantCards;
}
public List<PaperCard> getAllCards() {
List<PaperCard> cards = new ArrayList<PaperCard>(commonCards.getAllCards());
cards.addAll(variantCards.getAllCards());
return cards;
}
}

2
forge-gui/src/main/java/forge/gui/workshop/views/VWorkshopCatalog.java
View File

@@ -125,7 +125,7 @@ public enum VWorkshopCatalog implements IVDoc<CWorkshopCatalog> {
}
this.cardManager = new CardManager(this.statLabels, true);
this.cardManager.setPool(ItemPool.createFrom(Singletons.getMagicDb().getCommonCards().getAllCards(), PaperCard.class), true);
this.cardManager.setPool(ItemPool.createFrom(Singletons.getMagicDb().getAllCards(), PaperCard.class), true);
this.cardManagerContainer.setItemManager(this.cardManager);
this.cardManager.addSelectionListener(new ListSelectionListener() {