From 045a9fc1d485f83da76bb5f3a3aa0a3aaef402cc Mon Sep 17 00:00:00 2001 From: Sloth Date: Sat, 17 Nov 2012 21:12:34 +0000 Subject: [PATCH] - Fixed InputSelectMany. --- src/main/java/forge/card/cardfactory/CardFactoryArtifacts.java | 3 --- src/main/java/forge/control/input/InputSelectMany.java | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/forge/card/cardfactory/CardFactoryArtifacts.java b/src/main/java/forge/card/cardfactory/CardFactoryArtifacts.java index f328aba3f19..fa1296de77d 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryArtifacts.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryArtifacts.java @@ -5,9 +5,6 @@ import java.util.List; import javax.swing.JOptionPane; -import com.google.common.base.Function; -import com.google.common.base.Predicate; - import forge.Card; import forge.Command; diff --git a/src/main/java/forge/control/input/InputSelectMany.java b/src/main/java/forge/control/input/InputSelectMany.java index 33464aad238..0b4c37eb0cd 100644 --- a/src/main/java/forge/control/input/InputSelectMany.java +++ b/src/main/java/forge/control/input/InputSelectMany.java @@ -107,6 +107,7 @@ public abstract class InputSelectMany extends Input { protected Input onCancel() { return null; } protected boolean canCancelWithSomethingSelected() { return false; } protected boolean hasEnoughTargets() { return selected.size() >= min; } + protected boolean hasAllTargets() { return selected.size() >= max; } protected void selectEntity(T c) @@ -116,7 +117,7 @@ public abstract class InputSelectMany extends Input { this.selected.add(c); this.showMessage(); - if ( hasEnoughTargets() ) + if ( hasAllTargets() ) selectButtonOK(); }