checkstyle

This commit is contained in:
jendave
2011-08-30 07:46:15 +00:00
parent 73f8c055f2
commit 166a86fa9e
4 changed files with 97 additions and 82 deletions

2
.gitattributes vendored
View File

@@ -9507,11 +9507,11 @@ src/main/java/forge/CardFilter.java svneol=native#text/plain
src/main/java/forge/CardList.java svneol=native#text/plain src/main/java/forge/CardList.java svneol=native#text/plain
src/main/java/forge/CardListFilter.java svneol=native#text/plain src/main/java/forge/CardListFilter.java svneol=native#text/plain
src/main/java/forge/CardListUtil.java svneol=native#text/plain src/main/java/forge/CardListUtil.java svneol=native#text/plain
src/main/java/forge/CardPowerToughness.java svneol=native#text/plain
src/main/java/forge/CardReader.java svneol=native#text/plain src/main/java/forge/CardReader.java svneol=native#text/plain
src/main/java/forge/CardShopTableModel.java svneol=native#text/plain src/main/java/forge/CardShopTableModel.java svneol=native#text/plain
src/main/java/forge/CardUtil.java svneol=native#text/plain src/main/java/forge/CardUtil.java svneol=native#text/plain
src/main/java/forge/Card_Color.java svneol=native#text/plain src/main/java/forge/Card_Color.java svneol=native#text/plain
src/main/java/forge/Card_PT.java svneol=native#text/plain
src/main/java/forge/Card_Type.java svneol=native#text/plain src/main/java/forge/Card_Type.java svneol=native#text/plain
src/main/java/forge/Color.java svneol=native#text/plain src/main/java/forge/Color.java svneol=native#text/plain
src/main/java/forge/ColorChanger.java -text src/main/java/forge/ColorChanger.java -text

View File

