move constants to the right == expression

src/magic/MersenneTwisterFast.java

@@ -326,7 +326,7 @@ public strictfp class MersenneTwisterFast implements Serializable, Cloneable
         int i, j, k;
         setSeed(19650218);
         i=1; j=0;
-        k = (N>array.length ? N : array.length);
+        k = (array.length < N ? N : array.length);
         for (; k!=0; k--) 
             {
             mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >>> 30)) * 1664525)) + array[j] + j; /* non linear */

src/magic/card/Archon_of_Justice.java

@@ -18,7 +18,7 @@ public class Archon_of_Justice {
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play==triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     MagicTargetChoice.TARGET_PERMANENT,

src/magic/card/Blistergrub.java

@@ -14,7 +14,7 @@ public class Blistergrub {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
             final MagicPlayer player = permanent.getController();
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                         permanent,
                         player,

src/magic/card/Bogardan_Firefiend.java

@@ -16,7 +16,7 @@ public class Bogardan_Firefiend {
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     MagicTargetChoice.TARGET_CREATURE,

src/magic/card/Butcher_of_Malakir.java

@@ -18,7 +18,7 @@ public class Butcher_of_Malakir {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
             final MagicPlayer controller = permanent.getController();
-            return (MagicLocationType.Play==triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     controller,

src/magic/card/Chronozoa.java

@@ -14,7 +14,7 @@ public class Chronozoa {
     public static final MagicWhenPutIntoGraveyardTrigger T3 = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation &&
+            return (triggerData.fromLocation == MagicLocationType.Play &&
                     permanent.getCounters(MagicCounterType.Charge) == 0) ?
                 new MagicEvent(
                     permanent,

src/magic/card/Deadly_Grub.java

@@ -17,7 +17,7 @@ public class Deadly_Grub {
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation &&
+            return (triggerData.fromLocation == MagicLocationType.Play &&
                     permanent.getCounters(MagicCounterType.Charge) == 0) ?
                 new MagicEvent(
                     permanent,

src/magic/card/Doomed_Traveler.java

@@ -13,7 +13,7 @@ public class Doomed_Traveler {
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     this,

src/magic/card/Driver_of_the_Dead.java

@@ -32,7 +32,7 @@ public class Driver_of_the_Dead {
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     new MagicMayChoice(targetChoice),

src/magic/card/Elder_Cathar.java

@@ -17,7 +17,7 @@ public class Elder_Cathar {
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     MagicTargetChoice.TARGET_CREATURE_YOU_CONTROL,

src/magic/card/Festering_Goblin.java

@@ -15,7 +15,7 @@ public class Festering_Goblin {
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     MagicTargetChoice.TARGET_CREATURE,

src/magic/card/Goblin_Arsonist.java

@@ -18,7 +18,7 @@ public class Goblin_Arsonist {
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     new MagicMayChoice(

src/magic/card/Goblin_Marshal.java

@@ -39,7 +39,7 @@ public class Goblin_Marshal {
     public static final MagicWhenPutIntoGraveyardTrigger T3 = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     this,

src/magic/card/Gods__Eye__Gate_to_the_Reikai.java

@@ -13,7 +13,7 @@ public class Gods__Eye__Gate_to_the_Reikai {
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     this,

src/magic/card/Keiga__the_Tide_Star.java

@@ -15,7 +15,7 @@ public class Keiga__the_Tide_Star {
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play==triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     MagicTargetChoice.TARGET_CREATURE,

src/magic/card/Kodama_of_the_Center_Tree.java

@@ -34,7 +34,7 @@ public class Kodama_of_the_Center_Tree {
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicGraveyardTriggerData triggerData) {
-            if (MagicLocationType.Play == triggerData.fromLocation) {
+            if (triggerData.fromLocation == MagicLocationType.Play) {
                 final MagicPlayer player = permanent.getController();
                 final int cmc = game.filterTargets(player,
                         MagicTargetFilter.TARGET_SPIRIT_YOU_CONTROL).size()+1;

src/magic/card/Maalfeld_Twins.java

@@ -17,7 +17,7 @@ public class Maalfeld_Twins {
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     this,

src/magic/card/Mausoleum_Guard.java

@@ -13,7 +13,7 @@ public class Mausoleum_Guard {
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     this,

src/magic/card/Mogg_War_Marshal.java

@@ -36,7 +36,7 @@ public class Mogg_War_Marshal {
     public static final MagicWhenPutIntoGraveyardTrigger T3 = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     this,

src/magic/card/Moldgraf_Monstrosity.java

@@ -21,7 +21,7 @@ public class Moldgraf_Monstrosity {
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     this,

src/magic/card/Mycoid_Shepherd.java

@@ -15,7 +15,7 @@ public class Mycoid_Shepherd {
     public static final MagicWhenPutIntoGraveyardTrigger T1 = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     new MagicSimpleMayChoice(

src/magic/card/Necropede.java

@@ -17,7 +17,7 @@ public class Necropede {
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     new MagicMayChoice(

src/magic/card/Pitchburn_Devils.java

@@ -17,7 +17,7 @@ public class Pitchburn_Devils {
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                         permanent,
                         MagicTargetChoice.NEG_TARGET_CREATURE_OR_PLAYER,

src/magic/card/Polluted_Dead.java

@@ -18,7 +18,7 @@ public class Polluted_Dead {
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     MagicTargetChoice.TARGET_LAND,

src/magic/card/Roc_Egg.java

@@ -13,7 +13,7 @@ public class Roc_Egg {
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     this,

src/magic/card/Rotcrown_Ghoul.java

@@ -18,7 +18,7 @@ public class Rotcrown_Ghoul {
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                         permanent,
                         permanent.getController(),

src/magic/card/Soulcage_Fiend.java

@@ -16,7 +16,7 @@ public class Soulcage_Fiend {
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                         permanent,
                         permanent.getController(),

src/magic/card/Sprouting_Thrinax.java

@@ -14,7 +14,7 @@ public class Sprouting_Thrinax {
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play==triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     this,

src/magic/card/Tuktuk_the_Explorer.java

@@ -13,7 +13,7 @@ public class Tuktuk_the_Explorer {
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play==triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     this,

src/magic/card/Undead_Executioner.java

@@ -19,7 +19,7 @@ public class Undead_Executioner {
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     new MagicMayChoice(

src/magic/card/Weatherseed_Treefolk.java

@@ -17,7 +17,7 @@ public class Weatherseed_Treefolk {
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play == triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                         permanent,
                         this,

src/magic/card/Wurmcoil_Engine.java

@@ -14,7 +14,7 @@ public class Wurmcoil_Engine {
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-            return (MagicLocationType.Play==triggerData.fromLocation) ?
+            return (triggerData.fromLocation == MagicLocationType.Play) ?
                 new MagicEvent(
                     permanent,
                     this,

src/magic/data/CardDefinitions.java

@@ -172,15 +172,15 @@ public class CardDefinitions {
     }
         
     public static MagicCardDefinition getBasicLand(final MagicColor color) {
-        if (MagicColor.Black == color) {
+        if (color == MagicColor.Black) {
             return getCard("Swamp");
-        } else if (MagicColor.Blue == color) {
+        } else if (color == MagicColor.Blue) {
             return getCard("Island");
-        } else if (MagicColor.Green == color) {
+        } else if (color == MagicColor.Green) {
             return getCard("Forest");
-        } else if (MagicColor.Red == color) {
+        } else if (color == MagicColor.Red) {
             return getCard("Mountain");
-        } else if (MagicColor.White == color) {
+        } else if (color == MagicColor.White) {
             return getCard("Plains");
         }
         throw new RuntimeException("No matching basic land for MagicColor " + color);

src/magic/model/choice/MagicChoice.java

@@ -117,10 +117,10 @@ public abstract class MagicChoice {
             final MagicSource source);
 
     public static boolean isYesChoice(final Object choiceResult) {
-        return YES_CHOICE==choiceResult;
+        return choiceResult == YES_CHOICE;
     }
 
     public static boolean isNoChoice(final Object choiceResult) {
-        return NO_CHOICE==choiceResult;
+        return choiceResult == NO_CHOICE;
     }
 }

src/magic/model/trigger/MagicDieDrawCardTrigger.java

@@ -22,7 +22,7 @@ public class MagicDieDrawCardTrigger extends MagicWhenPutIntoGraveyardTrigger {
             final MagicGame game,
             final MagicPermanent permanent,
             final MagicGraveyardTriggerData triggerData) {
-        if (MagicLocationType.Play == triggerData.fromLocation) {
+        if (triggerData.fromLocation == MagicLocationType.Play) {
             return mustDraw ?
                 new MagicEvent(
                     permanent,

src/magic/model/trigger/MagicModularTrigger.java

@@ -24,7 +24,7 @@ public class MagicModularTrigger extends MagicWhenPutIntoGraveyardTrigger {
 
     @Override
     public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
-        if (MagicLocationType.Play == triggerData.fromLocation) {
+        if (triggerData.fromLocation == MagicLocationType.Play) {
             final int amount = permanent.getCounters(MagicCounterType.PlusOne);
             return new MagicEvent(
                 permanent,

src/magic/model/trigger/MagicSoulshiftTrigger.java

@@ -29,7 +29,7 @@ public class MagicSoulshiftTrigger extends MagicWhenPutIntoGraveyardTrigger {
             final MagicGame game,
             final MagicPermanent permanent,
             final MagicGraveyardTriggerData triggerData) {
-        if (MagicLocationType.Play == triggerData.fromLocation) {
+        if (triggerData.fromLocation == MagicLocationType.Play) {
             final MagicPlayer player = permanent.getController();
             final MagicTargetFilter targetFilter =
                     new MagicTargetFilter.MagicCMCTargetFilter(