Refactor: Use Collections.singletonList instead of Arrays.asList where appropriate.

src/magic/model/MagicCostManaType.java

@@ -1,6 +1,7 @@
 package magic.model;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
 
@@ -8,34 +9,34 @@ public enum MagicCostManaType {
 
     // Ordered from least restrictive to most restrictive.
     // Same order as in mana cost
-    Generic("generic","{1}",Arrays.asList(MagicManaType.Colorless,MagicManaType.White,MagicManaType.Blue,MagicManaType.Black,MagicManaType.Red,MagicManaType.Green)),
-    WhiteBlue("white/blue","{W/U}",Arrays.asList(MagicManaType.White,MagicManaType.Blue)),
-    WhiteBlack("white/black","{W/B}",Arrays.asList(MagicManaType.White,MagicManaType.Black)),
-    BlueBlack("blue/black","{U/B}",Arrays.asList(MagicManaType.Blue,MagicManaType.Black)),
-    BlueRed("blue/red","{U/R}",Arrays.asList(MagicManaType.Blue,MagicManaType.Red)),
-    BlackRed("black/red","{B/R}",Arrays.asList(MagicManaType.Black,MagicManaType.Red)),
-    BlackGreen("black/green","{B/G}",Arrays.asList(MagicManaType.Black,MagicManaType.Green)),
-    RedGreen("red/green","{R/G}",Arrays.asList(MagicManaType.Red,MagicManaType.Green)),
-    RedWhite("red/white","{R/W}",Arrays.asList(MagicManaType.Red,MagicManaType.White)),
-    GreenWhite("green/white","{G/W}",Arrays.asList(MagicManaType.Green,MagicManaType.White)),
-    GreenBlue("green/blue","{G/U}",Arrays.asList(MagicManaType.Green,MagicManaType.Blue)),
-    PhyrexianWhite("phyrexian white","{W/P}",Arrays.asList(MagicManaType.White)),
-    PhyrexianBlue("phyrexian blue","{U/P}",Arrays.asList(MagicManaType.Blue)),
-    PhyrexianBlack("phyrexian black","{B/P}",Arrays.asList(MagicManaType.Black)),
-    PhyrexianRed("phyrexian red","{R/P}",Arrays.asList(MagicManaType.Red)),
-    PhyrexianGreen("phyrexian green","{G/P}",Arrays.asList(MagicManaType.Green)),
-    HybridWhite("hybrid white","{2/W}",Arrays.asList(MagicManaType.White)),
-    HybridBlue("hybrid blue","{2/U}",Arrays.asList(MagicManaType.Blue)),
-    HybridBlack("hybrid black","{2/B}",Arrays.asList(MagicManaType.Black)),
-    HybridRed("hybrid red","{2/R}",Arrays.asList(MagicManaType.Red)),
-    HybridGreen("hybrid green","{2/G}",Arrays.asList(MagicManaType.Green)),
-    White("white","{W}",Arrays.asList(MagicManaType.White)),
-    Blue("blue","{U}",Arrays.asList(MagicManaType.Blue)),
-    Black("black","{B}",Arrays.asList(MagicManaType.Black)),
-    Red("red","{R}",Arrays.asList(MagicManaType.Red)),
-    Green("green","{G}",Arrays.asList(MagicManaType.Green)),
-    Snow("snow","{S}",Arrays.asList(MagicManaType.Snow)),
-    Colorless("colorless","{C}",Arrays.asList(MagicManaType.Colorless))
+    Generic("generic", "{1}", Arrays.asList(MagicManaType.Colorless, MagicManaType.White, MagicManaType.Blue, MagicManaType.Black, MagicManaType.Red, MagicManaType.Green)),
+    WhiteBlue("white/blue", "{W/U}", Arrays.asList(MagicManaType.White, MagicManaType.Blue)),
+    WhiteBlack("white/black", "{W/B}", Arrays.asList(MagicManaType.White, MagicManaType.Black)),
+    BlueBlack("blue/black", "{U/B}", Arrays.asList(MagicManaType.Blue, MagicManaType.Black)),
+    BlueRed("blue/red", "{U/R}", Arrays.asList(MagicManaType.Blue, MagicManaType.Red)),
+    BlackRed("black/red", "{B/R}", Arrays.asList(MagicManaType.Black, MagicManaType.Red)),
+    BlackGreen("black/green", "{B/G}", Arrays.asList(MagicManaType.Black, MagicManaType.Green)),
+    RedGreen("red/green", "{R/G}", Arrays.asList(MagicManaType.Red, MagicManaType.Green)),
+    RedWhite("red/white", "{R/W}", Arrays.asList(MagicManaType.Red, MagicManaType.White)),
+    GreenWhite("green/white", "{G/W}", Arrays.asList(MagicManaType.Green, MagicManaType.White)),
+    GreenBlue("green/blue", "{G/U}", Arrays.asList(MagicManaType.Green, MagicManaType.Blue)),
+    PhyrexianWhite("phyrexian white", "{W/P}", Collections.singletonList(MagicManaType.White)),
+    PhyrexianBlue("phyrexian blue", "{U/P}", Collections.singletonList(MagicManaType.Blue)),
+    PhyrexianBlack("phyrexian black", "{B/P}", Collections.singletonList(MagicManaType.Black)),
+    PhyrexianRed("phyrexian red", "{R/P}", Collections.singletonList(MagicManaType.Red)),
+    PhyrexianGreen("phyrexian green", "{G/P}", Collections.singletonList(MagicManaType.Green)),
+    HybridWhite("hybrid white", "{2/W}", Collections.singletonList(MagicManaType.White)),
+    HybridBlue("hybrid blue", "{2/U}", Collections.singletonList(MagicManaType.Blue)),
+    HybridBlack("hybrid black", "{2/B}", Collections.singletonList(MagicManaType.Black)),
+    HybridRed("hybrid red", "{2/R}", Collections.singletonList(MagicManaType.Red)),
+    HybridGreen("hybrid green", "{2/G}", Collections.singletonList(MagicManaType.Green)),
+    White("white", "{W}", Collections.singletonList(MagicManaType.White)),
+    Blue("blue", "{U}", Collections.singletonList(MagicManaType.Blue)),
+    Black("black", "{B}", Collections.singletonList(MagicManaType.Black)),
+    Red("red", "{R}", Collections.singletonList(MagicManaType.Red)),
+    Green("green", "{G}", Collections.singletonList(MagicManaType.Green)),
+    Snow("snow", "{S}", Collections.singletonList(MagicManaType.Snow)),
+    Colorless("colorless", "{C}", Collections.singletonList(MagicManaType.Colorless))
     ;
 
     public static final int NR_OF_TYPES=values().length;

src/magic/model/event/MagicBestowActivation.java

@@ -1,6 +1,6 @@
 package magic.model.event;
 
-import java.util.Arrays;
+import java.util.Collections;
 
 import magic.model.MagicCard;
 import magic.model.MagicGame;
@@ -53,7 +53,7 @@ public class MagicBestowActivation extends MagicHandCastActivation {
 
     @Override
     public Iterable<? extends MagicEvent> getCostEvent(final MagicCard source) {
-        return Arrays.asList(MagicPayManaCostEvent.Cast(source, cost));
+        return Collections.singletonList(MagicPayManaCostEvent.Cast(source, cost));
     }
 
     @Override

src/magic/model/event/MagicCrewActivation.java

@@ -8,7 +8,7 @@ import magic.model.mstatic.MagicStatic;
 import magic.model.mstatic.MagicLayer;
 import magic.model.action.AddStaticAction;
 
-import java.util.Arrays;
+import java.util.Collections;
 
 public class MagicCrewActivation extends MagicPermanentActivation {
 
@@ -34,7 +34,7 @@ public class MagicCrewActivation extends MagicPermanentActivation {
 
     @Override
     public Iterable<? extends MagicEvent> getCostEvent(final MagicPermanent source) {
-        return Arrays.asList(new MagicCrewCostEvent(source,crew));
+        return Collections.singletonList(new MagicCrewCostEvent(source, crew));
     }
 
     @Override

src/magic/model/event/MagicDashActivation.java

@@ -1,6 +1,7 @@
 package magic.model.event;
 
-import java.util.Arrays;
+import java.util.Collections;
+
 import magic.model.MagicCard;
 import magic.model.MagicGame;
 import magic.model.MagicManaCost;
@@ -27,7 +28,7 @@ public class MagicDashActivation extends MagicHandCastActivation {
 
     @Override
     public Iterable<? extends MagicEvent> getCostEvent(final MagicCard source) {
-        return Arrays.asList(
+        return Collections.singletonList(
             new MagicPayManaCostEvent(
                 source,
                 source.getGameCost(cost)

src/magic/model/event/MagicLevelUpActivation.java

@@ -10,7 +10,7 @@ import magic.model.action.ChangeCountersAction;
 import magic.model.condition.MagicArtificialCondition;
 import magic.model.condition.MagicCondition;
 
-import java.util.Arrays;
+import java.util.Collections;
 
 public class MagicLevelUpActivation extends MagicPermanentActivation {
 
@@ -35,7 +35,7 @@ public class MagicLevelUpActivation extends MagicPermanentActivation {
 
     @Override
     public Iterable<? extends MagicEvent> getCostEvent(final MagicPermanent source) {
-        return Arrays.asList(new MagicPayManaCostEvent(source,cost));
+        return Collections.singletonList(new MagicPayManaCostEvent(source, cost));
     }
 
     @Override

src/magic/model/event/MagicMorphActivation.java

@@ -1,7 +1,6 @@
 package magic.model.event;
 
 import java.util.Collections;
-import java.util.Arrays;
 import java.util.List;
 import java.util.LinkedList;
 
@@ -23,7 +22,7 @@ public class MagicMorphActivation extends MagicPermanentActivation {
     public static final MagicMorphActivation Manifest = new MagicMorphActivation(Collections.emptyList()) {
         @Override
         public Iterable<? extends MagicEvent> getCostEvent(final MagicPermanent source) {
-            return Arrays.asList(
+            return Collections.singletonList(
                 new MagicPayManaCostEvent(
                     source,
                     source.getRealCardDefinition().getCost()

src/magic/model/event/MagicMorphCastActivation.java

@@ -20,7 +20,7 @@ import magic.model.action.PutItemOnStackAction;
 import magic.model.action.RemoveCardAction;
 import magic.model.action.PlayCardFromStackAction;
 
-import java.util.Arrays;
+import java.util.Collections;
 
 public class MagicMorphCastActivation extends MagicHandCastActivation {
 
@@ -44,7 +44,7 @@ public class MagicMorphCastActivation extends MagicHandCastActivation {
             MagicCard.createTokenCard(morphSpell, morphSpell.getController()),
             MagicManaCost.create("{3}")
         );
-        return Arrays.asList(
+        return Collections.singletonList(
             new MagicPayManaCostEvent(
                 morphSpell,
                 modCost

src/magic/model/event/MagicPermanentActivation.java

@@ -16,7 +16,7 @@ import magic.model.condition.MagicCondition;
 import magic.model.mstatic.MagicStatic;
 import magic.model.stack.MagicAbilityOnStack;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 public abstract class MagicPermanentActivation extends MagicActivation<MagicPermanent> implements MagicChangeCardDefinition {
@@ -157,7 +157,7 @@ public abstract class MagicPermanentActivation extends MagicActivation<MagicPerm
         ) {
             @Override
             public Iterable<? extends MagicEvent> getCostEvent(final MagicPermanent source) {
-                return Arrays.asList(new MagicPayManaCostEvent(source,cost));
+                return Collections.singletonList(new MagicPayManaCostEvent(source, cost));
             }
             @Override
             public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) {

src/magic/model/event/MagicSacrificeManaActivation.java

@@ -2,7 +2,7 @@ package magic.model.event;
 
 import magic.model.MagicManaType;
 import magic.model.MagicPermanent;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 public class MagicSacrificeManaActivation extends MagicManaActivation {
@@ -13,6 +13,6 @@ public class MagicSacrificeManaActivation extends MagicManaActivation {
 
     @Override
     public Iterable<? extends MagicEvent> getCostEvent(final MagicPermanent perm) {
-        return Arrays.asList(new MagicSacrificeEvent(perm));
+        return Collections.singletonList(new MagicSacrificeEvent(perm));
     }
 }

src/magic/model/event/MagicSuspendActivation.java

@@ -1,6 +1,7 @@
 package magic.model.event;
 
-import java.util.Arrays;
+import java.util.Collections;
+
 import magic.model.MagicCard;
 import magic.model.MagicCounterType;
 import magic.model.MagicGame;
@@ -33,7 +34,7 @@ public class MagicSuspendActivation extends MagicCardAbilityActivation {
 
     @Override
     public Iterable<? extends MagicEvent> getCostEvent(final MagicCard source) {
-        return Arrays.asList(
+        return Collections.singletonList(
             new MagicPayManaCostEvent(source, cost)
         );
     }

src/magic/model/event/MagicTapManaActivation.java

@@ -1,6 +1,6 @@
 package magic.model.event;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import magic.model.MagicManaType;
@@ -14,7 +14,7 @@ public class MagicTapManaActivation extends MagicManaActivation {
 
     @Override
     public Iterable<? extends MagicEvent> getCostEvent(final MagicPermanent perm) {
-        return Arrays.asList(new MagicTapEvent(perm));
+        return Collections.singletonList(new MagicTapEvent(perm));
     }
 
     public static final MagicManaActivation White = new MagicTapManaActivation(MagicManaType.getList("{W}"));

src/magic/model/event/MagicUnearthActivation.java

@@ -1,6 +1,7 @@
 package magic.model.event;
 
-import java.util.Arrays;
+import java.util.Collections;
+
 import magic.model.MagicCard;
 import magic.model.MagicCardDefinition;
 import magic.model.MagicGame;
@@ -32,7 +33,7 @@ public class MagicUnearthActivation extends MagicCardAbilityActivation {
 
     @Override
     public Iterable<? extends MagicEvent> getCostEvent(final MagicCard source) {
-        return Arrays.asList(
+        return Collections.singletonList(
             new MagicPayManaCostEvent(source, cost)
         );
     }