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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-12-02 13:40:33 +00:00
parent 15aad4b92f
commit 51c2304e8f
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/forge/CardPredicates.java
View File

@@ -39,7 +39,7 @@ import forge.util.PredicateString;
*/ */
public final class CardPredicates { public final class CardPredicates {
public final static Predicate<Card> isController(final Player p) { public static final Predicate<Card> isController(final Player p) {
return new Predicate<Card>() { return new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
@@ -47,7 +47,7 @@ public final class CardPredicates {
} }
}; };
} }
public final static Predicate<Card> isOwner(final Player p) { public static final Predicate<Card> isOwner(final Player p) {
return new Predicate<Card>() { return new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
@@ -56,7 +56,7 @@ public final class CardPredicates {
}; };
} }
public final static Predicate<Card> isType(final String cardType) { public static final Predicate<Card> isType(final String cardType) {
return new Predicate<Card>() { return new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
@@ -65,7 +65,7 @@ public final class CardPredicates {
}; };
} }
public final static Predicate<Card> hasKeyword(final String keyword) { public static final Predicate<Card> hasKeyword(final String keyword) {
return new Predicate<Card>() { return new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
@@ -74,7 +74,7 @@ public final class CardPredicates {
}; };
} }
public final static Predicate<Card> containsKeyword(final String keyword) { public static final Predicate<Card> containsKeyword(final String keyword) {
return new Predicate<Card>() { return new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
@@ -83,7 +83,7 @@ public final class CardPredicates {
}; };
} }
public final static Predicate<Card> isTargetableBy(final SpellAbility source) { public static final Predicate<Card> isTargetableBy(final SpellAbility source) {
return new Predicate<Card>() { return new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
@@ -92,7 +92,7 @@ public final class CardPredicates {
}; };
} }
public final static Predicate<Card> nameEquals(final String name) { public static final Predicate<Card> nameEquals(final String name) {
return new Predicate<Card>() { return new Predicate<Card>() {
@Override @Override
public boolean apply(Card c) { public boolean apply(Card c) {
@@ -101,7 +101,7 @@ public final class CardPredicates {
}; };
} }
public final static Predicate<Card> possibleBlockers(final Card attacker) { public static final Predicate<Card> possibleBlockers(final Card attacker) {
return new Predicate<Card>() { return new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
@@ -110,7 +110,7 @@ public final class CardPredicates {
}; };
} }
public final static Predicate<Card> possibleBlockerForAtLeastOne(final Iterable<Card> attackers) { public static final Predicate<Card> possibleBlockerForAtLeastOne(final Iterable<Card> attackers) {
return new Predicate<Card>() { return new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
@@ -119,7 +119,7 @@ public final class CardPredicates {
}; };
} }
public final static Predicate<Card> isProtectedFrom(final Card source) { public static final Predicate<Card> isProtectedFrom(final Card source) {
return new Predicate<Card>() { return new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
@@ -128,7 +128,7 @@ public final class CardPredicates {
}; };
} }
public final static Predicate<Card> restriction(final String[] restrictions, final Player sourceController, final Card source) { public static final Predicate<Card> restriction(final String[] restrictions, final Player sourceController, final Card source) {
return new Predicate<Card>() { return new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {

22
src/main/java/forge/card/cardfactory/CardFactorySorceries.java
View File

@@ -251,7 +251,7 @@ public class CardFactorySorceries {
} }
private final static SpellAbility getGlobalRuin(final Card card) { private static final SpellAbility getGlobalRuin(final Card card) {
final List<Card> target = new ArrayList<Card>(); final List<Card> target = new ArrayList<Card>();
final List<Card> saveList = new ArrayList<Card>(); final List<Card> saveList = new ArrayList<Card>();
// need to use arrays so we can declare them final and still set the // need to use arrays so we can declare them final and still set the
@@ -435,7 +435,7 @@ public class CardFactorySorceries {
return spell; return spell;
} }
private final static void balanceLands(Spell card) { private static final void balanceLands(Spell card) {
List<List<Card>> lands = new ArrayList<List<Card>>(); List<List<Card>> lands = new ArrayList<List<Card>>();
for (Player p : Singletons.getModel().getGame().getPlayers()) { for (Player p : Singletons.getModel().getGame().getPlayers()) {
@@ -467,7 +467,7 @@ public class CardFactorySorceries {
} }
} }
private final static void balanceHands(Spell card) { private static final void balanceHands(Spell card) {
List<List<Card>> hands = new ArrayList<List<Card>>(); List<List<Card>> hands = new ArrayList<List<Card>>();
for (Player p : Singletons.getModel().getGame().getPlayers()) { for (Player p : Singletons.getModel().getGame().getPlayers()) {
@@ -491,7 +491,7 @@ public class CardFactorySorceries {
} }
} }
private final static void balanceCreatures(Spell card) { private static final void balanceCreatures(Spell card) {
List<List<Card>> creats = new ArrayList<List<Card>>(); List<List<Card>> creats = new ArrayList<List<Card>>();
for (Player p : Singletons.getModel().getGame().getPlayers()) { for (Player p : Singletons.getModel().getGame().getPlayers()) {
@@ -523,7 +523,7 @@ public class CardFactorySorceries {
} }
} }
private final static SpellAbility getBalance(final Card card) { private static final SpellAbility getBalance(final Card card) {
return new Spell(card) { return new Spell(card) {
private static final long serialVersionUID = -5941893280103164961L; private static final long serialVersionUID = -5941893280103164961L;
@@ -557,7 +557,7 @@ public class CardFactorySorceries {
}; };
} }
private final static SpellAbility getWindfall(final Card card) { private static final SpellAbility getWindfall(final Card card) {
return new Spell(card) { return new Spell(card) {
private static final long serialVersionUID = -7707012960887790709L; private static final long serialVersionUID = -7707012960887790709L;
@@ -594,7 +594,7 @@ public class CardFactorySorceries {
}; };
} }
private final static SpellAbility getPatriarchsBidding(final Card card) { private static final SpellAbility getPatriarchsBidding(final Card card) {
final SpellAbility spell = new Spell(card) { final SpellAbility spell = new Spell(card) {
private static final long serialVersionUID = -2182173662547136798L; private static final long serialVersionUID = -2182173662547136798L;
@@ -645,7 +645,7 @@ public class CardFactorySorceries {
return spell; return spell;
} }
private final static SpellAbility getLeeches(final Card card) { private static final SpellAbility getLeeches(final Card card) {
/* /*
* Target player loses all poison counters. Leeches deals that much * Target player loses all poison counters. Leeches deals that much
* damage to that player. * damage to that player.
@@ -686,7 +686,7 @@ public class CardFactorySorceries {
}; };
} }
private final static SpellAbility getSanityGrinding(final Card card) { private static final SpellAbility getSanityGrinding(final Card card) {
/* /*
* Chroma - Reveal the top ten cards of your library. For each blue * Chroma - Reveal the top ten cards of your library. For each blue
* mana symbol in the mana costs of the revealed cards, target * mana symbol in the mana costs of the revealed cards, target
@@ -734,7 +734,7 @@ public class CardFactorySorceries {
}; };
} }
private final static SpellAbility getProfaneCommand(final Card card) { private static final SpellAbility getProfaneCommand(final Card card) {
// not sure what to call variables, so I just made up something // not sure what to call variables, so I just made up something
final Player[] ab0player = new Player[1]; final Player[] ab0player = new Player[1];
final Card[] ab1card = new Card[1]; final Card[] ab1card = new Card[1];
@@ -1162,7 +1162,7 @@ public class CardFactorySorceries {
return spell; return spell;
} }
private final static SpellAbility getTransmuteArtifact(final Card card) { private static final SpellAbility getTransmuteArtifact(final Card card) {
/* /*
* Sacrifice an artifact. If you do, search your library for an * Sacrifice an artifact. If you do, search your library for an
* artifact card. If that card's converted mana cost is less than or * artifact card. If that card's converted mana cost is less than or

2
src/main/java/forge/control/input/InputControl.java
View File

@@ -43,7 +43,7 @@ public class InputControl extends MyObservable implements java.io.Serializable {
private final Stack<Input> inputStack = new Stack<Input>(); private final Stack<Input> inputStack = new Stack<Input>();
private final Stack<Input> urgentInputStack = new Stack<Input>(); private final Stack<Input> urgentInputStack = new Stack<Input>();
transient private final GameState game; private final transient GameState game;
/** /**
* TODO Write javadoc for Constructor. * TODO Write javadoc for Constructor.
* *

6
src/main/java/forge/game/zone/Zone.java
View File

@@ -43,12 +43,12 @@ public class Zone extends MyObservable implements IZone, Observer, java.io.Seria
private static final long serialVersionUID = -5687652485777639176L; private static final long serialVersionUID = -5687652485777639176L;
/** The cards. */ /** The cards. */
protected transient final List<Card> cardList = new ArrayList<Card>(); protected final transient List<Card> cardList = new ArrayList<Card>();
protected transient final List<Card> roCardList; protected final transient List<Card> roCardList;
protected final ZoneType zoneName; protected final ZoneType zoneName;
protected boolean update = true; protected boolean update = true;
protected transient final List<Card> cardsAddedThisTurn = new ArrayList<Card>(); protected final transient List<Card> cardsAddedThisTurn = new ArrayList<Card>();
protected final ArrayList<ZoneType> cardsAddedThisTurnSource = new ArrayList<ZoneType>(); protected final ArrayList<ZoneType> cardsAddedThisTurnSource = new ArrayList<ZoneType>();