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

Code cleanup

Browse Source
This commit is contained in:
drdev
2013-12-08 22:10:03 +00:00
parent cdf1b44cb0
commit 49aa0cc459
3 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui/src/main/java/forge/gui/input/InputBase.java
View File

@@ -60,19 +60,19 @@ public abstract class InputBase implements java.io.Serializable, Input {
@Override @Override
public final void selectButtonCancel() { public final void selectButtonCancel() {
if( isFinished() ) return; if (isFinished()) { return; }
onCancel(); onCancel();
} }
@Override @Override
public final void selectButtonOK() { public final void selectButtonOK() {
if( isFinished() ) return; if (isFinished()) { return; }
onOk(); onOk();
} }
@Override @Override
public final void selectCard(final Card c, final MouseEvent triggerEvent) { public final void selectCard(final Card c, final MouseEvent triggerEvent) {
if( isFinished() ) return; if (isFinished()) { return; }
onCardSelected(c, triggerEvent); onCardSelected(c, triggerEvent);
} }

5
forge-gui/src/main/java/forge/gui/input/InputSelectCards.java
View File

@@ -13,9 +13,10 @@ public abstract class InputSelectCards extends InputSelectManyBase<Card> {
@Override @Override
protected void onCardSelected(final Card c, final MouseEvent triggerEvent) { protected void onCardSelected(final Card c, final MouseEvent triggerEvent) {
if ( !selectEntity(c) ) if (!selectEntity(c)) {
return; return;
}
refresh(); refresh();
} }
} }

40
forge-gui/src/main/java/forge/gui/input/InputSelectManyBase.java
View File

@@ -9,7 +9,6 @@ import forge.gui.match.CMatchUI;
import forge.view.ButtonUtil; import forge.view.ButtonUtil;
public abstract class InputSelectManyBase<T extends GameEntity> extends InputSyncronizedBase implements InputSelectMany<T> { public abstract class InputSelectManyBase<T extends GameEntity> extends InputSyncronizedBase implements InputSelectMany<T> {
private static final long serialVersionUID = -2305549394512889450L; private static final long serialVersionUID = -2305549394512889450L;
protected final List<T> selected; protected final List<T> selected;
@@ -18,11 +17,9 @@ public abstract class InputSelectManyBase<T extends GameEntity> extends InputSyn
protected final int max; protected final int max;
public boolean allowUnselect = false; public boolean allowUnselect = false;
private boolean allowCancel = false; private boolean allowCancel = false;
protected String message = "Source-Card-Name - Select %d more card(s)"; protected String message = "Source-Card-Name - Select %d more card(s)";
protected InputSelectManyBase(int min, int max) { protected InputSelectManyBase(int min, int max) {
selected = new ArrayList<T>(); selected = new ArrayList<T>();
if (min > max) { if (min > max) {
@@ -35,11 +32,12 @@ public abstract class InputSelectManyBase<T extends GameEntity> extends InputSyn
protected void refresh() { protected void refresh() {
if (hasAllTargets()) { if (hasAllTargets()) {
selectButtonOK(); selectButtonOK();
} else { }
else {
this.showMessage(); this.showMessage();
} }
} }
@Override @Override
public final void showMessage() { public final void showMessage() {
showMessage(getMessage()); showMessage(getMessage());
@@ -102,34 +100,36 @@ public abstract class InputSelectManyBase<T extends GameEntity> extends InputSyn
if (!isValidChoice(c)) { if (!isValidChoice(c)) {
return false; return false;
} }
if ( selected.contains(c) ) { if (selected.contains(c)) {
if ( allowUnselect ) { if (allowUnselect) {
this.selected.remove(c); this.selected.remove(c);
onSelectStateChanged(c, false); onSelectStateChanged(c, false);
} else }
else {
return false; return false;
} else { }
}
else {
this.selected.add(c); this.selected.add(c);
onSelectStateChanged(c, true); onSelectStateChanged(c, true);
} }
return true; return true;
} }
protected void onSelectStateChanged(T c, boolean newState) { protected void onSelectStateChanged(T c, boolean newState) {
if( c instanceof Card ) if (c instanceof Card) {
CMatchUI.SINGLETON_INSTANCE.setUsedToPay((Card)c, newState); // UI supports card highlighting though this abstraction-breaking mechanism CMatchUI.SINGLETON_INSTANCE.setUsedToPay((Card)c, newState); // UI supports card highlighting though this abstraction-breaking mechanism
} }
}
protected void afterStop() { protected void afterStop() {
for(T c : selected) for (T c : selected) {
if( c instanceof Card) if (c instanceof Card) {
CMatchUI.SINGLETON_INSTANCE.setUsedToPay((Card)c, false); CMatchUI.SINGLETON_INSTANCE.setUsedToPay((Card)c, false);
} }
}
}
public final boolean isUnselectAllowed() { return allowUnselect; } public final boolean isUnselectAllowed() { return allowUnselect; }
public final void setUnselectAllowed(boolean allow) { this.allowUnselect = allow; } public final void setUnselectAllowed(boolean allow) { this.allowUnselect = allow; }