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

use predicates instead of a custom count function

Browse Source
This commit is contained in:
myk
2013-02-07 12:15:44 +00:00
parent 0ee3219c99
commit d1fb51a898
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/forge/gui/deckeditor/SEditorUtil.java
View File

@@ -14,6 +14,7 @@ import forge.gui.deckeditor.views.VCardCatalog;
import forge.gui.deckeditor.views.VCurrentDeck; import forge.gui.deckeditor.views.VCurrentDeck;
import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FLabel;
import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin;
import forge.item.CardPrinted;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.item.ItemPoolView; import forge.item.ItemPoolView;
import forge.util.Aggregates; import forge.util.Aggregates;
@@ -77,6 +78,9 @@ public final class SEditorUtil {
return (int) Math.round((double) (x0 * 100) / (double) y0); return (int) Math.round((double) (x0 * 100) / (double) y0);
} }
private static final Predicate<Object> totalPred = Predicates.instanceOf(CardPrinted.class);
private static final Predicate<Object> packPred = Predicates.not(totalPred);
/** /**
* setStats. * setStats.
* *
@@ -88,10 +92,12 @@ public final class SEditorUtil {
for (StatTypes s : StatTypes.values()) { for (StatTypes s : StatTypes.values()) {
switch (s) { switch (s) {
case TOTAL: case TOTAL:
view.getStatLabel(s).setText(String.valueOf(items.countAll())); view.getStatLabel(s).setText(String.valueOf(
Aggregates.sum(Iterables.filter(items, Predicates.compose(totalPred, items.getFnToPrinted())), items.getFnToCount())));
break; break;
case PACK: case PACK:
view.getStatLabel(s).setText(String.valueOf(items.countNonCards())); view.getStatLabel(s).setText(String.valueOf(
Aggregates.sum(Iterables.filter(items, Predicates.compose(packPred, items.getFnToPrinted())), items.getFnToCount())));
break; break;
default: default:
view.getStatLabel(s).setText(String.valueOf( view.getStatLabel(s).setText(String.valueOf(

12
src/main/java/forge/item/ItemPoolView.java
View File

@@ -171,18 +171,6 @@ public class ItemPoolView<T extends InventoryItem> implements Iterable<Entry<T,
return result; return result;
} }
public final int countNonCards() {
int result = 0;
if (this.getCards() != null) {
for (Map.Entry<T, Integer> e : cards.entrySet()) {
if (!(e.getKey() instanceof CardPrinted)) {
result += e.getValue();
}
}
}
return result;
}
/** /**
* *
* countDistinct. * countDistinct.