diff --git a/Mage.Client/src/main/java/mage/client/MagePane.java b/Mage.Client/src/main/java/mage/client/MagePane.java index 06862b0195d..8692beeb4c2 100644 --- a/Mage.Client/src/main/java/mage/client/MagePane.java +++ b/Mage.Client/src/main/java/mage/client/MagePane.java @@ -43,7 +43,7 @@ import org.apache.log4j.Logger; */ public abstract class MagePane extends javax.swing.JInternalFrame { - private final static Logger logger = Logger.getLogger(MagePane.class); + private static final Logger logger = Logger.getLogger(MagePane.class); /** Creates new form MagePane */ public MagePane() { diff --git a/Mage.Client/src/main/java/mage/client/components/layout/RelativeLayout.java b/Mage.Client/src/main/java/mage/client/components/layout/RelativeLayout.java index 2e8be5b2b60..d7c5a21d681 100644 --- a/Mage.Client/src/main/java/mage/client/components/layout/RelativeLayout.java +++ b/Mage.Client/src/main/java/mage/client/components/layout/RelativeLayout.java @@ -38,24 +38,24 @@ public class RelativeLayout implements LayoutManager2, java.io.Serializable { private static final long serialVersionUID = 1L; // Used in the constructor - public final static int X_AXIS = 0; - public final static int Y_AXIS = 1; + public static final int X_AXIS = 0; + public static final int Y_AXIS = 1; // See setAlignment() method - public final static float LEADING = 0.0f; - public final static float CENTER = 0.5f; - public final static float TRAILING = 1.0f; - public final static float COMPONENT = -1.0f; + public static final float LEADING = 0.0f; + public static final float CENTER = 0.5f; + public static final float TRAILING = 1.0f; + public static final float COMPONENT = -1.0f; // See setRoundingPolicy() method - public final static int DO_NOTHING = 0; - public final static int FIRST = 1; - public final static int LAST = 2; - public final static int LARGEST = 3; - public final static int EQUAL = 4; + public static final int DO_NOTHING = 0; + public static final int FIRST = 1; + public static final int LAST = 2; + public static final int LARGEST = 3; + public static final int EQUAL = 4; - private final static int MINIMUM = 0; - private final static int PREFERRED = 1; + private static final int MINIMUM = 0; + private static final int PREFERRED = 1; private Map constraints = new HashMap(); @@ -657,11 +657,9 @@ public class RelativeLayout implements LayoutManager2, java.io.Serializable { for (int i = 0; i < relativeSpace.length; i++) { int space = relativeSpace[i]; - if (space > 0) { - if (largestSpace < space) { - largestSpace = space; - largest = i; - } + if (space > 0 && largestSpace < space) { + largestSpace = space; + largest = i; } } diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java index 47d1180656b..3b6d542d8f5 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java @@ -71,7 +71,7 @@ import java.util.concurrent.ExecutionException; */ public class DeckEditorPanel extends javax.swing.JPanel { - private final static Logger logger = Logger.getLogger(DeckEditorPanel.class); + private static final Logger logger = Logger.getLogger(DeckEditorPanel.class); private JFileChooser fcSelectDeck; private JFileChooser fcImportDeck; @@ -697,7 +697,7 @@ class ImportFilter extends FileFilter { class UpdateDeckTask extends SwingWorker { - private final static Logger logger = Logger.getLogger(UpdateDeckTask.class); + private static final Logger logger = Logger.getLogger(UpdateDeckTask.class); private Session session; private UUID tableId; diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java index 111d18eb08f..8b193d4830c 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java @@ -60,7 +60,7 @@ import java.util.concurrent.ExecutionException; */ public class ConnectDialog extends MageDialog { - private final static Logger logger = Logger.getLogger(ConnectDialog.class); + private static final Logger logger = Logger.getLogger(ConnectDialog.class); private Connection connection; private ConnectTask task; diff --git a/Mage.Client/src/main/java/mage/client/dialog/JoinTableDialog.java b/Mage.Client/src/main/java/mage/client/dialog/JoinTableDialog.java index 4a52e9b4ae0..a0017becdb3 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/JoinTableDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/JoinTableDialog.java @@ -40,7 +40,7 @@ import org.apache.log4j.Logger; */ public class JoinTableDialog extends MageDialog { - private final static Logger logger = Logger.getLogger(JoinTableDialog.class); + private static final Logger logger = Logger.getLogger(JoinTableDialog.class); private UUID tableId; private UUID roomId; diff --git a/Mage.Client/src/main/java/mage/client/dialog/MageDialog.java b/Mage.Client/src/main/java/mage/client/dialog/MageDialog.java index 4bddd97845b..cac7b90cd95 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/MageDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/MageDialog.java @@ -47,7 +47,7 @@ import java.lang.reflect.InvocationTargetException; */ public class MageDialog extends javax.swing.JInternalFrame { - private final static Logger logger = Logger.getLogger(MageDialog.class); + private static final Logger logger = Logger.getLogger(MageDialog.class); protected boolean modal = false; diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java index f948a91c1a3..ba07b274258 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java @@ -54,7 +54,7 @@ import java.util.UUID; */ public class NewTableDialog extends MageDialog { - private final static Logger logger = Logger.getLogger(NewTableDialog.class); + private static final Logger logger = Logger.getLogger(NewTableDialog.class); private TableView table; private UUID playerId; diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java index f2859e6b1cb..1f458161dc9 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java @@ -60,7 +60,7 @@ import java.util.UUID; */ public class NewTournamentDialog extends MageDialog { - private final static Logger logger = Logger.getLogger(NewTournamentDialog.class); + private static final Logger logger = Logger.getLogger(NewTournamentDialog.class); private TableView table; private UUID playerId; diff --git a/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java b/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java index 7093443f522..99a5dd0c6b7 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java @@ -56,7 +56,7 @@ import java.util.concurrent.ExecutionException; */ public class TableWaitingDialog extends MageDialog { - private final static Logger logger = Logger.getLogger(TableWaitingDialog.class); + private static final Logger logger = Logger.getLogger(TableWaitingDialog.class); private UUID tableId; private UUID roomId; @@ -363,7 +363,7 @@ class UpdateSeatsTask extends SwingWorker { private TableWaitingDialog dialog; private int count = 0; - private final static Logger logger = Logger.getLogger(TableWaitingDialog.class); + private static final Logger logger = Logger.getLogger(TableWaitingDialog.class); UpdateSeatsTask(Session session, UUID roomId, UUID tableId, TableWaitingDialog dialog) { this.session = session; diff --git a/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java b/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java index fce95cb3fff..ab9c1938e38 100644 --- a/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java +++ b/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java @@ -59,7 +59,7 @@ import org.apache.log4j.Logger; */ public class FeedbackPanel extends javax.swing.JPanel { - private final static Logger logger = Logger.getLogger(FeedbackPanel.class); + private static final Logger logger = Logger.getLogger(FeedbackPanel.class); public enum FeedbackMode { INFORM, QUESTION, CONFIRM, CANCEL, SELECT, END diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java index bc40ade652d..5a04119ff5e 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -1255,7 +1255,7 @@ class ReplayTask extends SwingWorker> { private Session session; private UUID gameId; - private final static Logger logger = Logger.getLogger(ReplayTask.class); + private static final Logger logger = Logger.getLogger(ReplayTask.class); ReplayTask(Session session, UUID gameId) { this.session = session; diff --git a/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java b/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java index f239140582e..75a0e149e32 100644 --- a/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java +++ b/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java @@ -33,8 +33,8 @@ public class Plugins implements MagePlugins { public static final String PLUGINS_DIRECTORY = "plugins/"; - private final static MagePlugins fINSTANCE = new Plugins(); - private final static Logger logger = Logger.getLogger(Plugins.class); + private static final MagePlugins fINSTANCE = new Plugins(); + private static final Logger logger = Logger.getLogger(Plugins.class); private static PluginManager pm; private ThemePlugin themePlugin = null; diff --git a/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java b/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java index 1610e4ca137..5da476c56f8 100644 --- a/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java +++ b/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java @@ -53,7 +53,7 @@ import java.util.UUID; */ public class CallbackClientImpl implements CallbackClient { - private final static Logger logger = Logger.getLogger(CallbackClientImpl.class); + private static final Logger logger = Logger.getLogger(CallbackClientImpl.class); private UUID clientId; private MageFrame frame; diff --git a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java index 16b5ab7433d..aa87cf7a2b7 100644 --- a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java +++ b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java @@ -59,7 +59,7 @@ import org.apache.log4j.Logger; */ public class TournamentPanel extends javax.swing.JPanel { - private final static Logger logger = Logger.getLogger(TournamentPanel.class); + private static final Logger logger = Logger.getLogger(TournamentPanel.class); private UUID tournamentId; private Session session; @@ -334,7 +334,7 @@ class UpdateTournamentTask extends SwingWorker { private UUID tournamentId; private TournamentPanel panel; - private final static Logger logger = Logger.getLogger(UpdateTournamentTask.class); + private static final Logger logger = Logger.getLogger(UpdateTournamentTask.class); UpdateTournamentTask(Session session, UUID tournamentId, TournamentPanel panel) { this.session = session; diff --git a/Mage.Client/src/main/java/mage/client/util/Config.java b/Mage.Client/src/main/java/mage/client/util/Config.java index 152b202f434..5df46c3c428 100644 --- a/Mage.Client/src/main/java/mage/client/util/Config.java +++ b/Mage.Client/src/main/java/mage/client/util/Config.java @@ -42,7 +42,7 @@ import java.util.Properties; */ public class Config { - private final static Logger logger = Logger.getLogger(Config.class); + private static final Logger logger = Logger.getLogger(Config.class); public static final String remoteServer; public static final String serverName; diff --git a/Mage.Client/src/main/java/mage/client/util/EDTExceptionHandler.java b/Mage.Client/src/main/java/mage/client/util/EDTExceptionHandler.java index a7ab4c6edea..c119d39a2bb 100644 --- a/Mage.Client/src/main/java/mage/client/util/EDTExceptionHandler.java +++ b/Mage.Client/src/main/java/mage/client/util/EDTExceptionHandler.java @@ -38,7 +38,7 @@ import org.apache.log4j.Logger; */ public class EDTExceptionHandler implements Thread.UncaughtExceptionHandler { - private final static Logger logger = Logger.getLogger(EDTExceptionHandler.class); + private static final Logger logger = Logger.getLogger(EDTExceptionHandler.class); @Override public void uncaughtException(Thread t, Throwable e) { diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/Animation.java b/Mage.Client/src/main/java/org/mage/card/arcane/Animation.java index 4d4fe569edf..24bda4b47e3 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/Animation.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/Animation.java @@ -7,7 +7,7 @@ import java.awt.*; import java.util.Timer; import java.util.TimerTask; -abstract public class Animation { +public abstract class Animation { private static final long TARGET_MILLIS_PER_FRAME = 30; private static Timer timer = new Timer("Animation", true); @@ -46,7 +46,7 @@ abstract public class Animation { timer.scheduleAtFixedRate(timerTask, delay, TARGET_MILLIS_PER_FRAME); } - abstract protected void update (float percentage); + protected abstract void update (float percentage); protected void cancel () { timerTask.cancel(); @@ -102,7 +102,7 @@ abstract public class Animation { } } - static public void tapCardToggle (final CardPanel panel, final MagePermanent parent, final boolean tapped, final boolean flipped) { + public static void tapCardToggle (final CardPanel panel, final MagePermanent parent, final boolean tapped, final boolean flipped) { new Animation(300) { @Override protected void start () { @@ -177,7 +177,7 @@ abstract public class Animation { }; } - static public void moveCardToPlay (final int startX, final int startY, final int startWidth, final int endX, final int endY, + public static void moveCardToPlay (final int startX, final int startY, final int startWidth, final int endX, final int endY, final int endWidth, final CardPanel animationPanel, final CardPanel placeholder, final JLayeredPane layeredPane, final int speed) { UI.invokeLater(new Runnable() { @@ -247,7 +247,7 @@ abstract public class Animation { }); } - static public void moveCard (final int startX, final int startY, final int startWidth, final int endX, final int endY, + public static void moveCard (final int startX, final int startY, final int startWidth, final int endX, final int endY, final int endWidth, final CardPanel animationPanel, final CardPanel placeholder, final JLayeredPane layeredPane, final int speed) { UI.invokeLater(new Runnable() { @@ -294,11 +294,9 @@ abstract public class Animation { }); } - static public void shrinkCard () { + public static void shrinkCard () { final CardPanel overPanel, animationPanel; synchronized (enlargeLock) { - //delayedCardPanel = null; - //delayedTime = 0; overPanel = Animation.enlargedCardPanel; animationPanel = Animation.enlargedAnimationPanel; if (animationPanel == null) { @@ -348,15 +346,15 @@ abstract public class Animation { }; } - static public boolean isShowingEnlargedCard () { + public static boolean isShowingEnlargedCard () { synchronized (enlargeLock) { return enlargedAnimationPanel != null; } } - static public void showCard(final MagePermanent card, int count) { + public static void showCard(final MagePermanent card, int count) { if (count == 0) { - count = 1; + return; } new Animation(600 / count) { @Override @@ -377,9 +375,9 @@ abstract public class Animation { }; } - static public void hideCard(final MagePermanent card, int count) { + public static void hideCard(final MagePermanent card, int count) { if (count == 0) { - count = 1; + return; } new Animation(600 / count) { @Override diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java index 0b835fe9633..e5fc6695cae 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java @@ -46,12 +46,12 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti public static final Rectangle CARD_SIZE_FULL = new Rectangle(101, 149); - static private final float ROUNDED_CORNER_SIZE = 0.1f; - static private final float BLACK_BORDER_SIZE = 0.03f; - static private final int TEXT_GLOW_SIZE = 6; - static private final float TEXT_GLOW_INTENSITY = 3f; - static private final float ROT_CENTER_TO_TOP_CORNER = 1.0295630140987000315797369464196f; - static private final float ROT_CENTER_TO_BOTTOM_CORNER = 0.7071067811865475244008443621048f; + private static final float ROUNDED_CORNER_SIZE = 0.1f; + private static final float BLACK_BORDER_SIZE = 0.03f; + private static final int TEXT_GLOW_SIZE = 6; + private static final float TEXT_GLOW_INTENSITY = 3f; + private static final float ROT_CENTER_TO_TOP_CORNER = 1.0295630140987000315797369464196f; + private static final float ROT_CENTER_TO_BOTTOM_CORNER = 0.7071067811865475244008443621048f; public CardView gameCard; @@ -236,7 +236,7 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti public void setImage(final CardPanel panel) { synchronized (panel.imagePanel) { if (panel.imagePanel.hasImage()) { - setImage(panel.imagePanel.srcImage); + setImage(panel.imagePanel.getSrcImage()); } } } @@ -747,7 +747,7 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti return data; } - final protected String getType(CardView card) { + protected final String getType(CardView card) { StringBuilder sbType = new StringBuilder(); for (String superType : card.getSuperTypes()) { @@ -768,7 +768,7 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti return sbType.toString(); } - final protected String getText(String cardType, CardView card) { + protected final String getText(String cardType, CardView card) { StringBuilder sb = new StringBuilder(); if (card instanceof StackAbilityView || card instanceof AbilityView) { for (String rule : card.getRules()) { diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/ScaledImagePanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/ScaledImagePanel.java index c12dce237b8..b70d727637a 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/ScaledImagePanel.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/ScaledImagePanel.java @@ -10,7 +10,7 @@ import javax.swing.JPanel; public class ScaledImagePanel extends JPanel { private static final long serialVersionUID = -1523279873208605664L; - public volatile Image srcImage; + private volatile Image srcImage; private ScalingType scalingType = ScalingType.bilinear; private boolean scaleLarger; @@ -101,7 +101,6 @@ public class ScaledImagePanel extends JPanel { } private void scaleWithGetScaledInstance (Graphics2D g2, ScalingInfo info, int hints) { - Image srcImage = getSourceImage(info); Image scaledImage = srcImage.getScaledInstance(info.targetWidth, info.targetHeight, hints); g2.drawImage(scaledImage, info.x, info.y, null); } @@ -117,8 +116,6 @@ public class ScaledImagePanel extends JPanel { tempDestHeight = info.targetHeight; } - Image srcImage = getSourceImage(info); - // If not doing multipass or multipass only needs a single pass, just scale it once directly to the panel surface. if (multiPassType == MultipassType.none || (tempDestWidth == info.targetWidth && tempDestHeight == info.targetHeight)) { g2.drawImage(srcImage, info.x, info.y, info.targetWidth, info.targetHeight, null); @@ -174,15 +171,11 @@ public class ScaledImagePanel extends JPanel { tempSrcHeight, null); } - private Image getSourceImage (ScalingInfo info) { - return srcImage; - } - public Image getSrcImage() { return srcImage; } - static private class ScalingInfo { + private static class ScalingInfo { public int targetWidth; public int targetHeight; public int srcWidth; @@ -191,11 +184,11 @@ public class ScaledImagePanel extends JPanel { public int y; } - static public enum MultipassType { + public static enum MultipassType { none, nearestNeighbor, bilinear, bicubic } - static public enum ScalingType { + public static enum ScalingType { nearestNeighbor, replicate, bilinear, bicubic, areaAveraging } } diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java index f3337484623..7f77866fd77 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java @@ -10,8 +10,8 @@ import static org.mage.plugins.card.dl.DownloadJob.toFile; public class GathererSets implements Iterable { - private final static String SETS_PATH = File.separator + "sets"; - private final static File DEFAULT_OUT_DIR = new File("plugins" + File.separator + "images" + SETS_PATH); + private static final String SETS_PATH = File.separator + "sets"; + private static final File DEFAULT_OUT_DIR = new File("plugins" + File.separator + "images" + SETS_PATH); private static File outDir = DEFAULT_OUT_DIR; private static final String[] symbols = {"10E", "9ED", "8ED", "7ED", "6ED", "5ED", "4ED", "3ED", "2ED", "LEB", "LEA", diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSymbols.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSymbols.java index a70b5a6aa46..cadc5d7b6a0 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSymbols.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSymbols.java @@ -28,8 +28,8 @@ public class GathererSymbols implements Iterable { //TODO chaos and planeswalker symbol //chaos: http://gatherer.wizards.com/Images/Symbols/chaos.gif - private final static String SYMBOLS_PATH = File.separator + "symbols"; - private final static File DEFAULT_OUT_DIR = new File("plugins" + File.separator + "images" + SYMBOLS_PATH); + private static final String SYMBOLS_PATH = File.separator + "symbols"; + private static final File DEFAULT_OUT_DIR = new File("plugins" + File.separator + "images" + SYMBOLS_PATH); private static File outDir = DEFAULT_OUT_DIR; private static final String urlFmt = "http://gatherer.wizards.com/handlers/image.ashx?size=%1$s&name=%2$s&type=symbol"; diff --git a/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java b/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java index fbc2654f5b9..9986ffa591f 100644 --- a/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java +++ b/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java @@ -21,16 +21,16 @@ import org.junit.Ignore; @Ignore public class MultiConnectTest { - private final static Logger logger = Logger.getLogger(MultiConnectTest.class); + private static final Logger logger = Logger.getLogger(MultiConnectTest.class); /** * Amount of games to be started from this test. */ - private final static Integer USER_CONNECT_COUNT = 200; + private static final Integer USER_CONNECT_COUNT = 200; - private final static CountDownLatch latch = new CountDownLatch(USER_CONNECT_COUNT); + private static final CountDownLatch latch = new CountDownLatch(USER_CONNECT_COUNT); - private final static MageVersion version = new MageVersion(1, 0, 1, ""); + private static final MageVersion version = new MageVersion(1, 0, 1, ""); private static volatile int connected; diff --git a/Mage.Client/src/test/java/mage/client/game/StartMultiGamesTest.java b/Mage.Client/src/test/java/mage/client/game/StartMultiGamesTest.java index df80b7e080c..73811194418 100644 --- a/Mage.Client/src/test/java/mage/client/game/StartMultiGamesTest.java +++ b/Mage.Client/src/test/java/mage/client/game/StartMultiGamesTest.java @@ -13,12 +13,12 @@ import org.junit.Ignore; @Ignore public class StartMultiGamesTest { - private final static Logger logger = Logger.getLogger(StartMultiGamesTest.class); + private static final Logger logger = Logger.getLogger(StartMultiGamesTest.class); /** * Amount of games to be started from this test. */ - private final static Integer GAME_START_COUNT = 10; + private static final Integer GAME_START_COUNT = 10; private MageFrame frame = null; private Object sync = new Object(); diff --git a/Mage.Common/src/mage/remote/SessionImpl.java b/Mage.Common/src/mage/remote/SessionImpl.java index d4d8065943b..d1bb3539d03 100644 --- a/Mage.Common/src/mage/remote/SessionImpl.java +++ b/Mage.Common/src/mage/remote/SessionImpl.java @@ -60,7 +60,7 @@ import java.util.*; */ public class SessionImpl implements Session { - private final static Logger logger = Logger.getLogger(SessionImpl.class); + private static final Logger logger = Logger.getLogger(SessionImpl.class); private String sessionId; private MageServer server; diff --git a/Mage.Plugins/Mage.Theme.Plugin/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java b/Mage.Plugins/Mage.Theme.Plugin/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java index d8f28ab2627..4087bb5f05a 100644 --- a/Mage.Plugins/Mage.Theme.Plugin/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java +++ b/Mage.Plugins/Mage.Theme.Plugin/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java @@ -20,7 +20,7 @@ import java.util.Map; @Author(name = "nantuko") public class ThemePluginImpl implements ThemePlugin { - private final static Logger log = Logger.getLogger(ThemePluginImpl.class); + private static final Logger log = Logger.getLogger(ThemePluginImpl.class); private static BufferedImage background; @Init diff --git a/Mage.Server.Console/src/main/java/mage/server/console/ConnectDialog.java b/Mage.Server.Console/src/main/java/mage/server/console/ConnectDialog.java index e4fdeeb0b76..431a0f3acdb 100644 --- a/Mage.Server.Console/src/main/java/mage/server/console/ConnectDialog.java +++ b/Mage.Server.Console/src/main/java/mage/server/console/ConnectDialog.java @@ -55,7 +55,7 @@ import java.util.concurrent.ExecutionException; */ public class ConnectDialog extends JDialog { - private final static Logger logger = Logger.getLogger(ConnectDialog.class); + private static final Logger logger = Logger.getLogger(ConnectDialog.class); private ConsoleFrame console; private Connection connection; private ConnectTask task; diff --git a/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java b/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java index a7c3220be3a..796ff851e1e 100644 --- a/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java +++ b/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java @@ -52,12 +52,12 @@ import java.util.prefs.Preferences; */ public class ConsoleFrame extends javax.swing.JFrame implements MageClient { - private final static Logger logger = Logger.getLogger(ConsoleFrame.class); + private static final Logger logger = Logger.getLogger(ConsoleFrame.class); private static Session session; private ConnectDialog connectDialog; private static Preferences prefs = Preferences.userNodeForPackage(ConsoleFrame.class); - private final static MageVersion version = new MageVersion(1, 0, 1, ""); + private static final MageVersion version = new MageVersion(1, 0, 1, ""); /** * @return the session diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/Config2.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/Config2.java index 1cf91051fc9..7483e7dad46 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/Config2.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/Config2.java @@ -43,7 +43,7 @@ import mage.util.Logging; */ public class Config2 { - private final static Logger logger = Logging.getLogger(Config2.class.getName()); + private static final Logger logger = Logging.getLogger(Config2.class.getName()); // public static final int maxDepth; public static final int maxNodes; diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/GameStateEvaluator2.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/GameStateEvaluator2.java index 42f990a8b15..4422b7a1451 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/GameStateEvaluator2.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/GameStateEvaluator2.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; */ public class GameStateEvaluator2 { - private final static transient Logger logger = Logging.getLogger(GameStateEvaluator2.class.getName()); + private static final transient Logger logger = Logging.getLogger(GameStateEvaluator2.class.getName()); static { logger.setLevel(Level.ALL); diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java index 944f954e5ef..83fde106c2f 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java @@ -56,7 +56,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; */ public class SimulatedPlayer2 extends ComputerPlayer { - private final static transient Logger logger = Logger.getLogger(SimulatedPlayer2.class); + private static final transient Logger logger = Logger.getLogger(SimulatedPlayer2.class); private boolean isSimulatedPlayer; private transient ConcurrentLinkedQueue allActions; private boolean forced; diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulationWorker2.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulationWorker2.java index 0ec155cb9f0..991947bcb87 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulationWorker2.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulationWorker2.java @@ -41,7 +41,7 @@ import mage.util.Logging; */ public class SimulationWorker2 implements Callable { - private final static Logger logger = Logging.getLogger(SimulationWorker2.class.getName()); + private static final Logger logger = Logging.getLogger(SimulationWorker2.class.getName()); private Game game; private SimulatedAction2 previousActions; diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java index c2b9801ce8d..7ae8985f963 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java @@ -64,7 +64,7 @@ public class ComputerPlayerMCTS extends ComputerPlayer imple protected transient MCTSNode root; protected int maxThinkTime; - private final static transient Logger logger = Logger.getLogger(ComputerPlayerMCTS.class); + private static final transient Logger logger = Logger.getLogger(ComputerPlayerMCTS.class); private transient ExecutorService pool; private int cores; diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSExecutor.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSExecutor.java index 0477afca8a2..fbe716aa372 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSExecutor.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSExecutor.java @@ -42,7 +42,7 @@ public class MCTSExecutor implements Callable { protected int thinkTime; protected UUID playerId; - private final static transient Logger logger = Logger.getLogger(ComputerPlayerMCTS.class); + private static final transient Logger logger = Logger.getLogger(ComputerPlayerMCTS.class); public MCTSExecutor(Game sim, UUID playerId, int thinkTime) { this.playerId = playerId; diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSNode.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSNode.java index 33fa85f8caa..561229311db 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSNode.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSNode.java @@ -53,7 +53,7 @@ public class MCTSNode { private static final double selectionCoefficient = 1.0; private static final double passRatioTolerance = 0.0; - private final static transient Logger logger = Logger.getLogger(MCTSNode.class); + private static final transient Logger logger = Logger.getLogger(MCTSNode.class); private int visits = 0; private int wins = 0; diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java index 2bb73f66a6a..23ebed02e26 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java @@ -45,7 +45,7 @@ import java.util.UUID; */ public class MCTSPlayer extends ComputerPlayer { - private final static transient Logger logger = Logger.getLogger(MCTSPlayer.class); + private static final transient Logger logger = Logger.getLogger(MCTSPlayer.class); protected PassAbility pass = new PassAbility(); diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java index 750fb1e519f..a9bb65be1f9 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java @@ -64,7 +64,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer { private boolean isSimulatedPlayer; private static Random rnd = new Random(); private int actionCount = 0; - private final static transient Logger logger = Logger.getLogger(SimulatedPlayerMCTS.class); + private static final transient Logger logger = Logger.getLogger(SimulatedPlayerMCTS.class); public SimulatedPlayerMCTS(UUID id, boolean isSimulatedPlayer) { super(id); diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/Config.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/Config.java index 41a97818911..b0c056537fa 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/Config.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/Config.java @@ -41,7 +41,7 @@ import org.apache.log4j.Logger; */ public class Config { - private final static Logger logger = Logger.getLogger(Config.class); + private static final Logger logger = Logger.getLogger(Config.class); // public static final int maxDepth; public static final int maxNodes; diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java index a9d46c33baf..5b0ec65e48e 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java @@ -53,7 +53,7 @@ import org.apache.log4j.Logger; */ public class GameStateEvaluator { - private final static transient Logger logger = Logger.getLogger(GameStateEvaluator.class); + private static final transient Logger logger = Logger.getLogger(GameStateEvaluator.class); private static final int LIFE_FACTOR = Config.evaluatorLifeFactor; private static final int PERMANENT_FACTOR = Config.evaluatorPermanentFactor; diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulateBlockWorker.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulateBlockWorker.java index 3ddd574f48c..10f315c56d7 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulateBlockWorker.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulateBlockWorker.java @@ -39,7 +39,7 @@ import mage.util.Logging; */ public class SimulateBlockWorker implements Callable { - private final static Logger logger = Logging.getLogger(SimulationWorker.class.getName()); + private static final Logger logger = Logging.getLogger(SimulationWorker.class.getName()); private SimulationNode node; private ComputerPlayer3 player; diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java index 0f6e3775e57..5f69a528073 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java @@ -59,7 +59,7 @@ import org.apache.log4j.Logger; */ public class SimulatedPlayer extends ComputerPlayer { - private final static transient Logger logger = Logger.getLogger(SimulatedPlayer.class); + private static final transient Logger logger = Logger.getLogger(SimulatedPlayer.class); private boolean isSimulatedPlayer; private transient ConcurrentLinkedQueue allActions; private static PassAbility pass = new PassAbility(); diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulationWorker.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulationWorker.java index fb5dde1f43a..2d185c8096b 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulationWorker.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulationWorker.java @@ -41,7 +41,7 @@ import mage.util.Logging; */ public class SimulationWorker implements Callable { - private final static Logger logger = Logging.getLogger(SimulationWorker.class.getName()); + private static final Logger logger = Logging.getLogger(SimulationWorker.class.getName()); private Game game; private SimulatedAction previousActions; diff --git a/Mage.Server/src/main/java/mage/server/ChatManager.java b/Mage.Server/src/main/java/mage/server/ChatManager.java index b29589879d0..4d7d8d5f754 100644 --- a/Mage.Server/src/main/java/mage/server/ChatManager.java +++ b/Mage.Server/src/main/java/mage/server/ChatManager.java @@ -39,7 +39,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public class ChatManager { - private final static ChatManager INSTANCE = new ChatManager(); + private static final ChatManager INSTANCE = new ChatManager(); public static ChatManager getInstance() { return INSTANCE; diff --git a/Mage.Server/src/main/java/mage/server/ChatSession.java b/Mage.Server/src/main/java/mage/server/ChatSession.java index 35ee26e7f47..7c48e4cee57 100644 --- a/Mage.Server/src/main/java/mage/server/ChatSession.java +++ b/Mage.Server/src/main/java/mage/server/ChatSession.java @@ -45,7 +45,7 @@ import org.apache.log4j.Logger; */ public class ChatSession { - private final static Logger logger = Logger.getLogger(ChatSession.class); + private static final Logger logger = Logger.getLogger(ChatSession.class); private ConcurrentHashMap clients = new ConcurrentHashMap(); private UUID chatId; private DateFormat timeFormatter = SimpleDateFormat.getTimeInstance(SimpleDateFormat.SHORT); diff --git a/Mage.Server/src/main/java/mage/server/MageServerImpl.java b/Mage.Server/src/main/java/mage/server/MageServerImpl.java index be9e61ece94..321232d1934 100644 --- a/Mage.Server/src/main/java/mage/server/MageServerImpl.java +++ b/Mage.Server/src/main/java/mage/server/MageServerImpl.java @@ -66,7 +66,7 @@ import java.util.concurrent.ExecutorService; */ public class MageServerImpl implements MageServer { - private final static Logger logger = Logger.getLogger(MageServerImpl.class); + private static final Logger logger = Logger.getLogger(MageServerImpl.class); private static ExecutorService callExecutor = ThreadExecutor.getInstance().getCallExecutor(); private String password; diff --git a/Mage.Server/src/main/java/mage/server/Main.java b/Mage.Server/src/main/java/mage/server/Main.java index 77dd7f193b6..b3402018732 100644 --- a/Mage.Server/src/main/java/mage/server/Main.java +++ b/Mage.Server/src/main/java/mage/server/Main.java @@ -1,311 +1,314 @@ -/* -* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. -* -* Redistribution and use in source and binary forms, with or without modification, are -* permitted provided that the following conditions are met: -* -* 1. Redistributions of source code must retain the above copyright notice, this list of -* conditions and the following disclaimer. -* -* 2. Redistributions in binary form must reproduce the above copyright notice, this list -* of conditions and the following disclaimer in the documentation and/or other materials -* provided with the distribution. -* -* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED -* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR -* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* The views and conclusions contained in the software and documentation are those of the -* authors and should not be interpreted as representing official policies, either expressed -* or implied, of BetaSteward_at_googlemail.com. -*/ - -package mage.server; - -import mage.cards.repository.CardScanner; -import mage.game.match.MatchType; -import mage.game.tournament.TournamentType; -import mage.interfaces.MageServer; -import mage.remote.Connection; -import mage.server.game.DeckValidatorFactory; -import mage.server.game.GameFactory; -import mage.server.game.PlayerFactory; -import mage.server.tournament.TournamentFactory; -import mage.server.util.ConfigSettings; -import mage.server.util.PluginClassLoader; -import mage.server.util.ServerMessagesUtil; -import mage.server.util.SystemUtil; -import mage.server.util.config.GamePlugin; -import mage.server.util.config.Plugin; -import mage.utils.MageVersion; -import org.apache.log4j.Logger; -import org.jboss.remoting.*; -import org.jboss.remoting.callback.InvokerCallbackHandler; -import org.jboss.remoting.callback.ServerInvokerCallbackHandler; -import org.jboss.remoting.transport.Connector; -import org.jboss.remoting.transport.socket.SocketWrapper; -import org.jboss.remoting.transporter.TransporterClient; -import org.jboss.remoting.transporter.TransporterServer; -import org.w3c.dom.Element; - -import javax.management.MBeanServer; -import java.io.File; -import java.io.FilenameFilter; -import java.io.IOException; -import java.net.InetAddress; -import java.util.HashMap; -import java.util.Map; - -/** - * - * @author BetaSteward_at_googlemail.com - */ -public class Main { - - private static Logger logger = Logger.getLogger(Main.class); - - private final static String testModeArg = "-testMode="; - private final static String adminPasswordArg = "-adminPassword="; - private final static String pluginFolder = "plugins"; - private static MageVersion version = new MageVersion(1, 0, 1, ""); - - public static PluginClassLoader classLoader = new PluginClassLoader(); - public static TransporterServer server; - protected static boolean testMode; - /** - * @param args the command line arguments - */ - public static void main(String[] args) { - - logger.info("Starting MAGE server version " + version); - logger.info("Logging level: " + logger.getEffectiveLevel()); - CardScanner.scan(); - deleteSavedGames(); - ConfigSettings config = ConfigSettings.getInstance(); - for (GamePlugin plugin: config.getGameTypes()) { - GameFactory.getInstance().addGameType(plugin.getName(), loadGameType(plugin), loadPlugin(plugin)); - } - for (GamePlugin plugin: config.getTournamentTypes()) { - TournamentFactory.getInstance().addTournamentType(plugin.getName(), loadTournamentType(plugin), loadPlugin(plugin)); - } - for (Plugin plugin: config.getPlayerTypes()) { - PlayerFactory.getInstance().addPlayerType(plugin.getName(), loadPlugin(plugin)); - } - for (Plugin plugin: config.getDeckTypes()) { - DeckValidatorFactory.getInstance().addDeckType(plugin.getName(), loadPlugin(plugin)); - } - String adminPassword = ""; - for (String arg: args) { - if (arg.startsWith(testModeArg)) { - testMode = Boolean.valueOf(arg.replace(testModeArg, "")); - } - else if (arg.startsWith(adminPasswordArg)) { - adminPassword = arg.replace(adminPasswordArg, ""); - adminPassword = SystemUtil.sanitize(adminPassword); - } - } - Connection connection = new Connection(); - connection.setHost(config.getServerAddress()); - connection.setPort(config.getPort()); - try { - InvokerLocator serverLocator = new InvokerLocator(connection.getURI()); - if (!isAlreadyRunning(serverLocator)) { - server = new MageTransporterServer(serverLocator, new MageServerImpl(adminPassword, testMode), MageServer.class.getName(), new MageServerInvocationHandler()); - server.start(); - logger.info("Started MAGE server - listening on " + connection.toString()); - if (testMode) - logger.info("MAGE server running in test mode"); - initStatistics(); - } - else { - logger.fatal("Unable to start MAGE server - another server is already started"); - } - } catch (IOException ex) { - logger.fatal("Failed to start server - " + connection.toString(), ex); - } catch (Exception ex) { - logger.fatal("Failed to start server - " + connection.toString(), ex); - } - - } - - static void initStatistics() { - ServerMessagesUtil.getInstance().setStartDate(System.currentTimeMillis()); - } - - static boolean isAlreadyRunning(InvokerLocator serverLocator) { - Map metadata = new HashMap(); - metadata.put(SocketWrapper.WRITE_TIMEOUT, "2000"); - metadata.put("generalizeSocketException", "true"); - try { - MageServer testServer = (MageServer) TransporterClient.createTransporterClient(serverLocator.getLocatorURI(), MageServer.class, metadata); - if (testServer != null) { - testServer.getServerState(); - return true; - } - } catch (Throwable t) { - // assume server is not running - } - return false; - } - - static class ClientConnectionListener implements ConnectionListener { - @Override - public void handleConnectionException(Throwable throwable, Client client) { - Session session = SessionManager.getInstance().getSession(client.getSessionId()); - if (session != null) { - String sessionName; - User user = UserManager.getInstance().getUser(session.getUserId()); - if (user != null) - sessionName = user.getName() + " at " + session.getHost(); - else - sessionName = session.getHost(); - if (throwable instanceof ClientDisconnectedException) { - SessionManager.getInstance().disconnect(client.getSessionId(), false); - logger.info("client disconnected - " + sessionName); - } - else { - SessionManager.getInstance().disconnect(client.getSessionId(), false); - logger.info("connection to client lost - " + sessionName); - } - } - } - } - - static class MageTransporterServer extends TransporterServer { - - protected Connector connector; - - public MageTransporterServer(InvokerLocator locator, Object target, String subsystem, MageServerInvocationHandler callback) throws Exception { - super(locator, target, subsystem); - connector.addInvocationHandler("callback", callback); - connector.setLeasePeriod(5000); - connector.addConnectionListener(new ClientConnectionListener()); - } - - public Connector getConnector() throws Exception { - return connector; - } - - @Override - protected Connector getConnector(InvokerLocator locator, Map config, Element xmlConfig) throws Exception { - Connector c = super.getConnector(locator, config, xmlConfig); - this.connector = c; - return c; - } - } - - static class MageServerInvocationHandler implements ServerInvocationHandler { - - @Override - public void setMBeanServer(MBeanServer server) {} - - @Override - public void setInvoker(ServerInvoker invoker) {} - - @Override - public Object invoke(final InvocationRequest invocation) throws Throwable { - String sessionId = invocation.getSessionId(); - Map map = invocation.getRequestPayload(); - String host; - if (map != null) { - InetAddress clientAddress = (InetAddress) invocation.getRequestPayload().get(Remoting.CLIENT_ADDRESS); - host = clientAddress.getHostAddress(); - } else { - host = "localhost"; - } - SessionManager.getInstance().getSession(sessionId).setHost(host); - return null; - } - - @Override - public void addListener(InvokerCallbackHandler callbackHandler) { - ServerInvokerCallbackHandler handler = (ServerInvokerCallbackHandler) callbackHandler; - try { - String sessionId = handler.getClientSessionId(); - SessionManager.getInstance().createSession(sessionId, callbackHandler); - } catch (Throwable ex) { - logger.fatal("", ex); - } - } - - @Override - public void removeListener(InvokerCallbackHandler callbackHandler) { - logger.fatal("removeListener called"); -// ServerInvokerCallbackHandler handler = (ServerInvokerCallbackHandler) callbackHandler; -// String sessionId = handler.getCallbackClient().getSessionId(); -// SessionManager.getInstance().disconnect(sessionId); - } - - } - - private static Class loadPlugin(Plugin plugin) { - try { - classLoader.addURL(new File(pluginFolder + "/" + plugin.getJar()).toURI().toURL()); - logger.info("Loading plugin: " + plugin.getClassName()); - return Class.forName(plugin.getClassName(), true, classLoader); - } catch (ClassNotFoundException ex) { - logger.warn("Plugin not Found:" + plugin.getJar() + " - check plugin folder"); - } catch (Exception ex) { - logger.fatal("Error loading plugin " + plugin.getJar(), ex); - } - return null; - } - - private static MatchType loadGameType(GamePlugin plugin) { - try { - classLoader.addURL(new File(pluginFolder + "/" + plugin.getJar()).toURI().toURL()); - logger.info("Loading game type: " + plugin.getClassName()); - return (MatchType) Class.forName(plugin.getTypeName(), true, classLoader).newInstance(); - } catch (ClassNotFoundException ex) { - logger.warn("Game type not found:" + plugin.getJar() + " - check plugin folder"); - } catch (Exception ex) { - logger.fatal("Error loading game type " + plugin.getJar(), ex); - } - return null; - } - - private static TournamentType loadTournamentType(GamePlugin plugin) { - try { - classLoader.addURL(new File(pluginFolder + "/" + plugin.getJar()).toURI().toURL()); - logger.info("Loading tournament type: " + plugin.getClassName()); - return (TournamentType) Class.forName(plugin.getTypeName(), true, classLoader).newInstance(); - } catch (ClassNotFoundException ex) { - logger.warn("Tournament type not found:" + plugin.getJar() + " - check plugin folder"); - } catch (Exception ex) { - logger.fatal("Error loading game type " + plugin.getJar(), ex); - } - return null; - } - - private static void deleteSavedGames() { - File directory = new File("saved/"); - if (!directory.exists()) - directory.mkdirs(); - File[] files = directory.listFiles( - new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return name.endsWith(".game"); - } - } - ); - for (File file : files) - { - file.delete(); - } - } - - public static MageVersion getVersion() { - return version; - } - - public static boolean isTestMode() { - return testMode; - } -} +/* +* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. +* +* Redistribution and use in source and binary forms, with or without modification, are +* permitted provided that the following conditions are met: +* +* 1. Redistributions of source code must retain the above copyright notice, this list of +* conditions and the following disclaimer. +* +* 2. Redistributions in binary form must reproduce the above copyright notice, this list +* of conditions and the following disclaimer in the documentation and/or other materials +* provided with the distribution. +* +* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED +* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR +* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +* The views and conclusions contained in the software and documentation are those of the +* authors and should not be interpreted as representing official policies, either expressed +* or implied, of BetaSteward_at_googlemail.com. +*/ + +package mage.server; + +import mage.cards.repository.CardScanner; +import mage.game.match.MatchType; +import mage.game.tournament.TournamentType; +import mage.interfaces.MageServer; +import mage.remote.Connection; +import mage.server.game.DeckValidatorFactory; +import mage.server.game.GameFactory; +import mage.server.game.PlayerFactory; +import mage.server.tournament.TournamentFactory; +import mage.server.util.ConfigSettings; +import mage.server.util.PluginClassLoader; +import mage.server.util.ServerMessagesUtil; +import mage.server.util.SystemUtil; +import mage.server.util.config.GamePlugin; +import mage.server.util.config.Plugin; +import mage.utils.MageVersion; +import org.apache.log4j.Logger; +import org.jboss.remoting.*; +import org.jboss.remoting.callback.InvokerCallbackHandler; +import org.jboss.remoting.callback.ServerInvokerCallbackHandler; +import org.jboss.remoting.transport.Connector; +import org.jboss.remoting.transport.socket.SocketWrapper; +import org.jboss.remoting.transporter.TransporterClient; +import org.jboss.remoting.transporter.TransporterServer; +import org.w3c.dom.Element; + +import javax.management.MBeanServer; +import java.io.File; +import java.io.FilenameFilter; +import java.io.IOException; +import java.net.InetAddress; +import java.util.HashMap; +import java.util.Map; + +/** + * + * @author BetaSteward_at_googlemail.com + */ +public class Main { + + private static Logger logger = Logger.getLogger(Main.class); + + private static final String testModeArg = "-testMode="; + private static final String adminPasswordArg = "-adminPassword="; + private static final String pluginFolder = "plugins"; + private static MageVersion version = new MageVersion(1, 0, 1, ""); + + public static PluginClassLoader classLoader = new PluginClassLoader(); + public static TransporterServer server; + protected static boolean testMode; + /** + * @param args the command line arguments + */ + public static void main(String[] args) { + + logger.info("Starting MAGE server version " + version); + logger.info("Logging level: " + logger.getEffectiveLevel()); + CardScanner.scan(); + deleteSavedGames(); + ConfigSettings config = ConfigSettings.getInstance(); + for (GamePlugin plugin: config.getGameTypes()) { + GameFactory.getInstance().addGameType(plugin.getName(), loadGameType(plugin), loadPlugin(plugin)); + } + for (GamePlugin plugin: config.getTournamentTypes()) { + TournamentFactory.getInstance().addTournamentType(plugin.getName(), loadTournamentType(plugin), loadPlugin(plugin)); + } + for (Plugin plugin: config.getPlayerTypes()) { + PlayerFactory.getInstance().addPlayerType(plugin.getName(), loadPlugin(plugin)); + } + for (Plugin plugin: config.getDeckTypes()) { + DeckValidatorFactory.getInstance().addDeckType(plugin.getName(), loadPlugin(plugin)); + } + String adminPassword = ""; + for (String arg: args) { + if (arg.startsWith(testModeArg)) { + testMode = Boolean.valueOf(arg.replace(testModeArg, "")); + } + else if (arg.startsWith(adminPasswordArg)) { + adminPassword = arg.replace(adminPasswordArg, ""); + adminPassword = SystemUtil.sanitize(adminPassword); + } + } + Connection connection = new Connection(); + connection.setHost(config.getServerAddress()); + connection.setPort(config.getPort()); + try { + InvokerLocator serverLocator = new InvokerLocator(connection.getURI()); + if (!isAlreadyRunning(serverLocator)) { + server = new MageTransporterServer(serverLocator, new MageServerImpl(adminPassword, testMode), MageServer.class.getName(), new MageServerInvocationHandler()); + server.start(); + logger.info("Started MAGE server - listening on " + connection.toString()); + if (testMode) { + logger.info("MAGE server running in test mode"); + } + initStatistics(); + } + else { + logger.fatal("Unable to start MAGE server - another server is already started"); + } + } catch (IOException ex) { + logger.fatal("Failed to start server - " + connection.toString(), ex); + } catch (Exception ex) { + logger.fatal("Failed to start server - " + connection.toString(), ex); + } + + } + + static void initStatistics() { + ServerMessagesUtil.getInstance().setStartDate(System.currentTimeMillis()); + } + + static boolean isAlreadyRunning(InvokerLocator serverLocator) { + Map metadata = new HashMap(); + metadata.put(SocketWrapper.WRITE_TIMEOUT, "2000"); + metadata.put("generalizeSocketException", "true"); + try { + MageServer testServer = (MageServer) TransporterClient.createTransporterClient(serverLocator.getLocatorURI(), MageServer.class, metadata); + if (testServer != null) { + testServer.getServerState(); + return true; + } + } catch (Throwable t) { + // assume server is not running + } + return false; + } + + static class ClientConnectionListener implements ConnectionListener { + @Override + public void handleConnectionException(Throwable throwable, Client client) { + Session session = SessionManager.getInstance().getSession(client.getSessionId()); + if (session != null) { + String sessionName; + User user = UserManager.getInstance().getUser(session.getUserId()); + if (user != null) { + sessionName = user.getName() + " at " + session.getHost(); + } else { + sessionName = session.getHost(); + } + if (throwable instanceof ClientDisconnectedException) { + SessionManager.getInstance().disconnect(client.getSessionId(), false); + logger.info("client disconnected - " + sessionName); + } + else { + SessionManager.getInstance().disconnect(client.getSessionId(), false); + logger.info("connection to client lost - " + sessionName); + } + } + } + } + + static class MageTransporterServer extends TransporterServer { + + protected Connector connector; + + public MageTransporterServer(InvokerLocator locator, Object target, String subsystem, MageServerInvocationHandler callback) throws Exception { + super(locator, target, subsystem); + connector.addInvocationHandler("callback", callback); + connector.setLeasePeriod(5000); + connector.addConnectionListener(new ClientConnectionListener()); + } + + public Connector getConnector() throws Exception { + return connector; + } + + @Override + protected Connector getConnector(InvokerLocator locator, Map config, Element xmlConfig) throws Exception { + Connector c = super.getConnector(locator, config, xmlConfig); + this.connector = c; + return c; + } + } + + static class MageServerInvocationHandler implements ServerInvocationHandler { + + @Override + public void setMBeanServer(MBeanServer server) {} + + @Override + public void setInvoker(ServerInvoker invoker) {} + + @Override + public Object invoke(final InvocationRequest invocation) throws Throwable { + String sessionId = invocation.getSessionId(); + Map map = invocation.getRequestPayload(); + String host; + if (map != null) { + InetAddress clientAddress = (InetAddress) invocation.getRequestPayload().get(Remoting.CLIENT_ADDRESS); + host = clientAddress.getHostAddress(); + } else { + host = "localhost"; + } + SessionManager.getInstance().getSession(sessionId).setHost(host); + return null; + } + + @Override + public void addListener(InvokerCallbackHandler callbackHandler) { + ServerInvokerCallbackHandler handler = (ServerInvokerCallbackHandler) callbackHandler; + try { + String sessionId = handler.getClientSessionId(); + SessionManager.getInstance().createSession(sessionId, callbackHandler); + } catch (Throwable ex) { + logger.fatal("", ex); + } + } + + @Override + public void removeListener(InvokerCallbackHandler callbackHandler) { + logger.fatal("removeListener called"); +// ServerInvokerCallbackHandler handler = (ServerInvokerCallbackHandler) callbackHandler; +// String sessionId = handler.getCallbackClient().getSessionId(); +// SessionManager.getInstance().disconnect(sessionId); + } + + } + + private static Class loadPlugin(Plugin plugin) { + try { + classLoader.addURL(new File(pluginFolder + "/" + plugin.getJar()).toURI().toURL()); + logger.info("Loading plugin: " + plugin.getClassName()); + return Class.forName(plugin.getClassName(), true, classLoader); + } catch (ClassNotFoundException ex) { + logger.warn("Plugin not Found:" + plugin.getJar() + " - check plugin folder"); + } catch (Exception ex) { + logger.fatal("Error loading plugin " + plugin.getJar(), ex); + } + return null; + } + + private static MatchType loadGameType(GamePlugin plugin) { + try { + classLoader.addURL(new File(pluginFolder + "/" + plugin.getJar()).toURI().toURL()); + logger.info("Loading game type: " + plugin.getClassName()); + return (MatchType) Class.forName(plugin.getTypeName(), true, classLoader).newInstance(); + } catch (ClassNotFoundException ex) { + logger.warn("Game type not found:" + plugin.getJar() + " - check plugin folder"); + } catch (Exception ex) { + logger.fatal("Error loading game type " + plugin.getJar(), ex); + } + return null; + } + + private static TournamentType loadTournamentType(GamePlugin plugin) { + try { + classLoader.addURL(new File(pluginFolder + "/" + plugin.getJar()).toURI().toURL()); + logger.info("Loading tournament type: " + plugin.getClassName()); + return (TournamentType) Class.forName(plugin.getTypeName(), true, classLoader).newInstance(); + } catch (ClassNotFoundException ex) { + logger.warn("Tournament type not found:" + plugin.getJar() + " - check plugin folder"); + } catch (Exception ex) { + logger.fatal("Error loading game type " + plugin.getJar(), ex); + } + return null; + } + + private static void deleteSavedGames() { + File directory = new File("saved/"); + if (!directory.exists()) { + directory.mkdirs(); + } + File[] files = directory.listFiles( + new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.endsWith(".game"); + } + } + ); + for (File file : files) + { + file.delete(); + } + } + + public static MageVersion getVersion() { + return version; + } + + public static boolean isTestMode() { + return testMode; + } +} diff --git a/Mage.Server/src/main/java/mage/server/Session.java b/Mage.Server/src/main/java/mage/server/Session.java index 6a961f2b1fb..3e0dad491f2 100644 --- a/Mage.Server/src/main/java/mage/server/Session.java +++ b/Mage.Server/src/main/java/mage/server/Session.java @@ -48,7 +48,7 @@ import java.util.UUID; */ public class Session { - private final static Logger logger = Logger.getLogger(Session.class); + private static final Logger logger = Logger.getLogger(Session.class); private String sessionId; private UUID userId; diff --git a/Mage.Server/src/main/java/mage/server/SessionManager.java b/Mage.Server/src/main/java/mage/server/SessionManager.java index 42f1bfb19d3..7d3e00de4fa 100644 --- a/Mage.Server/src/main/java/mage/server/SessionManager.java +++ b/Mage.Server/src/main/java/mage/server/SessionManager.java @@ -45,8 +45,8 @@ import java.util.concurrent.ConcurrentHashMap; */ public class SessionManager { - private final static Logger logger = Logger.getLogger(SessionManager.class); - private final static SessionManager INSTANCE = new SessionManager(); + private static final Logger logger = Logger.getLogger(SessionManager.class); + private static final SessionManager INSTANCE = new SessionManager(); public static SessionManager getInstance() { return INSTANCE; diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java index 698650e670b..914bbcc639e 100644 --- a/Mage.Server/src/main/java/mage/server/TableController.java +++ b/Mage.Server/src/main/java/mage/server/TableController.java @@ -72,7 +72,7 @@ import java.util.concurrent.TimeUnit; */ public class TableController { - private final static Logger logger = Logger.getLogger(TableController.class); + private static final Logger logger = Logger.getLogger(TableController.class); private UUID userId; private UUID chatId; diff --git a/Mage.Server/src/main/java/mage/server/TableManager.java b/Mage.Server/src/main/java/mage/server/TableManager.java index 167334946f5..e1928d21c71 100644 --- a/Mage.Server/src/main/java/mage/server/TableManager.java +++ b/Mage.Server/src/main/java/mage/server/TableManager.java @@ -56,8 +56,8 @@ public class TableManager { protected static ScheduledExecutorService expireExecutor = Executors.newSingleThreadScheduledExecutor(); - private final static TableManager INSTANCE = new TableManager(); - private final static Logger logger = Logger.getLogger(TableManager.class); + private static final TableManager INSTANCE = new TableManager(); + private static final Logger logger = Logger.getLogger(TableManager.class); private ConcurrentHashMap controllers = new ConcurrentHashMap(); private ConcurrentHashMap tables = new ConcurrentHashMap(); diff --git a/Mage.Server/src/main/java/mage/server/User.java b/Mage.Server/src/main/java/mage/server/User.java index 0a529648eb0..f2ccb22c78f 100644 --- a/Mage.Server/src/main/java/mage/server/User.java +++ b/Mage.Server/src/main/java/mage/server/User.java @@ -50,7 +50,7 @@ import java.util.UUID; */ public class User { - private final static Logger logger = Logger.getLogger(User.class); + private static final Logger logger = Logger.getLogger(User.class); public enum UserState { Created, Connected, Disconnected, Reconnected; diff --git a/Mage.Server/src/main/java/mage/server/UserManager.java b/Mage.Server/src/main/java/mage/server/UserManager.java index d6fb6cf11a8..7adf437540b 100644 --- a/Mage.Server/src/main/java/mage/server/UserManager.java +++ b/Mage.Server/src/main/java/mage/server/UserManager.java @@ -49,8 +49,8 @@ public class UserManager { protected static ScheduledExecutorService expireExecutor = Executors.newSingleThreadScheduledExecutor(); - private final static UserManager INSTANCE = new UserManager(); - private final static Logger logger = Logger.getLogger(UserManager.class); + private static final UserManager INSTANCE = new UserManager(); + private static final Logger logger = Logger.getLogger(UserManager.class); public static UserManager getInstance() { return INSTANCE; diff --git a/Mage.Server/src/main/java/mage/server/draft/DraftController.java b/Mage.Server/src/main/java/mage/server/draft/DraftController.java index d232f237bc1..e9883dbf147 100644 --- a/Mage.Server/src/main/java/mage/server/draft/DraftController.java +++ b/Mage.Server/src/main/java/mage/server/draft/DraftController.java @@ -51,7 +51,7 @@ import org.apache.log4j.Logger; */ public class DraftController { - private final static Logger logger = Logger.getLogger(GameController.class); + private static final Logger logger = Logger.getLogger(GameController.class); public static final String INIT_FILE_PATH = "config" + File.separator + "init.txt"; private ConcurrentHashMap draftSessions = new ConcurrentHashMap(); diff --git a/Mage.Server/src/main/java/mage/server/draft/DraftManager.java b/Mage.Server/src/main/java/mage/server/draft/DraftManager.java index 16f4822b9ce..953d0ab3524 100644 --- a/Mage.Server/src/main/java/mage/server/draft/DraftManager.java +++ b/Mage.Server/src/main/java/mage/server/draft/DraftManager.java @@ -38,7 +38,7 @@ import mage.view.DraftPickView; * @author BetaSteward_at_googlemail.com */ public class DraftManager { - private final static DraftManager INSTANCE = new DraftManager(); + private static final DraftManager INSTANCE = new DraftManager(); public static DraftManager getInstance() { return INSTANCE; diff --git a/Mage.Server/src/main/java/mage/server/game/DeckValidatorFactory.java b/Mage.Server/src/main/java/mage/server/game/DeckValidatorFactory.java index 0db64233be2..1076525ccd2 100644 --- a/Mage.Server/src/main/java/mage/server/game/DeckValidatorFactory.java +++ b/Mage.Server/src/main/java/mage/server/game/DeckValidatorFactory.java @@ -41,8 +41,8 @@ import org.apache.log4j.Logger; */ public class DeckValidatorFactory { - private final static DeckValidatorFactory INSTANCE = new DeckValidatorFactory(); - private final static Logger logger = Logger.getLogger(DeckValidatorFactory.class); + private static final DeckValidatorFactory INSTANCE = new DeckValidatorFactory(); + private static final Logger logger = Logger.getLogger(DeckValidatorFactory.class); private Map deckTypes = new LinkedHashMap(); diff --git a/Mage.Server/src/main/java/mage/server/game/GameController.java b/Mage.Server/src/main/java/mage/server/game/GameController.java index 76b5cdd886c..5dc77faebd0 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameController.java +++ b/Mage.Server/src/main/java/mage/server/game/GameController.java @@ -70,7 +70,7 @@ import org.apache.log4j.Logger; public class GameController implements GameCallback { private static ExecutorService gameExecutor = ThreadExecutor.getInstance().getGameExecutor(); - private final static Logger logger = Logger.getLogger(GameController.class); + private static final Logger logger = Logger.getLogger(GameController.class); private ConcurrentHashMap gameSessions = new ConcurrentHashMap(); private ConcurrentHashMap watchers = new ConcurrentHashMap(); diff --git a/Mage.Server/src/main/java/mage/server/game/GameFactory.java b/Mage.Server/src/main/java/mage/server/game/GameFactory.java index b22bcd7aeac..ab36710576d 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameFactory.java +++ b/Mage.Server/src/main/java/mage/server/game/GameFactory.java @@ -45,8 +45,8 @@ import org.apache.log4j.Logger; */ public class GameFactory { - private final static GameFactory INSTANCE = new GameFactory(); - private final static Logger logger = Logger.getLogger(GameFactory.class); + private static final GameFactory INSTANCE = new GameFactory(); + private static final Logger logger = Logger.getLogger(GameFactory.class); private Map> games = new HashMap>(); private Map gameTypes = new HashMap(); diff --git a/Mage.Server/src/main/java/mage/server/game/GameManager.java b/Mage.Server/src/main/java/mage/server/game/GameManager.java index 90b1f3e25f3..535c91cddad 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameManager.java +++ b/Mage.Server/src/main/java/mage/server/game/GameManager.java @@ -39,7 +39,7 @@ import mage.view.GameView; * @author BetaSteward_at_googlemail.com */ public class GameManager { - private final static GameManager INSTANCE = new GameManager(); + private static final GameManager INSTANCE = new GameManager(); public static GameManager getInstance() { return INSTANCE; diff --git a/Mage.Server/src/main/java/mage/server/game/GameReplay.java b/Mage.Server/src/main/java/mage/server/game/GameReplay.java index 56f32d20153..42f4c6b0071 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameReplay.java +++ b/Mage.Server/src/main/java/mage/server/game/GameReplay.java @@ -46,7 +46,7 @@ import org.apache.log4j.Logger; */ public class GameReplay { - private final static Logger logger = Logger.getLogger(GameReplay.class); + private static final Logger logger = Logger.getLogger(GameReplay.class); private GameStates savedGame; private Game game; diff --git a/Mage.Server/src/main/java/mage/server/game/GameWorker.java b/Mage.Server/src/main/java/mage/server/game/GameWorker.java index ca0b7e72d0c..d4819e54d40 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameWorker.java +++ b/Mage.Server/src/main/java/mage/server/game/GameWorker.java @@ -40,7 +40,7 @@ import java.util.concurrent.Callable; */ public class GameWorker implements Callable { - private final static Logger logger = Logger.getLogger(GameWorker.class); + private static final Logger logger = Logger.getLogger(GameWorker.class); private GameCallback result; private Game game; diff --git a/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java b/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java index a626c73f7b2..c86d1c79a2e 100644 --- a/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java +++ b/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java @@ -60,7 +60,7 @@ import org.apache.log4j.Logger; */ public class GamesRoomImpl extends RoomImpl implements GamesRoom, Serializable { - private final static Logger logger = Logger.getLogger(GamesRoomImpl.class); + private static final Logger logger = Logger.getLogger(GamesRoomImpl.class); private static ScheduledExecutorService updateExecutor = Executors.newSingleThreadScheduledExecutor(); private static List tableView = new ArrayList(); diff --git a/Mage.Server/src/main/java/mage/server/game/GamesRoomManager.java b/Mage.Server/src/main/java/mage/server/game/GamesRoomManager.java index fcb18dea2ac..6ca6fc5b345 100644 --- a/Mage.Server/src/main/java/mage/server/game/GamesRoomManager.java +++ b/Mage.Server/src/main/java/mage/server/game/GamesRoomManager.java @@ -37,8 +37,8 @@ import java.util.concurrent.ConcurrentHashMap; */ public class GamesRoomManager { - private final static GamesRoomManager INSTANCE = new GamesRoomManager(); -// private final static Logger logger = Logger.getLogger(GamesRoomManager.class); + private static final GamesRoomManager INSTANCE = new GamesRoomManager(); +// private static final Logger logger = Logger.getLogger(GamesRoomManager.class); private ConcurrentHashMap rooms = new ConcurrentHashMap(); private UUID mainRoomId; diff --git a/Mage.Server/src/main/java/mage/server/game/PlayerFactory.java b/Mage.Server/src/main/java/mage/server/game/PlayerFactory.java index 1c3aeb10217..1b96015796a 100644 --- a/Mage.Server/src/main/java/mage/server/game/PlayerFactory.java +++ b/Mage.Server/src/main/java/mage/server/game/PlayerFactory.java @@ -42,8 +42,8 @@ import org.apache.log4j.Logger; */ public class PlayerFactory { - private final static PlayerFactory INSTANCE = new PlayerFactory(); - private final static Logger logger = Logger.getLogger(PlayerFactory.class); + private static final PlayerFactory INSTANCE = new PlayerFactory(); + private static final Logger logger = Logger.getLogger(PlayerFactory.class); private Map playerTypes = new LinkedHashMap(); diff --git a/Mage.Server/src/main/java/mage/server/game/ReplayManager.java b/Mage.Server/src/main/java/mage/server/game/ReplayManager.java index f37fa89bbf0..5a68ae25800 100644 --- a/Mage.Server/src/main/java/mage/server/game/ReplayManager.java +++ b/Mage.Server/src/main/java/mage/server/game/ReplayManager.java @@ -37,7 +37,7 @@ import mage.server.UserManager; * @author BetaSteward_at_googlemail.com */ public class ReplayManager { - private final static ReplayManager INSTANCE = new ReplayManager(); + private static final ReplayManager INSTANCE = new ReplayManager(); public static ReplayManager getInstance() { return INSTANCE; diff --git a/Mage.Server/src/main/java/mage/server/game/ReplaySession.java b/Mage.Server/src/main/java/mage/server/game/ReplaySession.java index ef0a42033ad..678722a16b3 100644 --- a/Mage.Server/src/main/java/mage/server/game/ReplaySession.java +++ b/Mage.Server/src/main/java/mage/server/game/ReplaySession.java @@ -43,7 +43,7 @@ import org.apache.log4j.Logger; */ public class ReplaySession implements GameCallback { - private final static Logger logger = Logger.getLogger(ReplaySession.class); + private static final Logger logger = Logger.getLogger(ReplaySession.class); private GameReplay replay; protected UUID userId; diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java index b38cffdb7fd..1e72f21ebec 100644 --- a/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java +++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java @@ -59,7 +59,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public class TournamentController { - private final static Logger logger = Logger.getLogger(TournamentController.class); + private static final Logger logger = Logger.getLogger(TournamentController.class); private UUID chatId; private UUID tableId; diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java index a0018bf1a37..50d387f38c2 100644 --- a/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java +++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java @@ -45,8 +45,8 @@ import org.apache.log4j.Logger; * @author BetaSteward_at_googlemail.com */ public class TournamentFactory { - private final static TournamentFactory INSTANCE = new TournamentFactory(); - private final static Logger logger = Logger.getLogger(TournamentFactory.class); + private static final TournamentFactory INSTANCE = new TournamentFactory(); + private static final Logger logger = Logger.getLogger(TournamentFactory.class); private Map> tournaments = new HashMap>(); private Map tournamentTypes = new HashMap(); diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentManager.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentManager.java index 0ea9d978848..b07c83e6ef8 100644 --- a/Mage.Server/src/main/java/mage/server/tournament/TournamentManager.java +++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentManager.java @@ -40,7 +40,7 @@ import mage.view.TournamentView; */ public class TournamentManager { - private final static TournamentManager INSTANCE = new TournamentManager(); + private static final TournamentManager INSTANCE = new TournamentManager(); private ConcurrentHashMap controllers = new ConcurrentHashMap(); diff --git a/Mage.Server/src/main/java/mage/server/util/Config.java b/Mage.Server/src/main/java/mage/server/util/Config.java index 769932e6866..8fa802365ca 100644 --- a/Mage.Server/src/main/java/mage/server/util/Config.java +++ b/Mage.Server/src/main/java/mage/server/util/Config.java @@ -38,7 +38,7 @@ import org.apache.log4j.Logger; */ public class Config { - private final static Logger logger = Logger.getLogger(Config.class); + private static final Logger logger = Logger.getLogger(Config.class); static { Properties p = new Properties(); diff --git a/Mage.Server/src/main/java/mage/server/util/ConfigSettings.java b/Mage.Server/src/main/java/mage/server/util/ConfigSettings.java index 0e2a5ebfd0d..8cf5d2e18ad 100644 --- a/Mage.Server/src/main/java/mage/server/util/ConfigSettings.java +++ b/Mage.Server/src/main/java/mage/server/util/ConfigSettings.java @@ -44,8 +44,8 @@ import org.apache.log4j.Logger; */ public class ConfigSettings { - private final static Logger logger = Logger.getLogger(ConfigSettings.class); - private final static ConfigSettings INSTANCE = new ConfigSettings(); + private static final Logger logger = Logger.getLogger(ConfigSettings.class); + private static final ConfigSettings INSTANCE = new ConfigSettings(); private Config config; diff --git a/Mage.Server/src/main/java/mage/server/util/ThreadExecutor.java b/Mage.Server/src/main/java/mage/server/util/ThreadExecutor.java index c96ef8406a2..202ee056d0c 100644 --- a/Mage.Server/src/main/java/mage/server/util/ThreadExecutor.java +++ b/Mage.Server/src/main/java/mage/server/util/ThreadExecutor.java @@ -49,7 +49,7 @@ public class ThreadExecutor { ((ThreadPoolExecutor)timeoutExecutor).allowCoreThreadTimeOut(true); } - private final static ThreadExecutor INSTANCE = new ThreadExecutor(); + private static final ThreadExecutor INSTANCE = new ThreadExecutor(); public static ThreadExecutor getInstance() { return INSTANCE; diff --git a/Mage.Sets/src/mage/sets/apocalypse/BloodfireDwarf.java b/Mage.Sets/src/mage/sets/apocalypse/BloodfireDwarf.java index 3499f6b26ac..398aefbb56f 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/BloodfireDwarf.java +++ b/Mage.Sets/src/mage/sets/apocalypse/BloodfireDwarf.java @@ -50,7 +50,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate; */ public class BloodfireDwarf extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature without flying"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature without flying"); static { filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); diff --git a/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java b/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java index fe7c43ee138..378a3131ece 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java +++ b/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java @@ -48,7 +48,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class DiversionaryTactics extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java b/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java index c736f809754..94a5b8ff621 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java +++ b/Mage.Sets/src/mage/sets/apocalypse/OvergrownEstate.java @@ -44,7 +44,7 @@ import mage.target.common.TargetControlledPermanent; */ public class OvergrownEstate extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); public OvergrownEstate(UUID ownerId) { super(ownerId, 113, "Overgrown Estate", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}{G}{W}"); diff --git a/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java b/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java index 8219a86fe5b..5c064ae1616 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java +++ b/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java @@ -51,7 +51,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class QuagmireDruid extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("enchantment"); + private static final FilterPermanent filter = new FilterPermanent("enchantment"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/Smash.java b/Mage.Sets/src/mage/sets/apocalypse/Smash.java index 82443749ab9..6081a6694b8 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Smash.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Smash.java @@ -43,7 +43,7 @@ import mage.target.TargetPermanent; */ public class Smash extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java b/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java index 14222d419ef..d8598f4c41c 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java +++ b/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java @@ -69,7 +69,7 @@ public class TranquilPath extends CardImpl { class TranquilPathEffect extends OneShotEffect { - private final static FilterPermanent filter = new FilterPermanent(""); + private static final FilterPermanent filter = new FilterPermanent(""); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AngelOfJubilation.java b/Mage.Sets/src/mage/sets/avacynrestored/AngelOfJubilation.java index c1db58dd2d2..8c70691310b 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/AngelOfJubilation.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/AngelOfJubilation.java @@ -51,7 +51,7 @@ import java.util.UUID; */ public class AngelOfJubilation extends CardImpl { - private final static FilterCreaturePermanent filterNonBlack = new FilterCreaturePermanent("nonblack creatures"); + private static final FilterCreaturePermanent filterNonBlack = new FilterCreaturePermanent("nonblack creatures"); static { filterNonBlack.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java b/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java index 06b8c0c7cff..5e1b9d46d57 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java @@ -61,7 +61,7 @@ public class DevoutChaplain extends CardImpl { new CardTypePredicate(CardType.ENCHANTMENT))); } - private final static FilterControlledPermanent humanFilter = new FilterControlledPermanent("untapped Human you control"); + private static final FilterControlledPermanent humanFilter = new FilterControlledPermanent("untapped Human you control"); static { humanFilter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java b/Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java index d283ed0f44d..3728d05ad16 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java @@ -56,7 +56,7 @@ import java.util.UUID; */ public class GallowsAtWillowHill extends CardImpl { - private final static FilterControlledPermanent humanFilter = new FilterControlledPermanent("untapped Human you control"); + private static final FilterControlledPermanent humanFilter = new FilterControlledPermanent("untapped Human you control"); static { humanFilter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BakuAltar.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BakuAltar.java index 777557e2a6f..f73e5405683 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BakuAltar.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BakuAltar.java @@ -51,7 +51,7 @@ import mage.game.permanent.token.SpiritToken; */ public class BakuAltar extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public BakuAltar(UUID ownerId) { super(ownerId, 152, "Baku Altar", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java index 3218d73730b..1de50701b0f 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java @@ -53,7 +53,7 @@ import mage.game.Game; */ public class BlademaneBaku extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public BlademaneBaku(UUID ownerId) { super(ownerId, 95, "Blademane Baku", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChiseiHeartOfOceans.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChiseiHeartOfOceans.java index 2cc8760da34..8117c81cf5b 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChiseiHeartOfOceans.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChiseiHeartOfOceans.java @@ -50,7 +50,7 @@ import mage.target.TargetPermanent; */ public class ChiseiHeartOfOceans extends CardImpl { - private final static FilterPermanent filter = new FilterControlledPermanent("remove a counter from a permanent you control"); + private static final FilterPermanent filter = new FilterControlledPermanent("remove a counter from a permanent you control"); static { filter.add(new ControllerPredicate(Constants.TargetController.YOU)); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ClashOfRealities.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ClashOfRealities.java index 496610c2a71..a80a7e565d3 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ClashOfRealities.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ClashOfRealities.java @@ -49,8 +49,8 @@ import mage.target.common.TargetCreaturePermanent; */ public class ClashOfRealities extends CardImpl { - private final static FilterCreaturePermanent filterSpirit = new FilterCreaturePermanent("Spirit creature"); - private final static FilterCreaturePermanent filterNotSpirit = new FilterCreaturePermanent("non-Spirit creature"); + private static final FilterCreaturePermanent filterSpirit = new FilterCreaturePermanent("Spirit creature"); + private static final FilterCreaturePermanent filterNotSpirit = new FilterCreaturePermanent("non-Spirit creature"); static { filterSpirit.add(new SubtypePredicate("Spirit")); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/DayOfDestiny.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/DayOfDestiny.java index 1d6b364f8b9..1fa52d78e98 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/DayOfDestiny.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/DayOfDestiny.java @@ -44,7 +44,7 @@ import mage.filter.predicate.mageobject.SupertypePredicate; */ public class DayOfDestiny extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Legendary creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Legendary creatures"); static { filter.add(new SupertypePredicate("Legendary")); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java index 1fc0dbd05c0..7de9ebe5c84 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java @@ -63,7 +63,7 @@ import java.util.UUID; */ public class FaithfulSquire extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public FaithfulSquire(UUID ownerId) { super(ownerId, 3, "Faithful Squire", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{W}{W}"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FinalJudgment.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FinalJudgment.java index 483c051574d..22a8f4024c7 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FinalJudgment.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FinalJudgment.java @@ -67,7 +67,7 @@ public class FinalJudgment extends CardImpl { class FinalJudgmentEffect extends OneShotEffect { - private final static FilterPermanent filter = new FilterPermanent(""); + private static final FilterPermanent filter = new FilterPermanent(""); static { filter.add(new CardTypePredicate(CardType.CREATURE)); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Floodbringer.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Floodbringer.java index 3092ae81238..551763f5799 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Floodbringer.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Floodbringer.java @@ -50,7 +50,7 @@ import mage.target.common.TargetLandPermanent; */ public class Floodbringer extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("a land you control (return to hand)"); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a land you control (return to hand)"); public Floodbringer(UUID ownerId) { super(ownerId, 34, "Floodbringer", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheCedars.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheCedars.java index f4b513cd2e8..821c8a03b0c 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheCedars.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheCedars.java @@ -55,7 +55,7 @@ import mage.target.common.TargetLandPermanent; */ public class GenjuOfTheCedars extends CardImpl { - private final static FilterLandPermanent filter = new FilterLandPermanent("Forest"); + private static final FilterLandPermanent filter = new FilterLandPermanent("Forest"); static { filter.add(new SubtypePredicate("Forest")); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFalls.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFalls.java index 89e4040d1a3..e461340c1ed 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFalls.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFalls.java @@ -56,7 +56,7 @@ import mage.target.common.TargetLandPermanent; */ public class GenjuOfTheFalls extends CardImpl { - private final static FilterLandPermanent filter = new FilterLandPermanent("Island"); + private static final FilterLandPermanent filter = new FilterLandPermanent("Island"); static { filter.add(new SubtypePredicate("Island")); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFens.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFens.java index 4a5d543c2d6..505af0093ff 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFens.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFens.java @@ -60,7 +60,7 @@ import mage.target.common.TargetLandPermanent; */ public class GenjuOfTheFens extends CardImpl { - private final static FilterLandPermanent filter = new FilterLandPermanent("Swamp"); + private static final FilterLandPermanent filter = new FilterLandPermanent("Swamp"); static { filter.add(new SubtypePredicate("Swamp")); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFields.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFields.java index 308dce48426..4f13f3f2007 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFields.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFields.java @@ -58,7 +58,7 @@ import mage.target.common.TargetLandPermanent; */ public class GenjuOfTheFields extends CardImpl { - private final static FilterLandPermanent filter = new FilterLandPermanent("Plains"); + private static final FilterLandPermanent filter = new FilterLandPermanent("Plains"); static { filter.add(new SubtypePredicate("Plains")); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheRealm.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheRealm.java index 37a240a518a..464342d21bf 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheRealm.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheRealm.java @@ -55,7 +55,7 @@ import mage.target.common.TargetLandPermanent; */ public class GenjuOfTheRealm extends CardImpl { - private final static FilterLandPermanent filter = new FilterLandPermanent(); + private static final FilterLandPermanent filter = new FilterLandPermanent(); public GenjuOfTheRealm(UUID ownerId) { super(ownerId, 151, "Genju of the Realm", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{W}{U}{B}{R}{G}"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheSpires.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheSpires.java index cca317578d1..fe46718b7f8 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheSpires.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheSpires.java @@ -55,7 +55,7 @@ import mage.target.common.TargetLandPermanent; */ public class GenjuOfTheSpires extends CardImpl { - private final static FilterLandPermanent filter = new FilterLandPermanent("Mountain"); + private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain"); static { filter.add(new SubtypePredicate("Mountain")); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java index 2e200daf6d8..1355659eafc 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java @@ -42,7 +42,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class HerosDemise extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); static { filter.add(new SupertypePredicate("Legendary")); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IreOfKaminari.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IreOfKaminari.java index aa539c65a37..5348683dba7 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IreOfKaminari.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IreOfKaminari.java @@ -43,7 +43,7 @@ import mage.target.common.TargetCreatureOrPlayer; */ public class IreOfKaminari extends CardImpl { - private final static FilterCard filter = new FilterCard("Arcane"); + private static final FilterCard filter = new FilterCard("Arcane"); static { filter.add(new SubtypePredicate("Arcane")); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java index 8d4849c1b67..8df5ac68b50 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java @@ -50,7 +50,7 @@ import mage.target.TargetPermanent; */ public class IsaoEnlightenedBushi extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("Samurai"); + private static final FilterPermanent filter = new FilterPermanent("Samurai"); static { filter.add(new SubtypePredicate("Samurai")); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java index bbda343317d..66ea1c50ae2 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java @@ -45,7 +45,7 @@ import mage.filter.common.FilterSpiritOrArcaneCard; */ public class KamiOfTatteredShoji extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public KamiOfTatteredShoji(UUID ownerId) { super(ownerId, 11, "Kami of Tattered Shoji", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java index 1ff953641fd..1e18f6de82b 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java @@ -48,7 +48,7 @@ import mage.target.TargetPermanent; */ public class NezumiShadowWatcher extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("Ninja"); + private static final FilterPermanent filter = new FilterPermanent("Ninja"); static { filter.add(new SubtypePredicate("Ninja")); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OyobiWhoSplitTheHeavens.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OyobiWhoSplitTheHeavens.java index e8bcce4b6d2..72c1633d1d9 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OyobiWhoSplitTheHeavens.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OyobiWhoSplitTheHeavens.java @@ -45,7 +45,7 @@ import mage.game.permanent.token.Token; */ public class OyobiWhoSplitTheHeavens extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public OyobiWhoSplitTheHeavens(UUID ownerId) { super(ownerId, 18, "Oyobi, Who Split the Heavens", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{6}{W}"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java index 99c9d816413..7eefeaeac74 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java @@ -53,7 +53,7 @@ import mage.players.Player; */ public class PetalmaneBaku extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public PetalmaneBaku(UUID ownerId) { super(ownerId, 139, "Petalmane Baku", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java index 2e5b0c6400e..0f1635bd821 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java @@ -52,7 +52,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class PusKami extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("nonblack creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonblack creature"); static { filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java index 1e591bcde6c..6790478790a 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java @@ -59,7 +59,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class QuillmaneBaku extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public QuillmaneBaku(UUID ownerId) { super(ownerId, 48, "Quillmane Baku", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/RibbonsOfTheReikai.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/RibbonsOfTheReikai.java index 62abcfffe79..876718209c1 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/RibbonsOfTheReikai.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/RibbonsOfTheReikai.java @@ -42,7 +42,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class RibbonsOfTheReikai extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Spirit you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Spirit you control"); static { filter.add(new SubtypePredicate("Spirit")); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java index ecf89dc224d..0e64b6d4ac3 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java @@ -44,7 +44,7 @@ import mage.filter.common.FilterSpiritOrArcaneCard; */ public class ScaledHulk extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public ScaledHulk(UUID ownerId) { super(ownerId, 143, "Scaled Hulk", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{G}"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java index 2f742ae8465..9f7a3757b0d 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java @@ -57,7 +57,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class SkullmaneBaku extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public SkullmaneBaku(UUID ownerId) { super(ownerId, 83, "Skullmane Baku", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{B}{B}"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java index 7fbef1fcb65..ec4738abc70 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledPermanent; */ public class SoratamiMindsweeper extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); public SoratamiMindsweeper(UUID ownerId) { super(ownerId, 52, "Soratami Mindsweeper", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TakenosCavalry.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TakenosCavalry.java index f0e729f4dc5..91010fc73a2 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TakenosCavalry.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TakenosCavalry.java @@ -49,7 +49,7 @@ import mage.target.common.TargetAttackingOrBlockingCreature; */ public class TakenosCavalry extends CardImpl { - private final static FilterAttackingOrBlockingCreature filter = new FilterAttackingOrBlockingCreature("attacking or blocking Spirit"); + private static final FilterAttackingOrBlockingCreature filter = new FilterAttackingOrBlockingCreature("attacking or blocking Spirit"); static { filter.add(new SubtypePredicate("Spirit")); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java index bc9f3809036..11a2eec15ae 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisVerdict.java @@ -43,7 +43,7 @@ import mage.target.common.TargetAttackingCreature; */ public class TerashisVerdict extends CardImpl { - private final static FilterAttackingCreature filter = new FilterAttackingCreature("attacking creature with power 3 or less"); + private static final FilterAttackingCreature filter = new FilterAttackingCreature("attacking creature with power 3 or less"); static { filter.add(new PowerPredicate(Filter.ComparisonType.LessThan, 4)); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java index 68d2c7953e6..457a718c1a3 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java @@ -51,7 +51,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class ThreadsOfDisloyalty extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost 2 or less"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost 2 or less"); static { filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, 3)); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TraprootKami.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TraprootKami.java index addb5a0d4b2..548646e97c9 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TraprootKami.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TraprootKami.java @@ -49,7 +49,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class TraprootKami extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("Forest"); + private static final FilterPermanent filter = new FilterPermanent("Forest"); static { filter.add(new SubtypePredicate("Forest")); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java index db0183ea96c..1b92dcdc147 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java @@ -57,7 +57,7 @@ import mage.target.TargetPermanent; */ public class WaxmaneBaku extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public WaxmaneBaku(UUID ownerId) { super(ownerId, 29, "Waxmane Baku", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiAvalanchers.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiAvalanchers.java index 18389d46e37..7cbab4b4b25 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiAvalanchers.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiAvalanchers.java @@ -47,7 +47,7 @@ import mage.target.common.TargetControlledPermanent; */ public class AkkiAvalanchers extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); public AkkiAvalanchers(UUID ownerId) { super(ownerId, 151, "Akki Avalanchers", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{R}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java index 837723a2c13..d895544d491 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java @@ -88,7 +88,7 @@ class AkkiLavarunnerAbility extends TriggeredAbilityImpl class TokTokVolcanoBorn extends Token { - private final static FilterCard filter = new FilterCard("red"); + private static final FilterCard filter = new FilterCard("red"); static { filter.add(new ColorPredicate(ObjectColor.RED)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java index 99e5444a52d..67d347785c9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java @@ -53,7 +53,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class AuraOfDominion extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls.java index 060d4f554dd..c76988820ba 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent; */ public class AzamiLadyOfScrolls extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Wizard you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Wizard you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BenBenAkkiHermit.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BenBenAkkiHermit.java index 4adcd7dd0f6..a7752e20ec2 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BenBenAkkiHermit.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BenBenAkkiHermit.java @@ -52,7 +52,7 @@ import mage.target.common.TargetAttackingCreature; */ public class BenBenAkkiHermit extends CardImpl { - private final static FilterLandPermanent filter = new FilterLandPermanent("untapped Mountain you control"); + private static final FilterLandPermanent filter = new FilterLandPermanent("untapped Mountain you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java index eb2c20f1baf..88b6cd2ad6d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class BlindWithAnger extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("nonlegendary creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonlegendary creature"); static { filter.add(Predicates.not(new SupertypePredicate("Legendary"))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory.java index 9c5afabdb9a..dcb82d7a94b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory.java @@ -49,7 +49,7 @@ import mage.players.Player; public class CallToGlory extends CardImpl { -private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Samurai"); +private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Samurai"); static { filter.add(new SubtypePredicate("Samurai")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Cleanfall.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Cleanfall.java index 473818646a3..ea40a7c31e4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Cleanfall.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Cleanfall.java @@ -42,7 +42,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class Cleanfall extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("enchantments"); + private static final FilterPermanent filter = new FilterPermanent("enchantments"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CommuneWithNature.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CommuneWithNature.java index f80a814b462..1e5ef7b1ca6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CommuneWithNature.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CommuneWithNature.java @@ -43,7 +43,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class CommuneWithNature extends CardImpl { - private final static FilterCard filter = new FilterCard("creature card"); + private static final FilterCard filter = new FilterCard("creature card"); static { filter.add(new CardTypePredicate(CardType.CREATURE)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java index 3be850c322c..9a77644f60f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java @@ -48,8 +48,8 @@ import mage.filter.predicate.mageobject.AbilityPredicate; */ public class Earthshaker extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); - private final static FilterCreaturePermanent creatureFilter = new FilterCreaturePermanent("creature without flying"); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterCreaturePermanent creatureFilter = new FilterCreaturePermanent("creature without flying"); static { filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EerieProcession.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EerieProcession.java index 864b6573127..a01df29a88d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EerieProcession.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EerieProcession.java @@ -43,7 +43,7 @@ import mage.target.common.TargetCardInLibrary; */ public class EerieProcession extends CardImpl { - private final static FilterCard filter = new FilterCard("Arcane card"); + private static final FilterCard filter = new FilterCard("Arcane card"); static { filter.add(new SubtypePredicate("Arcane")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java index df597363293..18043c034ba 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java @@ -49,7 +49,7 @@ import mage.target.TargetPermanent; */ public class EiganjoCastle extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); static { filter.add(new SupertypePredicate("Legendary")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTale.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTale.java index 04aee3d3bfb..255ea77d25f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTale.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTale.java @@ -53,7 +53,7 @@ import mage.target.common.TargetSpellOrPermanent; */ public class EightAndAHalfTale extends CardImpl { - private final static FilterCard filter = new FilterCard("white"); + private static final FilterCard filter = new FilterCard("white"); static { filter.add(new ColorPredicate(ObjectColor.WHITE)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GaleForce.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GaleForce.java index 50f8970b096..43c740491fa 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GaleForce.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GaleForce.java @@ -43,7 +43,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate; */ public class GaleForce extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying"); static { filter.add(new AbilityPredicate(FlyingAbility.class)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GlimpseOfNature.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GlimpseOfNature.java index f929ad31fe3..0160f9f42da 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GlimpseOfNature.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GlimpseOfNature.java @@ -65,7 +65,7 @@ public class GlimpseOfNature extends CardImpl { class GlimpseOfNatureTriggeredAbility extends DelayedTriggeredAbility { - private final static FilterSpell filter = new FilterSpell(); + private static final FilterSpell filter = new FilterSpell(); static { filter.add(new CardTypePredicate(CardType.CREATURE)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java index 1c0addd7635..721cbd130a2 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java @@ -47,7 +47,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class GuardianOfSolitude extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public GuardianOfSolitude(UUID ownerId) { super(ownerId, 64, "Guardian of Solitude", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HanaKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HanaKami.java index 99dd8469308..c89adf7d7d4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HanaKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HanaKami.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public class HanaKami extends CardImpl { - private final static FilterCard filter = new FilterCard("Arcane card from your graveyard"); + private static final FilterCard filter = new FilterCard("Arcane card from your graveyard"); static { filter.add(new SubtypePredicate("Arcane")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java index e1264d318ce..9fc0660112c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java @@ -57,7 +57,7 @@ import java.util.UUID; */ public class HeWhoHungers extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("a Spirit"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Spirit"); static { filter.add(new SubtypePredicate("Spirit")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java index f48694a2cbb..abed7fc1f54 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java @@ -52,7 +52,7 @@ import mage.target.TargetPermanent; public class HearthKami extends CardImpl { - private final static FilterArtifactPermanent filter = new FilterArtifactPermanent("artifact with converted mana cost X"); + private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifact with converted mana cost X"); public HearthKami(UUID ownerId) { super(ownerId, 171, "Hearth Kami", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java index 8cdb2ae09f1..c78ea03bad1 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HikariTwilightGuardian.java @@ -50,7 +50,7 @@ import mage.game.permanent.Permanent; */ public class HikariTwilightGuardian extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public HikariTwilightGuardian (UUID ownerId) { super(ownerId, 12, "Hikari, Twilight Guardian", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasDefiance.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasDefiance.java index 8c6c9e17a53..1c4921ac878 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasDefiance.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasDefiance.java @@ -44,7 +44,7 @@ import mage.target.TargetSpell; */ public class HisokasDefiance extends CardImpl { - private final static FilterSpell filter = new FilterSpell("Spirit or Arcane spell"); + private static final FilterSpell filter = new FilterSpell("Spirit or Arcane spell"); static { filter.add(Predicates.or(new SubtypePredicate("Spirit"), new SubtypePredicate("Arcane"))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HonorWornShaku.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HonorWornShaku.java index cb63daefbe3..ff8c52525ec 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HonorWornShaku.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HonorWornShaku.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledPermanent; */ public class HonorWornShaku extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("untapped legendary permanent"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped legendary permanent"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java index 97a343ad8f2..6a2c672927e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class HorizonSeed extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public HorizonSeed(UUID ownerId) { super(ownerId, 15, "Horizon Seed", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java index 0ceace3cb95..a9a1e610932 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InameDeathAspect.java @@ -73,7 +73,7 @@ public class InameDeathAspect extends CardImpl { class InameDeathAspectEffect extends SearchEffect { - private final static FilterCreatureCard filter = new FilterCreatureCard(); + private static final FilterCreatureCard filter = new FilterCreatureCard(); static { filter.add(new SubtypePredicate("Spirit")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InameLifeAspect.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InameLifeAspect.java index e7cebe1a39b..12d55c44181 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/InameLifeAspect.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InameLifeAspect.java @@ -46,7 +46,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public class InameLifeAspect extends CardImpl { - private final static FilterCard filter = new FilterCard("Spirit cards from your graveyard"); + private static final FilterCard filter = new FilterCard("Spirit cards from your graveyard"); static { filter.add(new SubtypePredicate("Spirit")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java index 57b11936f89..a1d3b54b1ee 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class InnocenceKami extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public InnocenceKami(UUID ownerId) { super(ownerId, 18, "Innocence Kami", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/JadeIdol.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JadeIdol.java index fb5ff10880d..a4182817b38 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JadeIdol.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JadeIdol.java @@ -45,7 +45,7 @@ import mage.game.permanent.token.Token; */ public class JadeIdol extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public JadeIdol(UUID ownerId) { super(ownerId, 256, "Jade Idol", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{4}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/JourneyersKite.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JourneyersKite.java index cb966cbacac..013270320e2 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JourneyersKite.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JourneyersKite.java @@ -48,7 +48,7 @@ import mage.target.common.TargetCardInLibrary; */ public class JourneyersKite extends CardImpl { - private final static FilterBasicLandCard filter = new FilterBasicLandCard(); + private static final FilterBasicLandCard filter = new FilterBasicLandCard(); public JourneyersKite (UUID ownerId) { super(ownerId, 257, "Journeyer's Kite", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/JoyousRespite.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JoyousRespite.java index 5e5d6575c9d..7d19b606969 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JoyousRespite.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JoyousRespite.java @@ -43,7 +43,7 @@ import mage.filter.common.FilterControlledPermanent; */ public class JoyousRespite extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public JoyousRespite (UUID ownerId) { super(ownerId, 216, "Joyous Respite", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java index bf742425eb9..1e0c4614894 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java @@ -48,7 +48,7 @@ import mage.target.TargetPermanent; * @author Loki */ public class KamiOfAncientLaw extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("enchantment"); + private static final FilterPermanent filter = new FilterPermanent("enchantment"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java index fef399472eb..51508c255ec 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java @@ -46,7 +46,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class KamiOfFiresRoar extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public KamiOfFiresRoar(UUID ownerId) { super(ownerId, 174, "Kami of Fire's Roar", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java index 894eb37cc15..b1b32e6c36e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java @@ -44,7 +44,7 @@ import mage.filter.common.FilterSpiritOrArcaneCard; */ public class KamiOfTheHunt extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public KamiOfTheHunt(UUID ownerId) { super(ownerId, 219, "Kami of the Hunt", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java index 6c996eed8f6..8baf4263e09 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java @@ -48,7 +48,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class KamiOfTheWaningMoon extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public KamiOfTheWaningMoon(UUID ownerId) { super(ownerId, 120, "Kami of the Waning Moon", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java index d796ab0ff79..bd16cbc8f67 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java @@ -49,7 +49,7 @@ import mage.target.TargetPermanent; */ public class KitsuneDiviner extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("Spirit"); + private static final FilterPermanent filter = new FilterPermanent("Spirit"); static { filter.add(new SubtypePredicate("Spirit")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java index caad94420ed..41832d30150 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java @@ -52,7 +52,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class KitsuneHealer extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); static { filter.add(new SupertypePredicate("Legendary")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneRiftwalker.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneRiftwalker.java index 98697994e5d..3460099147a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneRiftwalker.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneRiftwalker.java @@ -43,7 +43,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class KitsuneRiftwalker extends CardImpl { - private final static FilterCard filter = new FilterCard("Spirits and from Arcane"); + private static final FilterCard filter = new FilterCard("Spirits and from Arcane"); static { filter.add(Predicates.or(new SubtypePredicate("Arcane"), new SubtypePredicate("Spirit"))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java index 62ca700ef73..18f794a75fe 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java @@ -48,7 +48,7 @@ import mage.filter.common.FilterSpiritOrArcaneCard; */ public class KodamaOfTheSouthTree extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public KodamaOfTheSouthTree(UUID ownerId) { super(ownerId, 223, "Kodama of the South Tree", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java index bad325b3333..5fcebf0c12d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java @@ -55,7 +55,7 @@ import mage.util.CardUtil; public class KondasBanner extends CardImpl { - private final static FilterControlledCreaturePermanent legendaryFilter = new FilterControlledCreaturePermanent("Legendary creatures"); + private static final FilterControlledCreaturePermanent legendaryFilter = new FilterControlledCreaturePermanent("Legendary creatures"); static { legendaryFilter.add(new SupertypePredicate("Legendary")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java index b17a280eed1..8be6089b35b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledPermanent; */ public class MelokuTheCloudedMirror extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public MelokuTheCloudedMirror(UUID ownerId) { super(ownerId, 74, "Meloku the Clouded Mirror", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{U}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java index 6370fd16ae2..3585ee6bf03 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java @@ -50,7 +50,7 @@ import mage.target.TargetPermanent; */ public class MinamoSchoolAtWatersEdge extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("legendary permanent"); + private static final FilterPermanent filter = new FilterPermanent("legendary permanent"); static { filter.add(new SupertypePredicate("Legendary")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NagaoBoundByHonor.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NagaoBoundByHonor.java index 7b976ef8a20..55efb02391b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NagaoBoundByHonor.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NagaoBoundByHonor.java @@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class NagaoBoundByHonor extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Samurai creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Samurai creatures"); static { filter.add(new SubtypePredicate("Samurai")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java index 9b38523e52c..acf6819ba32 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java @@ -55,7 +55,7 @@ import mage.watchers.common.DamagedByWatcher; */ public class NineRingedBo extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("spirit"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("spirit"); static { filter.add(new SubtypePredicate("Spirit")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java index 3b187152655..0dfaa75b446 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java @@ -49,7 +49,7 @@ import mage.target.TargetPermanent; */ public class OkinaTempleToTheGrandfathers extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); static { filter.add(new SupertypePredicate("Legendary")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java index 9a61467c4a1..7c6f505f17c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java @@ -46,7 +46,7 @@ import mage.filter.common.FilterSpiritOrArcaneCard; */ public class OrbweaverKumo extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public OrbweaverKumo(UUID ownerId) { super(ownerId, 231, "Orbweaver Kumo", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java index 8108ad5d0f7..263eb7a541f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java @@ -45,7 +45,7 @@ import mage.target.common.TargetNonBasicLandPermanent; */ public class OreGorger extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public OreGorger(UUID ownerId) { super(ownerId, 182, "Ore Gorger", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java index e91ca15e870..ec1642b7564 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java @@ -79,7 +79,7 @@ public class PainwrackerOni extends CardImpl { class PainwrackerOniTriggeredAbility1 extends TriggeredAbilityImpl { - private final static FilterPermanent filter = new FilterPermanent(); + private static final FilterPermanent filter = new FilterPermanent(); static { filter.add(new SubtypePredicate("Ogre")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PeerThroughDepths.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PeerThroughDepths.java index 7a6a9dd9971..9cadeab7563 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PeerThroughDepths.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PeerThroughDepths.java @@ -44,7 +44,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class PeerThroughDepths extends CardImpl { - private final static FilterCard filter = new FilterCard("instant or sorcery card"); + private static final FilterCard filter = new FilterCard("instant or sorcery card"); static { filter.add(Predicates.or( new CardTypePredicate(CardType.SORCERY), diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java index 2e710791edd..cce831de772 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java @@ -45,7 +45,7 @@ import java.util.UUID; */ public class RyuseiTheFallingStar extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature without flying"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature without flying"); static { filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java index 53df2925908..882f7989c4b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro.java @@ -51,8 +51,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; public class SachiDaughterOfSeshiro extends CardImpl { - private final static FilterCreaturePermanent snakeFilter = new FilterCreaturePermanent("Snakes"); - private final static FilterCreaturePermanent shamanFilter = new FilterCreaturePermanent("Shamans"); + private static final FilterCreaturePermanent snakeFilter = new FilterCreaturePermanent("Snakes"); + private static final FilterCreaturePermanent shamanFilter = new FilterCreaturePermanent("Shamans"); static { snakeFilter.add(new SubtypePredicate("Snake")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java index 8dd767e9ddb..3d4c9089d36 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java @@ -51,7 +51,7 @@ import mage.game.permanent.Permanent; */ public class SeshiroTheAnointed extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Snakes"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Snakes"); static { filter.add(new SubtypePredicate("Snake")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java index f2f2cf0d511..fb4f191af5f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java @@ -50,7 +50,7 @@ import mage.target.TargetPermanent; */ public class ShinkaTheBloodsoakedKeep extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); static { filter.add(new SupertypePredicate("Legendary")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ShisatoWhisperingHunter.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ShisatoWhisperingHunter.java index ecde9c34581..5cc93b8c2b1 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ShisatoWhisperingHunter.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ShisatoWhisperingHunter.java @@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; public class ShisatoWhisperingHunter extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Snake"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Snake"); static { filter.add(new SubtypePredicate("Snake")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java index 4adceae0c12..a9c664ffdf8 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java @@ -50,7 +50,7 @@ import mage.target.TargetPermanent; */ public class ShizoDeathsStorehouse extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); static { filter.add(new SupertypePredicate("Legendary")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java index 3f49368a033..f740b4905a2 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java @@ -44,7 +44,7 @@ import mage.filter.common.FilterSpiritOrArcaneCard; */ public class SireOfTheStorm extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public SireOfTheStorm(UUID ownerId) { super(ownerId, 85, "Sire of the Storm", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java index 1e057a01444..749cb93ce2b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java @@ -47,7 +47,7 @@ import mage.target.common.TargetLandPermanent; */ public class Soilshaper extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public Soilshaper(UUID ownerId) { super(ownerId, 243, "Soilshaper", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiCloudskater.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiCloudskater.java index 540b70ac377..8c67d26ef96 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiCloudskater.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiCloudskater.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent; */ public class SoratamiCloudskater extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); public SoratamiCloudskater(UUID ownerId) { super(ownerId, 86, "Soratami Cloudskater", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorGuard.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorGuard.java index 813b462ce89..57a85fcaee0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorGuard.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorGuard.java @@ -53,8 +53,8 @@ import mage.target.common.TargetCreaturePermanent; */ public class SoratamiMirrorGuard extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); - private final static FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("creature with power 2 or less"); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); + private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("creature with power 2 or less"); static { filterCreature.add(new PowerPredicate(Filter.ComparisonType.LessThan, 3)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java index 0be744a226c..43cbb04d1c5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class SoratamiMirrorMage extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("lands"); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("lands"); public SoratamiMirrorMage(UUID ownerId) { super(ownerId, 88, "Soratami Mirror-Mage", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java index 8be50469b3c..b2240d5a125 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java @@ -51,7 +51,7 @@ import mage.target.common.TargetControlledPermanent; */ public class SoratamiRainshaper extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); public SoratamiRainshaper(UUID ownerId) { super(ownerId, 89, "Soratami Rainshaper", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSavant.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSavant.java index 890a776150c..a6f54faf084 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSavant.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSavant.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledPermanent; */ public class SoratamiSavant extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); public SoratamiSavant(UUID ownerId) { super(ownerId, 90, "Soratami Savant", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSeer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSeer.java index 4bf6339109b..397c71e160a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSeer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiSeer.java @@ -53,7 +53,7 @@ import mage.target.common.TargetControlledPermanent; */ public class SoratamiSeer extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("lands"); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("lands"); public SoratamiSeer(UUID ownerId) { super(ownerId, 91, "Soratami Seer", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SosukeSonOfSeshiro.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SosukeSonOfSeshiro.java index bddea011249..12fd4feef9b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SosukeSonOfSeshiro.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SosukeSonOfSeshiro.java @@ -55,7 +55,7 @@ import mage.target.targetpointer.FixedTarget; */ public class SosukeSonOfSeshiro extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Snake creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Snake creatures"); static { filter.add(new SubtypePredicate("Snake")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java index a4a47b5187b..a0e15139e43 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class SoulOfMagma extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public SoulOfMagma(UUID ownerId) { super(ownerId, 189, "Soul of Magma", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java b/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java index 4531d58b35f..a3f87c7f4cf 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent; * @author Loki */ public class StrengthOfCedars extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("the number of lands you control"); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("the number of lands you control"); public StrengthOfCedars (UUID ownerId) { super(ownerId, 245, "Strength of Cedars", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{G}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java index fe2e550a718..73afe167d6a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java @@ -48,7 +48,7 @@ import mage.target.common.TargetCreaturePermanent; public class TellerOfTales extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); // Outcome.Benefit, "tap or untap target creature" diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TenzaGodosMaul.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TenzaGodosMaul.java index 2eaf3ad1809..38513106a63 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TenzaGodosMaul.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TenzaGodosMaul.java @@ -60,8 +60,8 @@ public class TenzaGodosMaul extends CardImpl { private static final String rule1 = "As long as it's legendary, it gets an additional +2/+2"; private static final String rule2 = "As long as it's red, it has trample."; - private final static FilterCreaturePermanent legendaryFilter = new FilterCreaturePermanent("legendary"); - private final static FilterCreaturePermanent redFilter = new FilterCreaturePermanent("red"); + private static final FilterCreaturePermanent legendaryFilter = new FilterCreaturePermanent("legendary"); + private static final FilterCreaturePermanent redFilter = new FilterCreaturePermanent("red"); static { legendaryFilter.add(new SupertypePredicate("Legendary")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TheUnspeakable.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TheUnspeakable.java index dfa2e79ed96..5f9743fcffe 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TheUnspeakable.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TheUnspeakable.java @@ -47,7 +47,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public class TheUnspeakable extends CardImpl { - private final static FilterCard filter = new FilterCard("Arcane card from your graveyard"); + private static final FilterCard filter = new FilterCard("Arcane card from your graveyard"); static { filter.add(new SubtypePredicate("Arcane")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java index cec7c91aa64..8477ef67d60 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java @@ -47,7 +47,7 @@ import mage.target.common.TargetOpponent; */ public class ThiefOfHope extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public ThiefOfHope(UUID ownerId) { super(ownerId, 147, "Thief of Hope", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Thoughtbind.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Thoughtbind.java index 1fb6897ab1c..c8165fb3239 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Thoughtbind.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Thoughtbind.java @@ -44,7 +44,7 @@ import mage.target.TargetSpell; */ public class Thoughtbind extends CardImpl { - private final static FilterSpell filter = new FilterSpell("spell with converted mana cost 4 or less"); + private static final FilterSpell filter = new FilterSpell("spell with converted mana cost 4 or less"); static { filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, 5)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed.java index a335064b5d2..7ac3e1bf490 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCardInLibrary; */ public class TimeOfNeed extends CardImpl { - private final static FilterCard filter = new FilterCard("legendary creature card"); + private static final FilterCard filter = new FilterCard("legendary creature card"); static { filter.add(new CardTypePredicate(CardType.CREATURE)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/UyoSilentProphet.java b/Mage.Sets/src/mage/sets/championsofkamigawa/UyoSilentProphet.java index 34cdd4f7eef..bf0ee6b5707 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/UyoSilentProphet.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/UyoSilentProphet.java @@ -53,7 +53,7 @@ import mage.target.common.TargetControlledPermanent; */ public class UyoSilentProphet extends CardImpl { - private final static FilterSpell filter = new FilterSpell("instant or sorcery spell"); + private static final FilterSpell filter = new FilterSpell("instant or sorcery spell"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java index 5005e36b446..4170559198c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java @@ -51,7 +51,7 @@ import mage.target.targetpointer.FixedTarget; */ public class ZoZuThePunisher extends CardImpl { - private final static FilterCard filter = new FilterCard("legendary spell"); + private static final FilterCard filter = new FilterCard("legendary spell"); static { filter.add(new SupertypePredicate("Legendary")); diff --git a/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java b/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java index ec74f91b4b7..f4f0654d964 100644 --- a/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java +++ b/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java @@ -76,7 +76,7 @@ public class BloodhallOoze extends CardImpl { class BloodhallOozeTriggeredAbility1 extends TriggeredAbilityImpl { - private final static FilterPermanent filter = new FilterPermanent(); + private static final FilterPermanent filter = new FilterPermanent(); static { filter.add(new ColorPredicate(ObjectColor.BLACK)); diff --git a/Mage.Sets/src/mage/sets/conflux/Esperzoa.java b/Mage.Sets/src/mage/sets/conflux/Esperzoa.java index c1b6b56c0ed..8f43d393358 100644 --- a/Mage.Sets/src/mage/sets/conflux/Esperzoa.java +++ b/Mage.Sets/src/mage/sets/conflux/Esperzoa.java @@ -48,7 +48,7 @@ import mage.target.common.TargetControlledPermanent; * @author Loki */ public class Esperzoa extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("artifact"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/conflux/FaerieMechanist.java b/Mage.Sets/src/mage/sets/conflux/FaerieMechanist.java index dfe4e7cfe3e..da4abbdeff0 100644 --- a/Mage.Sets/src/mage/sets/conflux/FaerieMechanist.java +++ b/Mage.Sets/src/mage/sets/conflux/FaerieMechanist.java @@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class FaerieMechanist extends CardImpl { - private final static FilterCard filter = new FilterCard("artifact card"); + private static final FilterCard filter = new FilterCard("artifact card"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); } diff --git a/Mage.Sets/src/mage/sets/conflux/ScattershotArcher.java b/Mage.Sets/src/mage/sets/conflux/ScattershotArcher.java index a9c4089fdba..35f2d76fe9e 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScattershotArcher.java +++ b/Mage.Sets/src/mage/sets/conflux/ScattershotArcher.java @@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate; */ public class ScattershotArcher extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying"); static { filter.add(new AbilityPredicate(FlyingAbility.class)); diff --git a/Mage.Sets/src/mage/sets/darkascension/DerangedOutcast.java b/Mage.Sets/src/mage/sets/darkascension/DerangedOutcast.java index 80aee0290f6..565602a5828 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DerangedOutcast.java +++ b/Mage.Sets/src/mage/sets/darkascension/DerangedOutcast.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; * @author Loki */ public class DerangedOutcast extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("a Human"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Human"); static { filter.add(new SubtypePredicate("Human")); diff --git a/Mage.Sets/src/mage/sets/darkascension/Gravecrawler.java b/Mage.Sets/src/mage/sets/darkascension/Gravecrawler.java index 2a033f89f19..58210f2dbfd 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Gravecrawler.java +++ b/Mage.Sets/src/mage/sets/darkascension/Gravecrawler.java @@ -79,7 +79,7 @@ public class Gravecrawler extends CardImpl { class GravecrawlerPlayEffect extends AsThoughEffectImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("zombie"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("zombie"); static { filter.add(new SubtypePredicate("Zombie")); diff --git a/Mage.Sets/src/mage/sets/darkascension/IncreasingVengeance.java b/Mage.Sets/src/mage/sets/darkascension/IncreasingVengeance.java index 13050d75b93..32686961ecc 100644 --- a/Mage.Sets/src/mage/sets/darkascension/IncreasingVengeance.java +++ b/Mage.Sets/src/mage/sets/darkascension/IncreasingVengeance.java @@ -50,7 +50,7 @@ import mage.target.TargetSpell; */ public class IncreasingVengeance extends CardImpl { - private final static FilterSpell filter = new FilterSpell("instant or sorcery spell"); + private static final FilterSpell filter = new FilterSpell("instant or sorcery spell"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/darkascension/RavenousDemon.java b/Mage.Sets/src/mage/sets/darkascension/RavenousDemon.java index cd24f74ec78..88153c71aa3 100644 --- a/Mage.Sets/src/mage/sets/darkascension/RavenousDemon.java +++ b/Mage.Sets/src/mage/sets/darkascension/RavenousDemon.java @@ -46,7 +46,7 @@ import mage.target.common.TargetControlledPermanent; * @author intimidatingant */ public class RavenousDemon extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Human"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Human"); static { filter.add(new SubtypePredicate("Human")); diff --git a/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.java b/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.java index a1391b24e6a..2be6e88de90 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.java +++ b/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.java @@ -45,7 +45,7 @@ import mage.game.stack.Spell; */ public class SecretsOfTheDead extends CardImpl { - private final static FilterSpell filter = new FilterSpell("a spell from your graveyard"); + private static final FilterSpell filter = new FilterSpell("a spell from your graveyard"); static { filter.add(new SpellZonePredicate(Zone.GRAVEYARD)); diff --git a/Mage.Sets/src/mage/sets/darksteel/ArcaneSpyglass.java b/Mage.Sets/src/mage/sets/darksteel/ArcaneSpyglass.java index f7278151fe6..56ac492e457 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ArcaneSpyglass.java +++ b/Mage.Sets/src/mage/sets/darksteel/ArcaneSpyglass.java @@ -52,7 +52,7 @@ import mage.target.common.TargetControlledPermanent; */ public class ArcaneSpyglass extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); public ArcaneSpyglass (UUID ownerId) { super(ownerId, 93, "Arcane Spyglass", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{4}"); diff --git a/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java b/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java index 43ff17f0f01..45f4b4990bf 100644 --- a/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java +++ b/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java @@ -54,7 +54,7 @@ import mage.target.TargetPermanent; */ public class BlinkmothNexus extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("Blinkmoth"); + private static final FilterPermanent filter = new FilterPermanent("Blinkmoth"); static { filter.add(new SubtypePredicate("Blinkmoth")); diff --git a/Mage.Sets/src/mage/sets/darksteel/Coretapper.java b/Mage.Sets/src/mage/sets/darksteel/Coretapper.java index cf5e53e0e95..6055c6e349a 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Coretapper.java +++ b/Mage.Sets/src/mage/sets/darksteel/Coretapper.java @@ -50,7 +50,7 @@ import mage.target.TargetPermanent; */ public class Coretapper extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/darksteel/DarksteelForge.java b/Mage.Sets/src/mage/sets/darksteel/DarksteelForge.java index 304734514ab..aa07db14102 100644 --- a/Mage.Sets/src/mage/sets/darksteel/DarksteelForge.java +++ b/Mage.Sets/src/mage/sets/darksteel/DarksteelForge.java @@ -44,7 +44,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class DarksteelForge extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Artifacts you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Artifacts you control"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java b/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java index 3f51b5fcdd3..a9c4aa4ee9a 100644 --- a/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java +++ b/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java @@ -45,7 +45,7 @@ import mage.target.TargetPermanent; * @author Loki */ public class EchoingCalm extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("enchantment"); + private static final FilterPermanent filter = new FilterPermanent("enchantment"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/darksteel/EmissaryOfHope.java b/Mage.Sets/src/mage/sets/darksteel/EmissaryOfHope.java index 8119a793c8d..004242f2402 100644 --- a/Mage.Sets/src/mage/sets/darksteel/EmissaryOfHope.java +++ b/Mage.Sets/src/mage/sets/darksteel/EmissaryOfHope.java @@ -75,7 +75,7 @@ public class EmissaryOfHope extends CardImpl { } class EmissaryOfHopeEffect extends OneShotEffect { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java b/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java index 5e49302135e..6c35db6ab27 100644 --- a/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java +++ b/Mage.Sets/src/mage/sets/darksteel/KrarkClanStoker.java @@ -48,7 +48,7 @@ import mage.target.common.TargetControlledPermanent; */ public class KrarkClanStoker extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("an artifact"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("an artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/darksteel/MagneticFlux.java b/Mage.Sets/src/mage/sets/darksteel/MagneticFlux.java index 2186c78a123..06ff84702bd 100644 --- a/Mage.Sets/src/mage/sets/darksteel/MagneticFlux.java +++ b/Mage.Sets/src/mage/sets/darksteel/MagneticFlux.java @@ -44,7 +44,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class MagneticFlux extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Artifact creatures"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Artifact creatures"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/darksteel/MyrMatrix.java b/Mage.Sets/src/mage/sets/darksteel/MyrMatrix.java index 9d44b4c3513..09153d49707 100644 --- a/Mage.Sets/src/mage/sets/darksteel/MyrMatrix.java +++ b/Mage.Sets/src/mage/sets/darksteel/MyrMatrix.java @@ -50,7 +50,7 @@ import mage.game.permanent.token.MyrToken; */ public class MyrMatrix extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Myr"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Myr"); static { filter.add(new SubtypePredicate("Myr")); diff --git a/Mage.Sets/src/mage/sets/darksteel/NeurokProdigy.java b/Mage.Sets/src/mage/sets/darksteel/NeurokProdigy.java index 5d76361502b..d7960d518a6 100644 --- a/Mage.Sets/src/mage/sets/darksteel/NeurokProdigy.java +++ b/Mage.Sets/src/mage/sets/darksteel/NeurokProdigy.java @@ -48,7 +48,7 @@ import mage.target.common.TargetCardInHand; */ public class NeurokProdigy extends CardImpl { - private final static FilterCard filter = new FilterCard("an artifact card"); + private static final FilterCard filter = new FilterCard("an artifact card"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/darksteel/Oxidize.java b/Mage.Sets/src/mage/sets/darksteel/Oxidize.java index 6273e1ea574..98ab7837d4e 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Oxidize.java +++ b/Mage.Sets/src/mage/sets/darksteel/Oxidize.java @@ -43,7 +43,7 @@ import mage.target.TargetPermanent; */ public class Oxidize extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java b/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java index f71aadaf554..9594bf19e58 100644 --- a/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java +++ b/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java @@ -49,7 +49,7 @@ import mage.target.TargetPermanent; */ public class PteronGhost extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/darksteel/Reshape.java b/Mage.Sets/src/mage/sets/darksteel/Reshape.java index 1077906bbca..37f7896f7cc 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Reshape.java +++ b/Mage.Sets/src/mage/sets/darksteel/Reshape.java @@ -52,7 +52,7 @@ import mage.target.common.TargetControlledPermanent; */ public class Reshape extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("an artifact"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("an artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java b/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java index bf23940fce0..0004ac3ebd7 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java +++ b/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java @@ -51,8 +51,8 @@ import mage.target.common.TargetControlledPermanent; */ public class SlobadGoblinTinkerer extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); - private final static FilterControlledPermanent filterControlled = new FilterControlledPermanent("an artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterControlledPermanent filterControlled = new FilterControlledPermanent("an artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/darksteel/Soulscour.java b/Mage.Sets/src/mage/sets/darksteel/Soulscour.java index 17217038d18..766d23c0859 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Soulscour.java +++ b/Mage.Sets/src/mage/sets/darksteel/Soulscour.java @@ -69,7 +69,7 @@ public class Soulscour extends CardImpl { class SoulscourEffect extends OneShotEffect { - private final static FilterPermanent filter = new FilterPermanent(""); + private static final FilterPermanent filter = new FilterPermanent(""); static { filter.add(Predicates.not(new CardTypePredicate(CardType.ARTIFACT))); diff --git a/Mage.Sets/src/mage/sets/dissension/AzoriusChancery.java b/Mage.Sets/src/mage/sets/dissension/AzoriusChancery.java index 89f36bc1f04..5c4b24a3ebc 100644 --- a/Mage.Sets/src/mage/sets/dissension/AzoriusChancery.java +++ b/Mage.Sets/src/mage/sets/dissension/AzoriusChancery.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledPermanent; */ public class AzoriusChancery extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public AzoriusChancery(UUID ownerId) { super(ownerId, 170, "Azorius Chancery", Rarity.COMMON, new CardType[]{CardType.LAND}, ""); diff --git a/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java b/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java index 2fd8374f4c9..0e0a832af98 100644 --- a/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java +++ b/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java @@ -49,7 +49,7 @@ import mage.target.TargetPermanent; */ public class HaazdaExonerator extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("Aura"); + private static final FilterPermanent filter = new FilterPermanent("Aura"); static { filter.add(new SubtypePredicate("Aura")); diff --git a/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java b/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java index 097501d6c2e..b4a067869cc 100644 --- a/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java +++ b/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java @@ -46,7 +46,7 @@ import mage.target.TargetPermanent; */ public class IndrikStomphowler extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact or enchantment"); + private static final FilterPermanent filter = new FilterPermanent("artifact or enchantment"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/dissension/RakdosCarnarium.java b/Mage.Sets/src/mage/sets/dissension/RakdosCarnarium.java index a7de5fec148..56fa992cf99 100644 --- a/Mage.Sets/src/mage/sets/dissension/RakdosCarnarium.java +++ b/Mage.Sets/src/mage/sets/dissension/RakdosCarnarium.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent; */ public class RakdosCarnarium extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public RakdosCarnarium(UUID ownerId) { super(ownerId, 178, "Rakdos Carnarium", Rarity.COMMON, new CardType[]{CardType.LAND}, ""); diff --git a/Mage.Sets/src/mage/sets/dissension/SimicGrowthChamber.java b/Mage.Sets/src/mage/sets/dissension/SimicGrowthChamber.java index 176978c433b..0016896f7e4 100644 --- a/Mage.Sets/src/mage/sets/dissension/SimicGrowthChamber.java +++ b/Mage.Sets/src/mage/sets/dissension/SimicGrowthChamber.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledPermanent; */ public class SimicGrowthChamber extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public SimicGrowthChamber(UUID ownerId) { super(ownerId, 180, "Simic Growth Chamber", Rarity.COMMON, new CardType[]{CardType.LAND}, ""); diff --git a/Mage.Sets/src/mage/sets/dissension/SpellSnare.java b/Mage.Sets/src/mage/sets/dissension/SpellSnare.java index 48e608d7e57..18e84efa77a 100644 --- a/Mage.Sets/src/mage/sets/dissension/SpellSnare.java +++ b/Mage.Sets/src/mage/sets/dissension/SpellSnare.java @@ -42,7 +42,7 @@ import mage.target.TargetSpell; * @author Loki */ public class SpellSnare extends CardImpl { - private final static FilterSpell filter = new FilterSpell("spell with converted mana cost 2"); + private static final FilterSpell filter = new FilterSpell("spell with converted mana cost 2"); static { filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.Equal, 2)); diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/CelestialCrusader.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/CelestialCrusader.java index 93fdb817434..1d6a50a9a5a 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/CelestialCrusader.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/CelestialCrusader.java @@ -48,7 +48,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; * @author Loki */ public class CelestialCrusader extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("white creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("white creatures"); static { filter.add(new ColorPredicate(ObjectColor.WHITE)); diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/Pentavus.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/Pentavus.java index 34cb33f0fde..eeead992bd0 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/Pentavus.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/Pentavus.java @@ -55,7 +55,7 @@ import mage.target.common.TargetControlledPermanent; */ public class Pentavus extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Pentavite"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Pentavite"); static { filter.add(new SubtypePredicate("Pentavite")); diff --git a/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java b/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java index 79e12d50aec..dbae1a90c7e 100644 --- a/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java +++ b/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class BallynockTrapper extends CardImpl { - private final static FilterSpell filterWhiteSpell = new FilterSpell("a white spell"); + private static final FilterSpell filterWhiteSpell = new FilterSpell("a white spell"); static { filterWhiteSpell.add(new ColorPredicate(ObjectColor.WHITE)); diff --git a/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java b/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java index 64999c96000..f3d80821d42 100644 --- a/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java +++ b/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class BanishingKnack extends CardImpl { - private final static FilterPermanent filter = new FilterNonlandPermanent(); + private static final FilterPermanent filter = new FilterNonlandPermanent(); public BanishingKnack(UUID ownerId) { super(ownerId, 17, "Banishing Knack", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); diff --git a/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java b/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java index 089fb432254..d0fa745dda4 100644 --- a/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java @@ -47,8 +47,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public class BelligerentHatchling extends CardImpl { - private final static FilterSpell filterRedSpell = new FilterSpell("a red spell"); - private final static FilterSpell filterWhiteSpell = new FilterSpell("a white spell"); + private static final FilterSpell filterRedSpell = new FilterSpell("a red spell"); + private static final FilterSpell filterWhiteSpell = new FilterSpell("a white spell"); static { filterRedSpell.add(new ColorPredicate(ObjectColor.RED)); diff --git a/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java b/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java index 9b2d7765571..8010d37be22 100644 --- a/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java +++ b/Mage.Sets/src/mage/sets/eventide/CreakwoodLiege.java @@ -49,8 +49,8 @@ import mage.game.permanent.token.Token; */ public class CreakwoodLiege extends CardImpl { - private final static FilterCreaturePermanent filterBlackCreature = new FilterCreaturePermanent("black creatures"); - private final static FilterCreaturePermanent filterGreenCreature = new FilterCreaturePermanent("green creatures"); + private static final FilterCreaturePermanent filterBlackCreature = new FilterCreaturePermanent("black creatures"); + private static final FilterCreaturePermanent filterGreenCreature = new FilterCreaturePermanent("green creatures"); static { filterBlackCreature.add(new ColorPredicate(ObjectColor.BLACK)); diff --git a/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java b/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java index 756eaffd343..9a38df2c5fd 100644 --- a/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java +++ b/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java @@ -46,8 +46,8 @@ import mage.game.permanent.token.WolfToken; */ public class FableOfWolfAndOwl extends CardImpl { - private final static FilterSpell filterGreenSpell = new FilterSpell("a green spell"); - private final static FilterSpell filterBlueSpell = new FilterSpell("a blue spell"); + private static final FilterSpell filterGreenSpell = new FilterSpell("a green spell"); + private static final FilterSpell filterBlueSpell = new FilterSpell("a blue spell"); static { filterGreenSpell.add(new ColorPredicate(ObjectColor.GREEN)); diff --git a/Mage.Sets/src/mage/sets/eventide/FangSkulkin.java b/Mage.Sets/src/mage/sets/eventide/FangSkulkin.java index e5017d4f826..012534c4bca 100644 --- a/Mage.Sets/src/mage/sets/eventide/FangSkulkin.java +++ b/Mage.Sets/src/mage/sets/eventide/FangSkulkin.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class FangSkulkin extends CardImpl { - private final static FilterCreaturePermanent filterBlackCreature = new FilterCreaturePermanent("black creature"); + private static final FilterCreaturePermanent filterBlackCreature = new FilterCreaturePermanent("black creature"); static { filterBlackCreature.add(new ColorPredicate(ObjectColor.BLACK)); diff --git a/Mage.Sets/src/mage/sets/eventide/HoofSkulkin.java b/Mage.Sets/src/mage/sets/eventide/HoofSkulkin.java index cece2b9d8d1..d083911c5e1 100644 --- a/Mage.Sets/src/mage/sets/eventide/HoofSkulkin.java +++ b/Mage.Sets/src/mage/sets/eventide/HoofSkulkin.java @@ -48,7 +48,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class HoofSkulkin extends CardImpl { - private final static FilterCreaturePermanent filterGreenCreature = new FilterCreaturePermanent("green creature"); + private static final FilterCreaturePermanent filterGreenCreature = new FilterCreaturePermanent("green creature"); static { filterGreenCreature.add(new ColorPredicate(ObjectColor.GREEN)); diff --git a/Mage.Sets/src/mage/sets/eventide/JawboneSkulkin.java b/Mage.Sets/src/mage/sets/eventide/JawboneSkulkin.java index 127ebd74d34..0687c180bbb 100644 --- a/Mage.Sets/src/mage/sets/eventide/JawboneSkulkin.java +++ b/Mage.Sets/src/mage/sets/eventide/JawboneSkulkin.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class JawboneSkulkin extends CardImpl { - private final static FilterCreaturePermanent filterRedCreature = new FilterCreaturePermanent("red creature"); + private static final FilterCreaturePermanent filterRedCreature = new FilterCreaturePermanent("red creature"); static { filterRedCreature.add(new ColorPredicate(ObjectColor.RED)); diff --git a/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java b/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java index 93b6cbd86d8..89ed69bb221 100644 --- a/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java +++ b/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java @@ -52,7 +52,7 @@ import mage.target.common.TargetCreaturePermanent; public class MerrowLevitator extends CardImpl { - private final static FilterSpell filterBlueSpell = new FilterSpell("a blue spell"); + private static final FilterSpell filterBlueSpell = new FilterSpell("a blue spell"); static { filterBlueSpell.add(new ColorPredicate(ObjectColor.BLUE)); diff --git a/Mage.Sets/src/mage/sets/eventide/NettleSentinel.java b/Mage.Sets/src/mage/sets/eventide/NettleSentinel.java index 62f253c5fbe..07b65a8b9f8 100644 --- a/Mage.Sets/src/mage/sets/eventide/NettleSentinel.java +++ b/Mage.Sets/src/mage/sets/eventide/NettleSentinel.java @@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public class NettleSentinel extends CardImpl { - private final static FilterSpell filter = new FilterSpell("a green spell"); + private static final FilterSpell filter = new FilterSpell("a green spell"); static { filter.add(new ColorPredicate(ObjectColor.GREEN)); diff --git a/Mage.Sets/src/mage/sets/eventide/NoggleBridgebreaker.java b/Mage.Sets/src/mage/sets/eventide/NoggleBridgebreaker.java index d455268440e..5fe290ddb0d 100644 --- a/Mage.Sets/src/mage/sets/eventide/NoggleBridgebreaker.java +++ b/Mage.Sets/src/mage/sets/eventide/NoggleBridgebreaker.java @@ -44,7 +44,7 @@ import mage.target.common.TargetControlledPermanent; */ public class NoggleBridgebreaker extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public NoggleBridgebreaker(UUID ownerId) { super(ownerId, 107, "Noggle Bridgebreaker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U/R}{U/R}"); diff --git a/Mage.Sets/src/mage/sets/eventide/NoxiousHatchling.java b/Mage.Sets/src/mage/sets/eventide/NoxiousHatchling.java index 4e64bddc70d..317a93e11b0 100644 --- a/Mage.Sets/src/mage/sets/eventide/NoxiousHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/NoxiousHatchling.java @@ -48,8 +48,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public class NoxiousHatchling extends CardImpl { - private final static FilterSpell filterBlackSpell = new FilterSpell("a black spell"); - private final static FilterSpell filterGreenSpell = new FilterSpell("a green spell"); + private static final FilterSpell filterBlackSpell = new FilterSpell("a black spell"); + private static final FilterSpell filterGreenSpell = new FilterSpell("a green spell"); static { filterBlackSpell.add(new ColorPredicate(ObjectColor.BLACK)); diff --git a/Mage.Sets/src/mage/sets/eventide/Nucklavee.java b/Mage.Sets/src/mage/sets/eventide/Nucklavee.java index 92d9ea80334..f58ee2f945f 100644 --- a/Mage.Sets/src/mage/sets/eventide/Nucklavee.java +++ b/Mage.Sets/src/mage/sets/eventide/Nucklavee.java @@ -46,8 +46,8 @@ import mage.target.common.TargetCardInYourGraveyard; * @author Loki */ public class Nucklavee extends CardImpl { - private final static FilterCard filterRed = new FilterCard("red sorcery card from your graveyard"); - private final static FilterCard filterBlue = new FilterCard("blue instant card from your graveyard"); + private static final FilterCard filterRed = new FilterCard("red sorcery card from your graveyard"); + private static final FilterCard filterBlue = new FilterCard("blue instant card from your graveyard"); static { filterRed.add(new ColorPredicate(ObjectColor.RED)); diff --git a/Mage.Sets/src/mage/sets/eventide/Scarecrone.java b/Mage.Sets/src/mage/sets/eventide/Scarecrone.java index 38921747e0e..efc75bf1221 100644 --- a/Mage.Sets/src/mage/sets/eventide/Scarecrone.java +++ b/Mage.Sets/src/mage/sets/eventide/Scarecrone.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public class Scarecrone extends CardImpl { - private final static FilterCard filter = new FilterCard("artifact creature card from your graveyard"); + private static final FilterCard filter = new FilterCard("artifact creature card from your graveyard"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java b/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java index 116922b91c3..2414f18f856 100644 --- a/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java +++ b/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class ShellSkulkin extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("blue creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("blue creature"); static { filter.add(new ColorPredicate(ObjectColor.BLUE)); diff --git a/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java b/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java index a0e2851cba7..ef8c4ac6304 100644 --- a/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java @@ -51,8 +51,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public class SturdyHatchling extends CardImpl { - private final static FilterSpell filterGreenSpell = new FilterSpell("a green spell"); - private final static FilterSpell filterBlueSpell = new FilterSpell("a blue spell"); + private static final FilterSpell filterGreenSpell = new FilterSpell("a green spell"); + private static final FilterSpell filterBlueSpell = new FilterSpell("a blue spell"); static { filterGreenSpell.add(new ColorPredicate(ObjectColor.GREEN)); diff --git a/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java b/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java index ceaec8c70f2..45e9a848020 100644 --- a/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java @@ -47,8 +47,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public class VoraciousHatchling extends CardImpl { - private final static FilterSpell filterWhiteSpell = new FilterSpell("a white spell"); - private final static FilterSpell filterBlackSpell = new FilterSpell("a black spell"); + private static final FilterSpell filterWhiteSpell = new FilterSpell("a white spell"); + private static final FilterSpell filterBlackSpell = new FilterSpell("a black spell"); static { filterWhiteSpell.add(new ColorPredicate(ObjectColor.WHITE)); diff --git a/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java b/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java index 4e9775a522f..90784aec214 100644 --- a/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java +++ b/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java @@ -52,7 +52,7 @@ import mage.target.TargetPermanent; */ public class WickerboughElder extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact or enchantment"); + private static final FilterPermanent filter = new FilterPermanent("artifact or enchantment"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java b/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java index 9d62dc0d2dc..02e52cf08a7 100644 --- a/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java +++ b/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class WildernessHypnotist extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("red or green creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("red or green creature"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/fallenempires/HighTide.java b/Mage.Sets/src/mage/sets/fallenempires/HighTide.java index eb6f2df57e0..1e568519d0c 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/HighTide.java +++ b/Mage.Sets/src/mage/sets/fallenempires/HighTide.java @@ -75,7 +75,7 @@ public class HighTide extends CardImpl { class HighTideTriggeredAbility extends DelayedTriggeredManaAbility { - private final static FilterLandPermanent filter = new FilterLandPermanent("Island"); + private static final FilterLandPermanent filter = new FilterLandPermanent("Island"); static { filter.add(new SubtypePredicate("Island")); } diff --git a/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java b/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java index fdae5dba6b7..968da8ad1c3 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java +++ b/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java @@ -62,9 +62,9 @@ import mage.target.common.TargetCreaturePermanent; */ public class Seasinger extends CardImpl { - final private static String rule = "Gain control of target creature whose controller controls an Island for as long as you control Seasinger and Seasinger remains tapped"; - final private static FilterPermanent islandYouControl = new FilterPermanent("Island"); - final private static FilterCreaturePermanent creatureWhoseControllerControlsIsland = new FilterCreaturePermanent("creature whose controller controls an island"); + private static final String rule = "Gain control of target creature whose controller controls an Island for as long as you control Seasinger and Seasinger remains tapped"; + private static final FilterPermanent islandYouControl = new FilterPermanent("Island"); + private static final FilterCreaturePermanent creatureWhoseControllerControlsIsland = new FilterCreaturePermanent("creature whose controller controls an island"); static { islandYouControl.add(new SubtypePredicate("Island")); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ConjurersBauble.java b/Mage.Sets/src/mage/sets/fifthdawn/ConjurersBauble.java index f11841caef2..8ef26942795 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/ConjurersBauble.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/ConjurersBauble.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public class ConjurersBauble extends CardImpl { - final static private FilterCard filter = new FilterCard("card from your graveyard"); + private static final FilterCard filter = new FilterCard("card from your graveyard"); static { filter.add(new OwnerPredicate(Constants.TargetController.YOU)); diff --git a/Mage.Sets/src/mage/sets/fifthedition/NevinyrralsDisk.java b/Mage.Sets/src/mage/sets/fifthedition/NevinyrralsDisk.java index ff9e7008ec1..25eb21831f7 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/NevinyrralsDisk.java +++ b/Mage.Sets/src/mage/sets/fifthedition/NevinyrralsDisk.java @@ -49,7 +49,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class NevinyrralsDisk extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifacts, creatures, and enchantments"); + private static final FilterPermanent filter = new FilterPermanent("artifacts, creatures, and enchantments"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java b/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java index 2c99e612fbe..e7fd7767a22 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java @@ -77,7 +77,7 @@ public class CryptGhast extends CardImpl { class CryptGhastTriggeredAbility extends TriggeredManaAbility { - private final static FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Swamp"); + private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Swamp"); static { filter.add(new SubtypePredicate("Swamp")); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java b/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java index 77de198ec6a..fac9b42dd62 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java @@ -51,7 +51,7 @@ import mage.target.targetpointer.FixedTarget; */ public class FuriousResistance extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterBlockingCreature("blocking creature"); + private static final FilterCreaturePermanent filter = new FilterBlockingCreature("blocking creature"); public FuriousResistance(UUID ownerId) { super(ownerId, 93, "Furious Resistance", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GatewayShade.java b/Mage.Sets/src/mage/sets/gatecrash/GatewayShade.java index 6c963bb2348..5f174167031 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GatewayShade.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GatewayShade.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledPermanent; */ public class GatewayShade extends CardImpl { - private final static FilterControlledLandPermanent filter = new FilterControlledLandPermanent("untapped Gate you control"); + private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("untapped Gate you control"); static { filter.add(new SubtypePredicate("Gate")); filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GruulCharm.java b/Mage.Sets/src/mage/sets/gatecrash/GruulCharm.java index 28ae59212d9..92430bb6a8c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GruulCharm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GruulCharm.java @@ -53,9 +53,9 @@ import mage.game.permanent.Permanent; */ public class GruulCharm extends CardImpl { - final static private FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures without flying"); - final static private FilterPermanent filter2 = new FilterPermanent("all permanents you own"); - final static private FilterCreaturePermanent filter3 = new FilterCreaturePermanent("creature with flying"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures without flying"); + private static final FilterPermanent filter2 = new FilterPermanent("all permanents you own"); + private static final FilterCreaturePermanent filter3 = new FilterCreaturePermanent("creature with flying"); static { filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java b/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java index cf464c81e09..39ae7d0e013 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java @@ -53,7 +53,7 @@ import mage.target.targetpointer.FixedTarget; */ public class GruulRagebeast extends CardImpl { - final private static FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creature an opponent controls"); static { filter2.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java b/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java index 0959141e909..d6e2036d00e 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java @@ -44,7 +44,7 @@ import mage.filter.predicate.permanent.CounterPredicate; */ public class Hindervines extends CardImpl { - final static private FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with no +1/+1 counters on them"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with no +1/+1 counters on them"); static { filter.add(Predicates.not(new CounterPredicate(CounterType.P1P1))); diff --git a/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java b/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java index 6167c099ad3..cf4237b996d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java @@ -53,7 +53,7 @@ import mage.target.targetpointer.FixedTarget; */ public class MarkForDeath extends CardImpl { - final private static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java b/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java index cc3f081fb30..4d8124b133c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java @@ -49,7 +49,7 @@ import mage.filter.common.FilterControlledPermanent; */ public class Rubblehulk extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("lands you control"); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("lands you control"); public Rubblehulk(UUID ownerId) { super(ownerId, 191, "Rubblehulk", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{R}{G}"); diff --git a/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java b/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java index a90ab0f4db8..86dd2f2f689 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java +++ b/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java @@ -47,7 +47,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public class TreasuryThrull extends CardImpl { - private final static FilterCard filter = new FilterCard("artifact, creature, or enchantment card from your graveyard"); + private static final FilterCard filter = new FilterCard("artifact, creature, or enchantment card from your graveyard"); static { filter.add(Predicates.or(new CardTypePredicate(CardType.ARTIFACT), new CardTypePredicate(CardType.CREATURE), diff --git a/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java b/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java index 18107741669..be37d262051 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java @@ -54,7 +54,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class WayOfTheThief extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("Gate"); + private static final FilterPermanent filter = new FilterPermanent("Gate"); static { filter.add(new SubtypePredicate("Gate")); diff --git a/Mage.Sets/src/mage/sets/guildpact/CullingSun.java b/Mage.Sets/src/mage/sets/guildpact/CullingSun.java index 1b0ff1710f5..9b1249c65cc 100644 --- a/Mage.Sets/src/mage/sets/guildpact/CullingSun.java +++ b/Mage.Sets/src/mage/sets/guildpact/CullingSun.java @@ -41,7 +41,7 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; * @author Loki */ public class CullingSun extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost 3 or less"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost 3 or less"); static { filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, 4)); diff --git a/Mage.Sets/src/mage/sets/guildpact/Frazzle.java b/Mage.Sets/src/mage/sets/guildpact/Frazzle.java index b8d45cf5652..5c2620a649d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Frazzle.java +++ b/Mage.Sets/src/mage/sets/guildpact/Frazzle.java @@ -43,7 +43,7 @@ import mage.target.TargetSpell; */ public class Frazzle extends CardImpl { - private final static FilterSpell filter = new FilterSpell("nonblue spell"); + private static final FilterSpell filter = new FilterSpell("nonblue spell"); static { filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLUE))); diff --git a/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java b/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java index 1569cea3482..00629dc8fea 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java +++ b/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreatureOrPlayer; */ public class Gelectrode extends CardImpl { - private final static FilterSpell filter = new FilterSpell("an instant or sorcery spell"); + private static final FilterSpell filter = new FilterSpell("an instant or sorcery spell"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java b/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java index f8d8bb176fa..2eea8a0edbc 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java +++ b/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class GruulGuildmage extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a land"); public GruulGuildmage(UUID ownerId) { super(ownerId, 144, "Gruul Guildmage", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{R/G}{R/G}"); diff --git a/Mage.Sets/src/mage/sets/guildpact/IzzetBoilerworks.java b/Mage.Sets/src/mage/sets/guildpact/IzzetBoilerworks.java index b1584cfd99a..5155418e700 100644 --- a/Mage.Sets/src/mage/sets/guildpact/IzzetBoilerworks.java +++ b/Mage.Sets/src/mage/sets/guildpact/IzzetBoilerworks.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent; */ public class IzzetBoilerworks extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public IzzetBoilerworks(UUID ownerId) { super(ownerId, 159, "Izzet Boilerworks", Rarity.COMMON, new CardType[]{CardType.LAND}, ""); diff --git a/Mage.Sets/src/mage/sets/guildpact/IzzetChronarch.java b/Mage.Sets/src/mage/sets/guildpact/IzzetChronarch.java index 9427f22305d..723f7ed25ae 100644 --- a/Mage.Sets/src/mage/sets/guildpact/IzzetChronarch.java +++ b/Mage.Sets/src/mage/sets/guildpact/IzzetChronarch.java @@ -46,7 +46,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public class IzzetChronarch extends CardImpl { - private final static FilterCard filter = new FilterCard("instant or sorcery card from your graveyard"); + private static final FilterCard filter = new FilterCard("instant or sorcery card from your graveyard"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/guildpact/Mortify.java b/Mage.Sets/src/mage/sets/guildpact/Mortify.java index 708e0529198..c08447c3d15 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Mortify.java +++ b/Mage.Sets/src/mage/sets/guildpact/Mortify.java @@ -42,7 +42,7 @@ import mage.target.TargetPermanent; */ public class Mortify extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("creature or enchantment"); + private static final FilterPermanent filter = new FilterPermanent("creature or enchantment"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/guildpact/OrzhovBasilica.java b/Mage.Sets/src/mage/sets/guildpact/OrzhovBasilica.java index 31749b3d835..c38c2a1efeb 100644 --- a/Mage.Sets/src/mage/sets/guildpact/OrzhovBasilica.java +++ b/Mage.Sets/src/mage/sets/guildpact/OrzhovBasilica.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledPermanent; */ public class OrzhovBasilica extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public OrzhovBasilica(UUID ownerId) { super(ownerId, 161, "Orzhov Basilica", Rarity.COMMON, new CardType[]{CardType.LAND}, ""); diff --git a/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java b/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java index 351e2867fcd..d9c14228719 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java +++ b/Mage.Sets/src/mage/sets/guildpact/SkeletalVampire.java @@ -53,7 +53,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class SkeletalVampire extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Bat"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Bat"); static { filter.add(new SubtypePredicate("Bat")); diff --git a/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java b/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java index e095865efe5..538fb7a6e7c 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java +++ b/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class WeeDragonauts extends CardImpl { - private final static FilterSpell filter = new FilterSpell("instant or sorcery spell"); + private static final FilterSpell filter = new FilterSpell("instant or sorcery spell"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java b/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java index ac9588bb636..db75a73e390 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java +++ b/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java @@ -44,7 +44,7 @@ import mage.target.TargetPermanent; */ public class WreakHavoc extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact or land"); + private static final FilterPermanent filter = new FilterPermanent("artifact or land"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java b/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java index 30a18758db0..ee45a5d3512 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java +++ b/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java @@ -55,7 +55,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class WurmweaverCoil extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("green creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("green creature"); static { filter.add(new ColorPredicate(ObjectColor.GREEN)); diff --git a/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java b/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java index edc3bd6ad0e..c2e04940dae 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java +++ b/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java @@ -45,7 +45,7 @@ import java.util.UUID; */ public class AncientGrudge extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/innistrad/BattlegroundGeist.java b/Mage.Sets/src/mage/sets/innistrad/BattlegroundGeist.java index aa067608487..ef9b79f1e49 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BattlegroundGeist.java +++ b/Mage.Sets/src/mage/sets/innistrad/BattlegroundGeist.java @@ -45,7 +45,7 @@ import java.util.UUID; */ public class BattlegroundGeist extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Spirit creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Spirit creatures"); static { filter.add(new SubtypePredicate("Spirit")); diff --git a/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java b/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java index c527061a7dd..fe0072d0bc1 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java +++ b/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java @@ -84,7 +84,7 @@ public class BitterheartWitch extends CardImpl { class BitterheartWitchEffect extends OneShotEffect { - private final static FilterCard filter = new FilterCard("Curse card in your library"); + private static final FilterCard filter = new FilterCard("Curse card in your library"); static { filter.add(new SubtypePredicate("Curse")); diff --git a/Mage.Sets/src/mage/sets/innistrad/HollowhengeScavenger.java b/Mage.Sets/src/mage/sets/innistrad/HollowhengeScavenger.java index 97c8cd8ed43..2a2ad55591b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HollowhengeScavenger.java +++ b/Mage.Sets/src/mage/sets/innistrad/HollowhengeScavenger.java @@ -45,7 +45,7 @@ import java.util.UUID; */ public class HollowhengeScavenger extends CardImpl { - private final static String staticText = "Morbid - When {this} enters the battlefield, if a creature died this turn, you gain 5 life."; + private static final String staticText = "Morbid - When {this} enters the battlefield, if a creature died this turn, you gain 5 life."; public HollowhengeScavenger(UUID ownerId) { super(ownerId, 188, "Hollowhenge Scavenger", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); diff --git a/Mage.Sets/src/mage/sets/innistrad/IntangibleVirtue.java b/Mage.Sets/src/mage/sets/innistrad/IntangibleVirtue.java index 8f35ab622f0..699568bb29a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/IntangibleVirtue.java +++ b/Mage.Sets/src/mage/sets/innistrad/IntangibleVirtue.java @@ -45,7 +45,7 @@ import mage.filter.predicate.permanent.TokenPredicate; */ public class IntangibleVirtue extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Creature tokens"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creature tokens"); static { filter.add(new TokenPredicate()); diff --git a/Mage.Sets/src/mage/sets/innistrad/MorkrutBanshee.java b/Mage.Sets/src/mage/sets/innistrad/MorkrutBanshee.java index b295835d15a..38bff1b5d5a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MorkrutBanshee.java +++ b/Mage.Sets/src/mage/sets/innistrad/MorkrutBanshee.java @@ -46,7 +46,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; */ public class MorkrutBanshee extends CardImpl { - private final static String staticText = "Morbid - When {this} enters the battlefield, if a creature died this turn, target creature gets -4/-4 until end of turn."; + private static final String staticText = "Morbid - When {this} enters the battlefield, if a creature died this turn, target creature gets -4/-4 until end of turn."; public MorkrutBanshee(UUID ownerId) { super(ownerId, 110, "Morkrut Banshee", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{B}{B}"); diff --git a/Mage.Sets/src/mage/sets/innistrad/WoodlandSleuth.java b/Mage.Sets/src/mage/sets/innistrad/WoodlandSleuth.java index a384c57adc8..f1db0131c19 100644 --- a/Mage.Sets/src/mage/sets/innistrad/WoodlandSleuth.java +++ b/Mage.Sets/src/mage/sets/innistrad/WoodlandSleuth.java @@ -52,7 +52,7 @@ import mage.players.Player; */ public class WoodlandSleuth extends CardImpl { - private final static String staticText = "Morbid - When {this} enters the battlefield, if a creature died this turn, return a creature card at random from your graveyard to your hand."; + private static final String staticText = "Morbid - When {this} enters the battlefield, if a creature died this turn, return a creature card at random from your graveyard to your hand."; public WoodlandSleuth(UUID ownerId) { super(ownerId, 210, "Woodland Sleuth", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); diff --git a/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java b/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java index 89b6bab0c82..2e601cec8be 100644 --- a/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java +++ b/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java @@ -49,7 +49,7 @@ import mage.counters.CounterType; */ public class UrborgSkeleton extends CardImpl { - private final static String staticText = "If Urborg Skeleton was kicked, it enters the battlefield with a +1/+1 counter on it"; + private static final String staticText = "If Urborg Skeleton was kicked, it enters the battlefield with a +1/+1 counter on it"; public UrborgSkeleton(UUID ownerId) { super(ownerId, 134, "Urborg Skeleton", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}"); diff --git a/Mage.Sets/src/mage/sets/legions/DarkSupplicant.java b/Mage.Sets/src/mage/sets/legions/DarkSupplicant.java index 969656a239d..02204d7d4e0 100644 --- a/Mage.Sets/src/mage/sets/legions/DarkSupplicant.java +++ b/Mage.Sets/src/mage/sets/legions/DarkSupplicant.java @@ -56,7 +56,7 @@ import mage.target.common.TargetControlledPermanent; */ public class DarkSupplicant extends CardImpl { - final static private FilterControlledPermanent filter = new FilterControlledPermanent("three Clerics you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("three Clerics you control"); static { filter.add(new SubtypePredicate("Cleric")); diff --git a/Mage.Sets/src/mage/sets/legions/GoblinTurncoat.java b/Mage.Sets/src/mage/sets/legions/GoblinTurncoat.java index f895bc7e9cb..c8a9e7a1e82 100644 --- a/Mage.Sets/src/mage/sets/legions/GoblinTurncoat.java +++ b/Mage.Sets/src/mage/sets/legions/GoblinTurncoat.java @@ -47,7 +47,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class GoblinTurncoat extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Goblin"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Goblin"); static { filter.add(new SubtypePredicate("Goblin")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java b/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java index f060a141110..02b5aaea99d 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java @@ -55,7 +55,7 @@ import java.util.UUID; */ public class Benthicore extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java b/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java index 9d3c42e6e25..15e8a72b56f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java @@ -48,7 +48,7 @@ import java.util.UUID; */ public class BlackPoplarShaman extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("Treefolk"); + private static final FilterPermanent filter = new FilterPermanent("Treefolk"); static { filter.add(new SubtypePredicate("Treefolk")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java b/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java index 6e86e242fd5..c6883f6ccc6 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java @@ -43,7 +43,7 @@ import java.util.UUID; */ public class BoggartBirthRite extends CardImpl { - private final static FilterCard filter = new FilterCard("Goblin card from your graveyard"); + private static final FilterCard filter = new FilterCard("Goblin card from your graveyard"); static { filter.add(new SubtypePredicate("Goblin")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/CaterwaulingBoggart.java b/Mage.Sets/src/mage/sets/lorwyn/CaterwaulingBoggart.java index 10348e9b37f..84542e44812 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/CaterwaulingBoggart.java +++ b/Mage.Sets/src/mage/sets/lorwyn/CaterwaulingBoggart.java @@ -47,8 +47,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class CaterwaulingBoggart extends CardImpl { - private final static FilterPermanent filterGoblin = new FilterControlledCreaturePermanent("Goblin"); - private final static FilterPermanent filterElemental = new FilterControlledCreaturePermanent("Elemental"); + private static final FilterPermanent filterGoblin = new FilterControlledCreaturePermanent("Goblin"); + private static final FilterPermanent filterElemental = new FilterControlledCreaturePermanent("Elemental"); static { filterGoblin.add(new SubtypePredicate("Goblin")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java b/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java index aadcad7362e..8dfde313b8c 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java +++ b/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java @@ -55,7 +55,7 @@ import java.util.UUID; */ public class CloudgoatRanger extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("untapped Kithkin you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Kithkin you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java b/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java index 155d729527d..0926c6b23e5 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java @@ -47,7 +47,7 @@ import java.util.UUID; */ public class ElvishEulogist extends CardImpl { - private final static FilterCard filter = new FilterCard("Elf"); + private static final FilterCard filter = new FilterCard("Elf"); static { filter.add(new SubtypePredicate("Elf")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java b/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java index d49b2711d1c..e50096c2641 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java @@ -44,7 +44,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class ElvishHandservant extends CardImpl { - private final static FilterSpell filter = new FilterSpell("Giant"); + private static final FilterSpell filter = new FilterSpell("Giant"); static { filter.add(new SubtypePredicate("Giant")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java b/Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java index 330d95a2668..724ac0c24b7 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java @@ -44,7 +44,7 @@ import java.util.UUID; */ public class ElvishPromenade extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Elf you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Elf you control"); static { filter.add(new SubtypePredicate("Elf")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java b/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java index c13185ffb11..d57490cb96c 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java +++ b/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java @@ -44,7 +44,7 @@ import java.util.UUID; */ public class EyeblightsEnding extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Elf creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Elf creature"); static { filter.add(Predicates.not(new SubtypePredicate("Elf"))); diff --git a/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java b/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java index d1fd6036ef9..6e4170dbd17 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java @@ -49,7 +49,7 @@ import java.util.UUID; */ public class Facevaulter extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Goblin"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Goblin"); static { filter.add(new SubtypePredicate("Goblin")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java b/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java index 2f50da3838d..0cc27a77b09 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java @@ -50,7 +50,7 @@ import java.util.UUID; */ public class Goatnapper extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("Goat"); + private static final FilterPermanent filter = new FilterPermanent("Goat"); static { filter.add(new SubtypePredicate("Goat")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java b/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java index 44459a42a77..a2fa9963292 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java @@ -52,7 +52,7 @@ import java.util.UUID; */ public class GuardianOfCloverdell extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Kithkin"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Kithkin"); static { filter.add(new SubtypePredicate("Kithkin")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java b/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java index b2aedc3e913..3a79afec6f7 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java @@ -50,7 +50,7 @@ import java.util.UUID; */ public class HarpoonSniper extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Merfolk you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Merfolk you control"); static { filter.add(new SubtypePredicate("Merfolk")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java b/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java index 34fa51c5af1..9b64d023202 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java @@ -53,8 +53,8 @@ import java.util.UUID; */ public class HearthcageGiant extends CardImpl { - private final static FilterControlledPermanent filterElemental = new FilterControlledPermanent("Elemental"); - private final static FilterCreaturePermanent filterGiant = new FilterCreaturePermanent("Giant"); + private static final FilterControlledPermanent filterElemental = new FilterControlledPermanent("Elemental"); + private static final FilterCreaturePermanent filterGiant = new FilterCreaturePermanent("Giant"); static { filterElemental.add(new SubtypePredicate("Elemental")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java b/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java index 89d93cc61a0..b8de881e4d7 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java @@ -45,8 +45,8 @@ import java.util.UUID; */ public class HurlyBurly extends CardImpl { - private final static FilterCreaturePermanent filterWithoutFlying = new FilterCreaturePermanent("creature without flying"); - private final static FilterCreaturePermanent filterWithFlying = new FilterCreaturePermanent("creature with flying"); + private static final FilterCreaturePermanent filterWithoutFlying = new FilterCreaturePermanent("creature without flying"); + private static final FilterCreaturePermanent filterWithFlying = new FilterCreaturePermanent("creature with flying"); static { filterWithoutFlying.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java b/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java index 4b8324e96bc..8255af74ea4 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java @@ -51,7 +51,7 @@ import java.util.UUID; */ public class ImperiousPerfect extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf creatures"); static { filter.add(new SubtypePredicate("Elf")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java b/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java index f4b8f158101..64d670c54ab 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java +++ b/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java @@ -44,7 +44,7 @@ import mage.game.permanent.token.ElfToken; */ public class LysAlanaHuntmaster extends CardImpl { - private final static FilterSpell filter = new FilterSpell("Elf spell"); + private static final FilterSpell filter = new FilterSpell("Elf spell"); static { filter.add(new SubtypePredicate("Elf")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java b/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java index b44946bb1ac..e729fdf97e5 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java @@ -52,8 +52,8 @@ import java.util.UUID; */ public class MadAuntie extends CardImpl { - private final static FilterControlledCreaturePermanent filter1 = new FilterControlledCreaturePermanent("another Goblin"); - private final static FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Goblin creatures"); + private static final FilterControlledCreaturePermanent filter1 = new FilterControlledCreaturePermanent("another Goblin"); + private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Goblin creatures"); static { filter1.add(new SubtypePredicate("Goblin")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java b/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java index 8f493370bfb..9c5b5cad791 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java +++ b/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java @@ -52,7 +52,7 @@ import java.util.UUID; */ public class NectarFaerie extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("Faerie or Elf"); + private static final FilterPermanent filter = new FilterPermanent("Faerie or Elf"); static { filter.add(Predicates.or(new SubtypePredicate("Faerie"),new SubtypePredicate("Elf"))); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java b/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java index 5874880f9de..865d0c10848 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java @@ -51,7 +51,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public class ScionOfOona extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Faeries"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Faeries"); static { filter.add(new SubtypePredicate("Faerie")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java b/Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java index 6fd8a87203d..3e66b5b07a9 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java @@ -46,7 +46,7 @@ import java.util.UUID; */ public class SeedguideAsh extends CardImpl { - private final static FilterCard filter = new FilterCard("Forest"); + private static final FilterCard filter = new FilterCard("Forest"); static { filter.add(new SubtypePredicate("Forest")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/SpringleafDrum.java b/Mage.Sets/src/mage/sets/lorwyn/SpringleafDrum.java index ba872610878..be736f84136 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SpringleafDrum.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SpringleafDrum.java @@ -45,7 +45,7 @@ import java.util.UUID; */ public class SpringleafDrum extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java b/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java index 2ba69cc5664..d9680aeefd8 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java @@ -50,7 +50,7 @@ import java.util.UUID; */ public class SummonTheSchool extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java b/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java index a654b17cbd0..cb3390b73a5 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java @@ -47,7 +47,7 @@ import java.util.UUID; */ public class SunriseSovereign extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Giant"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Giant"); static { filter.add(new SubtypePredicate("Giant")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java b/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java index 21f7a6f63ff..ee6d184e90c 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java +++ b/Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java @@ -50,7 +50,7 @@ import java.util.UUID; */ public class TarPitcher extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Goblin"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Goblin"); static { filter.add(new SubtypePredicate("Goblin")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java b/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java index 9c230ccc1c5..964a56abeb1 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java @@ -46,7 +46,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class ThorntoothWitch extends CardImpl { - private final static FilterSpell filter = new FilterSpell("Treefolk"); + private static final FilterSpell filter = new FilterSpell("Treefolk"); static { filter.add(new SubtypePredicate("Treefolk")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java b/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java index ddfbd885964..9437eb70716 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java +++ b/Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java @@ -49,8 +49,8 @@ import mage.filter.predicate.permanent.AnotherPredicate; */ public class TimberProtector extends CardImpl { - private final static FilterCreaturePermanent filterTreefolk = new FilterCreaturePermanent("Treefolk creatures"); - private final static FilterControlledPermanent filterBoth = new FilterControlledPermanent("Other Treefolk and Forests you control"); + private static final FilterCreaturePermanent filterTreefolk = new FilterCreaturePermanent("Treefolk creatures"); + private static final FilterControlledPermanent filterBoth = new FilterControlledPermanent("Other Treefolk and Forests you control"); static { filterTreefolk.add(new SubtypePredicate("Treefolk")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java b/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java index 98b25573f3a..7c8b04048be 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java @@ -45,7 +45,7 @@ import java.util.UUID; */ public class WizenedCenn extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Kithkin creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Kithkin creatures"); static { filter.add(new SubtypePredicate("Kithkin")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java b/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java index 11549c60a33..737e6226533 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java +++ b/Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java @@ -48,7 +48,7 @@ import java.util.UUID; */ public class WortBoggartAuntie extends CardImpl { - private final static FilterCard filter = new FilterCard("Goblin card from your graveyard"); + private static final FilterCard filter = new FilterCard("Goblin card from your graveyard"); static { filter.add(new SubtypePredicate("Goblin")); diff --git a/Mage.Sets/src/mage/sets/magic2010/BorderlandRanger.java b/Mage.Sets/src/mage/sets/magic2010/BorderlandRanger.java index 1ccb896a5a2..dc0c73715a9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BorderlandRanger.java +++ b/Mage.Sets/src/mage/sets/magic2010/BorderlandRanger.java @@ -43,7 +43,7 @@ import mage.target.common.TargetCardInLibrary; */ public class BorderlandRanger extends CardImpl { - private final static FilterBasicLandCard filter = new FilterBasicLandCard(); + private static final FilterBasicLandCard filter = new FilterBasicLandCard(); public BorderlandRanger(UUID ownerId) { super(ownerId, 169, "Borderland Ranger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); diff --git a/Mage.Sets/src/mage/sets/magic2010/CaptainOfTheWatch.java b/Mage.Sets/src/mage/sets/magic2010/CaptainOfTheWatch.java index 823897fb5da..44590112466 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CaptainOfTheWatch.java +++ b/Mage.Sets/src/mage/sets/magic2010/CaptainOfTheWatch.java @@ -50,7 +50,7 @@ import mage.game.permanent.token.SoldierToken; */ public class CaptainOfTheWatch extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); static { filter.add(new SubtypePredicate("Soldier")); diff --git a/Mage.Sets/src/mage/sets/magic2010/Fabricate.java b/Mage.Sets/src/mage/sets/magic2010/Fabricate.java index b137f46b555..47f0a8aea8c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Fabricate.java +++ b/Mage.Sets/src/mage/sets/magic2010/Fabricate.java @@ -42,7 +42,7 @@ import mage.target.common.TargetCardInLibrary; */ public class Fabricate extends CardImpl { - private final static FilterCard filter = new FilterCard("artifact"); + private static final FilterCard filter = new FilterCard("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/magic2010/HowlOfTheNightPack.java b/Mage.Sets/src/mage/sets/magic2010/HowlOfTheNightPack.java index cd08cd917ed..5b5b6f74816 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HowlOfTheNightPack.java +++ b/Mage.Sets/src/mage/sets/magic2010/HowlOfTheNightPack.java @@ -43,7 +43,7 @@ import mage.game.permanent.token.WolfToken; */ public class HowlOfTheNightPack extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("for each Forest you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("for each Forest you control"); static { filter.add(new SubtypePredicate("Forest")); diff --git a/Mage.Sets/src/mage/sets/magic2010/PlanarCleansing.java b/Mage.Sets/src/mage/sets/magic2010/PlanarCleansing.java index 23a9817e17e..7d118d6b429 100644 --- a/Mage.Sets/src/mage/sets/magic2010/PlanarCleansing.java +++ b/Mage.Sets/src/mage/sets/magic2010/PlanarCleansing.java @@ -67,7 +67,7 @@ public class PlanarCleansing extends CardImpl { class PlanarCleansingEffect extends OneShotEffect { - private final static FilterPermanent filter = new FilterNonlandPermanent(); + private static final FilterPermanent filter = new FilterNonlandPermanent(); public PlanarCleansingEffect() { super(Constants.Outcome.DestroyPermanent); diff --git a/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java b/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java index 1f0b0b3ad23..7459097b7ee 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java +++ b/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java @@ -43,7 +43,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class SeismicStrike extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Mountains you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Mountains you control"); static { filter.add(new SubtypePredicate("Mountain")); diff --git a/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java b/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java index 56814b786e2..24c32f8fb6b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java +++ b/Mage.Sets/src/mage/sets/magic2010/SerpentOfTheEndlessSea.java @@ -52,7 +52,7 @@ import mage.game.events.GameEvent; */ public class SerpentOfTheEndlessSea extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Islands you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Islands you control"); static { filter.add(new SubtypePredicate("Island")); diff --git a/Mage.Sets/src/mage/sets/magic2010/SiegeGangCommander.java b/Mage.Sets/src/mage/sets/magic2010/SiegeGangCommander.java index 3d2aea22ef8..50bb25979f0 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SiegeGangCommander.java +++ b/Mage.Sets/src/mage/sets/magic2010/SiegeGangCommander.java @@ -53,7 +53,7 @@ import mage.target.common.TargetCreatureOrPlayer; */ public class SiegeGangCommander extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Goblin"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Goblin"); static { filter.add(new SubtypePredicate("Goblin")); diff --git a/Mage.Sets/src/mage/sets/magic2010/TempestOfLight.java b/Mage.Sets/src/mage/sets/magic2010/TempestOfLight.java index 6d0742b9fc7..498b25d1fd1 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TempestOfLight.java +++ b/Mage.Sets/src/mage/sets/magic2010/TempestOfLight.java @@ -65,7 +65,7 @@ public class TempestOfLight extends CardImpl { class TempestOfLightEffect extends OneShotEffect { - private final static FilterPermanent filter = new FilterPermanent(""); + private static final FilterPermanent filter = new FilterPermanent(""); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java b/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java index 034f785321e..2b744220d1d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java +++ b/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class TendrilsOfCorruption extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Swamp you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Swamp you control"); static { filter.add(new SubtypePredicate("Swamp")); diff --git a/Mage.Sets/src/mage/sets/magic2010/Twincast.java b/Mage.Sets/src/mage/sets/magic2010/Twincast.java index 7beea74b08c..61216528922 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Twincast.java +++ b/Mage.Sets/src/mage/sets/magic2010/Twincast.java @@ -43,7 +43,7 @@ import mage.target.TargetSpell; */ public class Twincast extends CardImpl { - private final static FilterSpell filter = new FilterSpell("instant or sorcery spell"); + private static final FilterSpell filter = new FilterSpell("instant or sorcery spell"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java b/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java index ea411f5d1bd..e92a8bf2489 100644 --- a/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java +++ b/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java @@ -50,7 +50,7 @@ import mage.target.TargetPermanent; */ public class UndeadSlayer extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("Skeleton, Vampire, or Zombie"); + private static final FilterPermanent filter = new FilterPermanent("Skeleton, Vampire, or Zombie"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/magic2010/VeteranArmorsmith.java b/Mage.Sets/src/mage/sets/magic2010/VeteranArmorsmith.java index df5c7f6d4b0..a8c8356cf16 100644 --- a/Mage.Sets/src/mage/sets/magic2010/VeteranArmorsmith.java +++ b/Mage.Sets/src/mage/sets/magic2010/VeteranArmorsmith.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class VeteranArmorsmith extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); static { filter.add(new SubtypePredicate("Soldier")); diff --git a/Mage.Sets/src/mage/sets/magic2010/VeteranSwordsmith.java b/Mage.Sets/src/mage/sets/magic2010/VeteranSwordsmith.java index 1b52f18234c..ab5f068cd4d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/VeteranSwordsmith.java +++ b/Mage.Sets/src/mage/sets/magic2010/VeteranSwordsmith.java @@ -44,7 +44,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class VeteranSwordsmith extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier"); static { filter.add(new SubtypePredicate("Soldier")); diff --git a/Mage.Sets/src/mage/sets/magic2012/Auramancer.java b/Mage.Sets/src/mage/sets/magic2012/Auramancer.java index e508e0de78b..de4664f7657 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Auramancer.java +++ b/Mage.Sets/src/mage/sets/magic2012/Auramancer.java @@ -46,7 +46,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public class Auramancer extends CardImpl { - private final static FilterCard filter = new FilterCard("enchantment card from your graveyard"); + private static final FilterCard filter = new FilterCard("enchantment card from your graveyard"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/magic2012/BountifulHarvest.java b/Mage.Sets/src/mage/sets/magic2012/BountifulHarvest.java index 3a928937e6c..5112a5da7eb 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BountifulHarvest.java +++ b/Mage.Sets/src/mage/sets/magic2012/BountifulHarvest.java @@ -42,7 +42,7 @@ import mage.filter.common.FilterControlledPermanent; */ public class BountifulHarvest extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public BountifulHarvest(UUID ownerId) { super(ownerId, 166, "Bountiful Harvest", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{G}"); diff --git a/Mage.Sets/src/mage/sets/magic2012/CemeteryReaper.java b/Mage.Sets/src/mage/sets/magic2012/CemeteryReaper.java index bda14ed1c94..b6c094b251a 100644 --- a/Mage.Sets/src/mage/sets/magic2012/CemeteryReaper.java +++ b/Mage.Sets/src/mage/sets/magic2012/CemeteryReaper.java @@ -54,7 +54,7 @@ import mage.target.common.TargetCardInGraveyard; */ public class CemeteryReaper extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie creatures"); static { filter.add(new SubtypePredicate("Zombie")); } diff --git a/Mage.Sets/src/mage/sets/magic2012/GoblinGrenade.java b/Mage.Sets/src/mage/sets/magic2012/GoblinGrenade.java index f10fff158e4..08c94dc3acd 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GoblinGrenade.java +++ b/Mage.Sets/src/mage/sets/magic2012/GoblinGrenade.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCreatureOrPlayer; */ public class GoblinGrenade extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Goblin"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Goblin"); static { filter.add(new SubtypePredicate("Goblin")); diff --git a/Mage.Sets/src/mage/sets/magic2012/GuardiansPledge.java b/Mage.Sets/src/mage/sets/magic2012/GuardiansPledge.java index 815e972539f..0ac22907ac7 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GuardiansPledge.java +++ b/Mage.Sets/src/mage/sets/magic2012/GuardiansPledge.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public class GuardiansPledge extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("White creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("White creatures"); static { filter.add(new ColorPredicate(ObjectColor.WHITE)); diff --git a/Mage.Sets/src/mage/sets/magic2012/Levitation.java b/Mage.Sets/src/mage/sets/magic2012/Levitation.java index 858015e719f..4dcdb7dfd3e 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Levitation.java +++ b/Mage.Sets/src/mage/sets/magic2012/Levitation.java @@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class Levitation extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("creatures "); + private static final FilterPermanent filter = new FilterPermanent("creatures "); static { filter.add(new CardTypePredicate(CardType.CREATURE)); diff --git a/Mage.Sets/src/mage/sets/magic2012/LordOfTheUnreal.java b/Mage.Sets/src/mage/sets/magic2012/LordOfTheUnreal.java index e6674bb80e8..63af9bb939e 100644 --- a/Mage.Sets/src/mage/sets/magic2012/LordOfTheUnreal.java +++ b/Mage.Sets/src/mage/sets/magic2012/LordOfTheUnreal.java @@ -48,7 +48,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class LordOfTheUnreal extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Illusion creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Illusion creatures"); static { filter.add(new SubtypePredicate("Illusion")); diff --git a/Mage.Sets/src/mage/sets/magic2012/MasterThief.java b/Mage.Sets/src/mage/sets/magic2012/MasterThief.java index e117177eb6c..18b5d90496d 100644 --- a/Mage.Sets/src/mage/sets/magic2012/MasterThief.java +++ b/Mage.Sets/src/mage/sets/magic2012/MasterThief.java @@ -47,7 +47,7 @@ import mage.target.TargetPermanent; */ public class MasterThief extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/magic2012/PrimordialHydra.java b/Mage.Sets/src/mage/sets/magic2012/PrimordialHydra.java index 4df05150330..5850ad27401 100644 --- a/Mage.Sets/src/mage/sets/magic2012/PrimordialHydra.java +++ b/Mage.Sets/src/mage/sets/magic2012/PrimordialHydra.java @@ -56,7 +56,7 @@ import java.util.UUID; */ public class PrimordialHydra extends CardImpl { - private final static String staticText = "{this} has trample as long as it has ten or more +1/+1 counters on it"; + private static final String staticText = "{this} has trample as long as it has ten or more +1/+1 counters on it"; public PrimordialHydra(UUID ownerId) { super(ownerId, 189, "Primordial Hydra", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{X}{G}{G}"); diff --git a/Mage.Sets/src/mage/sets/magic2012/SolemnSimulacrum.java b/Mage.Sets/src/mage/sets/magic2012/SolemnSimulacrum.java index d84224d5c80..1177c205c87 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SolemnSimulacrum.java +++ b/Mage.Sets/src/mage/sets/magic2012/SolemnSimulacrum.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCardInLibrary; */ public class SolemnSimulacrum extends CardImpl { - private final static FilterBasicLandCard filter = new FilterBasicLandCard(); + private static final FilterBasicLandCard filter = new FilterBasicLandCard(); public SolemnSimulacrum(UUID ownerId) { super(ownerId, 217, "Solemn Simulacrum", Rarity.RARE, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}"); diff --git a/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java b/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java index e3303fbad5b..d1ff75b20cd 100644 --- a/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java +++ b/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java @@ -48,7 +48,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class StingerflingSpider extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying"); static { filter.add(new AbilityPredicate(FlyingAbility.class)); diff --git a/Mage.Sets/src/mage/sets/magic2013/AugurOfBolas.java b/Mage.Sets/src/mage/sets/magic2013/AugurOfBolas.java index 8f814fcb246..e4282073bbb 100644 --- a/Mage.Sets/src/mage/sets/magic2013/AugurOfBolas.java +++ b/Mage.Sets/src/mage/sets/magic2013/AugurOfBolas.java @@ -78,7 +78,7 @@ public class AugurOfBolas extends CardImpl { class AugurOfBolasEffect extends OneShotEffect { - final static private FilterCard filter = new FilterCard("Instant or Sorcery card"); + private static final FilterCard filter = new FilterCard("Instant or Sorcery card"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java b/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java index 907d6537a28..be0e2340443 100644 --- a/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java +++ b/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class DiscipleOfBolas extends CardImpl { - final private static FilterCreaturePermanent filter = new FilterCreaturePermanent(" another creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(" another creature"); static { filter.add(new AnotherPredicate()); diff --git a/Mage.Sets/src/mage/sets/magic2013/FungalSprouting.java b/Mage.Sets/src/mage/sets/magic2013/FungalSprouting.java index 58f3a4428b7..c295ae8ac75 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FungalSprouting.java +++ b/Mage.Sets/src/mage/sets/magic2013/FungalSprouting.java @@ -71,7 +71,7 @@ public class FungalSprouting extends CardImpl { class FungalSproutingEffect extends OneShotEffect { - private final static FilterPermanent filter = new FilterPermanent(); + private static final FilterPermanent filter = new FilterPermanent(); static { filter.add(new CardTypePredicate(CardType.CREATURE)); diff --git a/Mage.Sets/src/mage/sets/magic2013/LilianaOfTheDarkRealms.java b/Mage.Sets/src/mage/sets/magic2013/LilianaOfTheDarkRealms.java index 8fba0b1ea37..a5b89e4d9a2 100644 --- a/Mage.Sets/src/mage/sets/magic2013/LilianaOfTheDarkRealms.java +++ b/Mage.Sets/src/mage/sets/magic2013/LilianaOfTheDarkRealms.java @@ -67,7 +67,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class LilianaOfTheDarkRealms extends CardImpl { - private final static FilterLandCard filter = new FilterLandCard("Swamp card"); + private static final FilterLandCard filter = new FilterLandCard("Swamp card"); static { filter.add(new SubtypePredicate("Swamp")); diff --git a/Mage.Sets/src/mage/sets/magic2013/MwonvuliBeastTracker.java b/Mage.Sets/src/mage/sets/magic2013/MwonvuliBeastTracker.java index ffc1ab313df..45a20a6e729 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MwonvuliBeastTracker.java +++ b/Mage.Sets/src/mage/sets/magic2013/MwonvuliBeastTracker.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCardInLibrary; */ public class MwonvuliBeastTracker extends CardImpl { - private final static FilterCard filter = new FilterCard("creature card with deathtouch, hexproof, reach, or trample in your library"); + private static final FilterCard filter = new FilterCard("creature card with deathtouch, hexproof, reach, or trample in your library"); static { filter.add(new CardTypePredicate(CardType.CREATURE)); diff --git a/Mage.Sets/src/mage/sets/magic2013/Spelltwine.java b/Mage.Sets/src/mage/sets/magic2013/Spelltwine.java index 13fd1692c1a..d442c180976 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Spelltwine.java +++ b/Mage.Sets/src/mage/sets/magic2013/Spelltwine.java @@ -50,8 +50,8 @@ import mage.target.common.TargetCardInYourGraveyard; */ public class Spelltwine extends CardImpl { - private final static FilterCard filter = new FilterCard("instant or sorcery card from your graveyard"); - private final static FilterCard filter2 = new FilterCard("instant or sorcery card from an opponent's graveyard"); + private static final FilterCard filter = new FilterCard("instant or sorcery card from your graveyard"); + private static final FilterCard filter2 = new FilterCard("instant or sorcery card from an opponent's graveyard"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Misdirection.java b/Mage.Sets/src/mage/sets/mercadianmasques/Misdirection.java index b28a4d34875..6cc7200aad0 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Misdirection.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Misdirection.java @@ -56,7 +56,7 @@ import mage.target.common.TargetCardInHand; */ public class Misdirection extends CardImpl { - final static private FilterSpell filter2 = new FilterSpell(); + private static final FilterSpell filter2 = new FilterSpell(); static { filter2.add(new NumberOfTargetsPredicate(1)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java b/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java index ece952f18b1..9c9c07c1c23 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java @@ -43,7 +43,7 @@ import mage.target.TargetPermanent; */ public class AltarsLight extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact or enchantment"); + private static final FilterPermanent filter = new FilterPermanent("artifact or enchantment"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/mirrodin/Annul.java b/Mage.Sets/src/mage/sets/mirrodin/Annul.java index 71364e6cc27..d21818f8465 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Annul.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Annul.java @@ -43,7 +43,7 @@ import mage.target.TargetSpell; */ public class Annul extends CardImpl { - private final static FilterSpell filter = new FilterSpell("artifact or enchantment spell"); + private static final FilterSpell filter = new FilterSpell("artifact or enchantment spell"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/mirrodin/Atog.java b/Mage.Sets/src/mage/sets/mirrodin/Atog.java index 1e321afd570..c0b2a6f2ac1 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Atog.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Atog.java @@ -47,7 +47,7 @@ import mage.target.common.TargetControlledPermanent; */ public class Atog extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("an artifact"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("an artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java b/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java index cadb9e038ac..4009d9334fe 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java @@ -48,7 +48,7 @@ import mage.target.TargetPermanent; */ public class AuriokTransfixer extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java b/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java index 0525e088f31..09be75de8ee 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java @@ -44,7 +44,7 @@ import mage.target.TargetPermanent; */ public class Deconstruct extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java b/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java index 91a9bc4cdd5..9e669247814 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java @@ -49,7 +49,7 @@ import mage.target.TargetPermanent; */ public class ElfReplica extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("enchantment"); + private static final FilterPermanent filter = new FilterPermanent("enchantment"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java b/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java index 5d7e368df2d..17b8fb44f49 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java +++ b/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java @@ -49,7 +49,7 @@ import mage.target.TargetPermanent; */ public class GalvanicKey extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java b/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java index 5db4482bbcb..f91588a5b10 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java +++ b/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java @@ -49,7 +49,7 @@ import mage.target.TargetPermanent; */ public class GoblinReplica extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/KrarkClanGrunt.java b/Mage.Sets/src/mage/sets/mirrodin/KrarkClanGrunt.java index 2131f1a9a0f..44a217bda41 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/KrarkClanGrunt.java +++ b/Mage.Sets/src/mage/sets/mirrodin/KrarkClanGrunt.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledPermanent; */ public class KrarkClanGrunt extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("an artifact"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("an artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java b/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java index a3e0a795703..3e9f6177e83 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java +++ b/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java @@ -50,8 +50,8 @@ import mage.target.common.TargetControlledPermanent; */ public class KrarkClanShaman extends CardImpl { - private final static FilterControlledPermanent filterSacrificed = new FilterControlledPermanent("an artifact"); - private final static FilterCreaturePermanent filterTargetedCreatures = new FilterCreaturePermanent("creature without flying"); + private static final FilterControlledPermanent filterSacrificed = new FilterControlledPermanent("an artifact"); + private static final FilterCreaturePermanent filterTargetedCreatures = new FilterCreaturePermanent("creature without flying"); static { filterSacrificed.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java index 5ed5165034e..0c1e68c6a32 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class LeoninAbunas extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Artifacts you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Artifacts you control"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java b/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java index a2296b9fe2c..c53f23aa6e8 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java @@ -46,7 +46,7 @@ import mage.target.TargetPermanent; */ public class LoomingHoverguard extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java b/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java index e49d4b67d08..88819ef2a38 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java @@ -48,7 +48,7 @@ import mage.target.TargetPermanent; */ public class LoxodonMender extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/Megatog.java b/Mage.Sets/src/mage/sets/mirrodin/Megatog.java index 3f517b725c1..e68678b7c1d 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Megatog.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Megatog.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent; */ public class Megatog extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("an artifact"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("an artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java b/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java index e5c4f60dff7..40230f39e1d 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java +++ b/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class MolderSlug extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java b/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java index 3e6b4069751..2e384e789f3 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java @@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class NimLasher extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("artifact you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("artifact you control"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java b/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java index cb344bde1b7..81bd9d56653 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class NimShambler extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("artifact you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("artifact you control"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java b/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java index 76d33907533..96df87c0d4c 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java @@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class NimShrieker extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("artifact you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("artifact you control"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java b/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java index 1fd665350d5..3a44fc37070 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCreatureOrPlayer; */ public class ShrapnelBlast extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("an artifact"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("an artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java b/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java index 3128e818dab..257d6995995 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class TrollsOfTelJilad extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("green creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("green creature"); static { filter.add(new ColorPredicate(ObjectColor.GREEN)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java b/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java index db78511f34d..337018c6925 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java @@ -44,7 +44,7 @@ import mage.target.TargetPermanent; */ public class TurnToDust extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("Equipment"); + private static final FilterPermanent filter = new FilterPermanent("Equipment"); static { filter.add(new SubtypePredicate("Equipment")); diff --git a/Mage.Sets/src/mage/sets/morningtide/ChameleonColossus.java b/Mage.Sets/src/mage/sets/morningtide/ChameleonColossus.java index 564be9cf633..040a5973121 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ChameleonColossus.java +++ b/Mage.Sets/src/mage/sets/morningtide/ChameleonColossus.java @@ -55,7 +55,7 @@ import mage.game.permanent.Permanent; */ public class ChameleonColossus extends CardImpl { - private final static FilterCard filter = new FilterCard("black"); + private static final FilterCard filter = new FilterCard("black"); static { filter.add(new ColorPredicate(ObjectColor.BLACK)); diff --git a/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java b/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java index 9990e2cc27a..1c4aab0dc15 100644 --- a/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java +++ b/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java @@ -51,8 +51,8 @@ import mage.target.common.TargetCardInYourGraveyard; */ public class EverbarkShaman extends CardImpl { - private final static FilterCard filterForest = new FilterCard("Forest"); - private final static FilterCard filterTreefolk = new FilterCard("Treefolk from your graveyard"); + private static final FilterCard filterForest = new FilterCard("Forest"); + private static final FilterCard filterTreefolk = new FilterCard("Treefolk from your graveyard"); static { filterForest.add(new NamePredicate("Forest")); diff --git a/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java b/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java index 47d4552ef83..cbaf0d47da5 100644 --- a/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java +++ b/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java @@ -52,7 +52,7 @@ import mage.players.Player; */ public class GreatbowDoyen extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Archer creatures you control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Archer creatures you control"); static { filter.add(new ControllerPredicate(Constants.TargetController.YOU)); diff --git a/Mage.Sets/src/mage/sets/morningtide/HeritageDruid.java b/Mage.Sets/src/mage/sets/morningtide/HeritageDruid.java index 10de37b5f05..f45e958815f 100644 --- a/Mage.Sets/src/mage/sets/morningtide/HeritageDruid.java +++ b/Mage.Sets/src/mage/sets/morningtide/HeritageDruid.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledCreaturePermanent; public class HeritageDruid extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Elves you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Elves you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/morningtide/IdyllicTutor.java b/Mage.Sets/src/mage/sets/morningtide/IdyllicTutor.java index 5351b3c35b3..2c66d1e50c4 100644 --- a/Mage.Sets/src/mage/sets/morningtide/IdyllicTutor.java +++ b/Mage.Sets/src/mage/sets/morningtide/IdyllicTutor.java @@ -42,7 +42,7 @@ import mage.target.common.TargetCardInLibrary; */ public class IdyllicTutor extends CardImpl { - private final static FilterCard filter = new FilterCard("enchantment"); + private static final FilterCard filter = new FilterCard("enchantment"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java b/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java index 6d261c5efef..498ec180e1b 100644 --- a/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java +++ b/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java @@ -49,7 +49,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class InspiredSprite extends CardImpl { - private final static FilterSpell filter = new FilterSpell("Wizard"); + private static final FilterSpell filter = new FilterSpell("Wizard"); static { filter.add(new SubtypePredicate("Wizard")); diff --git a/Mage.Sets/src/mage/sets/morningtide/KinsbaileCavalier.java b/Mage.Sets/src/mage/sets/morningtide/KinsbaileCavalier.java index edf106fad98..ab057d80390 100644 --- a/Mage.Sets/src/mage/sets/morningtide/KinsbaileCavalier.java +++ b/Mage.Sets/src/mage/sets/morningtide/KinsbaileCavalier.java @@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class KinsbaileCavalier extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Knight"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Knight"); static { filter.add(new SubtypePredicate("Knight")); diff --git a/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java b/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java index f5878cdfd00..6e2ffe0e263 100644 --- a/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java +++ b/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java @@ -49,8 +49,8 @@ import mage.target.common.TargetCreaturePermanent; */ public class LysAlanaBowmaster extends CardImpl { - private final static FilterSpell filterElf = new FilterSpell("Elf"); - private final static FilterCreaturePermanent filterFlying = new FilterCreaturePermanent("creature with flying"); + private static final FilterSpell filterElf = new FilterSpell("Elf"); + private static final FilterCreaturePermanent filterFlying = new FilterCreaturePermanent("creature with flying"); static { filterElf.add(new SubtypePredicate("Elf")); diff --git a/Mage.Sets/src/mage/sets/morningtide/MothdustChangeling.java b/Mage.Sets/src/mage/sets/morningtide/MothdustChangeling.java index 4f66fd9f6d4..04a1e208f44 100644 --- a/Mage.Sets/src/mage/sets/morningtide/MothdustChangeling.java +++ b/Mage.Sets/src/mage/sets/morningtide/MothdustChangeling.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent; */ public class MothdustChangeling extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/morningtide/RhysTheExiled.java b/Mage.Sets/src/mage/sets/morningtide/RhysTheExiled.java index 8efe7fb77b7..8be33d29a55 100644 --- a/Mage.Sets/src/mage/sets/morningtide/RhysTheExiled.java +++ b/Mage.Sets/src/mage/sets/morningtide/RhysTheExiled.java @@ -52,7 +52,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class RhysTheExiled extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Elf"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Elf"); static { filter.add(new SubtypePredicate("Elf")); diff --git a/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java b/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java index 7554df945af..b32137f0272 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java +++ b/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class ScarbladeElite extends CardImpl { - private final static FilterCard filter = new FilterCard("Assassin card from your graveyard"); + private static final FilterCard filter = new FilterCard("Assassin card from your graveyard"); static { filter.add(new SubtypePredicate("Assassin")); diff --git a/Mage.Sets/src/mage/sets/morningtide/SeethingPathblazer.java b/Mage.Sets/src/mage/sets/morningtide/SeethingPathblazer.java index 17d554d637c..1d87b875d55 100644 --- a/Mage.Sets/src/mage/sets/morningtide/SeethingPathblazer.java +++ b/Mage.Sets/src/mage/sets/morningtide/SeethingPathblazer.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class SeethingPathblazer extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Elemental"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Elemental"); static { filter.add(new SubtypePredicate("Elemental")); diff --git a/Mage.Sets/src/mage/sets/morningtide/ShardVolley.java b/Mage.Sets/src/mage/sets/morningtide/ShardVolley.java index 16934ba404d..dc149df3983 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ShardVolley.java +++ b/Mage.Sets/src/mage/sets/morningtide/ShardVolley.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCreatureOrPlayer; */ public class ShardVolley extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public ShardVolley(UUID ownerId) { super(ownerId, 103, "Shard Volley", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); diff --git a/Mage.Sets/src/mage/sets/morningtide/Shinewend.java b/Mage.Sets/src/mage/sets/morningtide/Shinewend.java index 6cce8fe2031..e8aa49586ee 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Shinewend.java +++ b/Mage.Sets/src/mage/sets/morningtide/Shinewend.java @@ -53,7 +53,7 @@ import mage.target.TargetPermanent; */ public class Shinewend extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("enchantment"); + private static final FilterPermanent filter = new FilterPermanent("enchantment"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/morningtide/SigilTracer.java b/Mage.Sets/src/mage/sets/morningtide/SigilTracer.java index 81a0289a85d..79f0b5fbcfb 100644 --- a/Mage.Sets/src/mage/sets/morningtide/SigilTracer.java +++ b/Mage.Sets/src/mage/sets/morningtide/SigilTracer.java @@ -53,7 +53,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class SigilTracer extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Wizards you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Wizards you control"); private static final FilterSpell filterInstorSorc = new FilterSpell("instant or sorcery spell"); static { diff --git a/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java b/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java index 1efd4b91d92..030c4df9f4f 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java +++ b/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java @@ -53,7 +53,7 @@ import mage.target.TargetPermanent; */ public class Stingmoggie extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact or land"); + private static final FilterPermanent filter = new FilterPermanent("artifact or land"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/morningtide/VioletPall.java b/Mage.Sets/src/mage/sets/morningtide/VioletPall.java index 08b3a1a9ae3..d0478ff1406 100644 --- a/Mage.Sets/src/mage/sets/morningtide/VioletPall.java +++ b/Mage.Sets/src/mage/sets/morningtide/VioletPall.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class VioletPall extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("nonblack creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonblack creature"); static { filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); diff --git a/Mage.Sets/src/mage/sets/morningtide/WeirdingShaman.java b/Mage.Sets/src/mage/sets/morningtide/WeirdingShaman.java index e48ba4defb8..d9fac55b19d 100644 --- a/Mage.Sets/src/mage/sets/morningtide/WeirdingShaman.java +++ b/Mage.Sets/src/mage/sets/morningtide/WeirdingShaman.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledPermanent; */ public class WeirdingShaman extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Goblin"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Goblin"); static { filter.add(new SubtypePredicate("Goblin")); diff --git a/Mage.Sets/src/mage/sets/nemesis/PhyrexianDriver.java b/Mage.Sets/src/mage/sets/nemesis/PhyrexianDriver.java index a7754693cc6..a9188069ff1 100644 --- a/Mage.Sets/src/mage/sets/nemesis/PhyrexianDriver.java +++ b/Mage.Sets/src/mage/sets/nemesis/PhyrexianDriver.java @@ -43,7 +43,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class PhyrexianDriver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Mercenary creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Mercenary creatures"); static { filter.add(new SubtypePredicate("Mercenary")); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MentalMisstep.java b/Mage.Sets/src/mage/sets/newphyrexia/MentalMisstep.java index d8059f1ead4..eff214783d7 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MentalMisstep.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MentalMisstep.java @@ -44,7 +44,7 @@ import mage.target.TargetSpell; */ public class MentalMisstep extends CardImpl { - private final static FilterSpell filter = new FilterSpell("spell with converted mana cost 1"); + private static final FilterSpell filter = new FilterSpell("spell with converted mana cost 1"); static { filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.Equal, 1)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage.java b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage.java index af30d446424..b01f562cfc3 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage.java @@ -54,7 +54,7 @@ import mage.target.common.TargetCreatureOrPlayer; * @author BetaSteward */ public class ShrineOfBurningRage extends CardImpl { - private final static FilterSpell filter = new FilterSpell("a red spell"); + private static final FilterSpell filter = new FilterSpell("a red spell"); static { filter.add(new ColorPredicate(ObjectColor.RED)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java b/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java index 3e4ed9e51a3..cf968c53bb2 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java @@ -44,7 +44,7 @@ import mage.target.TargetPermanent; */ public class VictoriousDestruction extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact or land"); + private static final FilterPermanent filter = new FilterPermanent("artifact or land"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java b/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java index 01b8981a7e4..c190f097aa5 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class Nekrataal extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("nonartifact, nonblack creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonartifact, nonblack creature"); static { filter.add(Predicates.not(new CardTypePredicate(CardType.ARTIFACT))); diff --git a/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java b/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java index f07f3d935da..7dd4c5b2148 100644 --- a/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java +++ b/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class CatapultMaster extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("untapped Soldiers you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Soldiers you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java b/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java index 702f1caff62..b0e9c4a1a78 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java +++ b/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java @@ -93,7 +93,7 @@ public class SupremeInquisitor extends CardImpl { class SupremeInquisitorEffect extends OneShotEffect { - private final static FilterCard filter = new FilterCard(); + private static final FilterCard filter = new FilterCard(); public SupremeInquisitorEffect() { super(Constants.Outcome.Exile); diff --git a/Mage.Sets/src/mage/sets/onslaught/Swat.java b/Mage.Sets/src/mage/sets/onslaught/Swat.java index 31805e39606..4a974441850 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Swat.java +++ b/Mage.Sets/src/mage/sets/onslaught/Swat.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class Swat extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 2 or less"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 2 or less"); static { filter.add(new PowerPredicate(Filter.ComparisonType.LessThan, 3)); diff --git a/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java b/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java index c36bd9d581b..1a8de975485 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java +++ b/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCreaturePermanent; * @author Melkhior */ public class WirewoodLodge extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf"); static { filter.add(new SubtypePredicate("Elf")); } diff --git a/Mage.Sets/src/mage/sets/planechase/AkromasVengeance.java b/Mage.Sets/src/mage/sets/planechase/AkromasVengeance.java index 2c449b3e82b..5cb5ac756a9 100644 --- a/Mage.Sets/src/mage/sets/planechase/AkromasVengeance.java +++ b/Mage.Sets/src/mage/sets/planechase/AkromasVengeance.java @@ -69,7 +69,7 @@ public class AkromasVengeance extends CardImpl { class AkromasVengeanceEffect extends OneShotEffect { - private final static FilterPermanent filter = new FilterPermanent(""); + private static final FilterPermanent filter = new FilterPermanent(""); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/planechase/AscendantEvincar.java b/Mage.Sets/src/mage/sets/planechase/AscendantEvincar.java index 76557915914..a57d48e7b6e 100644 --- a/Mage.Sets/src/mage/sets/planechase/AscendantEvincar.java +++ b/Mage.Sets/src/mage/sets/planechase/AscendantEvincar.java @@ -48,8 +48,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public class AscendantEvincar extends CardImpl { - private final static FilterCreaturePermanent filterBlack = new FilterCreaturePermanent("black creatures"); - private final static FilterCreaturePermanent filterNonBlack = new FilterCreaturePermanent("Nonblack creatures"); + private static final FilterCreaturePermanent filterBlack = new FilterCreaturePermanent("black creatures"); + private static final FilterCreaturePermanent filterNonBlack = new FilterCreaturePermanent("Nonblack creatures"); static { filterBlack.add(new ColorPredicate(ObjectColor.BLACK)); diff --git a/Mage.Sets/src/mage/sets/planechase/BorosGarrison.java b/Mage.Sets/src/mage/sets/planechase/BorosGarrison.java index 66ab74ae4b1..03819d436e9 100644 --- a/Mage.Sets/src/mage/sets/planechase/BorosGarrison.java +++ b/Mage.Sets/src/mage/sets/planechase/BorosGarrison.java @@ -51,7 +51,7 @@ import mage.target.common.TargetControlledPermanent; */ public class BorosGarrison extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public BorosGarrison(UUID ownerId) { super(ownerId, 131, "Boros Garrison", Rarity.COMMON, new CardType[]{CardType.LAND}, null); diff --git a/Mage.Sets/src/mage/sets/planechase/Broodstar.java b/Mage.Sets/src/mage/sets/planechase/Broodstar.java index b1e0eda62d1..338ed4b1787 100644 --- a/Mage.Sets/src/mage/sets/planechase/Broodstar.java +++ b/Mage.Sets/src/mage/sets/planechase/Broodstar.java @@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; * @author Loki */ public class Broodstar extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("artifacts you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("artifacts you control"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/planechase/CabalCoffers.java b/Mage.Sets/src/mage/sets/planechase/CabalCoffers.java index 2d08a4c9c0d..9001e47b9d2 100644 --- a/Mage.Sets/src/mage/sets/planechase/CabalCoffers.java +++ b/Mage.Sets/src/mage/sets/planechase/CabalCoffers.java @@ -48,7 +48,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class CabalCoffers extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Swamp you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Swamp you control"); static { filter.add(new SubtypePredicate("Swamp")); diff --git a/Mage.Sets/src/mage/sets/planechase/CranialPlating.java b/Mage.Sets/src/mage/sets/planechase/CranialPlating.java index c8b53281814..b13e9a27ed3 100644 --- a/Mage.Sets/src/mage/sets/planechase/CranialPlating.java +++ b/Mage.Sets/src/mage/sets/planechase/CranialPlating.java @@ -52,7 +52,7 @@ import mage.target.common.TargetControlledCreaturePermanent; * @author Loki */ public class CranialPlating extends CardImpl { - private final static FilterControlledPermanent filterCounted = new FilterControlledPermanent("artifacts you control"); + private static final FilterControlledPermanent filterCounted = new FilterControlledPermanent("artifacts you control"); static { filterCounted.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/planechase/ExplosiveVegetation.java b/Mage.Sets/src/mage/sets/planechase/ExplosiveVegetation.java index bcf7692c2b6..b7207a60992 100644 --- a/Mage.Sets/src/mage/sets/planechase/ExplosiveVegetation.java +++ b/Mage.Sets/src/mage/sets/planechase/ExplosiveVegetation.java @@ -41,7 +41,7 @@ import mage.target.common.TargetCardInLibrary; */ public class ExplosiveVegetation extends CardImpl { - private final static FilterBasicLandCard filter = new FilterBasicLandCard(); + private static final FilterBasicLandCard filter = new FilterBasicLandCard(); public ExplosiveVegetation(UUID ownerId) { super(ownerId, 70, "Explosive Vegetation", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); diff --git a/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java b/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java index eb78859c560..1604c0f603b 100644 --- a/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java +++ b/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class FiresOfYavimaya extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Creatures you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Creatures you control"); static { filter.add(new ControllerPredicate(Constants.TargetController.YOU)); diff --git a/Mage.Sets/src/mage/sets/planechase/FlamekinHarbinger.java b/Mage.Sets/src/mage/sets/planechase/FlamekinHarbinger.java index f3c61dee5a9..b918a3f3e1e 100644 --- a/Mage.Sets/src/mage/sets/planechase/FlamekinHarbinger.java +++ b/Mage.Sets/src/mage/sets/planechase/FlamekinHarbinger.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCardInLibrary; */ public class FlamekinHarbinger extends CardImpl { - private final static FilterCard filter = new FilterCard("Elemental card"); + private static final FilterCard filter = new FilterCard("Elemental card"); static { filter.add(new SubtypePredicate("Elemental")); diff --git a/Mage.Sets/src/mage/sets/planechase/GruulTurf.java b/Mage.Sets/src/mage/sets/planechase/GruulTurf.java index 3fb0f24979f..94b8309a948 100644 --- a/Mage.Sets/src/mage/sets/planechase/GruulTurf.java +++ b/Mage.Sets/src/mage/sets/planechase/GruulTurf.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent; */ public class GruulTurf extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public GruulTurf(UUID ownerId) { super(ownerId, 134, "Gruul Turf", Rarity.COMMON, new CardType[]{CardType.LAND}, ""); diff --git a/Mage.Sets/src/mage/sets/planechase/LodestoneMyr.java b/Mage.Sets/src/mage/sets/planechase/LodestoneMyr.java index c262889f4e8..c963da89475 100644 --- a/Mage.Sets/src/mage/sets/planechase/LodestoneMyr.java +++ b/Mage.Sets/src/mage/sets/planechase/LodestoneMyr.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent; */ public class LodestoneMyr extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped artifact you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped artifact you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/planechase/SilvergladeElemental.java b/Mage.Sets/src/mage/sets/planechase/SilvergladeElemental.java index 255de2e5a41..5ed4857639a 100644 --- a/Mage.Sets/src/mage/sets/planechase/SilvergladeElemental.java +++ b/Mage.Sets/src/mage/sets/planechase/SilvergladeElemental.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCardInLibrary; */ public class SilvergladeElemental extends CardImpl { - private final static FilterLandCard filter = new FilterLandCard("Forest card"); + private static final FilterLandCard filter = new FilterLandCard("Forest card"); static { filter.add(new SubtypePredicate("Forest")); diff --git a/Mage.Sets/src/mage/sets/planeshift/NemataGroveGuardian.java b/Mage.Sets/src/mage/sets/planeshift/NemataGroveGuardian.java index c5cebfc59cc..2698f519bfe 100644 --- a/Mage.Sets/src/mage/sets/planeshift/NemataGroveGuardian.java +++ b/Mage.Sets/src/mage/sets/planeshift/NemataGroveGuardian.java @@ -50,8 +50,8 @@ import mage.target.common.TargetControlledPermanent; * @author Loki */ public class NemataGroveGuardian extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Saproling creatures"); - private final static FilterControlledPermanent filter1 = new FilterControlledPermanent("Saproling"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Saproling creatures"); + private static final FilterControlledPermanent filter1 = new FilterControlledPermanent("Saproling"); static { filter.add(new SubtypePredicate("Saproling")); diff --git a/Mage.Sets/src/mage/sets/prophecy/Abolish.java b/Mage.Sets/src/mage/sets/prophecy/Abolish.java index 5d3b6b0006f..4b4a18d1e05 100644 --- a/Mage.Sets/src/mage/sets/prophecy/Abolish.java +++ b/Mage.Sets/src/mage/sets/prophecy/Abolish.java @@ -48,8 +48,8 @@ import mage.target.common.TargetCardInHand; */ public class Abolish extends CardImpl { - private final static FilterCard filterCost = new FilterCard("Plains card"); - private final static FilterPermanent filter = new FilterPermanent("artifact or enchantment"); + private static final FilterCard filterCost = new FilterCard("Plains card"); + private static final FilterPermanent filter = new FilterPermanent("artifact or enchantment"); static { filterCost.add(new SubtypePredicate("Plains")); diff --git a/Mage.Sets/src/mage/sets/ravnika/AgrusKosWojekVeteran.java b/Mage.Sets/src/mage/sets/ravnika/AgrusKosWojekVeteran.java index 8f3015172b8..9a3a5e8397c 100644 --- a/Mage.Sets/src/mage/sets/ravnika/AgrusKosWojekVeteran.java +++ b/Mage.Sets/src/mage/sets/ravnika/AgrusKosWojekVeteran.java @@ -46,8 +46,8 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public class AgrusKosWojekVeteran extends CardImpl { - private final static FilterAttackingCreature filterRed = new FilterAttackingCreature("attacking red creatures"); - private final static FilterAttackingCreature filterWhite = new FilterAttackingCreature("attacking white creatures"); + private static final FilterAttackingCreature filterRed = new FilterAttackingCreature("attacking red creatures"); + private static final FilterAttackingCreature filterWhite = new FilterAttackingCreature("attacking white creatures"); static { filterRed.add(new ColorPredicate(ObjectColor.RED)); diff --git a/Mage.Sets/src/mage/sets/ravnika/CrownOfConvergence.java b/Mage.Sets/src/mage/sets/ravnika/CrownOfConvergence.java index 83d7c8b3a80..dc3658858cf 100644 --- a/Mage.Sets/src/mage/sets/ravnika/CrownOfConvergence.java +++ b/Mage.Sets/src/mage/sets/ravnika/CrownOfConvergence.java @@ -85,7 +85,7 @@ public class CrownOfConvergence extends CardImpl { class CrownOfConvergenceColorBoostEffect extends BoostAllEffect { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures you control"); private static final String effectText = "creatures you control that share a color with that card get +1/+1"; diff --git a/Mage.Sets/src/mage/sets/ravnika/DarkHeartOfTheWood.java b/Mage.Sets/src/mage/sets/ravnika/DarkHeartOfTheWood.java index 8f256d158c8..c6e487d756c 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DarkHeartOfTheWood.java +++ b/Mage.Sets/src/mage/sets/ravnika/DarkHeartOfTheWood.java @@ -46,7 +46,7 @@ import mage.target.common.TargetControlledPermanent; */ public class DarkHeartOfTheWood extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Forest"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Forest"); static { filter.add(new SubtypePredicate("Forest")); diff --git a/Mage.Sets/src/mage/sets/ravnika/DimirAqueduct.java b/Mage.Sets/src/mage/sets/ravnika/DimirAqueduct.java index 1a609f1de70..fd5de0b25b0 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DimirAqueduct.java +++ b/Mage.Sets/src/mage/sets/ravnika/DimirAqueduct.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent; */ public class DimirAqueduct extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public DimirAqueduct(UUID ownerId) { super(ownerId, 276, "Dimir Aqueduct", Rarity.COMMON, new CardType[]{CardType.LAND}, null); diff --git a/Mage.Sets/src/mage/sets/ravnika/DowsingShaman.java b/Mage.Sets/src/mage/sets/ravnika/DowsingShaman.java index bbade838796..ad2db41fe8b 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DowsingShaman.java +++ b/Mage.Sets/src/mage/sets/ravnika/DowsingShaman.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public class DowsingShaman extends CardImpl { - private final static FilterCard filter = new FilterCard("enchantment card from your graveyard"); + private static final FilterCard filter = new FilterCard("enchantment card from your graveyard"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java b/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java index 47eb415f581..bb6168114e5 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java +++ b/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java @@ -51,7 +51,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class ElvishSkysweeper extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying"); static { filter.add(new AbilityPredicate(FlyingAbility.class)); diff --git a/Mage.Sets/src/mage/sets/ravnika/Farseek.java b/Mage.Sets/src/mage/sets/ravnika/Farseek.java index b0ef57fbc1f..6b7faf55a59 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Farseek.java +++ b/Mage.Sets/src/mage/sets/ravnika/Farseek.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCardInLibrary; */ public class Farseek extends CardImpl { - private final static FilterCard filter = new FilterCard("Plains, Island, Swamp, or Mountain card"); + private static final FilterCard filter = new FilterCard("Plains, Island, Swamp, or Mountain card"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/ravnika/GlareOfSubdual.java b/Mage.Sets/src/mage/sets/ravnika/GlareOfSubdual.java index 6c3b83f4591..7f79c349059 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GlareOfSubdual.java +++ b/Mage.Sets/src/mage/sets/ravnika/GlareOfSubdual.java @@ -51,8 +51,8 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class GlareOfSubdual extends CardImpl { - private final static FilterControlledCreaturePermanent filterCost = new FilterControlledCreaturePermanent("untapped creature you control"); - private final static FilterPermanent filterTarget = new FilterPermanent("artifact or creature"); + private static final FilterControlledCreaturePermanent filterCost = new FilterControlledCreaturePermanent("untapped creature you control"); + private static final FilterPermanent filterTarget = new FilterPermanent("artifact or creature"); static { filterCost.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/ravnika/GolgariRotFarm.java b/Mage.Sets/src/mage/sets/ravnika/GolgariRotFarm.java index 141b8700946..922ba64f260 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GolgariRotFarm.java +++ b/Mage.Sets/src/mage/sets/ravnika/GolgariRotFarm.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent; */ public class GolgariRotFarm extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public GolgariRotFarm(UUID ownerId) { super(ownerId, 278, "Golgari Rot Farm", Rarity.COMMON, new CardType[]{CardType.LAND}, null); diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java b/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java index 06159364153..01a8d02997b 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java +++ b/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java @@ -81,7 +81,7 @@ public class HuntedHorror extends CardImpl { class CentaurToken extends Token { - private final static FilterCard filter = new FilterCard("black"); + private static final FilterCard filter = new FilterCard("black"); static { filter.add(new ColorPredicate(ObjectColor.BLACK)); diff --git a/Mage.Sets/src/mage/sets/ravnika/NullmageShepherd.java b/Mage.Sets/src/mage/sets/ravnika/NullmageShepherd.java index f74fa8d9603..15a76e069ae 100644 --- a/Mage.Sets/src/mage/sets/ravnika/NullmageShepherd.java +++ b/Mage.Sets/src/mage/sets/ravnika/NullmageShepherd.java @@ -52,8 +52,8 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class NullmageShepherd extends CardImpl { - private final static FilterControlledCreaturePermanent filterCost = new FilterControlledCreaturePermanent("untapped creatures you control"); - private final static FilterPermanent filterTarget = new FilterPermanent("artifact or enchantment"); + private static final FilterControlledCreaturePermanent filterCost = new FilterControlledCreaturePermanent("untapped creatures you control"); + private static final FilterPermanent filterTarget = new FilterPermanent("artifact or enchantment"); static { filterCost.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/ravnika/Sandsower.java b/Mage.Sets/src/mage/sets/ravnika/Sandsower.java index afc90e06b21..48737d45ff1 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Sandsower.java +++ b/Mage.Sets/src/mage/sets/ravnika/Sandsower.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class Sandsower extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/ravnika/SelesnyaEvangel.java b/Mage.Sets/src/mage/sets/ravnika/SelesnyaEvangel.java index 4e7c0d5b04a..cd47f2c84c4 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SelesnyaEvangel.java +++ b/Mage.Sets/src/mage/sets/ravnika/SelesnyaEvangel.java @@ -52,7 +52,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class SelesnyaEvangel extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/ravnika/SelesnyaSanctuary.java b/Mage.Sets/src/mage/sets/ravnika/SelesnyaSanctuary.java index fcc759acaa0..4b6b636fce2 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SelesnyaSanctuary.java +++ b/Mage.Sets/src/mage/sets/ravnika/SelesnyaSanctuary.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledPermanent; */ public class SelesnyaSanctuary extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public SelesnyaSanctuary(UUID ownerId) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java b/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java index 7fa8b34cf88..57c521100e1 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java @@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class BlistercoilWeird extends CardImpl { - private final static FilterSpell filter = new FilterSpell("instant or sorcery spell"); + private static final FilterSpell filter = new FilterSpell("instant or sorcery spell"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CryptbornHorror.java b/Mage.Sets/src/mage/sets/returntoravnica/CryptbornHorror.java index 6f2e0276e70..1d172ae77cc 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CryptbornHorror.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CryptbornHorror.java @@ -48,7 +48,7 @@ import mage.game.permanent.Permanent; */ public class CryptbornHorror extends CardImpl { - private final static String rule = "{this} enters the battlefield with X +1/+1 counters on it, where X is the total life lost by your opponents this turn"; + private static final String rule = "{this} enters the battlefield with X +1/+1 counters on it, where X is the total life lost by your opponents this turn"; public CryptbornHorror(UUID ownerId) { super(ownerId, 212, "Cryptborn Horror", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{B/R}{B/R}"); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/EpicExperiment.java b/Mage.Sets/src/mage/sets/returntoravnica/EpicExperiment.java index 29b79b1d7e8..4aaf96a272b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/EpicExperiment.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/EpicExperiment.java @@ -79,7 +79,7 @@ public class EpicExperiment extends CardImpl { class EpicExperimentEffect extends OneShotEffect { - private final static FilterCard filter = new FilterCard(); + private static final FilterCard filter = new FilterCard(); static { filter.add(Predicates.or(new CardTypePredicate(CardType.INSTANT), new CardTypePredicate(CardType.SORCERY))); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GroveOfTheGuardian.java b/Mage.Sets/src/mage/sets/returntoravnica/GroveOfTheGuardian.java index ec37dd088c0..73587b38ce2 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GroveOfTheGuardian.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GroveOfTheGuardian.java @@ -54,7 +54,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class GroveOfTheGuardian extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Guttersnipe.java b/Mage.Sets/src/mage/sets/returntoravnica/Guttersnipe.java index 743fcda0ee2..dd04fe6ffd0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Guttersnipe.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Guttersnipe.java @@ -49,7 +49,7 @@ import mage.players.Player; */ public class Guttersnipe extends CardImpl { - private final static FilterSpell filter = new FilterSpell("an instant or sorcery spell"); + private static final FilterSpell filter = new FilterSpell("an instant or sorcery spell"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java b/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java index 7deff55b945..942b87a2e34 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java @@ -46,7 +46,7 @@ import mage.target.TargetPermanent; */ public class KeeningApparition extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("enchantment"); + private static final FilterPermanent filter = new FilterPermanent("enchantment"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/LotlethTroll.java b/Mage.Sets/src/mage/sets/returntoravnica/LotlethTroll.java index 64ee706c043..73b9109df09 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/LotlethTroll.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/LotlethTroll.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCardInHand; */ public class LotlethTroll extends CardImpl { - final static private FilterCreatureCard filter = new FilterCreatureCard("creature card in your hand"); + private static final FilterCreatureCard filter = new FilterCreatureCard("creature card in your hand"); public LotlethTroll(UUID ownerId) { super(ownerId, 177, "Lotleth Troll", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{B}{G}"); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/NivixGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/NivixGuildmage.java index 1790f681030..a3a03aecf7b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/NivixGuildmage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/NivixGuildmage.java @@ -50,7 +50,7 @@ import mage.target.TargetSpell; */ public class NivixGuildmage extends CardImpl { - private final static FilterSpell filter = new FilterSpell("instant or sorcery spell"); + private static final FilterSpell filter = new FilterSpell("instant or sorcery spell"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AncientStirrings.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AncientStirrings.java index b671b1390b1..cd9c5a37dc7 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AncientStirrings.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AncientStirrings.java @@ -43,7 +43,7 @@ import java.util.UUID; */ public class AncientStirrings extends CardImpl { - private final static FilterCard filter = new FilterCard("colorless card"); + private static final FilterCard filter = new FilterCard("colorless card"); static { filter.add(new ColorlessPredicate()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DisasterRadius.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DisasterRadius.java index 72cc241a491..a1afcb417ae 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DisasterRadius.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DisasterRadius.java @@ -75,7 +75,7 @@ public class DisasterRadius extends CardImpl { class DisasterRadiusEffect extends OneShotEffect { - final private static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature your opponents control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature your opponents control"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EchoMage.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EchoMage.java index 0246c6e64ec..b3083eea6be 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EchoMage.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EchoMage.java @@ -56,7 +56,7 @@ import mage.target.TargetSpell; */ public class EchoMage extends CardImpl { - private final static FilterSpell filter = new FilterSpell("instant or sorcery spell"); + private static final FilterSpell filter = new FilterSpell("instant or sorcery spell"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravitationalShift.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravitationalShift.java index 7e4fb573b33..2c2eb783c2e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravitationalShift.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravitationalShift.java @@ -46,8 +46,8 @@ import mage.filter.predicate.mageobject.AbilityPredicate; */ public class GravitationalShift extends CardImpl { - private final static FilterCreaturePermanent filter1 = new FilterCreaturePermanent("Creatures with flying"); - private final static FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Creatures without flying"); + private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent("Creatures with flying"); + private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Creatures without flying"); static { filter1.add(new AbilityPredicate(FlyingAbility.class)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellcarverDemon.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellcarverDemon.java index a9d550575bf..b000bce059d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellcarverDemon.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HellcarverDemon.java @@ -79,7 +79,7 @@ public class HellcarverDemon extends CardImpl { class HellcarverDemonEffect extends OneShotEffect { - private final static FilterControlledPermanent filterPermanents = new FilterControlledPermanent("Permanent"); + private static final FilterControlledPermanent filterPermanents = new FilterControlledPermanent("Permanent"); private static FilterNonlandCard filter = new FilterNonlandCard("nonland card exiled with Hellcarver Demon"); public HellcarverDemonEffect() { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java index 28a9179e061..d447292adbd 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java @@ -75,7 +75,7 @@ public class JaddiLifestrider extends CardImpl { class JaddiLifestriderEffect extends OneShotEffect { - final private static FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creatures you control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creatures you control"); static { filter.add(new ControllerPredicate(Constants.TargetController.YOU)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java index 3289260f140..0ec9bf69174 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class BriarknitKami extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public BriarknitKami(UUID ownerId) { super(ownerId, 124, "Briarknit Kami", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/EiganjoFreeRiders.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/EiganjoFreeRiders.java index 84c797c3873..26b6a411cd8 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/EiganjoFreeRiders.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/EiganjoFreeRiders.java @@ -48,7 +48,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class EiganjoFreeRiders extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("white creature you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("white creature you control"); static { filter.add(new ColorPredicate(ObjectColor.WHITE)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java index e1d06489da5..dd91f275a92 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java @@ -42,7 +42,7 @@ import mage.filter.common.FilterSpiritOrArcaneCard; */ public class FiddleheadKami extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public FiddleheadKami(UUID ownerId) { super(ownerId, 130, "Fiddlehead Kami", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GnatMiser.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GnatMiser.java index 419bc8a9e92..45a8adf5ba2 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GnatMiser.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GnatMiser.java @@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class GnatMiser extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("blue creature"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("blue creature"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfCruelty.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfCruelty.java index ef341181c27..b52bc25192d 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfCruelty.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfCruelty.java @@ -44,7 +44,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public class HandOfCruelty extends CardImpl { - private final static FilterCard filter = new FilterCard("white"); + private static final FilterCard filter = new FilterCard("white"); static { filter.add(new ColorPredicate(ObjectColor.WHITE)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfHonor.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfHonor.java index a14fcf92388..6ccc60b23c4 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfHonor.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HandOfHonor.java @@ -44,7 +44,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public class HandOfHonor extends CardImpl { - private final static FilterCard filter = new FilterCard("black"); + private static final FilterCard filter = new FilterCard("black"); static { filter.add(new ColorPredicate(ObjectColor.BLACK)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.java index 382c4fddfce..839d5eae46c 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.java @@ -44,7 +44,7 @@ import mage.filter.common.FilterSpiritOrArcaneCard; */ public class HaruOnna extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public HaruOnna(UUID ownerId) { super(ownerId, 132, "Haru-Onna", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/IizukaTheRuthless.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/IizukaTheRuthless.java index 12b47ed6f07..74498666b44 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/IizukaTheRuthless.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/IizukaTheRuthless.java @@ -51,7 +51,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class IizukaTheRuthless extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Samurai"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Samurai"); static { filter.add(new SubtypePredicate("Samurai")); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KashiTribeElite.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KashiTribeElite.java index efd1fc5402f..064738a648f 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KashiTribeElite.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KashiTribeElite.java @@ -50,7 +50,7 @@ import mage.filter.predicate.mageobject.SupertypePredicate; */ public class KashiTribeElite extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Legendary Snakes"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Legendary Snakes"); static { filter.add(new SupertypePredicate("Legendary")); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KatakiWarsWage.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KatakiWarsWage.java index 8b6f4682216..aaa3d37d94c 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KatakiWarsWage.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KatakiWarsWage.java @@ -49,7 +49,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class KatakiWarsWage extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifacts"); + private static final FilterPermanent filter = new FilterPermanent("artifacts"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java index 295246278cd..8345b614bd8 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java @@ -46,7 +46,7 @@ import mage.target.TargetPlayer; */ public class KemuriOnna extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public KemuriOnna(UUID ownerId) { super(ownerId, 76, "Kemuri-Onna", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{B}"); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java index 9e14099824e..c0b10b74388 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java @@ -46,7 +46,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class KiriOnna extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); public KiriOnna(UUID ownerId) { super(ownerId, 43, "Kiri-Onna", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/LocustMiser.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/LocustMiser.java index 05a0f0289b3..1772e2c7faf 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/LocustMiser.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/LocustMiser.java @@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class LocustMiser extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("blue creature"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("blue creature"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java index 500aeff7f55..aa0d9567320 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java @@ -52,7 +52,7 @@ import mage.target.TargetPermanent; */ public class ManrikiGusari extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("Equipment"); + private static final FilterPermanent filter = new FilterPermanent("Equipment"); static { filter.add(new SubtypePredicate("Equipment")); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java index 72d9dcc5bfc..8f9e95cc4eb 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java @@ -48,8 +48,8 @@ import mage.target.TargetPermanent; */ public class NikkoOnna extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); - private final static FilterPermanent filterTarget = new FilterPermanent("enchantment"); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterPermanent filterTarget = new FilterPermanent("enchantment"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java index 433e38ef175..0382e1db6aa 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OboroBreezecaller.java @@ -50,7 +50,7 @@ import mage.target.common.TargetLandPermanent; */ public class OboroBreezecaller extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public OboroBreezecaller(UUID ownerId) { super(ownerId, 48, "Oboro Breezecaller", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OniOfWildPlaces.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OniOfWildPlaces.java index c5237cf1cdd..b0ef8e73bc2 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/OniOfWildPlaces.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/OniOfWildPlaces.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class OniOfWildPlaces extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("red creature you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("red creature you control"); static { filter.add(new ColorPredicate(ObjectColor.RED)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java index 1c46b17f230..a99df4d1154 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java @@ -43,7 +43,7 @@ import mage.filter.predicate.mageobject.SupertypePredicate; */ public class RekiTheHistoryOfKamigawa extends CardImpl { - private final static FilterSpell filter = new FilterSpell("legendary spell"); + private static final FilterSpell filter = new FilterSpell("legendary spell"); static { filter.add(new SupertypePredicate("Legendary")); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkullCollector.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkullCollector.java index 36f6b37322d..4e9ebb97d4f 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkullCollector.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkullCollector.java @@ -51,7 +51,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class SkullCollector extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("black creature you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("black creature you control"); static { filter.add(new ColorPredicate(ObjectColor.BLACK)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/StampedingSerow.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/StampedingSerow.java index 68966f84bc0..3fd7012c157 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/StampedingSerow.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/StampedingSerow.java @@ -49,7 +49,7 @@ import java.util.UUID; */ public class StampedingSerow extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("green creature you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("green creature you control"); static { filter.add(new ColorPredicate(ObjectColor.GREEN)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java index c31db2ceff6..7de022a144c 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java @@ -43,7 +43,7 @@ import mage.target.TargetPermanent; */ public class SunderFromWithin extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact or land"); + private static final FilterPermanent filter = new FilterPermanent("artifact or land"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/TrustedAdvisor.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/TrustedAdvisor.java index 374f3907b5b..2dd38d3bbb6 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/TrustedAdvisor.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/TrustedAdvisor.java @@ -52,7 +52,7 @@ import mage.target.common.TargetControlledPermanent; */ public class TrustedAdvisor extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("blue creature"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("blue creature"); static { filter.add(new ColorPredicate(ObjectColor.BLUE)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java index ed53e6551da..f205be43774 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java @@ -48,8 +48,8 @@ import mage.target.TargetPermanent; */ public class YukiOnna extends CardImpl { - private final static FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); - private final static FilterPermanent filterTarget = new FilterPermanent("artifact"); + private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); + private static final FilterPermanent filterTarget = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java index 1555d28347d..2243b3f46d8 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ChromeSteed.java @@ -46,7 +46,7 @@ import mage.cards.CardImpl; * @author Loki */ public class ChromeSteed extends CardImpl { - private final static String text = "Metalcraft - Chrome Steed gets +2/+2 as long as you control three or more artifacts"; + private static final String text = "Metalcraft - Chrome Steed gets +2/+2 as long as you control three or more artifacts"; public ChromeSteed (UUID ownerId) { super(ownerId, 142, "Chrome Steed", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}"); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java index 34cb652208c..0ceb30e18fc 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SunspearShikari.java @@ -46,8 +46,8 @@ import mage.cards.CardImpl; */ public class SunspearShikari extends CardImpl { - private final static String rule1 = "As long as {this} is equipped, it has first strike"; - private final static String rule2 = "As long as {this} is equipped, it has lifelink"; + private static final String rule1 = "As long as {this} is equipped, it has first strike"; + private static final String rule2 = "As long as {this} is equipped, it has lifelink"; public SunspearShikari(UUID ownerId) { super(ownerId, 23, "Sunspear Shikari", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java b/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java index b2c931da7f8..ad90b49b413 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DeathBaron.java @@ -48,8 +48,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class DeathBaron extends CardImpl { - private final static FilterCreaturePermanent filterSkeletons = new FilterCreaturePermanent("Skeleton creatures"); - private final static FilterCreaturePermanent filterZombie = new FilterCreaturePermanent("Zombie creatures"); + private static final FilterCreaturePermanent filterSkeletons = new FilterCreaturePermanent("Skeleton creatures"); + private static final FilterCreaturePermanent filterZombie = new FilterCreaturePermanent("Zombie creatures"); static { filterSkeletons.add(new SubtypePredicate("Skeleton")); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java b/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java index ef0a8503f3c..b15c519eda6 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MasterOfEtherium.java @@ -49,8 +49,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public class MasterOfEtherium extends CardImpl { - private final static FilterControlledPermanent filterCounted = new FilterControlledPermanent("artifacts you control"); - private final static FilterCreaturePermanent filterBoosted = new FilterCreaturePermanent("artifact creatures you control"); + private static final FilterControlledPermanent filterCounted = new FilterControlledPermanent("artifacts you control"); + private static final FilterCreaturePermanent filterBoosted = new FilterCreaturePermanent("artifact creatures you control"); static { filterCounted.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/tempest/Aftershock.java b/Mage.Sets/src/mage/sets/tempest/Aftershock.java index efba5d027bb..a3c8bd7b87e 100644 --- a/Mage.Sets/src/mage/sets/tempest/Aftershock.java +++ b/Mage.Sets/src/mage/sets/tempest/Aftershock.java @@ -44,7 +44,7 @@ import mage.target.TargetPermanent; */ public class Aftershock extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact, creature, or land"); + private static final FilterPermanent filter = new FilterPermanent("artifact, creature, or land"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/tempest/ArmorSliver.java b/Mage.Sets/src/mage/sets/tempest/ArmorSliver.java index a07c834af03..53fe9b674e1 100644 --- a/Mage.Sets/src/mage/sets/tempest/ArmorSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/ArmorSliver.java @@ -48,7 +48,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class ArmorSliver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Sliver creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Sliver creatures"); static { filter.add(new SubtypePredicate("Sliver")); diff --git a/Mage.Sets/src/mage/sets/tempest/Auratog.java b/Mage.Sets/src/mage/sets/tempest/Auratog.java index ec0800abbb2..b6379293c87 100644 --- a/Mage.Sets/src/mage/sets/tempest/Auratog.java +++ b/Mage.Sets/src/mage/sets/tempest/Auratog.java @@ -47,7 +47,7 @@ import mage.target.common.TargetControlledPermanent; */ public class Auratog extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("an enchantment"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("an enchantment"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/tempest/BarbedSliver.java b/Mage.Sets/src/mage/sets/tempest/BarbedSliver.java index deb270cb199..b0e3a705e9e 100644 --- a/Mage.Sets/src/mage/sets/tempest/BarbedSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/BarbedSliver.java @@ -48,7 +48,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class BarbedSliver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Sliver creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Sliver creatures"); static { filter.add(new SubtypePredicate("Sliver")); diff --git a/Mage.Sets/src/mage/sets/tempest/Boil.java b/Mage.Sets/src/mage/sets/tempest/Boil.java index 11bbc7f9da3..590db71700b 100644 --- a/Mage.Sets/src/mage/sets/tempest/Boil.java +++ b/Mage.Sets/src/mage/sets/tempest/Boil.java @@ -41,7 +41,7 @@ import mage.filter.predicate.mageobject.NamePredicate; */ public class Boil extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("islands"); + private static final FilterPermanent filter = new FilterPermanent("islands"); static { filter.add(new NamePredicate("Island")); diff --git a/Mage.Sets/src/mage/sets/tempest/ClotSliver.java b/Mage.Sets/src/mage/sets/tempest/ClotSliver.java index 0e5935fe620..6105372bb29 100644 --- a/Mage.Sets/src/mage/sets/tempest/ClotSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/ClotSliver.java @@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class ClotSliver extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("Slivers"); + private static final FilterPermanent filter = new FilterPermanent("Slivers"); static { filter.add(new SubtypePredicate("Sliver")); diff --git a/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java b/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java index ee1950f6409..7cb54790c22 100644 --- a/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java +++ b/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java @@ -46,7 +46,7 @@ import mage.target.TargetPermanent; */ public class CloudchaserEagle extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("enchantment"); + private static final FilterPermanent filter = new FilterPermanent("enchantment"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java b/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java index 5e2f2a052b8..067b6a8d560 100644 --- a/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java +++ b/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class DarkBanishing extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("nonblack creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonblack creature"); static { filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); diff --git a/Mage.Sets/src/mage/sets/tempest/Disenchant.java b/Mage.Sets/src/mage/sets/tempest/Disenchant.java index d6bc1fc3c5b..b356cde262f 100644 --- a/Mage.Sets/src/mage/sets/tempest/Disenchant.java +++ b/Mage.Sets/src/mage/sets/tempest/Disenchant.java @@ -43,7 +43,7 @@ import mage.target.TargetPermanent; */ public class Disenchant extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact or enchantment"); + private static final FilterPermanent filter = new FilterPermanent("artifact or enchantment"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/tempest/DreadOfNight.java b/Mage.Sets/src/mage/sets/tempest/DreadOfNight.java index de9b7e6f5e1..cfa7696ab0b 100644 --- a/Mage.Sets/src/mage/sets/tempest/DreadOfNight.java +++ b/Mage.Sets/src/mage/sets/tempest/DreadOfNight.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public class DreadOfNight extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("White creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("White creatures"); static { filter.add(new ColorPredicate(ObjectColor.WHITE)); diff --git a/Mage.Sets/src/mage/sets/tempest/Earthcraft.java b/Mage.Sets/src/mage/sets/tempest/Earthcraft.java index fe46f15e2b1..44a3b2d0c92 100644 --- a/Mage.Sets/src/mage/sets/tempest/Earthcraft.java +++ b/Mage.Sets/src/mage/sets/tempest/Earthcraft.java @@ -51,8 +51,8 @@ import mage.target.common.TargetControlledPermanent; */ public class Earthcraft extends CardImpl { - private final static FilterControlledCreaturePermanent filterCreature = new FilterControlledCreaturePermanent("untapped creature you control"); - private final static FilterControlledPermanent filterLand = new FilterControlledPermanent("basic land"); + private static final FilterControlledCreaturePermanent filterCreature = new FilterControlledCreaturePermanent("untapped creature you control"); + private static final FilterControlledPermanent filterLand = new FilterControlledPermanent("basic land"); static { filterCreature.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/tempest/EladamriLordOfLeaves.java b/Mage.Sets/src/mage/sets/tempest/EladamriLordOfLeaves.java index 24f778d0122..7ac9e3a0ee4 100644 --- a/Mage.Sets/src/mage/sets/tempest/EladamriLordOfLeaves.java +++ b/Mage.Sets/src/mage/sets/tempest/EladamriLordOfLeaves.java @@ -48,8 +48,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class EladamriLordOfLeaves extends CardImpl { - private final static FilterCreaturePermanent filterCreatures = new FilterCreaturePermanent("Elf creatures"); - private final static FilterPermanent filterPermanents = new FilterPermanent("Elves"); + private static final FilterCreaturePermanent filterCreatures = new FilterCreaturePermanent("Elf creatures"); + private static final FilterPermanent filterPermanents = new FilterPermanent("Elves"); static { filterCreatures.add(new SubtypePredicate("Elf")); diff --git a/Mage.Sets/src/mage/sets/tempest/Gallantry.java b/Mage.Sets/src/mage/sets/tempest/Gallantry.java index aee2d9a7a68..2e772f765be 100644 --- a/Mage.Sets/src/mage/sets/tempest/Gallantry.java +++ b/Mage.Sets/src/mage/sets/tempest/Gallantry.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class Gallantry extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterBlockingCreature("blocking creature"); + private static final FilterCreaturePermanent filter = new FilterBlockingCreature("blocking creature"); public Gallantry(UUID ownerId) { super(ownerId, 232, "Gallantry", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); diff --git a/Mage.Sets/src/mage/sets/tempest/HannasCustody.java b/Mage.Sets/src/mage/sets/tempest/HannasCustody.java index fd81a9c386f..2f2ac318364 100644 --- a/Mage.Sets/src/mage/sets/tempest/HannasCustody.java +++ b/Mage.Sets/src/mage/sets/tempest/HannasCustody.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class HannasCustody extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifacts"); + private static final FilterPermanent filter = new FilterPermanent("artifacts"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/tempest/HeartSliver.java b/Mage.Sets/src/mage/sets/tempest/HeartSliver.java index 86bf91920b9..3cf13957b82 100644 --- a/Mage.Sets/src/mage/sets/tempest/HeartSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/HeartSliver.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class HeartSliver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("All sliver creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All sliver creatures"); static { filter.add(new SubtypePredicate("Sliver")); diff --git a/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java b/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java index 1654fda330e..fa76cc6c6e7 100644 --- a/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java +++ b/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java @@ -50,7 +50,7 @@ import mage.target.common.TargetControlledPermanent; */ public class HeartwoodGiant extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("a Forest"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Forest"); static { filter.add(new SubtypePredicate("Forest")); diff --git a/Mage.Sets/src/mage/sets/tempest/HornedSliver.java b/Mage.Sets/src/mage/sets/tempest/HornedSliver.java index 72e1bead98c..2767eba4826 100644 --- a/Mage.Sets/src/mage/sets/tempest/HornedSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/HornedSliver.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class HornedSliver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); static { filter.add(new SubtypePredicate("Sliver")); diff --git a/Mage.Sets/src/mage/sets/tempest/MarshLurker.java b/Mage.Sets/src/mage/sets/tempest/MarshLurker.java index f1cf8b0dc07..75623c5037e 100644 --- a/Mage.Sets/src/mage/sets/tempest/MarshLurker.java +++ b/Mage.Sets/src/mage/sets/tempest/MarshLurker.java @@ -48,7 +48,7 @@ import mage.target.common.TargetControlledPermanent; */ public class MarshLurker extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("a Swamp"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Swamp"); static { filter.add(new SubtypePredicate("Swamp")); diff --git a/Mage.Sets/src/mage/sets/tempest/MnemonicSliver.java b/Mage.Sets/src/mage/sets/tempest/MnemonicSliver.java index 278fcbdaf48..423c98a042f 100644 --- a/Mage.Sets/src/mage/sets/tempest/MnemonicSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/MnemonicSliver.java @@ -49,7 +49,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class MnemonicSliver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Sliver creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Sliver creatures"); static { filter.add(new SubtypePredicate("Sliver")); diff --git a/Mage.Sets/src/mage/sets/tempest/MoggRaider.java b/Mage.Sets/src/mage/sets/tempest/MoggRaider.java index 98375c6c139..dd6529913da 100644 --- a/Mage.Sets/src/mage/sets/tempest/MoggRaider.java +++ b/Mage.Sets/src/mage/sets/tempest/MoggRaider.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class MoggRaider extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("a Goblin"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Goblin"); static { filter.add(new SubtypePredicate("Goblin")); diff --git a/Mage.Sets/src/mage/sets/tempest/MuscleSliver.java b/Mage.Sets/src/mage/sets/tempest/MuscleSliver.java index 9bf6ef15097..e258bd8fadf 100644 --- a/Mage.Sets/src/mage/sets/tempest/MuscleSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/MuscleSliver.java @@ -44,7 +44,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class MuscleSliver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); static { filter.add(new SubtypePredicate("Sliver")); diff --git a/Mage.Sets/src/mage/sets/tempest/NeedleStorm.java b/Mage.Sets/src/mage/sets/tempest/NeedleStorm.java index 10e66f6e97f..2b00a0a0820 100644 --- a/Mage.Sets/src/mage/sets/tempest/NeedleStorm.java +++ b/Mage.Sets/src/mage/sets/tempest/NeedleStorm.java @@ -42,7 +42,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate; */ public class NeedleStorm extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying"); static { filter.add(new AbilityPredicate(FlyingAbility.class)); diff --git a/Mage.Sets/src/mage/sets/tempest/RatsOfRath.java b/Mage.Sets/src/mage/sets/tempest/RatsOfRath.java index 17833afc1c3..798c1a6b230 100644 --- a/Mage.Sets/src/mage/sets/tempest/RatsOfRath.java +++ b/Mage.Sets/src/mage/sets/tempest/RatsOfRath.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent; */ public class RatsOfRath extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("artifact, creature, or land you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("artifact, creature, or land you control"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/tempest/RecklessSpite.java b/Mage.Sets/src/mage/sets/tempest/RecklessSpite.java index 7a85fae81d3..543254e3089 100644 --- a/Mage.Sets/src/mage/sets/tempest/RecklessSpite.java +++ b/Mage.Sets/src/mage/sets/tempest/RecklessSpite.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class RecklessSpite extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("nonblack creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonblack creature"); static { filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); diff --git a/Mage.Sets/src/mage/sets/tempest/TalonSliver.java b/Mage.Sets/src/mage/sets/tempest/TalonSliver.java index df54db958a3..430acb0d871 100644 --- a/Mage.Sets/src/mage/sets/tempest/TalonSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/TalonSliver.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class TalonSliver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); static { filter.add(new SubtypePredicate("Sliver")); diff --git a/Mage.Sets/src/mage/sets/tempest/Telethopter.java b/Mage.Sets/src/mage/sets/tempest/Telethopter.java index 38d0737aeae..33f30b024ae 100644 --- a/Mage.Sets/src/mage/sets/tempest/Telethopter.java +++ b/Mage.Sets/src/mage/sets/tempest/Telethopter.java @@ -48,7 +48,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class Telethopter extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/tempest/TradewindRider.java b/Mage.Sets/src/mage/sets/tempest/TradewindRider.java index f288cdd648c..9cc466568e7 100644 --- a/Mage.Sets/src/mage/sets/tempest/TradewindRider.java +++ b/Mage.Sets/src/mage/sets/tempest/TradewindRider.java @@ -51,7 +51,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class TradewindRider extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/sets/tempest/Tranquility.java b/Mage.Sets/src/mage/sets/tempest/Tranquility.java index 45b938b09c9..fa5f81114f3 100644 --- a/Mage.Sets/src/mage/sets/tempest/Tranquility.java +++ b/Mage.Sets/src/mage/sets/tempest/Tranquility.java @@ -65,7 +65,7 @@ public class Tranquility extends CardImpl { class TranquilityEffect extends OneShotEffect { - private final static FilterPermanent filter = new FilterPermanent(""); + private static final FilterPermanent filter = new FilterPermanent(""); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/tempest/Verdigris.java b/Mage.Sets/src/mage/sets/tempest/Verdigris.java index 628d25d8615..c4f521a539d 100644 --- a/Mage.Sets/src/mage/sets/tempest/Verdigris.java +++ b/Mage.Sets/src/mage/sets/tempest/Verdigris.java @@ -42,7 +42,7 @@ import mage.target.TargetPermanent; */ public class Verdigris extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/tempest/WingedSliver.java b/Mage.Sets/src/mage/sets/tempest/WingedSliver.java index 4670cf81e87..df73d5e67d3 100644 --- a/Mage.Sets/src/mage/sets/tempest/WingedSliver.java +++ b/Mage.Sets/src/mage/sets/tempest/WingedSliver.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class WingedSliver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("All sliver creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All sliver creatures"); static { filter.add(new SubtypePredicate("Sliver")); diff --git a/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java b/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java index a0e5fa1f34c..0e774e86386 100644 --- a/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java +++ b/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java @@ -46,7 +46,7 @@ import mage.target.TargetPermanent; */ public class AvenCloudchaser extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("enchantment"); + private static final FilterPermanent filter = new FilterPermanent("enchantment"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/tenth/BlanchwoodArmor.java b/Mage.Sets/src/mage/sets/tenth/BlanchwoodArmor.java index a32b9cf49c9..da7eb3a035a 100644 --- a/Mage.Sets/src/mage/sets/tenth/BlanchwoodArmor.java +++ b/Mage.Sets/src/mage/sets/tenth/BlanchwoodArmor.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class BlanchwoodArmor extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Forest you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Forest you control"); static { filter.add(new SubtypePredicate("Forest")); diff --git a/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java b/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java index 8c0f35afb39..a10abf13147 100644 --- a/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java +++ b/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class CraftyPathmage extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 2 or less"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 2 or less"); static { filter.add(new PowerPredicate(Filter.ComparisonType.LessThan, 3)); diff --git a/Mage.Sets/src/mage/sets/tenth/CreepingMold.java b/Mage.Sets/src/mage/sets/tenth/CreepingMold.java index 6be987ebb42..a5668c00b34 100644 --- a/Mage.Sets/src/mage/sets/tenth/CreepingMold.java +++ b/Mage.Sets/src/mage/sets/tenth/CreepingMold.java @@ -43,7 +43,7 @@ import mage.target.TargetPermanent; */ public class CreepingMold extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact, enchantment, or land"); + private static final FilterPermanent filter = new FilterPermanent("artifact, enchantment, or land"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/tenth/ElvishChampion.java b/Mage.Sets/src/mage/sets/tenth/ElvishChampion.java index 5f900f7b1c5..f554acb4cdf 100644 --- a/Mage.Sets/src/mage/sets/tenth/ElvishChampion.java +++ b/Mage.Sets/src/mage/sets/tenth/ElvishChampion.java @@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class ElvishChampion extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf creatures"); static { filter.add(new SubtypePredicate("Elf")); diff --git a/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java b/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java index 112da6f55e8..335ec29f720 100644 --- a/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java +++ b/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class FemerefArchers extends CardImpl { - private final static FilterAttackingCreature filter = new FilterAttackingCreature("attacking creature with flying"); + private static final FilterAttackingCreature filter = new FilterAttackingCreature("attacking creature with flying"); static { filter.add(new AbilityPredicate(FlyingAbility.class)); diff --git a/Mage.Sets/src/mage/sets/tenth/FieldMarshal.java b/Mage.Sets/src/mage/sets/tenth/FieldMarshal.java index 2c0eb5ca938..d48b238d833 100644 --- a/Mage.Sets/src/mage/sets/tenth/FieldMarshal.java +++ b/Mage.Sets/src/mage/sets/tenth/FieldMarshal.java @@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class FieldMarshal extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); static { filter.add(new SubtypePredicate("Soldier")); diff --git a/Mage.Sets/src/mage/sets/tenth/GoblinKing.java b/Mage.Sets/src/mage/sets/tenth/GoblinKing.java index 706859479ff..47b8421d142 100644 --- a/Mage.Sets/src/mage/sets/tenth/GoblinKing.java +++ b/Mage.Sets/src/mage/sets/tenth/GoblinKing.java @@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class GoblinKing extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin creatures"); static { filter.add(new SubtypePredicate("Goblin")); diff --git a/Mage.Sets/src/mage/sets/tenth/HateWeaver.java b/Mage.Sets/src/mage/sets/tenth/HateWeaver.java index c771b75bda8..d903677b4b8 100644 --- a/Mage.Sets/src/mage/sets/tenth/HateWeaver.java +++ b/Mage.Sets/src/mage/sets/tenth/HateWeaver.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class HateWeaver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("blue or red creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("blue or red creature"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java b/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java index b0362bc3254..4c10f4e9bf5 100644 --- a/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java +++ b/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java @@ -49,7 +49,7 @@ import mage.target.TargetPermanent; */ public class IcyManipulator extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact, creature, or land"); + private static final FilterPermanent filter = new FilterPermanent("artifact, creature, or land"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/tenth/LordOfTheUndead.java b/Mage.Sets/src/mage/sets/tenth/LordOfTheUndead.java index ee2d3b80379..9f491f30a96 100644 --- a/Mage.Sets/src/mage/sets/tenth/LordOfTheUndead.java +++ b/Mage.Sets/src/mage/sets/tenth/LordOfTheUndead.java @@ -51,8 +51,8 @@ import mage.target.common.TargetCardInYourGraveyard; * @author Loki */ public class LordOfTheUndead extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie"); - private final static FilterCard filterCard = new FilterCard("Zombie card from your graveyard"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie"); + private static final FilterCard filterCard = new FilterCard("Zombie card from your graveyard"); static { filter.add(new SubtypePredicate("Zombie")); diff --git a/Mage.Sets/src/mage/sets/tenth/MightWeaver.java b/Mage.Sets/src/mage/sets/tenth/MightWeaver.java index 2a642d48c87..0f3a3f70516 100644 --- a/Mage.Sets/src/mage/sets/tenth/MightWeaver.java +++ b/Mage.Sets/src/mage/sets/tenth/MightWeaver.java @@ -51,7 +51,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class MightWeaver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("red or white creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("red or white creature"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/tenth/Mobilization.java b/Mage.Sets/src/mage/sets/tenth/Mobilization.java index ee3c6246f17..7926634bfa0 100644 --- a/Mage.Sets/src/mage/sets/tenth/Mobilization.java +++ b/Mage.Sets/src/mage/sets/tenth/Mobilization.java @@ -49,7 +49,7 @@ import mage.game.permanent.token.SoldierToken; */ public class Mobilization extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); static { filter.add(new SubtypePredicate("Soldier")); diff --git a/Mage.Sets/src/mage/sets/tenth/MolimoMaroSorcerer.java b/Mage.Sets/src/mage/sets/tenth/MolimoMaroSorcerer.java index b43e18147c4..16b26bc8276 100644 --- a/Mage.Sets/src/mage/sets/tenth/MolimoMaroSorcerer.java +++ b/Mage.Sets/src/mage/sets/tenth/MolimoMaroSorcerer.java @@ -46,7 +46,7 @@ import mage.filter.common.FilterControlledPermanent; */ public class MolimoMaroSorcerer extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("lands you control"); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("lands you control"); public MolimoMaroSorcerer(UUID ownerId) { super(ownerId, 280, "Molimo, Maro-Sorcerer", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{G}{G}{G}"); diff --git a/Mage.Sets/src/mage/sets/tenth/Nightmare.java b/Mage.Sets/src/mage/sets/tenth/Nightmare.java index 0a39f463fb6..7e6d3e78060 100644 --- a/Mage.Sets/src/mage/sets/tenth/Nightmare.java +++ b/Mage.Sets/src/mage/sets/tenth/Nightmare.java @@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class Nightmare extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Swamps you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Swamps you control"); static { filter.add(new SubtypePredicate("Swamp")); diff --git a/Mage.Sets/src/mage/sets/tenth/QuirionDryad.java b/Mage.Sets/src/mage/sets/tenth/QuirionDryad.java index 54088aff6cc..185cf9d8c08 100644 --- a/Mage.Sets/src/mage/sets/tenth/QuirionDryad.java +++ b/Mage.Sets/src/mage/sets/tenth/QuirionDryad.java @@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public class QuirionDryad extends CardImpl { - private final static FilterSpell filter = new FilterSpell("white, blue, black, or red spell"); + private static final FilterSpell filter = new FilterSpell("white, blue, black, or red spell"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/tenth/RageWeaver.java b/Mage.Sets/src/mage/sets/tenth/RageWeaver.java index b8e768dff47..8eb94d07c42 100644 --- a/Mage.Sets/src/mage/sets/tenth/RageWeaver.java +++ b/Mage.Sets/src/mage/sets/tenth/RageWeaver.java @@ -51,7 +51,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class RageWeaver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("black or green creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("black or green creature"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java b/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java index efc962d56b8..1eefdd5b192 100644 --- a/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java +++ b/Mage.Sets/src/mage/sets/tenth/RelentlessRats.java @@ -52,7 +52,7 @@ import mage.game.permanent.Permanent; */ public class RelentlessRats extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(new NamePredicate("Relentless Rats")); diff --git a/Mage.Sets/src/mage/sets/tenth/ScionOfTheWild.java b/Mage.Sets/src/mage/sets/tenth/ScionOfTheWild.java index e453aea8183..f6d08f1391b 100644 --- a/Mage.Sets/src/mage/sets/tenth/ScionOfTheWild.java +++ b/Mage.Sets/src/mage/sets/tenth/ScionOfTheWild.java @@ -44,7 +44,7 @@ import mage.filter.common.FilterControlledCreaturePermanent; */ public class ScionOfTheWild extends CardImpl { - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures you control"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures you control"); public ScionOfTheWild(UUID ownerId) { super(ownerId, 295, "Scion of the Wild", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{G}{G}"); diff --git a/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java b/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java index 70dfe3549f8..931aee9baa0 100644 --- a/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java +++ b/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java @@ -51,7 +51,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class SkyWeaver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("white or black creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("white or black creature"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java b/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java index 1f63e8ed34b..2de4000abba 100644 --- a/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java +++ b/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class SpiritWeaver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("green or blue creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("green or blue creature"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/tenth/SpittingEarth.java b/Mage.Sets/src/mage/sets/tenth/SpittingEarth.java index 17556f96989..e623f76e8ba 100644 --- a/Mage.Sets/src/mage/sets/tenth/SpittingEarth.java +++ b/Mage.Sets/src/mage/sets/tenth/SpittingEarth.java @@ -43,7 +43,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class SpittingEarth extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("Mountain you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Mountain you control"); static { filter.add(new SubtypePredicate("Mountain")); diff --git a/Mage.Sets/src/mage/sets/tenth/SylvanScrying.java b/Mage.Sets/src/mage/sets/tenth/SylvanScrying.java index e4021495ad7..810b1b48c39 100644 --- a/Mage.Sets/src/mage/sets/tenth/SylvanScrying.java +++ b/Mage.Sets/src/mage/sets/tenth/SylvanScrying.java @@ -41,7 +41,7 @@ import mage.target.common.TargetCardInLibrary; */ public class SylvanScrying extends CardImpl { - private final static FilterLandCard filter = new FilterLandCard("land card"); + private static final FilterLandCard filter = new FilterLandCard("land card"); public SylvanScrying(UUID ownerId) { super(ownerId, 302, "Sylvan Scrying", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); diff --git a/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java b/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java index 8227d9638a3..bf62a4902bb 100644 --- a/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java +++ b/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java @@ -45,7 +45,7 @@ import mage.target.TargetPermanent; */ public class ViridianShaman extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/tenth/YavimayaEnchantress.java b/Mage.Sets/src/mage/sets/tenth/YavimayaEnchantress.java index 134788324e1..b481f6cace6 100644 --- a/Mage.Sets/src/mage/sets/tenth/YavimayaEnchantress.java +++ b/Mage.Sets/src/mage/sets/tenth/YavimayaEnchantress.java @@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class YavimayaEnchantress extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("enchantment on the battlefield"); + private static final FilterPermanent filter = new FilterPermanent("enchantment on the battlefield"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/timeshifted/Dragonstorm.java b/Mage.Sets/src/mage/sets/timeshifted/Dragonstorm.java index 37c8b5af48f..bae0ef2b1e0 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Dragonstorm.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Dragonstorm.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCardInLibrary; public class Dragonstorm extends CardImpl { - final static private FilterPermanentCard filter = new FilterPermanentCard("Dragon permanent card"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Dragon permanent card"); static { filter.add(new SubtypePredicate("Dragon")); diff --git a/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java b/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java index a44c5d736c5..5913274dd55 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java +++ b/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java @@ -53,7 +53,7 @@ import mage.game.permanent.Permanent; */ public class GemstoneMine extends CardImpl { - final static private FilterPermanent filter = new FilterPermanent(); + private static final FilterPermanent filter = new FilterPermanent(); static { filter.add(Predicates.not(new AnotherPredicate())); diff --git a/Mage.Sets/src/mage/sets/timespiral/TwoHeadedSliver.java b/Mage.Sets/src/mage/sets/timespiral/TwoHeadedSliver.java index 6bba398c8bd..486dc16ef09 100644 --- a/Mage.Sets/src/mage/sets/timespiral/TwoHeadedSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/TwoHeadedSliver.java @@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class TwoHeadedSliver extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Sliver creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Sliver creatures"); static { filter.add(new SubtypePredicate("Sliver")); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/AuraFlux.java b/Mage.Sets/src/mage/sets/urzaslegacy/AuraFlux.java index 74fc80b1a22..28aad783809 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/AuraFlux.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/AuraFlux.java @@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; * @author Plopman */ public class AuraFlux extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("enchantments"); + private static final FilterPermanent filter = new FilterPermanent("enchantments"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DerangedHermit.java b/Mage.Sets/src/mage/sets/urzaslegacy/DerangedHermit.java index 3173cde642e..76178943ebb 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/DerangedHermit.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/DerangedHermit.java @@ -49,7 +49,7 @@ import mage.game.permanent.token.SquirrelToken; */ public class DerangedHermit extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Squirrel creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Squirrel creatures"); static { filter.add(new SubtypePredicate("Squirrel")); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Eviscerator.java b/Mage.Sets/src/mage/sets/urzaslegacy/Eviscerator.java index e6a8428682a..a96e1b3a31e 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Eviscerator.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Eviscerator.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public class Eviscerator extends CardImpl { - private final static FilterCard filter = new FilterCard("white"); + private static final FilterCard filter = new FilterCard("white"); static { filter.add(new ColorPredicate(ObjectColor.WHITE)); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java b/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java index fcc1166aa12..d5e4f460643 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java @@ -49,7 +49,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class KingCrab extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("green creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("green creature"); static { filter.add(new ColorPredicate(ObjectColor.GREEN)); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantArchangel.java b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantArchangel.java index b0a1193fa48..15498691b7e 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantArchangel.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantArchangel.java @@ -53,7 +53,7 @@ import mage.game.permanent.Permanent; */ public class RadiantArchangel extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(new AbilityPredicate(FlyingAbility.class)); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java index 4d229f2ad10..5b73e359259 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCreaturePermanent; * @author Plopman */ public class RadiantsJudgment extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 4 or greater"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 4 or greater"); static { filter.add(new PowerPredicate(Filter.ComparisonType.GreaterThan, 3)); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java b/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java index 5c08ec96164..1702d9cb61f 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java @@ -49,7 +49,7 @@ import mage.target.TargetPermanent; */ public class RingOfGix extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact, creature, or land"); + private static final FilterPermanent filter = new FilterPermanent("artifact, creature, or land"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java b/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java index 8d87763709e..68c55d991cb 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java @@ -70,7 +70,7 @@ public class Rivalry extends CardImpl { class RivalryTriggeredAbility extends TriggeredAbilityImpl { - private final static FilterPermanent filter = new FilterLandPermanent(); + private static final FilterPermanent filter = new FilterLandPermanent(); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/TragicPoet.java b/Mage.Sets/src/mage/sets/urzaslegacy/TragicPoet.java index c02177e689a..0d030253c82 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/TragicPoet.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/TragicPoet.java @@ -48,7 +48,7 @@ import mage.target.common.TargetCardInYourGraveyard; */ public class TragicPoet extends CardImpl { - private final static FilterCard filter = new FilterCard("enchantment card from your graveyard"); + private static final FilterCard filter = new FilterCard("enchantment card from your graveyard"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaGranger.java b/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaGranger.java index b717e6acbb8..e0ad415fda6 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaGranger.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/YavimayaGranger.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCardInLibrary; */ public class YavimayaGranger extends CardImpl { - private final static FilterBasicLandCard filter = new FilterBasicLandCard(); + private static final FilterBasicLandCard filter = new FilterBasicLandCard(); public YavimayaGranger(UUID ownerId) { super(ownerId, 118, "Yavimaya Granger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); diff --git a/Mage.Sets/src/mage/sets/urzassaga/CitanulHierophants.java b/Mage.Sets/src/mage/sets/urzassaga/CitanulHierophants.java index 482c2807035..9117c34a9a9 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CitanulHierophants.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CitanulHierophants.java @@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class CitanulHierophants extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("creatures"); + private static final FilterPermanent filter = new FilterPermanent("creatures"); static { filter.add(new CardTypePredicate(CardType.CREATURE)); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Clear.java b/Mage.Sets/src/mage/sets/urzassaga/Clear.java index 4b3a22685aa..bd6eeeeee08 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Clear.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Clear.java @@ -45,7 +45,7 @@ import mage.target.TargetPermanent; */ public class Clear extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("enchantment"); + private static final FilterPermanent filter = new FilterPermanent("enchantment"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Hush.java b/Mage.Sets/src/mage/sets/urzassaga/Hush.java index 0643327c681..74c0abeac86 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Hush.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Hush.java @@ -68,7 +68,7 @@ public class Hush extends CardImpl { class HushEffect extends OneShotEffect { - private final static FilterPermanent filter = new FilterPermanent(""); + private static final FilterPermanent filter = new FilterPermanent(""); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/sets/urzassaga/RainOfSalt.java b/Mage.Sets/src/mage/sets/urzassaga/RainOfSalt.java index 539d8c66294..746041fa810 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/RainOfSalt.java +++ b/Mage.Sets/src/mage/sets/urzassaga/RainOfSalt.java @@ -43,7 +43,7 @@ import mage.target.TargetPermanent; */ public class RainOfSalt extends CardImpl { - private final static FilterPermanent filter = new FilterLandPermanent(); + private static final FilterPermanent filter = new FilterLandPermanent(); public RainOfSalt(UUID ownerId) { super(ownerId, 206, "Rain of Salt", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{R}{R}"); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Scrap.java b/Mage.Sets/src/mage/sets/urzassaga/Scrap.java index 50a591a9008..b81bef00f8d 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Scrap.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Scrap.java @@ -45,7 +45,7 @@ import mage.target.TargetPermanent; */ public class Scrap extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact"); + private static final FilterPermanent filter = new FilterPermanent("artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java b/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java index e951455daa6..98b75985853 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java @@ -46,7 +46,7 @@ import mage.target.TargetPermanent; * @author Loki */ public class SternProctor extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact or enchantment"); + private static final FilterPermanent filter = new FilterPermanent("artifact or enchantment"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/urzassaga/TolarianAcademy.java b/Mage.Sets/src/mage/sets/urzassaga/TolarianAcademy.java index b07f425df14..37d121b3a94 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/TolarianAcademy.java +++ b/Mage.Sets/src/mage/sets/urzassaga/TolarianAcademy.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; public class TolarianAcademy extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledPermanent("artifact you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("artifact you control"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); diff --git a/Mage.Sets/src/mage/sets/urzassaga/VernalBloom.java b/Mage.Sets/src/mage/sets/urzassaga/VernalBloom.java index e271ae24217..4c05c60faf6 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/VernalBloom.java +++ b/Mage.Sets/src/mage/sets/urzassaga/VernalBloom.java @@ -73,7 +73,7 @@ public class VernalBloom extends CardImpl { class VernalBloomTriggeredAbility extends TriggeredManaAbility { - private final static FilterLandPermanent filter = new FilterLandPermanent("Forest"); + private static final FilterLandPermanent filter = new FilterLandPermanent("Forest"); static { filter.add(new SubtypePredicate("Forest")); } diff --git a/Mage.Sets/src/mage/sets/worldwake/JwariShapeshifter.java b/Mage.Sets/src/mage/sets/worldwake/JwariShapeshifter.java index dc6f7102301..840d2b0263a 100644 --- a/Mage.Sets/src/mage/sets/worldwake/JwariShapeshifter.java +++ b/Mage.Sets/src/mage/sets/worldwake/JwariShapeshifter.java @@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; */ public class JwariShapeshifter extends CardImpl { - final static private FilterPermanent filter = new FilterPermanent("Ally creature"); + private static final FilterPermanent filter = new FilterPermanent("Ally creature"); static { filter.add(new SubtypePredicate("Ally")); diff --git a/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java b/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java index 169427d4dbd..89902c19f9d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java +++ b/Mage.Sets/src/mage/sets/worldwake/RicochetTrap.java @@ -52,7 +52,7 @@ import mage.watchers.WatcherImpl; */ public class RicochetTrap extends CardImpl { - final static private FilterSpell filter = new FilterSpell(); + private static final FilterSpell filter = new FilterSpell(); static { filter.add(new NumberOfTargetsPredicate(1)); diff --git a/Mage.Sets/src/mage/sets/worldwake/RuinGhost.java b/Mage.Sets/src/mage/sets/worldwake/RuinGhost.java index 381c1ce2ffb..5914558092c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RuinGhost.java +++ b/Mage.Sets/src/mage/sets/worldwake/RuinGhost.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent; */ public class RuinGhost extends CardImpl { - final static private FilterControlledPermanent filter = new FilterControlledPermanent("land you control"); + private static final FilterControlledPermanent filter = new FilterControlledPermanent("land you control"); static { filter.add(new CardTypePredicate(CardType.LAND)); diff --git a/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java b/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java index 0fd409c6716..9199bbba198 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java +++ b/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java @@ -51,7 +51,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class TideforceElemental extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { filter.add(new AnotherPredicate()); diff --git a/Mage.Sets/src/mage/sets/worldwake/Twitch.java b/Mage.Sets/src/mage/sets/worldwake/Twitch.java index 3340aff6009..c02561d3b0c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Twitch.java +++ b/Mage.Sets/src/mage/sets/worldwake/Twitch.java @@ -44,7 +44,7 @@ import mage.target.TargetPermanent; */ public class Twitch extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact, creature, or land"); + private static final FilterPermanent filter = new FilterPermanent("artifact, creature, or land"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java b/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java index 4fb1220b752..f72a633e95b 100644 --- a/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java +++ b/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class UrgeToFeed extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); public UrgeToFeed(UUID ownerId) { super(ownerId, 70, "Urge to Feed", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{B}{B}"); @@ -76,7 +76,7 @@ public class UrgeToFeed extends CardImpl { class UrgeToFeedEffect extends OneShotEffect { - final private static FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped Vampire creatures you control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped Vampire creatures you control"); static { filter.add(new ControllerPredicate(Constants.TargetController.YOU)); diff --git a/Mage.Sets/src/mage/sets/worldwake/VastwoodAnimist.java b/Mage.Sets/src/mage/sets/worldwake/VastwoodAnimist.java index faf5b183900..9879d15afd2 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VastwoodAnimist.java +++ b/Mage.Sets/src/mage/sets/worldwake/VastwoodAnimist.java @@ -55,7 +55,7 @@ import mage.target.common.TargetControlledPermanent; */ public class VastwoodAnimist extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public VastwoodAnimist(UUID ownerId) { super(ownerId, 116, "Vastwood Animist", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); diff --git a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java index d1c5ac597e8..ec95d6f29dd 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java +++ b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java @@ -48,7 +48,7 @@ import mage.counters.CounterType; */ public class AetherFigment extends CardImpl { - private final static String staticText = "with two +1/+1 counters on it, if it was kicked"; + private static final String staticText = "with two +1/+1 counters on it, if it was kicked"; public AetherFigment(UUID ownerId) { super(ownerId, 40, "AEther Figment", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); diff --git a/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java b/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java index eacc8a4f090..6a3d19c21ae 100644 --- a/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/LethargyTrap.java @@ -46,7 +46,7 @@ import mage.game.Game; */ public class LethargyTrap extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("attacking creatures"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("attacking creatures"); static { filter.add(new AttackingPredicate()); diff --git a/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java b/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java index 6638b621bd8..39adface6bc 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java +++ b/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java @@ -47,7 +47,7 @@ import mage.target.TargetPermanent; */ public class RelicCrush extends CardImpl { - private final static FilterPermanent filter = new FilterPermanent("artifact or enchantment"); + private static final FilterPermanent filter = new FilterPermanent("artifact or enchantment"); static { filter.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/zendikar/ScytheTiger.java b/Mage.Sets/src/mage/sets/zendikar/ScytheTiger.java index 3a64adcd44a..69b846f9b94 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ScytheTiger.java +++ b/Mage.Sets/src/mage/sets/zendikar/ScytheTiger.java @@ -46,7 +46,7 @@ import mage.target.common.TargetControlledPermanent; */ public class ScytheTiger extends CardImpl { - private final static FilterControlledPermanent filter = new FilterControlledLandPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); public ScytheTiger(UUID ownerId) { super(ownerId, 183, "Scythe Tiger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}"); diff --git a/Mage.Sets/src/mage/sets/zendikar/Tanglesap.java b/Mage.Sets/src/mage/sets/zendikar/Tanglesap.java index 2ef6f0ac9a2..f6a00769cf7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Tanglesap.java +++ b/Mage.Sets/src/mage/sets/zendikar/Tanglesap.java @@ -44,7 +44,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate; */ public class Tanglesap extends CardImpl { - final static private FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures without trample"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures without trample"); static { filter.add(Predicates.not(new AbilityPredicate(TrampleAbility.class))); diff --git a/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java b/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java index a8df0020267..3e1c1298f5b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java +++ b/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java @@ -1,73 +1,73 @@ -package org.mage.test.load; - -import mage.interfaces.MageClient; -import mage.interfaces.callback.CallbackClient; -import mage.interfaces.callback.ClientCallback; -import mage.remote.Session; -import mage.utils.MageVersion; -import org.apache.log4j.Logger; - -import java.util.UUID; - -/** - * For tests only - * - * @author noxx - */ -public class SimpleMageClient implements MageClient { - - private UUID clientId; - private final static MageVersion version = new MageVersion(1, 0, 1, ""); - - private static final transient Logger log = Logger.getLogger(SimpleMageClient.class); - - private CallbackClient callbackClient; - - public SimpleMageClient() { - clientId = UUID.randomUUID(); - callbackClient = new LoadCallbackClient(); - } - - @Override - public UUID getId() { - return clientId; - } - - @Override - public MageVersion getVersion() { - return version; - } - - @Override - public void connected(String message) { - // do nothing - } - - @Override - public void disconnected() { - // do nothing - } - - @Override - public void showMessage(String message) { - log.info(message); - } - - @Override - public void showError(String message) { - log.error(message); - } - - @Override - public void processCallback(ClientCallback callback) { - callbackClient.processCallback(callback); - } - - public void setSession(Session session) { - ((LoadCallbackClient)callbackClient).setSession(session); - } - - public boolean isGameOver() { - return ((LoadCallbackClient)callbackClient).isGameOver(); - } -} +package org.mage.test.load; + +import mage.interfaces.MageClient; +import mage.interfaces.callback.CallbackClient; +import mage.interfaces.callback.ClientCallback; +import mage.remote.Session; +import mage.utils.MageVersion; +import org.apache.log4j.Logger; + +import java.util.UUID; + +/** + * For tests only + * + * @author noxx + */ +public class SimpleMageClient implements MageClient { + + private UUID clientId; + private static final MageVersion version = new MageVersion(1, 0, 1, ""); + + private static final transient Logger log = Logger.getLogger(SimpleMageClient.class); + + private CallbackClient callbackClient; + + public SimpleMageClient() { + clientId = UUID.randomUUID(); + callbackClient = new LoadCallbackClient(); + } + + @Override + public UUID getId() { + return clientId; + } + + @Override + public MageVersion getVersion() { + return version; + } + + @Override + public void connected(String message) { + // do nothing + } + + @Override + public void disconnected() { + // do nothing + } + + @Override + public void showMessage(String message) { + log.info(message); + } + + @Override + public void showError(String message) { + log.error(message); + } + + @Override + public void processCallback(ClientCallback callback) { + callbackClient.processCallback(callback); + } + + public void setSession(Session session) { + ((LoadCallbackClient)callbackClient).setSession(session); + } + + public boolean isGameOver() { + return ((LoadCallbackClient)callbackClient).isGameOver(); + } +} diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestBase.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestBase.java index 7690500e24f..cc953515238 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestBase.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestBase.java @@ -41,7 +41,7 @@ public abstract class MageTestBase { public static PluginClassLoader classLoader = new PluginClassLoader(); - private final static String pluginFolder = "plugins"; + private static final String pluginFolder = "plugins"; protected Pattern pattern = Pattern.compile("([a-zA-Z]*):([\\w]*):([a-zA-Z ,\\-.!'\\d]*):([\\d]*)(:\\{tapped\\})?"); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java index 7ddd90bd459..c84e691a84d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java @@ -38,7 +38,7 @@ public abstract class MageTestPlayerBase { public static PluginClassLoader classLoader = new PluginClassLoader(); - private final static String pluginFolder = "plugins"; + private static final String pluginFolder = "plugins"; protected Pattern pattern = Pattern.compile("([a-zA-Z]*):([\\w]*):([a-zA-Z ,\\-.!'\\d]*):([\\d]*)(:\\{tapped\\})?"); diff --git a/Mage.Updater/src/main/java/com/magefree/update/Updater.java b/Mage.Updater/src/main/java/com/magefree/update/Updater.java index 2bd10253bb6..56829eaa70f 100644 --- a/Mage.Updater/src/main/java/com/magefree/update/Updater.java +++ b/Mage.Updater/src/main/java/com/magefree/update/Updater.java @@ -23,7 +23,7 @@ public class Updater { /** * URL to get metadata and files from. */ - private final static String URL_PREFIX = "http://download.magefree.com/update/"; + private static final String URL_PREFIX = "http://download.magefree.com/update/"; /** * Main. Application Entry Point. diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java index cb7dd2f57b8..101bc0eb2fb 100644 --- a/Mage/src/mage/abilities/AbilityImpl.java +++ b/Mage/src/mage/abilities/AbilityImpl.java @@ -60,7 +60,7 @@ import java.util.UUID; */ public abstract class AbilityImpl> implements Ability { - private final static transient Logger logger = Logger.getLogger(AbilityImpl.class); + private static final transient Logger logger = Logger.getLogger(AbilityImpl.class); protected UUID id; protected UUID originalId; diff --git a/Mage/src/mage/abilities/effects/common/continious/LoseAbilityAttachedEffect.java b/Mage/src/mage/abilities/effects/common/continious/LoseAbilityAttachedEffect.java index caee1ac12d2..f9822241fbc 100644 --- a/Mage/src/mage/abilities/effects/common/continious/LoseAbilityAttachedEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/LoseAbilityAttachedEffect.java @@ -41,7 +41,7 @@ import org.apache.log4j.Logger; */ public class LoseAbilityAttachedEffect extends ContinuousEffectImpl { - private final static Logger logger = Logger.getLogger(LoseAbilityAttachedEffect.class); + private static final Logger logger = Logger.getLogger(LoseAbilityAttachedEffect.class); protected Ability ability; protected AttachmentType attachmentType; diff --git a/Mage/src/mage/cards/CardImpl.java b/Mage/src/mage/cards/CardImpl.java index 85ceb52599b..518346660ce 100644 --- a/Mage/src/mage/cards/CardImpl.java +++ b/Mage/src/mage/cards/CardImpl.java @@ -54,7 +54,7 @@ import java.util.*; public abstract class CardImpl> extends MageObjectImpl implements Card { private static final long serialVersionUID = 1L; - private final static Logger logger = Logger.getLogger(CardImpl.class); + private static final Logger logger = Logger.getLogger(CardImpl.class); protected UUID ownerId; protected int cardNumber; diff --git a/Mage/src/mage/cards/ExpansionSet.java b/Mage/src/mage/cards/ExpansionSet.java index 84eb302d0d9..be6c0558289 100644 --- a/Mage/src/mage/cards/ExpansionSet.java +++ b/Mage/src/mage/cards/ExpansionSet.java @@ -43,7 +43,7 @@ import java.util.*; */ public abstract class ExpansionSet implements Serializable { - private final static Logger logger = Logger.getLogger(ExpansionSet.class); + private static final Logger logger = Logger.getLogger(ExpansionSet.class); protected static Random rnd = new Random(); diff --git a/Mage/src/mage/cards/Sets.java b/Mage/src/mage/cards/Sets.java index 0c6c0181e53..aea33d0be34 100644 --- a/Mage/src/mage/cards/Sets.java +++ b/Mage/src/mage/cards/Sets.java @@ -47,7 +47,7 @@ import org.apache.log4j.Logger; */ public class Sets extends HashMap { - private final static Logger logger = Logger.getLogger(Sets.class); + private static final Logger logger = Logger.getLogger(Sets.class); private static final Sets fINSTANCE = new Sets(); protected static Random rnd = new Random(); diff --git a/Mage/src/mage/cards/decks/importer/DeckImporter.java b/Mage/src/mage/cards/decks/importer/DeckImporter.java index 132fa75378c..6af78ca0cf2 100644 --- a/Mage/src/mage/cards/decks/importer/DeckImporter.java +++ b/Mage/src/mage/cards/decks/importer/DeckImporter.java @@ -39,7 +39,7 @@ import org.apache.log4j.Logger; */ public abstract class DeckImporter { - private final static Logger logger = Logger.getLogger(DeckImporter.class); + private static final Logger logger = Logger.getLogger(DeckImporter.class); protected StringBuilder sbMessage = new StringBuilder(); protected int lineCount; diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java index 3a88b3ca8b2..637626aad54 100644 --- a/Mage/src/mage/game/GameImpl.java +++ b/Mage/src/mage/game/GameImpl.java @@ -94,7 +94,7 @@ import org.apache.log4j.Logger; public abstract class GameImpl> implements Game, Serializable { - private final static transient Logger logger = Logger.getLogger(GameImpl.class); + private static final transient Logger logger = Logger.getLogger(GameImpl.class); private static final FilterPermanent filterAura = new FilterPermanent(); private static final FilterPermanent filterEquipment = new FilterPermanent(); diff --git a/Mage/src/mage/game/GameStates.java b/Mage/src/mage/game/GameStates.java index a1c5c0926de..0fda26e4fca 100644 --- a/Mage/src/mage/game/GameStates.java +++ b/Mage/src/mage/game/GameStates.java @@ -39,7 +39,7 @@ import org.apache.log4j.Logger; */ public class GameStates implements Serializable { - private final static transient Logger logger = Logger.getLogger(GameStates.class); + private static final transient Logger logger = Logger.getLogger(GameStates.class); // private List states = new LinkedList(); private List states = new LinkedList(); diff --git a/Mage/src/mage/game/Seat.java b/Mage/src/mage/game/Seat.java index d32cf3a8ca6..751a18d3932 100644 --- a/Mage/src/mage/game/Seat.java +++ b/Mage/src/mage/game/Seat.java @@ -37,7 +37,7 @@ import mage.players.Player; */ public class Seat implements Serializable { -// private final static Logger logger = Logger.getLogger(Seat.class); +// private static final Logger logger = Logger.getLogger(Seat.class); private String playerType; private Player player;