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

fix bugs in minimal set calculation.

Browse Source 
added that column to itemmanager
This commit is contained in:
Maxmtg
2014-01-25 16:29:56 +00:00
parent 7d2cc8fac5
commit 11c205f0c9
5 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui/src/main/java/forge/gui/deckeditor/DeckProxy.java
View File

@@ -11,6 +11,7 @@ import com.google.common.base.Predicate;
import forge.Singletons;
import forge.StaticData;
import forge.card.CardEdition;
import forge.card.ColorSet;
import forge.deck.CardPool;
import forge.deck.Deck;
@@ -48,7 +49,7 @@ public class DeckProxy implements InventoryItem {
private int sbSize = Integer.MIN_VALUE;
private final String path;
private final Function<IHasName, Deck> fnGetDeck;
private String edition;
private CardEdition edition;
public DeckProxy(Deck deck, GameType type, IStorage<? extends IHasName> storage) {
this(deck, type, "", storage, null);
@@ -85,12 +86,12 @@ public class DeckProxy implements InventoryItem {
return path;
}
public String getEdition() {
public CardEdition getEdition() {
if ( null == edition ) {
if ( deck instanceof PreconDeck )
edition = ((PreconDeck) deck).getEdition();
edition = StaticData.instance().getEditions().get(((PreconDeck) deck).getEdition());
if ( !isGeneratedDeck() )
edition = StaticData.instance().getEditions().getEarliestEditionWithAllCards(getDeck().getAllCardsInASinglePool()).getCode();
edition = StaticData.instance().getEditions().getEarliestEditionWithAllCards(getDeck().getAllCardsInASinglePool());
}
return edition;
}

1
forge-gui/src/main/java/forge/gui/toolbox/itemmanager/DeckManager.java
View File

@@ -68,6 +68,7 @@ public final class DeckManager extends ItemManager<DeckProxy> {
ColumnDef.NAME,
ColumnDef.DECK_COLOR,
ColumnDef.DECK_FORMAT,
ColumnDef.DECK_EDITION,
ColumnDef.DECK_MAIN,
ColumnDef.DECK_SIDE);

13
forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ColumnDef.java
View File

@@ -337,6 +337,19 @@ public enum ColumnDef {
return StringUtils.join(Iterables.transform(deck.getFormats(), GameFormat.FN_GET_NAME) , ", ");
}
}),
DECK_EDITION("Min.Set", "Min.Set", 30, 30, 30, SortState.ASC, new ItemCellRenderer(),
new Function<Entry<InventoryItem, Integer>, Comparable<?>>() {
@Override
public Comparable<?> apply(final Entry<InventoryItem, Integer> from) {
return toDeck(from.getKey()).getEdition();
}
},
new Function<Entry<? extends InventoryItem, Integer>, Object>() {
@Override
public Object apply(final Entry<? extends InventoryItem, Integer> from) {
return toDeck(from.getKey()).getEdition().getCode();
}
}),
DECK_MAIN("Main", "Main Deck", 30, 30, 30, SortState.ASC, new IntegerRenderer(),
new Function<Entry<InventoryItem, Integer>, Comparable<?>>() {
@Override