@@ -112,7 +112,7 @@ public class Card extends MyObservable implements Comparable<Card> {
private int baseAttack = 0; private int baseAttack = 0;
private int baseDefense = 0; private int baseDefense = 0;
private ArrayList<Card_PT> newPT = new ArrayList<Card_PT>(); // stack of set power/toughness private ArrayList<CardPowerToughness> newPT = new ArrayList<CardPowerToughness>(); // stack of set power/toughness
private int baseLoyalty = 0; private int baseLoyalty = 0;
private String baseAttackString = null; private String baseAttackString = null;
private String baseDefenseString = null; private String baseDefenseString = null;
@@ -3405,7 +3405,7 @@ public class Card extends MyObservable implements Comparable<Card> {
if (newPT.isEmpty()) if (newPT.isEmpty())
return -1; return -1;
Card_PT latestPT = getLatestPT(); CardPowerToughness latestPT = getLatestPT();
return latestPT.getPower(); return latestPT.getPower();
} }
@@ -3414,16 +3414,16 @@ public class Card extends MyObservable implements Comparable<Card> {
if (newPT.isEmpty()) if (newPT.isEmpty())
return -1; return -1;
Card_PT latestPT = getLatestPT(); CardPowerToughness latestPT = getLatestPT();
return latestPT.getToughness(); return latestPT.getToughness();
} }
public Card_PT getLatestPT() { public CardPowerToughness getLatestPT() {
Card_PT latestPT = new Card_PT(-1,-1,0); CardPowerToughness latestPT = new CardPowerToughness(-1,-1,0);
long max = 0; long max = 0;
for (Card_PT pt : newPT) { for (CardPowerToughness pt : newPT) {
if (pt.getTimestamp() >= max) { if (pt.getTimestamp() >= max) {
max = pt.getTimestamp(); max = pt.getTimestamp();
latestPT = pt; latestPT = pt;
@@ -3434,12 +3434,12 @@ public class Card extends MyObservable implements Comparable<Card> {
} }
public void addNewPT(int power, int toughness, long timestamp) { public void addNewPT(int power, int toughness, long timestamp) {
newPT.add(new Card_PT(power, toughness, timestamp)); newPT.add(new CardPowerToughness(power, toughness, timestamp));
} }
public void removeNewPT(long timestamp) { public void removeNewPT(long timestamp) {
for (int i = 0; i < newPT.size(); i++) { for (int i = 0; i < newPT.size(); i++) {
Card_PT cardPT = newPT.get(i); CardPowerToughness cardPT = newPT.get(i);
if (cardPT.getTimestamp() == timestamp) if (cardPT.getTimestamp() == timestamp)
newPT.remove(cardPT); newPT.remove(cardPT);
} }

View File

@@ -1,12 +1,12 @@
package forge; package forge;
/** /**
* <p>Card_Color class.</p> * <p>CardPowerToughness class.</p>
* *
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class Card_PT { public class CardPowerToughness {
private int power; private int power;
private int toughness; private int toughness;
@@ -17,7 +17,7 @@ public class Card_PT {
* *
* @return a long. * @return a long.
*/ */
public long getTimestamp() { public final long getTimestamp() {
return timeStamp; return timeStamp;
} }
@@ -28,17 +28,27 @@ public class Card_PT {
* @param newToughness a int. * @param newToughness a int.
* @param stamp a long. * @param stamp a long.
*/ */
Card_PT(int newPower, int newToughness, long stamp) { CardPowerToughness(final int newPower, final int newToughness, final long stamp) {
power = newPower; power = newPower;
toughness = newToughness; toughness = newToughness;
timeStamp = stamp; timeStamp = stamp;
} }
public int getPower() { /**
*
* Get Power.
* @return int
*/
public final int getPower() {
return power; return power;
} }
public int getToughness() { /**
*
* Get Toughness.
* @return int
*/
public final int getToughness() {
return toughness; return toughness;
} }
@@ -50,7 +60,7 @@ public class Card_PT {
* @param stamp a long. * @param stamp a long.
* @return a boolean. * @return a boolean.
*/ */
public boolean equals(int newPower, int newToughness, long stamp) { public final boolean equals(final int newPower, final int newToughness, final long stamp) {
return timeStamp == stamp && power == newPower && toughness == newToughness; return timeStamp == stamp && power == newPower && toughness == newToughness;
} }
} }

View File

@@ -10,81 +10,86 @@ import java.util.ArrayList;
*/ */
public class GenerateDeckUtil { public class GenerateDeckUtil {
/**
*
* Arrays of dual and tri-land cards.
* @param colors a String
* @return ArrayList<String>
*/
public static ArrayList<String> getDualLandList(final String colors) {
public static ArrayList<String> getDualLandList(String colors) { ArrayList<String> dLands = new ArrayList<String>();
ArrayList<String> DLands = new ArrayList<String>();
if (colors.length() > 3) { if (colors.length() > 3) {
DLands.add("Rupture Spire"); dLands.add("Rupture Spire");
DLands.add("Undiscovered Paradise"); dLands.add("Undiscovered Paradise");
} }
if (colors.length() > 2) { if (colors.length() > 2) {
DLands.add("Evolving Wilds"); dLands.add("Evolving Wilds");
DLands.add("Terramorphic Expanse"); dLands.add("Terramorphic Expanse");
} }
if (colors.contains("W") && colors.contains("U")) { if (colors.contains("W") && colors.contains("U")) {
DLands.add("Tundra"); dLands.add("Tundra");
DLands.add("Hallowed Fountain"); dLands.add("Hallowed Fountain");
DLands.add("Flooded Strand"); dLands.add("Flooded Strand");
} }
if (colors.contains("U") && colors.contains("B")) { if (colors.contains("U") && colors.contains("B")) {
DLands.add("Underground Sea"); dLands.add("Underground Sea");
DLands.add("Watery Grave"); dLands.add("Watery Grave");
DLands.add("Polluted Delta"); dLands.add("Polluted Delta");
} }
if (colors.contains("B") && colors.contains("R")) { if (colors.contains("B") && colors.contains("R")) {
DLands.add("Badlands"); dLands.add("Badlands");
DLands.add("Blood Crypt"); dLands.add("Blood Crypt");
DLands.add("Bloodstained Mire"); dLands.add("Bloodstained Mire");
} }
if (colors.contains("R") && colors.contains("G")) { if (colors.contains("R") && colors.contains("G")) {
DLands.add("Taiga"); dLands.add("Taiga");
DLands.add("Stomping Ground"); dLands.add("Stomping Ground");
DLands.add("Wooded Foothills"); dLands.add("Wooded Foothills");
} }
if (colors.contains("G") && colors.contains("W")) { if (colors.contains("G") && colors.contains("W")) {
DLands.add("Savannah"); dLands.add("Savannah");
DLands.add("Temple Garden"); dLands.add("Temple Garden");
DLands.add("Windswept Heath"); dLands.add("Windswept Heath");
} }
if (colors.contains("W") && colors.contains("B")) { if (colors.contains("W") && colors.contains("B")) {
DLands.add("Scrubland"); dLands.add("Scrubland");
DLands.add("Godless Shrine"); dLands.add("Godless Shrine");
DLands.add("Marsh Flats"); dLands.add("Marsh Flats");
} }
if (colors.contains("U") && colors.contains("R")) { if (colors.contains("U") && colors.contains("R")) {
DLands.add("Volcanic Island"); dLands.add("Volcanic Island");
DLands.add("Steam Vents"); dLands.add("Steam Vents");
DLands.add("Scalding Tarn"); dLands.add("Scalding Tarn");
} }
if (colors.contains("B") && colors.contains("G")) { if (colors.contains("B") && colors.contains("G")) {
DLands.add("Bayou"); dLands.add("Bayou");
DLands.add("Overgrown Tomb"); dLands.add("Overgrown Tomb");
DLands.add("Verdant Catacombs"); dLands.add("Verdant Catacombs");
} }
if (colors.contains("R") && colors.contains("W")) { if (colors.contains("R") && colors.contains("W")) {
DLands.add("Plateau"); dLands.add("Plateau");
DLands.add("Sacred Foundry"); dLands.add("Sacred Foundry");
DLands.add("Arid Mesa"); dLands.add("Arid Mesa");
} }
if (colors.contains("G") && colors.contains("U")) { if (colors.contains("G") && colors.contains("U")) {
DLands.add("Tropical Island"); dLands.add("Tropical Island");
DLands.add("Breeding Pool"); dLands.add("Breeding Pool");
DLands.add("Misty Rainforest"); dLands.add("Misty Rainforest");
} }
return DLands; return dLands;
} }
} }