diff --git a/src/main/java/forge/game/phase/PhaseType.java b/src/main/java/forge/game/phase/PhaseType.java index 233cbd23a98..46828e2f3aa 100644 --- a/src/main/java/forge/game/phase/PhaseType.java +++ b/src/main/java/forge/game/phase/PhaseType.java @@ -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; } -} \ No newline at end of file +} diff --git a/src/main/java/forge/game/phase/PhaseUtil.java b/src/main/java/forge/game/phase/PhaseUtil.java index 55a3da46d1c..26615fa7eea 100644 --- a/src/main/java/forge/game/phase/PhaseUtil.java +++ b/src/main/java/forge/game/phase/PhaseUtil.java @@ -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; diff --git a/src/main/java/forge/game/player/ComputerAIInput.java b/src/main/java/forge/game/player/ComputerAIInput.java index 1956d4a8601..ec838c4bb21 100644 --- a/src/main/java/forge/game/player/ComputerAIInput.java +++ b/src/main/java/forge/game/player/ComputerAIInput.java @@ -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: diff --git a/src/main/java/forge/game/zone/ZoneType.java b/src/main/java/forge/game/zone/ZoneType.java index 5438897445b..48591d20a9a 100644 --- a/src/main/java/forge/game/zone/ZoneType.java +++ b/src/main/java/forge/game/zone/ZoneType.java @@ -72,4 +72,4 @@ public enum ZoneType { public boolean isKnown() { return !holdsHiddenInfo; } -} \ No newline at end of file +} diff --git a/src/main/java/forge/gui/deckeditor/MenuCommon.java b/src/main/java/forge/gui/deckeditor/MenuCommon.java index 0560b12b5ad..c779f98778b 100644 --- a/src/main/java/forge/gui/deckeditor/MenuCommon.java +++ b/src/main/java/forge/gui/deckeditor/MenuCommon.java @@ -77,7 +77,8 @@ public final class MenuCommon extends MenuBase { // 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"); diff --git a/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java b/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java index 1124b8f92eb..2b14e6515c8 100644 --- a/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java +++ b/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java @@ -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); diff --git a/src/main/java/forge/item/ItemPool.java b/src/main/java/forge/item/ItemPool.java index 346cc2aba13..f7ba8d3271e 100644 --- a/src/main/java/forge/item/ItemPool.java +++ b/src/main/java/forge/item/ItemPool.java @@ -231,9 +231,9 @@ public class ItemPool extends ItemPoolView { 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. diff --git a/src/main/java/forge/view/arcane/PlayArea.java b/src/main/java/forge/view/arcane/PlayArea.java index 84489b477cf..753ed7a6162 100644 --- a/src/main/java/forge/view/arcane/PlayArea.java +++ b/src/main/java/forge/view/arcane/PlayArea.java @@ -276,10 +276,10 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen // Store the current rows and others. final List storedRows = new ArrayList(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 } }