From 92caa7514da4a44ba376be4782a8857a66fb37a0 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sat, 16 Mar 2013 10:01:18 +0000 Subject: [PATCH] rem warning, replace array with immutable list in Color --- src/main/java/forge/Color.java | 6 ++++-- src/main/java/forge/card/trigger/WrappedAbility.java | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/forge/Color.java b/src/main/java/forge/Color.java index b21807610e0..fb9639d7d89 100644 --- a/src/main/java/forge/Color.java +++ b/src/main/java/forge/Color.java @@ -19,6 +19,8 @@ package forge; import java.util.EnumSet; +import com.google.common.collect.ImmutableList; + import forge.card.ColorSet; import forge.card.MagicColor; import forge.card.mana.ManaCostBeingPaid; @@ -46,7 +48,7 @@ public enum Color { /** The Blue. */ Blue(16); - public static final Color[] WUBRG = new Color[] { White, Blue, Black, Red, Green }; + public static final ImmutableList WUBRG = ImmutableList.of( White, Blue, Black, Red, Green ); @SuppressWarnings("unused") private int flag = 0; @@ -128,7 +130,7 @@ public enum Color { final EnumSet colors = EnumSet.of(Color.Colorless); for( int i = 0; i < MagicColor.NUMBER_OR_COLORS; i++ ) { if( cc.hasAnyColor(MagicColor.WUBRG[i]) ) - colors.add(Color.WUBRG[i]); + colors.add(Color.WUBRG.get(i)); } if (colors.size() > 1) { colors.remove(Color.Colorless); diff --git a/src/main/java/forge/card/trigger/WrappedAbility.java b/src/main/java/forge/card/trigger/WrappedAbility.java index cd9c3293a71..f571fc25b50 100644 --- a/src/main/java/forge/card/trigger/WrappedAbility.java +++ b/src/main/java/forge/card/trigger/WrappedAbility.java @@ -7,7 +7,6 @@ import java.util.Map; import forge.Card; import forge.Singletons; -import forge.card.ability.AbilityFactory; import forge.card.ability.ApiType; import forge.card.cost.Cost; import forge.card.mana.ManaCost;