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

remove superfluous Pair class and use apache's version

Browse Source
This commit is contained in:
myk
2013-01-31 16:17:52 +00:00
parent 2b8e5199b0
commit e204c484eb
4 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/forge/gui/deckeditor/SFilterUtil.java
View File

@@ -4,6 +4,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.tuple.Pair;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -15,7 +17,6 @@ import forge.gui.toolbox.FLabel;
import forge.gui.toolbox.FSpinner;
import forge.item.CardPrinted;
import forge.util.ComparableOp;
import forge.util.Pair;
import forge.util.PredicateString.StringOp;
/**
@@ -131,7 +132,8 @@ public class SFilterUtil {
Map<RangeTypes, Pair<FSpinner, FSpinner>> spinners, VCardCatalog.RangeTypes field) {
Pair<FSpinner, FSpinner> sPair = spinners.get(field);
Predicate<CardRules> fieldFilter = getCardRulesFieldPredicate(
Integer.valueOf(sPair.a.getValue().toString()), Integer.valueOf(sPair.b.getValue().toString()), field.cardField);
Integer.valueOf(sPair.getLeft().getValue().toString()),
Integer.valueOf(sPair.getRight().getValue().toString()), field.cardField);
if (null != fieldFilter && VCardCatalog.RangeTypes.CMC != field)
{

22
src/main/java/forge/gui/deckeditor/controllers/CCardCatalog.java
View File

@@ -21,6 +21,8 @@ import javax.swing.KeyStroke;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.apache.commons.lang3.tuple.Pair;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -44,7 +46,6 @@ import forge.item.InventoryItem;
import forge.item.ItemPredicate;
import forge.quest.QuestWorld;
import forge.quest.data.GameFormatQuest;
import forge.util.Pair;
/**
* Controls the "card catalog" panel in the deck editor UI.
@@ -255,8 +256,8 @@ public enum CCardCatalog implements ICDoc {
// ensure mins can's exceed maxes and maxes can't fall below mins
for (Pair<FSpinner, FSpinner> sPair : VCardCatalog.SINGLETON_INSTANCE.getSpinners().values()) {
final FSpinner min = sPair.a;
final FSpinner max = sPair.b;
final FSpinner min = sPair.getLeft();
final FSpinner max = sPair.getRight();
min.addChangeListener(new ChangeListener() {
@Override
@@ -367,13 +368,13 @@ public enum CCardCatalog implements ICDoc {
@SuppressWarnings("serial")
private <T> void addRestriction(Pair<JComponent, Predicate<CardPrinted>> restriction, final Set<T> activeSet, final T key) {
final Predicate<CardPrinted> predicate = restriction.b;
final Predicate<CardPrinted> predicate = restriction.getRight();
if (null != predicate && activePredicates.contains(predicate)) {
return;
}
VCardCatalog.SINGLETON_INSTANCE.addRestrictionWidget(restriction.a, new Command() {
VCardCatalog.SINGLETON_INSTANCE.addRestrictionWidget(restriction.getLeft(), new Command() {
@Override
public void execute() {
if (null != key) {
@@ -397,11 +398,10 @@ public enum CCardCatalog implements ICDoc {
private Pair<JComponent, Predicate<CardPrinted>> buildRangeRestriction(RangeTypes t) {
Pair<FSpinner, FSpinner> s = VCardCatalog.SINGLETON_INSTANCE.getSpinners().get(t);
s.a.setValue(0);
s.b.setValue(10);
s.getLeft().setValue(0);
s.getRight().setValue(10);
return new Pair<JComponent, Predicate<CardPrinted>>(
VCardCatalog.SINGLETON_INSTANCE.buildRangeRestrictionWidget(t), null);
return Pair.of(VCardCatalog.SINGLETON_INSTANCE.buildRangeRestrictionWidget(t), null);
}
private String buildSearchRestrictionText(String text, boolean isInverse, boolean wantName, boolean wantType, boolean wantText) {
@@ -434,7 +434,7 @@ public enum CCardCatalog implements ICDoc {
VCardCatalog.SINGLETON_INSTANCE.getTxfSearch().setText("");
return new Pair<JComponent, Predicate<CardPrinted>>(
return Pair.of(
VCardCatalog.SINGLETON_INSTANCE.buildPlainRestrictionWidget(shortText, fullText),
SFilterUtil.buildTextFilter(text, isInverse, wantName, wantType, wantText));
}
@@ -495,7 +495,7 @@ public enum CCardCatalog implements ICDoc {
}
tooltip.append("</html>");
return new Pair<JComponent, Predicate<CardPrinted>>(
return Pair.of(
VCardCatalog.SINGLETON_INSTANCE.buildPlainRestrictionWidget(displayName, tooltip.toString()),
allowReprints ? format.getFilterRules() : format.getFilterPrinted());
}

10
src/main/java/forge/gui/deckeditor/views/VCardCatalog.java
View File

@@ -14,6 +14,9 @@ import javax.swing.JTable;
import javax.swing.JTextField;
import net.miginfocom.swing.MigLayout;
import org.apache.commons.lang3.tuple.Pair;
import forge.Command;
import forge.card.CardRulesPredicates;
import forge.gui.WrapLayout;
@@ -27,7 +30,6 @@ import forge.gui.toolbox.FLabel;
import forge.gui.toolbox.FSkin;
import forge.gui.toolbox.FSpinner;
import forge.gui.toolbox.FTextField;
import forge.util.Pair;
import forge.util.TextUtil;
/**
@@ -149,7 +151,7 @@ public enum VCardCatalog implements IVDoc<CCardCatalog>, ITableContainer {
// fill spinner map
for (RangeTypes t : RangeTypes.values()) {
spinners.put(t, new Pair<FSpinner, FSpinner>(
spinners.put(t, Pair.of(
new FSpinner.Builder().maxValue(10).build(),
new FSpinner.Builder().maxValue(10).build()));
}
@@ -272,11 +274,11 @@ public enum VCardCatalog implements IVDoc<CCardCatalog>, ITableContainer {
pnl.setOpaque(false);
Pair<FSpinner, FSpinner> s = spinners.get(t);
pnl.add(s.a, "w 45!");
pnl.add(s.getLeft(), "w 45!");
pnl.add(new FLabel.Builder().text("<=").fontSize(11).build());
pnl.add(new FLabel.Builder().text(t.toLabelString()).fontSize(11).build());
pnl.add(new FLabel.Builder().text("<=").fontSize(11).build());
pnl.add(s.b, "w 45!");
pnl.add(s.getRight(), "w 45!");
return pnl;
}

11
src/main/java/forge/util/Pair.java
View File

@@ -1,11 +0,0 @@
package forge.util;
public class Pair<T, V> {
public final T a;
public final V b;
public Pair(T a, V b) {
this.a = a;
this.b = b;
}
}