- CheckStyle.

src/main/java/forge/control/FControl.java

@@ -282,8 +282,9 @@ public enum FControl {
      */
     private Lobby lobby = null;
     public Lobby getLobby() {
-        if( lobby == null )
+        if (lobby == null) {
             lobby = new Lobby();
+        }
         return lobby;
     }
 

src/main/java/forge/control/Lobby.java

@@ -62,7 +62,6 @@ public class Lobby {
      */
     public LobbyPlayer findLocalPlayer(PlayerType type, String name) {
 
-        
         return new LobbyPlayer(type, name);
     }
 
@@ -72,8 +71,9 @@ public class Lobby {
      * @return
      */
     public LobbyPlayer findLocalPlayer(PlayerType type) {
-        if ( type == PlayerType.HUMAN )
+        if (type == PlayerType.HUMAN) {
             return new LobbyPlayer(type, "Human"); // need to get name!
+        }
 
         LobbyPlayer player = findLocalPlayer(type, getRandomName());
         player.setAvatarIndex(MyRandom.getRandom().nextInt(FSkin.getAvatars().size()));
@@ -100,5 +100,4 @@ public class Lobby {
     }
 
 
-    
 }

src/main/java/forge/control/input/Input.java

@@ -122,6 +122,7 @@ public abstract class Input implements java.io.Serializable {
      * This method is used to mark old descendants of Input
      * TODO: Write javadoc for this method.
      */
-    public /*abstract */void isClassUpdated() {}//;
+    public /*abstract */void isClassUpdated() {
+    } //;
 
 }

src/main/java/forge/control/input/InputBlock.java

@@ -46,7 +46,7 @@ public class InputBlock extends Input {
     private static final long serialVersionUID = 6120743598368928128L;
 
     private Card currentAttacker = null;
-    private final HashMap<Card,List<Card>> allBlocking = new HashMap<Card, List<Card>>();
+    private final HashMap<Card, List<Card>> allBlocking = new HashMap<Card, List<Card>>();
     private final Player defender;
 
     /**
@@ -125,8 +125,8 @@ public class InputBlock extends Input {
                 }
 
                 List<Card> attackersBlocked = this.allBlocking.get(card);
-                if (!attackersBlocked.contains(this.currentAttacker) && 
+                if (!attackersBlocked.contains(this.currentAttacker)
-                        CombatUtil.canBlock(this.currentAttacker, card, Singletons.getModel().getGame().getCombat())) {
+                        && CombatUtil.canBlock(this.currentAttacker, card, Singletons.getModel().getGame().getCombat())) {
                     attackersBlocked.add(this.currentAttacker);
                     Singletons.getModel().getGame().getCombat().addBlocker(this.currentAttacker, card);
                     reminder = false;

src/main/java/forge/control/input/InputControl.java

@@ -211,8 +211,9 @@ public class InputControl extends MyObservable implements java.io.Serializable {
                     return null;
                 }
 
-                if ( priority.isHuman() )
+                if (priority.isHuman()) {
                     return new InputBlock(priority);
+                }
 
                 // ai is under attack
                 priority.getController().getAiInput().getComputer().declareBlockers();
@@ -238,7 +239,7 @@ public class InputControl extends MyObservable implements java.io.Serializable {
         } else if (priority.isHuman()) {
             boolean prioritySkip = priority.getController().mayAutoPass(phase)
                     || priority.getController().isUiSetToSkipPhase(playerTurn, phase);
-            if (this.game.getStack().isEmpty() && prioritySkip ) {
+            if (this.game.getStack().isEmpty() && prioritySkip) {
                 handler.passPriority();
                 return null;
             } else {

src/main/java/forge/control/input/InputMulligan.java

@@ -94,7 +94,9 @@ public class InputMulligan extends Input {
 
         // Computer mulligan
         for (Player ai : game.getPlayers()) {
-            if ( ai.isHuman() ) continue;
+            if (ai.isHuman()) {
+                continue;
+            }
 
             boolean aiTakesMulligan = true;
 
@@ -121,7 +123,7 @@ public class InputMulligan extends Input {
             final List<Card> openingHand = new ArrayList<Card>(p.getCardsIn(ZoneType.Hand));
 
             for (final Card c : openingHand) {
-                if ( p.isHuman() ) {
+                if (p.isHuman()) {
                     final ArrayList<String> kws = c.getKeyword();
                     for (int i = 0; i < kws.size(); i++) {
                         final String kw = kws.get(i);
@@ -161,8 +163,9 @@ public class InputMulligan extends Input {
                             }
                         }
                     }
-                    if (c.getName().startsWith("Leyline") && !(c.getName().startsWith("Leyline of Singularity") && 
+                    if (c.getName().startsWith("Leyline")
-                       (Iterables.any(game.getCardsIn(ZoneType.Battlefield), CardPredicates.nameEquals("Leyline of Singularity"))))) {
+                            && !(c.getName().startsWith("Leyline of Singularity")
+                            && (Iterables.any(game.getCardsIn(ZoneType.Battlefield), CardPredicates.nameEquals("Leyline of Singularity"))))) {
                         ga.moveToPlay(c);
                         //ga.checkStateEffects();
                     }

src/main/java/forge/control/input/InputPassPriority.java

@@ -86,5 +86,6 @@ public class InputPassPriority extends Input {
         }
     } // selectCard()
 
-    @Override public void isClassUpdated() {}
+    @Override public void isClassUpdated() {
+    }
 }

src/main/java/forge/control/input/InputPayDiscardCost.java

@@ -186,5 +186,6 @@ public class InputPayDiscardCost extends Input {
         this.unpaid.execute();
     }
 
-    @Override public void isClassUpdated() {}
+    @Override public void isClassUpdated() {
+    }
 }

src/main/java/forge/control/input/InputPayManaCost.java

@@ -117,7 +117,7 @@ public class InputPayManaCost extends InputPayMana {
 
         this.spell = sa;
 
-        if (Singletons.getModel().getGame() != null ) {
+        if (Singletons.getModel().getGame() != null) {
             if (sa.getSourceCard().isCopiedSpell() && sa.isSpell()) {
                 if (this.spell.getAfterPayMana() != null) {
                     this.stopSetNext(this.spell.getAfterPayMana());
@@ -291,5 +291,6 @@ public class InputPayManaCost extends InputPayMana {
         }
     }
 
-    @Override public void isClassUpdated() {}
+    @Override public void isClassUpdated() {
+    }
 }

src/main/java/forge/control/input/InputPayManaCost2.java

@@ -156,5 +156,6 @@ public class InputPayManaCost2 extends InputPayMana {
         }
     }
 
-    @Override public void isClassUpdated() {}
+    @Override public void isClassUpdated() {
+    }
 }

src/main/java/forge/control/input/InputPayManaCostAbility.java

@@ -248,6 +248,7 @@ public class InputPayManaCostAbility extends InputPayMana {
         }
     }
 
-    @Override public void isClassUpdated() {}
+    @Override public void isClassUpdated() {
+    }
 
 }

src/main/java/forge/control/input/InputPayManaCostUtil.java

@@ -62,7 +62,6 @@ public class InputPayManaCostUtil {
             return manaCost;
         }
 
-        
         final StringBuilder cneeded = new StringBuilder();
         final StringBuilder colorRequired = new StringBuilder();
         boolean choice = true;
@@ -81,7 +80,7 @@ public class InputPayManaCostUtil {
         List<SpellAbility> abilities = new ArrayList<SpellAbility>();
         // you can't remove unneeded abilities inside a for(am:abilities) loop :(
 
-        for(SpellAbility ma : card.getManaAbility()) {
+        for (SpellAbility ma : card.getManaAbility()) {
             ma.setActivatingPlayer(Singletons.getControl().getPlayer());
             AbilityManaPart m = ma.getManaPart();
             if (!ma.canPlay()) {

src/main/java/forge/control/input/InputPayManaX.java

@@ -110,5 +110,6 @@ public class InputPayManaX extends InputPayMana {
      * @see forge.control.input.Input#isClassUpdated()
      */
     @Override
-    public void isClassUpdated() {}
+    public void isClassUpdated() {
+    }
 }

src/main/java/forge/control/input/InputPayReturnCost.java

@@ -186,8 +186,7 @@ public class InputPayReturnCost extends Input {
         this.unpaid.execute();
     }
 
-    
+    @Override public void isClassUpdated() {
-    @Override public void isClassUpdated() {}
+    }
-
 
 }

src/main/java/forge/control/input/InputPaySacCost.java

@@ -187,5 +187,6 @@ public class InputPaySacCost extends Input {
         this.unpaid.execute();
     }
 
-    @Override public void isClassUpdated() {}
+    @Override public void isClassUpdated() {
+    }
 }

src/main/java/forge/control/input/InputSelectMany.java

@@ -21,9 +21,11 @@ public abstract class InputSelectMany<T extends GameEntity> extends Input {
 
     private String message = "Source-Card-Name - Select %d more card(s)";
 
-    protected InputSelectMany(int min, int max)
+    protected InputSelectMany(int min, int max) {
-    {
+
-        if( min > max ) throw new IllegalArgumentException("Min must not be greater than Max");
+        if (min > max) {
+            throw new IllegalArgumentException("Min must not be greater than Max");
+        }
         this.min = min;
         this.max = max;
     }
@@ -36,10 +38,18 @@ public abstract class InputSelectMany<T extends GameEntity> extends Input {
         boolean canCancel = (min == 0 && selected.isEmpty()) || canCancelWithSomethingSelected();
         boolean canOk = hasEnoughTargets();
 
-        if (canOk && canCancel) ButtonUtil.enableAll();
+        if (canOk && canCancel) {
-        if (!canOk && canCancel) ButtonUtil.enableOnlyCancel();
+            ButtonUtil.enableAll();
-        if (canOk && !canCancel) ButtonUtil.enableOnlyOK();
+        }
-        if (!canOk && !canCancel) ButtonUtil.disableAll();
+        if (!canOk && canCancel) {
+            ButtonUtil.enableOnlyCancel();
+        }
+        if (canOk && !canCancel) {
+            ButtonUtil.enableOnlyOK();
+        }
+        if (!canOk && !canCancel) {
+            ButtonUtil.disableAll();
+        }
     }
 
 
@@ -61,10 +71,11 @@ public abstract class InputSelectMany<T extends GameEntity> extends Input {
         //   Singletons.getModel().getMatch().getInput().setInput(next);
         // }
 
-        if ( null == next )
+        if (null == next) {
             this.stop();
-        else 
+        } else {
             this.stopSetNext(next);
+        }
 
         // for a next use
         selected.clear();
@@ -82,23 +93,24 @@ public abstract class InputSelectMany<T extends GameEntity> extends Input {
         //   Singletons.getModel().getMatch().getInput().setInput(next);
         // }
 
-        if ( null == next )
+        if (null == next) {
             this.stop();
-        else 
+        } else {
             this.stopSetNext(next);
+        }
 
         // for a next use
         selected.clear();
     }
 
     @Override
-    public void isClassUpdated() {}
+    public void isClassUpdated() {
+    }
 
     public void setMessage(String message0) {
         this.message = message0; // TODO: Add 0 to parameter's name.
     }
 
-    
     // must define these
     protected abstract Input onDone();
     protected abstract boolean isValidChoice(T choice);
@@ -109,19 +121,18 @@ public abstract class InputSelectMany<T extends GameEntity> extends Input {
     protected boolean hasEnoughTargets() { return selected.size() >= min; }
     protected boolean hasAllTargets() { return selected.size() >= max; }
 
+    protected void selectEntity(T c) {
 
-    protected void selectEntity(T c)
+        if (selected.contains(c) || !isValidChoice(c)) {
-    {
+            return;
-        if ( selected.contains(c) || !isValidChoice(c) ) return;
+        }
 
         this.selected.add(c);
         this.showMessage();
 
-        if ( hasAllTargets() )
+        if (hasAllTargets()) {
             selectButtonOK();
+        }
     }
 
-    
-    
-    
 }

src/main/java/forge/control/input/InputSelectManyCards.java

@@ -5,8 +5,8 @@ import forge.Card;
 public abstract class InputSelectManyCards extends InputSelectMany<Card> {
     private static final long serialVersionUID = -6609493252672573139L;
 
-    protected InputSelectManyCards(int min, int max)
+    protected InputSelectManyCards(int min, int max) {
-    {
+
         super(min, max);
     }
 

src/main/java/forge/control/input/InputSelectManyPlayers.java

@@ -13,8 +13,8 @@ public class InputSelectManyPlayers extends InputSelectMany<Player> {
     protected final Function<List<Player>, Input> onComplete;
     private final Predicate<Player> allowedFilter;
 
-    public InputSelectManyPlayers(final Predicate<Player> allowedRule, int min, int max, final Function<List<Player>, Input> onDone)
+    public InputSelectManyPlayers(final Predicate<Player> allowedRule, int min, int max, final Function<List<Player>, Input> onDone) {
-    {
+
         super(min, max);
         allowedFilter = allowedRule;
         onComplete = onDone;
@@ -27,7 +27,9 @@ public class InputSelectManyPlayers extends InputSelectMany<Player> {
     }
 
     protected boolean isValidChoice(Player choice) {
-        if ( allowedFilter != null && !allowedFilter.apply(choice)) return false;
+        if (allowedFilter != null && !allowedFilter.apply(choice)) {
+            return false;
+        }
         return true;
     }