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

Checkstyle

Browse Source
This commit is contained in:
jendave
2011-11-16 18:21:27 +00:00
parent d87c08677e
commit 24e1b18e35
7 changed files with 97 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/main/java/forge/Card.java
View File

@@ -61,8 +61,9 @@ public class Card extends GameEntity implements Comparable<Card> {
/** /**
* Sets the state. * Sets the state.
* *
* @param state the state * @param state
* the state
* @return true, if successful * @return true, if successful
*/ */
public boolean setState(final String state) { public boolean setState(final String state) {
@@ -85,7 +86,7 @@ public class Card extends GameEntity implements Comparable<Card> {
/** /**
* Gets the states. * Gets the states.
* *
* @return the states * @return the states
*/ */
public Set<String> getStates() { public Set<String> getStates() {
@@ -94,7 +95,7 @@ public class Card extends GameEntity implements Comparable<Card> {
/** /**
* Gets the cur state. * Gets the cur state.
* *
* @return the cur state * @return the cur state
*/ */
public String getCurState() { public String getCurState() {
@@ -103,9 +104,11 @@ public class Card extends GameEntity implements Comparable<Card> {
/** /**
* Switch states. * Switch states.
* *
* @param from the from * @param from
* @param to the to * the from
* @param to
* the to
*/ */
public void switchStates(final String from, final String to) { public void switchStates(final String from, final String to) {
final CardCharacteristics tmp = this.characteristicsMap.get(from); final CardCharacteristics tmp = this.characteristicsMap.get(from);
@@ -115,8 +118,9 @@ public class Card extends GameEntity implements Comparable<Card> {
/** /**
* Clear states. * Clear states.
* *
* @param state the state * @param state
* the state
*/ */
public void clearStates(final String state) { public void clearStates(final String state) {
this.characteristicsMap.remove(state); this.characteristicsMap.remove(state);
@@ -124,30 +128,34 @@ public class Card extends GameEntity implements Comparable<Card> {
/** /**
* Turn face down. * Turn face down.
*
* @return true, if successful
*/ */
public boolean turnFaceDown() { public boolean turnFaceDown() {
if (!this.isDoubleFaced) { if (!this.isDoubleFaced) {
this.preTFDCharacteristic = this.curCharacteristics; this.preTFDCharacteristic = this.curCharacteristics;
return this.setState("FaceDown"); return this.setState("FaceDown");
} }
return false; return false;
} }
/** /**
* Turn face up. * Turn face up.
*
* @return true, if successful
*/ */
public boolean turnFaceUp() { public boolean turnFaceUp() {
if (this.curCharacteristics.equals("FaceDown")) { if (this.curCharacteristics.equals("FaceDown")) {
return this.setState(this.preTFDCharacteristic); return this.setState(this.preTFDCharacteristic);
} }
return false; return false;
} }
/** /**
* Checks if is cloned. * Checks if is cloned.
* *
* @return true, if is cloned * @return true, if is cloned
*/ */
public boolean isCloned() { public boolean isCloned() {
@@ -161,8 +169,9 @@ public class Card extends GameEntity implements Comparable<Card> {
/** /**
* Gets the state. * Gets the state.
* *
* @param state the state * @param state
* the state
* @return the state * @return the state
*/ */
public CardCharacteristics getState(final String state) { public CardCharacteristics getState(final String state) {
@@ -180,8 +189,9 @@ public class Card extends GameEntity implements Comparable<Card> {
/** /**
* addAlternateState. * addAlternateState.
* *
* @param state the state * @param state
* the state
*/ */
public final void addAlternateState(final String state) { public final void addAlternateState(final String state) {
this.characteristicsMap.put(state, new CardCharacteristics()); this.characteristicsMap.put(state, new CardCharacteristics());
@@ -2901,7 +2911,7 @@ public class Card extends GameEntity implements Comparable<Card> {
/** /**
* Gets the regenerated this turn. * Gets the regenerated this turn.
* *
* @return the regenerated this turn * @return the regenerated this turn
*/ */
public final int getRegeneratedThisTurn() { public final int getRegeneratedThisTurn() {
@@ -2910,8 +2920,9 @@ public class Card extends GameEntity implements Comparable<Card> {
/** /**
* Sets the regenerated this turn. * Sets the regenerated this turn.
* *
* @param n the new regenerated this turn * @param n
* the new regenerated this turn
*/ */
public final void setRegeneratedThisTurn(final int n) { public final void setRegeneratedThisTurn(final int n) {
this.regeneratedThisTurn = n; this.regeneratedThisTurn = n;
@@ -8089,7 +8100,9 @@ public class Card extends GameEntity implements Comparable<Card> {
this.getCharacteristics().setCardColorsOverridden(cardColorsOverridden0); this.getCharacteristics().setCardColorsOverridden(cardColorsOverridden0);
} }
/* (non-Javadoc) /*
* (non-Javadoc)
*
* @see forge.GameEntity#hasProtectionFrom(forge.Card) * @see forge.GameEntity#hasProtectionFrom(forge.Card)
*/ */
@Override @Override

2
src/main/java/forge/ComputerUtilAttack.java
View File

@@ -342,7 +342,7 @@ public class ComputerUtilAttack {
remainingAttackers.remove(blockableAttackers.get(i)); remainingAttackers.remove(blockableAttackers.get(i));
} }
if ((CombatUtil.sumDamageIfUnblocked(remainingAttackers, human) > human.getLife()) if ((CombatUtil.sumDamageIfUnblocked(remainingAttackers, human) > human.getLife())
&& AllZone.getHumanPlayer().canLoseLife() && AllZone.getHumanPlayer().canLoseLife()
&& !((human.cantLoseForZeroOrLessLife() || human.cantLose() || computer.cantWin()) && human.getLife() < 1)) { && !((human.cantLoseForZeroOrLessLife() || human.cantLose() || computer.cantWin()) && human.getLife() < 1)) {
return true; return true;

101
src/main/java/forge/card/abilityfactory/AbilityFactorySetState.java
View File

@@ -186,8 +186,8 @@ public class AbilityFactorySetState {
tgtCards = AbilityFactory.getDefinedCards(abilityFactory.getHostCard(), tgtCards = AbilityFactory.getDefinedCards(abilityFactory.getHostCard(),
abilityFactory.getMapParams().get("Defined"), sa); abilityFactory.getMapParams().get("Defined"), sa);
} }
boolean remChanged = abilityFactory.getMapParams().containsKey("RememberChanged"); final boolean remChanged = abilityFactory.getMapParams().containsKey("RememberChanged");
for (final Card tgt : tgtCards) { for (final Card tgt : tgtCards) {
if (abilityFactory.getAbTgt() != null) { if (abilityFactory.getAbTgt() != null) {
@@ -195,48 +195,43 @@ public class AbilityFactorySetState {
continue; continue;
} }
} }
String mode = abilityFactory.getMapParams().get("Mode"); final String mode = abilityFactory.getMapParams().get("Mode");
if (mode != null) { if (mode != null) {
if(mode.equals("Transform")) { if (mode.equals("Transform")) {
if(tgt.isDoubleFaced()) { if (tgt.isDoubleFaced()) {
if(tgt.getCurState().equals("Original")) { if (tgt.getCurState().equals("Original")) {
if(tgt.setState("Transformed") && remChanged) { if (tgt.setState("Transformed") && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt); abilityFactory.getHostCard().addRemembered(tgt);
} }
} } else if (tgt.getCurState().equals("Transformed")) {
else if(tgt.getCurState().equals("Transformed")) { if (tgt.setState("Original") && remChanged) {
if(tgt.setState("Original") && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt); abilityFactory.getHostCard().addRemembered(tgt);
} }
} }
} }
} } else if (mode.equals("Flip")) {
else if(mode.equals("Flip")) { if (tgt.isFlip()) {
if(tgt.isFlip()) { if (tgt.getCurState().equals("Original")) {
if(tgt.getCurState().equals("Original")) { if (tgt.setState("Flipped") && remChanged) {
if(tgt.setState("Flipped") && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt); abilityFactory.getHostCard().addRemembered(tgt);
} }
} } else if (tgt.getCurState().equals("Flipped")) {
else if(tgt.getCurState().equals("Flipped")) { if (tgt.setState("Original") && remChanged) {
if(tgt.setState("Original") && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt); abilityFactory.getHostCard().addRemembered(tgt);
} }
} }
} }
} } else if (mode.equals("TurnFace")) {
else if(mode.equals("TurnFace")) { if (tgt.getCurState().equals("Original")) {
if(tgt.getCurState().equals("Original")) { if (tgt.turnFaceDown() && remChanged) {
if(tgt.turnFaceDown() && remChanged) { abilityFactory.getHostCard().addRemembered(tgt);
}
} else if (tgt.getCurState().equals("FaceDown")) {
if (tgt.turnFaceUp() && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt); abilityFactory.getHostCard().addRemembered(tgt);
} }
} }
else if(tgt.getCurState().equals("FaceDown")) { }
if(tgt.turnFaceUp() && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt);
}
}
}
} else { } else {
tgt.setState(abilityFactory.getMapParams().get("NewState")); tgt.setState(abilityFactory.getMapParams().get("NewState"));
} }
@@ -384,48 +379,43 @@ public class AbilityFactorySetState {
} }
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
String mode = abilityFactory.getMapParams().get("Mode"); final String mode = abilityFactory.getMapParams().get("Mode");
if (mode != null) { if (mode != null) {
if(mode.equals("Transform")) { if (mode.equals("Transform")) {
if(list.get(i).isDoubleFaced()) { if (list.get(i).isDoubleFaced()) {
if(list.get(i).getCurState().equals("Original")) { if (list.get(i).getCurState().equals("Original")) {
if(list.get(i).setState("Transformed") && remChanged) { if (list.get(i).setState("Transformed") && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt); abilityFactory.getHostCard().addRemembered(tgt);
} }
} } else if (list.get(i).getCurState().equals("Transformed")) {
else if(list.get(i).getCurState().equals("Transformed")) { if (list.get(i).setState("Original") && remChanged) {
if(list.get(i).setState("Original") && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt); abilityFactory.getHostCard().addRemembered(tgt);
} }
} }
} }
} } else if (mode.equals("Flip")) {
else if(mode.equals("Flip")) { if (list.get(i).isFlip()) {
if(list.get(i).isFlip()) { if (list.get(i).getCurState().equals("Original")) {
if(list.get(i).getCurState().equals("Original")) { if (list.get(i).setState("Flipped") && remChanged) {
if(list.get(i).setState("Flipped") && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt); abilityFactory.getHostCard().addRemembered(tgt);
} }
} } else if (list.get(i).getCurState().equals("Flipped")) {
else if(list.get(i).getCurState().equals("Flipped")) { if (list.get(i).setState("Original") && remChanged) {
if(list.get(i).setState("Original") && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt); abilityFactory.getHostCard().addRemembered(tgt);
} }
} }
} }
} } else if (mode.equals("TurnFace")) {
else if(mode.equals("TurnFace")) { if (list.get(i).getCurState().equals("Original")) {
if(list.get(i).getCurState().equals("Original")) { if (list.get(i).turnFaceDown() && remChanged) {
if(list.get(i).turnFaceDown() && remChanged) { abilityFactory.getHostCard().addRemembered(tgt);
}
} else if (list.get(i).getCurState().equals("FaceDown")) {
if (list.get(i).turnFaceUp() && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt); abilityFactory.getHostCard().addRemembered(tgt);
} }
} }
else if(list.get(i).getCurState().equals("FaceDown")) { }
if(list.get(i).turnFaceUp() && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt);
}
}
}
} else { } else {
list.get(i).setState(abilityFactory.getMapParams().get("NewState")); list.get(i).setState(abilityFactory.getMapParams().get("NewState"));
} }
@@ -447,8 +437,7 @@ public class AbilityFactorySetState {
if (params.containsKey("Mode")) { if (params.containsKey("Mode")) {
sb.append(params.get("Mode")); sb.append(params.get("Mode"));
} } else {
else {
sb.append(params.get("NewState")); sb.append(params.get("NewState"));
} }

6
src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
View File

@@ -1156,7 +1156,7 @@ public class AbilityFactoryZoneAffecting {
p.discard(c, sa); p.discard(c, sa);
discarded.add(c); discarded.add(c);
} }
} else if (mode.equals("RevealYouChoose") || mode.equals("RevealOppChoose") } else if (mode.equals("RevealYouChoose") || mode.equals("RevealOppChoose")
|| mode.equals("TgtChoose")) { || mode.equals("TgtChoose")) {
// Is Reveal you choose right? I think the wrong player is // Is Reveal you choose right? I think the wrong player is
// being used? // being used?
@@ -1173,7 +1173,7 @@ public class AbilityFactoryZoneAffecting {
Player chooser = p; Player chooser = p;
if (mode.equals("RevealYouChoose")) { if (mode.equals("RevealYouChoose")) {
chooser = source.getController(); chooser = source.getController();
} else if (mode.equals("RevealOppChoose")){ } else if (mode.equals("RevealOppChoose")) {
chooser = source.getController().getOpponent(); chooser = source.getController().getOpponent();
} }
@@ -1200,7 +1200,7 @@ public class AbilityFactoryZoneAffecting {
final Card dC = dChoices.get(CardUtil.getRandomIndex(dChoices)); final Card dC = dChoices.get(CardUtil.getRandomIndex(dChoices));
dPChHand.remove(dC); dPChHand.remove(dC);
if (mode.startsWith("Reveal")) { if (mode.startsWith("Reveal")) {
final CardList dCs = new CardList(); final CardList dCs = new CardList();
dCs.add(dC); dCs.add(dC);

2
src/main/java/forge/card/cardfactory/AbstractCardFactory.java
View File

@@ -493,7 +493,7 @@ public abstract class AbstractCardFactory implements CardFactoryInterface {
CardFactoryUtil.parseKeywords(card, cardName); CardFactoryUtil.parseKeywords(card, cardName);
for (final String state : card.getStates()) { for (final String state : card.getStates()) {
if(card.isDoubleFaced() && state.equals("FaceDown")) { if (card.isDoubleFaced() && state.equals("FaceDown")) {
continue; //Ignore FaceDown for DFC since they have none. continue; //Ignore FaceDown for DFC since they have none.
} }
card.setState(state); card.setState(state);

4
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -4172,7 +4172,7 @@ public class CardFactoryUtil {
public static Card copyStats(final Object o) { public static Card copyStats(final Object o) {
final Card sim = (Card) o; final Card sim = (Card) o;
final Card c = new Card(); final Card c = new Card();
c.setFlip(sim.isFlip()); c.setFlip(sim.isFlip());
c.setDoubleFaced(sim.isDoubleFaced()); c.setDoubleFaced(sim.isDoubleFaced());
c.setCurSetCode(sim.getCurSetCode()); c.setCurSetCode(sim.getCurSetCode());
@@ -4186,7 +4186,7 @@ public class CardFactoryUtil {
} }
sim.setState(origState); sim.setState(origState);
c.setState(origState); c.setState(origState);
return c; return c;
} // copyStats() } // copyStats()

24
src/main/java/forge/card/trigger/TriggerHandler.java
View File

@@ -82,7 +82,7 @@ public class TriggerHandler {
* </p> * </p>
*/ */
public final void clearDelayedTrigger() { public final void clearDelayedTrigger() {
delayedTriggers.clear(); this.delayedTriggers.clear();
} }
/** /**
@@ -291,16 +291,16 @@ public class TriggerHandler {
// triggers are running. // triggers are running.
final ArrayList<Trigger> delayedTriggersWorkingCopy = new ArrayList<Trigger>(this.delayedTriggers); final ArrayList<Trigger> delayedTriggersWorkingCopy = new ArrayList<Trigger>(this.delayedTriggers);
CardList allCards = AllZoneUtil.getCardsInGame(); CardList allCards = AllZoneUtil.getCardsInGame();
//Static triggers // Static triggers
for(final Card c : allCards) { for (final Card c : allCards) {
for(final Trigger t : c.getTriggers()) { for (final Trigger t : c.getTriggers()) {
if(t.getMapParams().containsKey("Static")) { if (t.getMapParams().containsKey("Static")) {
this.runSingleTrigger(t, mode, runParams); this.runSingleTrigger(t, mode, runParams);
} }
} }
} }
this.suppressMode("Always"); this.suppressMode("Always");
AllZone.getGameAction().checkStateEffects(true); AllZone.getGameAction().checkStateEffects(true);
this.clearSuppression("Always"); this.clearSuppression("Always");
@@ -310,8 +310,8 @@ public class TriggerHandler {
allCards.addAll(AllZoneUtil.getCardsIn(Constant.Zone.Stack).getController(playerAP)); allCards.addAll(AllZoneUtil.getCardsIn(Constant.Zone.Stack).getController(playerAP));
for (final Card c : allCards) { for (final Card c : allCards) {
for (final Trigger t : c.getTriggers()) { for (final Trigger t : c.getTriggers()) {
if(!t.getMapParams().containsKey("Static")) { if (!t.getMapParams().containsKey("Static")) {
this.runSingleTrigger(t, mode, runParams); this.runSingleTrigger(t, mode, runParams);
} }
} }
} }
@@ -331,8 +331,8 @@ public class TriggerHandler {
allCards.addAll(AllZoneUtil.getCardsIn(Constant.Zone.Stack).getController(playerAP.getOpponent())); allCards.addAll(AllZoneUtil.getCardsIn(Constant.Zone.Stack).getController(playerAP.getOpponent()));
for (final Card c : allCards) { for (final Card c : allCards) {
for (final Trigger t : c.getTriggers()) { for (final Trigger t : c.getTriggers()) {
if(!t.getMapParams().containsKey("Static")) { if (!t.getMapParams().containsKey("Static")) {
this.runSingleTrigger(t, mode, runParams); this.runSingleTrigger(t, mode, runParams);
} }
} }
} }