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-01 21:13:09 +00:00
parent 4b415ea611
commit a9a199518d
6 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/forge/gui/toolbox/FDeckChooser.java
View File

@@ -78,8 +78,8 @@ public class FDeckChooser extends JPanel {
}
};
public FDeckChooser(String titleText, PlayerType pt)
{
public FDeckChooser(String titleText, PlayerType pt) {
playerType = pt;
// Radio button panels: Human and AI
@@ -173,7 +173,7 @@ public class FDeckChooser extends JPanel {
final ExperimentalLabel btn = getBtnRandom();
btn.setCommand(new Command() { @Override public void execute() { lst.setSelectedIndices( DeckgenUtil.randomSelectColors()); } });
btn.setCommand(new Command() { @Override public void execute() { lst.setSelectedIndices(DeckgenUtil.randomSelectColors()); } });
// Init basic two color deck
lst.setSelectedIndices(new int[]{0, 1});

6
src/main/java/forge/item/CardDb.java
View File

@@ -169,7 +169,7 @@ public final class CardDb {
setMap.put(cardName, cardCopies);
for (int i = 0; i < count; i++) {
lastAdded = CardPrinted.build(card, set, s.getValue().getRarity(), i);
if(lastAdded.isTraditional()) {
if (lastAdded.isTraditional()) {
this.allTraditionalCardsFlat.add(lastAdded);
} else {
this.allNonTraditionalCardsFlat.add(lastAdded);
@@ -220,7 +220,9 @@ public final class CardDb {
* @return true, if is card supported
*/
public boolean isCardSupported(final String cardName0) {
if ( null == cardName0 ) return false; // obviously
if (null == cardName0) {
return false; // obviously
}
final boolean isFoil = this.isFoil(cardName0);
final String cardName = isFoil ? this.removeFoilSuffix(cardName0) : cardName0;

2
src/main/java/forge/item/CardPrinted.java
View File

@@ -519,7 +519,7 @@ public final class CardPrinted implements Comparable<CardPrinted>, InventoryItem
/** The Constant exceptLands. */
public static final Predicate<CardPrinted> EXCEPT_LANDS = Predicates.rarity(false, CardRarity.BasicLand);
public static final Predicate<CardPrinted> NONTRADITIONAL = com.google.common.base.Predicates.or(Predicates.type("Vanguard"),Predicates.type("Scheme"),Predicates.type("Plane"));
public static final Predicate<CardPrinted> NONTRADITIONAL = com.google.common.base.Predicates.or(Predicates.type("Vanguard"), Predicates.type("Scheme"), Predicates.type("Plane"));
public static final Predicate<CardPrinted> TRADITIONAL = com.google.common.base.Predicates.not(Presets.NONTRADITIONAL);
}

4
src/main/java/forge/item/ItemPredicate.java
View File

@@ -49,7 +49,7 @@ public abstract class ItemPredicate {
@Override
public boolean apply(final InventoryItem card) {
return card instanceof TournamentPack && !((TournamentPack)card).isStarterDeck();
return card instanceof TournamentPack && !((TournamentPack) card).isStarterDeck();
}
};
@@ -62,7 +62,7 @@ public abstract class ItemPredicate {
@Override
public boolean apply(final InventoryItem card) {
return card instanceof TournamentPack && ((TournamentPack)card).isStarterDeck();
return card instanceof TournamentPack && ((TournamentPack) card).isStarterDeck();
}
};