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

clean up core classes

Browse Source
This commit is contained in:
Maxmtg
2013-11-23 08:12:40 +00:00
parent 800b3f8272
commit 37849b88e2
5 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,9 +102,4 @@ public class StaticData {
return variantCards; return variantCards;
} }
public List<PaperCard> getAllCards() {
List<PaperCard> cards = new ArrayList<PaperCard>(commonCards.getAllCards());
cards.addAll(variantCards.getAllCards());
return cards;
}
} }

5
forge-core/src/main/java/forge/card/CardDb.java
View File

@@ -321,6 +321,11 @@ public final class CardDb implements ICardDatabase {
return Lists.newArrayList(Iterables.filter(this.roAllCards, predicate)); return Lists.newArrayList(Iterables.filter(this.roAllCards, predicate));
} }
@Override
public Iterator<PaperCard> iterator() {
return this.roAllCards.iterator();
}
public Predicate<? super PaperCard> wasPrintedInSets(List<String> setCodes) { public Predicate<? super PaperCard> wasPrintedInSets(List<String> setCodes) {
return new PredicateExistsInSets(setCodes); return new PredicateExistsInSets(setCodes);
} }

2
forge-core/src/main/java/forge/card/ICardDatabase.java
View File

@@ -8,7 +8,7 @@ import com.google.common.base.Predicate;
import forge.item.PaperCard; import forge.item.PaperCard;
public interface ICardDatabase { public interface ICardDatabase extends Iterable<PaperCard> {
PaperCard tryGetCard(String cardName); PaperCard tryGetCard(String cardName);
PaperCard tryGetCard(String cardName, boolean fromLastSet); PaperCard tryGetCard(String cardName, boolean fromLastSet);
PaperCard tryGetCard(String cardName, String edition); PaperCard tryGetCard(String cardName, String edition);

8
forge-core/src/main/java/forge/card/mana/ManaCost.java
View File

@@ -100,20 +100,18 @@ public final class ManaCost implements Comparable<ManaCost> {
return "{" + this.genericCost + "}"; return "{" + this.genericCost + "}";
} }
final StringBuilder xb = new StringBuilder();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (this.genericCost > 0) { if (this.genericCost > 0) {
sb.append("{" + this.genericCost + "}"); sb.append("{" + this.genericCost + "}");
} }
for (final ManaCostShard s : this.shards) { for (final ManaCostShard s : this.shards) {
if (s == ManaCostShard.X) { if (s == ManaCostShard.X) {
xb.append(s.toString()); sb.insert(0, s.toString());
} } else {
else {
sb.append(s.toString()); sb.append(s.toString());
} }
} }
return xb.toString() + sb.toString(); return sb.toString();
} }
/** /**

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

@@ -17,6 +17,8 @@ import net.miginfocom.swing.MigLayout;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import com.google.common.collect.Iterables;
import forge.Command; import forge.Command;
import forge.Singletons; import forge.Singletons;
import forge.gui.WrapLayout; import forge.gui.WrapLayout;
@@ -125,18 +127,19 @@ public enum VWorkshopCatalog implements IVDoc<CWorkshopCatalog> {
} }
this.cardManager = new CardManager(this.statLabels, true); this.cardManager = new CardManager(this.statLabels, true);
this.cardManager.setPool(ItemPool.createFrom(Singletons.getMagicDb().getAllCards(), PaperCard.class), true); Iterable<PaperCard> allCards = Iterables.concat(Singletons.getMagicDb().getCommonCards(), Singletons.getMagicDb().getVariantCards());
this.cardManager.setPool(ItemPool.createFrom(allCards, PaperCard.class), true);
this.cardManagerContainer.setItemManager(this.cardManager); this.cardManagerContainer.setItemManager(this.cardManager);
this.cardManager.addSelectionListener(new ListSelectionListener() { this.cardManager.addSelectionListener(new ListSelectionListener() {
@Override @Override
public void valueChanged(ListSelectionEvent e) { public void valueChanged(ListSelectionEvent e) {
PaperCard card = cardManager.getSelectedItem(); PaperCard card = cardManager.getSelectedItem();
CDetail.SINGLETON_INSTANCE.showCard(card); CDetail.SINGLETON_INSTANCE.showCard(card);
CPicture.SINGLETON_INSTANCE.showImage(card); CPicture.SINGLETON_INSTANCE.showImage(card);
CCardScript.SINGLETON_INSTANCE.showCard(card); CCardScript.SINGLETON_INSTANCE.showCard(card);
} }
}); });
} }
private void _setupSpinner (JSpinner spinner) { private void _setupSpinner (JSpinner spinner) {