diff --git a/src/main/java/forge/MagicStack.java b/src/main/java/forge/MagicStack.java index 9097685e689..beeaa37a9cf 100644 --- a/src/main/java/forge/MagicStack.java +++ b/src/main/java/forge/MagicStack.java @@ -1010,7 +1010,7 @@ public class MagicStack extends MyObservable { final AbilityActivated trigAb = new AbilityActivated(source, "0") { private static final long serialVersionUID = 7497175394128633122L; - + @Override public boolean doTrigger(final boolean mandatory) { return true; @@ -1038,7 +1038,7 @@ public class MagicStack extends MyObservable { if (!hasFoundPossibleSA) { return; } - if(source.getOwner().isHuman()) { + if (source.getOwner().isHuman()) { AllZone.getGameAction().playCardNoCost(source); } else { System.out.println("rebound: " + source); @@ -1051,7 +1051,7 @@ public class MagicStack extends MyObservable { } } } - + } AllZone.getGameAction().moveToGraveyard(source); } diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryAlterLife.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryAlterLife.java index a0d65dc65c2..f1a95a3d4f3 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryAlterLife.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryAlterLife.java @@ -133,7 +133,7 @@ public class AbilityFactoryAlterLife { public void resolve() { AbilityFactoryAlterLife.gainLifeResolve(this.af, this); } - + @Override public boolean canPlayFromEffectAI(final boolean mandatory, final boolean withOutManaCost) { if (withOutManaCost) { @@ -336,7 +336,7 @@ public class AbilityFactoryAlterLife { return (randomReturn && chance); } - + /** *
* gainLifeDoTriggerAI. @@ -523,7 +523,7 @@ public class AbilityFactoryAlterLife { public void resolve() { AbilityFactoryAlterLife.loseLifeResolve(this.af, this); } - + @Override public boolean canPlayFromEffectAI(final boolean mandatory, final boolean withOutManaCost) { if (withOutManaCost) { @@ -722,7 +722,7 @@ public class AbilityFactoryAlterLife { return (randomReturn && chance); } - + /** *
* loseLifeDoTriggerAI. diff --git a/src/main/java/forge/control/home/ControlSettings.java b/src/main/java/forge/control/home/ControlSettings.java index d0242b48039..783c95a9939 100644 --- a/src/main/java/forge/control/home/ControlSettings.java +++ b/src/main/java/forge/control/home/ControlSettings.java @@ -157,7 +157,7 @@ public class ControlSettings { prefs.setSkin(name); Singletons.getView().setSkin(skin); ((GuiTopLevel) AllZone.getDisplay()).getController().changeState(0); - + // changeState creates a new HomeTopLevel, so we can't just use the view object we already have. ((GuiTopLevel) AllZone.getDisplay()).getController().getHomeView().showSettingsMenu(); diff --git a/src/main/java/forge/view/match/ViewField.java b/src/main/java/forge/view/match/ViewField.java index b9e9c02c6e1..22680393946 100644 --- a/src/main/java/forge/view/match/ViewField.java +++ b/src/main/java/forge/view/match/ViewField.java @@ -765,12 +765,12 @@ public class ViewField extends FRoundedPanel { super(txt); this.setHorizontalTextPosition(SwingConstants.CENTER); this.setHorizontalAlignment(SwingConstants.CENTER); - + defaultBG = ViewField.this.skin.getColor("active"); hoverBG = ViewField.this.skin.getColor("hover"); pressedBG = ViewField.this.skin.getColor("inactive"); textColor = ViewField.this.skin.getColor("text"); - + this.setForeground(textColor); this.addMouseListener(new MouseAdapter() {