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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-04-09 19:05:04 +00:00
parent f77c9cdde7
commit ed1915fba8
8 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/forge/game/phase/PhaseType.java
View File

@@ -6,7 +6,7 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils;
public enum PhaseType {
UNTAP("Untap", 0),
UPKEEP("Upkeep", 1),
@@ -23,27 +23,28 @@ public enum PhaseType {
MAIN2("Main2", 12),
END_OF_TURN("End of Turn", 13),
CLEANUP("Cleanup", 14);
public final String Name;
public final int Index;
private PhaseType(String name, int index) {
Name = name;
Index = index;
}
public static PhaseType getByIndex(int idx) {
for( PhaseType ph : PhaseType.values() )
{
if ( ph.Index == idx ) return ph;
for (PhaseType ph : PhaseType.values()) {
if (ph.Index == idx) {
return ph;
}
}
throw new InvalidParameterException("No PhaseType found with index " + idx );
throw new InvalidParameterException("No PhaseType found with index " + idx);
}
public final boolean isAfter(final PhaseType phase) {
return this.Index > phase.Index;
}
public final boolean isMain() {
return this == MAIN1 || this == MAIN2;
}
@@ -100,4 +101,4 @@ public enum PhaseType {
}
return result;
}
}
}

6
src/main/java/forge/game/phase/PhaseUtil.java
View File

@@ -372,7 +372,7 @@ public class PhaseUtil {
*/
public static boolean isBeforeAttackersAreDeclared() {
final PhaseType phase = Singletons.getModel().getGameState().getPhaseHandler().getPhase();
return phase == PhaseType.UNTAP || phase == PhaseType.UPKEEP || phase == PhaseType.DRAW
return phase == PhaseType.UNTAP || phase == PhaseType.UPKEEP || phase == PhaseType.DRAW
|| phase == PhaseType.MAIN1 || phase == PhaseType.COMBAT_BEGIN;
}
@@ -391,8 +391,8 @@ public class PhaseUtil {
// Index of field; computer is 0, human is 1
int i = p.isComputer() ? 0 : 1;
switch(s)
{
switch(s) {
case UPKEEP:
lbl = t.getFieldControls().get(i).getView().getLblUpkeep();
break;

4
src/main/java/forge/game/player/ComputerAIInput.java
View File

@@ -96,10 +96,10 @@ public class ComputerAIInput extends Input {
if (AllZone.getStack().size() > 0) {
this.computer.stackNotEmpty();
} else {
} else {
switch(phase) {
case MAIN1:
Log.debug("Computer main1");
Log.debug("Computer main1");
this.computer.main();
break;
case COMBAT_BEGIN:

2
src/main/java/forge/game/zone/ZoneType.java
View File

@@ -72,4 +72,4 @@ public enum ZoneType {
public boolean isKnown() {
return !holdsHiddenInfo;
}
}
}

3
src/main/java/forge/gui/deckeditor/MenuCommon.java
View File

@@ -77,7 +77,8 @@ public final class MenuCommon extends MenuBase<Deck> {
// The only remaining reference to global variable!
randomDeck.getMain().addAllFlat(Predicate.not(CardRules.Predicates.Presets.IS_BASIC_LAND).random(CardDb.instance().getAllUniqueCards(), CardPrinted.FN_GET_RULES, 15*5));
randomDeck.getMain().addAllFlat(Predicate.not(CardRules.Predicates.Presets.IS_BASIC_LAND)
.random(CardDb.instance().getAllUniqueCards(), CardPrinted.FN_GET_RULES, 15 * 5));
randomDeck.getMain().add("Plains");
randomDeck.getMain().add("Island");
randomDeck.getMain().add("Swamp");

2
src/main/java/forge/gui/home/settings/VSubmenuPreferences.java
View File

@@ -113,7 +113,7 @@ public enum VSubmenuPreferences implements IVSubmenu {
pnlPrefs.add(cbStackLand, regularConstraints);
pnlPrefs.add(new NoteLabel("Minimizes mana lock in AI hands, giving a slight advantage to computer."), regularConstraints);
pnlPrefs.add(cbManaBurn, regularConstraints);
pnlPrefs.add(new NoteLabel("Play with mana burn (from pre-Magic 2010 rules)."), regularConstraints);

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

@@ -231,9 +231,9 @@ public class ItemPool<T extends InventoryItem> extends ItemPoolView<T> {
for (final T e : flat) {
this.remove(e);
}
// need not set out-of-sync: either remove did set, or nothing was removed
}
// need not set out-of-sync: either remove did set, or nothing was removed
}
/**
*
* Clear.

16
src/main/java/forge/view/arcane/PlayArea.java
View File

@@ -276,10 +276,10 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
// Store the current rows and others.
final List<CardStackRow> storedRows = new ArrayList<CardStackRow>(this.rows.size());
for (final CardStackRow row : this.rows) {
try{
try {
storedRows.add((CardStackRow) row.clone());
}
catch(NullPointerException e){
catch (NullPointerException e) {
System.out.println("Null pointer exception in Row Spacing. Possibly also part of the issue.");
}
}
@@ -342,9 +342,9 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
try {
rows.add(insertIndex == -1 ? rows.size() : insertIndex, currentRow);
}
catch(ArrayIndexOutOfBoundsException e) {
System.out.println("ArrayIndex Out of Bounds when trying to add row in PlayArea. Someone fix this logic, " +
" I believe it causes the no cards loading in issue we've noticed.");
catch (ArrayIndexOutOfBoundsException e) {
System.out.println("ArrayIndex Out of Bounds when trying to add row in PlayArea. Someone fix this logic, "
+ " I believe it causes the no cards loading in issue we've noticed.");
// TODO: There's a crash here, maybe when rows == [null] and currentRow == [[Plant Wall]] and insertIndex is 0
}
currentRow = new CardStackRow();
@@ -360,9 +360,9 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
try {
rows.add(insertIndex == -1 ? rows.size() : insertIndex, currentRow);
}
catch(ArrayIndexOutOfBoundsException e) {
System.out.println("ArrayIndex Out of Bounds when trying to add row in PlayArea. Someone fix this logic, " +
" I believe it causes the no cards loading in issue we've noticed.");
catch (ArrayIndexOutOfBoundsException e) {
System.out.println("ArrayIndex Out of Bounds when trying to add row in PlayArea. Someone fix this logic, "
+ " I believe it causes the no cards loading in issue we've noticed.");
// TODO: There's a crash here, maybe when rows == [null] and currentRow == [[Plant Wall]] and insertIndex is 0
}
}