diff --git a/src/magic/DeckStrCal.java b/src/magic/DeckStrCal.java
index e9621eb754..6d344208c0 100644
--- a/src/magic/DeckStrCal.java
+++ b/src/magic/DeckStrCal.java
@@ -132,8 +132,8 @@ public class DeckStrCal {
         // Set difficulty.
         final MagicDuel testDuel=new MagicDuel(config);
         testDuel.initialize();
-        
-        // Create players 
+
+        // Create players
         final DuelPlayerConfig[] players = new DuelPlayerConfig[2];
         for (int i = 0; i < 2; i++) {
             players[i] = new DuelPlayerConfig(
@@ -195,7 +195,7 @@ public class DeckStrCal {
         while (testDuel.getGamesPlayed() < testDuel.getGamesTotal()) {
             final MagicGame game=testDuel.nextGame();
             game.setArtificial(true);
-            
+
             //maximum duration of a game is 60 minutes
             final HeadlessGameController controller = new HeadlessGameController(game, 3600000);
 
diff --git a/src/magic/MagicMain.java b/src/magic/MagicMain.java
index ef4f49f1b1..0687ac5a6b 100644
--- a/src/magic/MagicMain.java
+++ b/src/magic/MagicMain.java
@@ -29,7 +29,7 @@ public class MagicMain {
         Thread.setDefaultUncaughtExceptionHandler(new UiExceptionHandler());
 
         setSplashScreen();
-       
+
         System.out.println(MagicSystem.getRuntimeParameters());
         parseCommandline(args);
 
@@ -44,7 +44,7 @@ public class MagicMain {
             final double duration = (double)(System.currentTimeMillis() - start_time) / 1000;
             System.err.println("Initalization of engine took " + duration + "s");
         }
-        
+
         // try to set the look and feel
         setLookAndFeel("Nimbus");
         reporter.setMessage("Starting UI...");
@@ -54,7 +54,7 @@ public class MagicMain {
             }
         });
     }
-        
+
     private static void setLookAndFeel(final String laf) {
         try {
             for (final LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
@@ -112,7 +112,7 @@ public class MagicMain {
         if (MagicSystem.isAiVersusAi()) {
             final DuelConfig config = DuelConfig.getInstance();
             config.load();
-            
+
             // set both player profile to AI for AI vs AI mode
             config.setPlayerProfile(0, config.getPlayerProfile(1));
 
@@ -122,7 +122,7 @@ public class MagicMain {
 
         // normal UI startup.
         ScreenController.showStartScreen();
-        
+
     }
 
     private static void parseCommandline(final String[] args) {
diff --git a/src/magic/ai/MCTSAI.java b/src/magic/ai/MCTSAI.java
index 9bc9eb8a6c..778a15c4b0 100644
--- a/src/magic/ai/MCTSAI.java
+++ b/src/magic/ai/MCTSAI.java
@@ -69,7 +69,7 @@ public class MCTSAI implements MagicAI {
     static double UCB1_C = 0.4;
     static double RATIO_K = 1.0;
     private int sims = 0;
-    
+
     private static final int THREADS = Runtime.getRuntime().availableProcessors();
 
     static {
@@ -126,14 +126,14 @@ public class MCTSAI implements MagicAI {
         if (size == 1) {
             return startGame.map(RCHOICES.get(0));
         }
-        
+
         //root represents the start state
         final MCTSGameTree root = MCTSGameTree.getNode(CACHE, aiGame, RCHOICES);
 
         log("MCTS cached=" + root.getNumSim());
-        
+
         sims = 0;
-        final ExecutorService executor = Executors.newFixedThreadPool(THREADS); 
+        final ExecutorService executor = Executors.newFixedThreadPool(THREADS);
         final BlockingQueue<Runnable> queue = new LinkedBlockingQueue<>();
 
         // ensure tree update runs at least once
@@ -146,9 +146,9 @@ public class MCTSAI implements MagicAI {
                 TreeUpdate(this, root, aiGame, executor, queue, END_TIME, RCHOICES);
             }
         };
-        
+
         updateTask.run();
-        
+
         try {
             // wait for artificialLevel + 1 seconds for jobs to finish
             executor.awaitTermination(aiLevel + 1, TimeUnit.SECONDS);
@@ -210,10 +210,10 @@ public class MCTSAI implements MagicAI {
 
     public void TreeUpdate(
         final Runnable updateTask,
-        final MCTSGameTree root, 
-        final MagicGame aiGame, 
-        final ExecutorService executor, 
-        final BlockingQueue<Runnable> queue, 
+        final MCTSGameTree root,
+        final MagicGame aiGame,
+        final ExecutorService executor,
+        final BlockingQueue<Runnable> queue,
         final long END_TIME,
         final List<Object[]> RCHOICES
     ) {
@@ -232,14 +232,14 @@ public class MCTSAI implements MagicAI {
 
         //clone the MagicGame object for simulation
         final MagicGame rootGame = new MagicGame(aiGame, aiGame.getScorePlayer());
-        
+
         //pass in a clone of the state,
         //genNewTreeNode grows the tree by one node
         //and returns the path from the root to the new node
         final LinkedList<MCTSGameTree> path = growTree(root, rootGame, RCHOICES);
 
         assert path.size() >= 2 : "ERROR! length of MCTS path is " + path.size();
-        
+
         // play a simulated game to get score
         // update all nodes along the path from root to new node
 
@@ -254,7 +254,7 @@ public class MCTSAI implements MagicAI {
                 return;
             }
         }
-        
+
         // virtual loss + game theoretic value propagation
         final Iterator<MCTSGameTree> iter = path.descendingIterator();
         MCTSGameTree child = null;
@@ -278,7 +278,7 @@ public class MCTSAI implements MagicAI {
                 }
             }
         }
-       
+
         // end simulations once root is AI win or time is up
         if (running && root.isAIWin() == false) {
             try {
@@ -450,7 +450,7 @@ public class MCTSAI implements MagicAI {
             return 1.0 - counts[0] / (2.0 * MAX_CHOICES);
         }
     }
-    
+
     private int[] runSimulation(final MagicGame game) {
 
         int aiChoices = 0;
@@ -465,7 +465,7 @@ public class MCTSAI implements MagicAI {
                !Thread.currentThread().isInterrupted() &&
                game.advanceToNextEventWithChoice()) {
             final MagicEvent event = game.getNextEvent();
-            
+
             if (event.getPlayer() == game.getScorePlayer()) {
                 aiChoices++;
             } else {
@@ -713,11 +713,11 @@ class MCTSGameTree implements Iterable<MCTSGameTree> {
     boolean isSolved() {
         return evalScore == Integer.MAX_VALUE || evalScore == Integer.MIN_VALUE;
     }
-    
+
     void recordVirtualLoss() {
         numSim++;
     }
-    
+
     void removeVirtualLoss() {
         numSim--;
     }
diff --git a/src/magic/ai/MMAB.java b/src/magic/ai/MMAB.java
index 945d6f23c9..8eaa156e70 100644
--- a/src/magic/ai/MMAB.java
+++ b/src/magic/ai/MMAB.java
@@ -62,11 +62,11 @@ public class MMAB implements MagicAI {
         final int artificialLevel = scorePlayer.getAiProfile().getAiLevel();
         final int rounds = (size + THREADS - 1) / THREADS;
         final long slice = artificialLevel * SEC_TO_NANO / rounds;
-        
+
         for (final Object[] choice : choices) {
             final ArtificialChoiceResults achoice=new ArtificialChoiceResults(choice);
             achoices.add(achoice);
-                    
+
             final MagicGame workerGame=new MagicGame(sourceGame,scorePlayer);
             if (!CHEAT) {
                 workerGame.hideHiddenCards();
@@ -77,7 +77,7 @@ public class MMAB implements MagicAI {
             workerGame.setFastMana(true);
             workerGame.setFastTarget(true);
             workerGame.setFastBlocker(true);
-            
+
             executor.execute(new Runnable() {
                 @Override
                 public void run() {
@@ -148,7 +148,7 @@ class MMABWorker {
         this.scoreBoard=scoreBoard;
         this.CHEAT=CHEAT;
     }
-    
+
     /** Determines if game score should be cached for this game state. */
     public boolean shouldCache() {
         switch (game.getPhase().getType()) {
diff --git a/src/magic/ai/MTDF.java b/src/magic/ai/MTDF.java
index 48ea1c5144..af02273079 100644
--- a/src/magic/ai/MTDF.java
+++ b/src/magic/ai/MTDF.java
@@ -29,16 +29,16 @@ public class MTDF implements MagicAI {
     public Object[] findNextEventChoiceResults(final MagicGame sourceGame, final MagicPlayer scorePlayer) {
         final int artificialLevel = scorePlayer.getAiProfile().getAiLevel();
         final long startTime = System.currentTimeMillis();
-        
+
         END = startTime + artificialLevel * 1000;
 
         final MagicGame root = new MagicGame(sourceGame, scorePlayer);
         //root.setMainPhases(artificialLevel);
-        
+
         if (!CHEAT) {
             root.hideHiddenCards();
         }
-        
+
         final MagicEvent event = root.getNextEvent();
         final List<Object[]> choices = event.getArtificialChoiceResults(root);
         if (choices.size() == 1) {
@@ -47,7 +47,7 @@ public class MTDF implements MagicAI {
 
         root.setFastChoices(true);
         final TTEntry result = iterative_deepening(root, choices);
-        
+
         // Logging.
         final long timeTaken = System.currentTimeMillis() - startTime;
         log("MTDF" +
@@ -70,7 +70,7 @@ public class MTDF implements MagicAI {
     }
 
     private boolean hasTime() {
-        return System.currentTimeMillis() < END; 
+        return System.currentTimeMillis() < END;
     }
 
     private TTEntry iterative_deepening(final MagicGame root, final List<Object[]> choices) {
@@ -129,18 +129,18 @@ public class MTDF implements MagicAI {
 
         final boolean isMax = game.getScorePlayer() == game.getNextEvent().getPlayer();
         final boolean isMin = !isMax;
-            
+
         int g = isMax ? Integer.MIN_VALUE : Integer.MAX_VALUE;
         int a = alpha; /* save original alpha value */
         int b = beta;  /* save original beta value */
         int idx = -1;
-        
+
         for (final Object[] choice : choices) {
             if ((isMax && g >= beta) ||
                 (isMin && g <= alpha)) {
                 break;
             }
-            
+
             game.snapshot();
             game.executeNextEvent(choice);
             final List<Object[]> choices_child = d == 1 ?
@@ -148,7 +148,7 @@ public class MTDF implements MagicAI {
                 game.advanceToNextEventWithChoices();
             final int g_child = AlphaBetaWithMemory(game, choices_child, a, b, d - 1);
             game.restore();
-            
+
             idx++;
             if ((isMax && g_child > g) ||
                 (isMin && g_child < g)) {
@@ -168,11 +168,11 @@ public class MTDF implements MagicAI {
             table.put(id_check, entry);
             table.remove(id);
         }
-        
+
         entry.update(g, alpha, beta);
         return g;
     }
-    
+
     private void log(final String message) {
         MagicGameLog.log(message);
     }
@@ -182,21 +182,21 @@ class TTEntry {
     int lowerbound = Integer.MIN_VALUE;
     int upperbound = Integer.MAX_VALUE;
     int chosen = -1;
-        
+
     void update(int g, int alpha, int beta) {
-        /* Traditional transposition table storing of bounds */ 
-        /* Fail low result implies an upper bound */ 
+        /* Traditional transposition table storing of bounds */
+        /* Fail low result implies an upper bound */
         if (g <= alpha) {
-            upperbound = g; 
-        }
-        /* Found an accurate minimax value - will not occur if called with zero window */ 
-        if (g > alpha && g < beta) {
-            lowerbound = g; 
             upperbound = g;
         }
-        /* Fail high result implies a lower bound */ 
+        /* Found an accurate minimax value - will not occur if called with zero window */
+        if (g > alpha && g < beta) {
+            lowerbound = g;
+            upperbound = g;
+        }
+        /* Fail high result implies a lower bound */
         if (g >= beta) {
-            lowerbound = g; 
+            lowerbound = g;
         }
     }
 }
diff --git a/src/magic/data/CardDefinitions.java b/src/magic/data/CardDefinitions.java
index 98c3818180..b6844f1272 100644
--- a/src/magic/data/CardDefinitions.java
+++ b/src/magic/data/CardDefinitions.java
@@ -98,11 +98,11 @@ public class CardDefinitions {
         assert cardDef.getIndex() == -1 : "cardDefinition has been assigned index";
 
         cardDef.setIndex(cdefIndex.getAndIncrement());
-        
+
         if (cardDef.isPlayable()) {
             cardDef.add(new MagicHandCastActivation(cardDef));
         }
-       
+
         allPlayableCardDefs.put(cardDef.getAsciiName(), cardDef);
     }
 
@@ -125,7 +125,7 @@ public class CardDefinitions {
                 }
             }
         }
-            
+
         try {
             cardDefinition.validate();
         } catch (Exception e) {
@@ -175,7 +175,7 @@ public class CardDefinitions {
             throw new RuntimeException("Error loading " + file, cause);
         }
     }
-    
+
     public static void loadCardDefinition(final String cardName) {
         final File cardFile = new File(SCRIPTS_DIRECTORY, getCanonicalName(cardName) + ".txt");
         if (cardFile.isFile() == false) {
@@ -215,7 +215,7 @@ public class CardDefinitions {
         printStatistics();
         updateNewCardsLog(CardDefinitions.loadCardsSnapshotFile());
     }
-    
+
     private static boolean isZero(double value, double delta){
         return value >= -delta && value <= delta;
     }
@@ -242,7 +242,7 @@ public class CardDefinitions {
             throw new RuntimeException(ex);
         }
     }
-    
+
     public static MagicCardDefinition getToken(final String original) {
         final MagicCardDefinition token = getCard(original);
         if (token.isToken()) {
diff --git a/src/magic/data/CardLegality.java b/src/magic/data/CardLegality.java
index cb821ecb6b..ca0da1d6ad 100644
--- a/src/magic/data/CardLegality.java
+++ b/src/magic/data/CardLegality.java
@@ -8,7 +8,7 @@ public enum CardLegality {
     Banned(CardLegalityStrings._S3),
     Restricted(CardLegalityStrings._S4),
     TooManyCopies(CardLegalityStrings._S5);
-    
+
     private final String description;
 
     private CardLegality(String aString) {
diff --git a/src/magic/data/CardStatistics.java b/src/magic/data/CardStatistics.java
index f885018eaa..f1c1c350bd 100644
--- a/src/magic/data/CardStatistics.java
+++ b/src/magic/data/CardStatistics.java
@@ -58,7 +58,7 @@ public class CardStatistics {
             MagicIcon.ARTIFACT
         )
     );
-    
+
     private final Collection<MagicCardDefinition> cards;
 
     public int totalCards;
diff --git a/src/magic/data/DuelConfig.java b/src/magic/data/DuelConfig.java
index 1ce88c72ea..88c68f1b0e 100644
--- a/src/magic/data/DuelConfig.java
+++ b/src/magic/data/DuelConfig.java
@@ -32,7 +32,7 @@ public class DuelConfig {
 
     // CTR
     public DuelConfig() {
-        
+
         // Ensure DuelConfig has valid PlayerProfile references.
         // If missing then creates default profiles.
         PlayerProfiles.refreshMap();
diff --git a/src/magic/data/GeneralConfig.java b/src/magic/data/GeneralConfig.java
index 4771c7cbea..aa7ad8cc8c 100644
--- a/src/magic/data/GeneralConfig.java
+++ b/src/magic/data/GeneralConfig.java
@@ -34,27 +34,27 @@ public class GeneralConfig {
 
     private static final String LEFT="left";
     private int left   = -1;
-    
+
     private static final String TOP="top";
     private int top    = 0;
 
     private static final String TEXT_MODE_OPTION = "TextViewOption";
     private boolean showTextModeOption = false;
-    
+
     private static final String WIDTH="width";
     public static final int DEFAULT_WIDTH=1024;
     private int width  = DEFAULT_WIDTH;
-    
+
     private static final String HEIGHT="height";
     public static final int DEFAULT_HEIGHT=600;
     private int height = DEFAULT_HEIGHT;
-    
+
     private static final String MAXIMIZED="maximized";
     private boolean maximized=false;
-    
+
     private static final String THEME="theme";
     private String theme="felt";
-    
+
     private static final String AVATAR="avatar";
     private String avatar="legend";
 
@@ -66,121 +66,121 @@ public class GeneralConfig {
 
     private static final String ALWAYS_PASS="pass";
     private boolean alwaysPass = true;
-    
+
     private static final String SMART_TARGET="target";
     private boolean smartTarget = false;
-    
+
     private static final String POPUP_DELAY="popup";
     private int popupDelay = 300;
-    
+
     private static final String MESSAGE_DELAY = "message";
     private int messageDelay = 2000;
-    
+
     private static final String HIGH_QUALITY="hq";
     private boolean highQuality = false;
-    
+
     private static final String SOUND="sound";
     private boolean sound = true;
-    
+
     private static final String TOUCHSCREEN = "touchscreen";
     private boolean touchscreen = false;
-    
+
     private static final String MOUSEWHEEL_POPUP = "mousewheel";
     private boolean mouseWheelPopup = false;
-    
+
     private static final String FULLSCREEN = "fullScreen";
     private boolean fullScreen = false;
-    
+
     private static final String PREVIEW_CARD_ON_SELECT = "previewCardOnSelect";
     private boolean previewCardOnSelect = true;
-    
+
     private static final String SHOW_LOG_MESSAGES = "showLogMessages";
     private boolean showLogMessages = true;
-    
+
     private static final String MULLIGAN_SCREEN = "mulliganScreen";
     private boolean isMulliganScreenActive = true;
-    
+
     private static final String RECENT_DECK = "MostRecentDeckFilename";
     private String mostRecentDeckFilename = "";
-    
+
     private static final String CUSTOM_BACKGROUND = "customBackground";
     private boolean isCustomBackground = false;
-    
+
     private static final String SHOW_MISSING_CARD_DATA = "showMissingCardData";
     private boolean showMissingCardData = true;
-    
+
     private static final String CARD_IMAGES_PATH = "cardImagesPath";
     private String cardImagesPath = "";
-    
+
     private static final String ANIMATE_GAMEPLAY = "animateGameplay";
     private boolean animateGameplay = true;
-    
+
     private static final String ANIMATION_FLAGS = "animationFlags";
-    
+
     private static final String DECK_FILE_MAX_LINES = "deckFileMaxLines";
     private int deckFileMaxLines = 500;
-    
+
     private static final String PROXY_SETTINGS = "proxySettings";
     private String proxySettings = "";
-    
+
     private static final String FIREMIND_ACCESS_TOKEN = "firemindAccessToken";
     private String firemindAccessToken = "";
-    
+
     private static final String NEWTURN_ALERT_DURATION = "newTurnAlertDuration";
     private int newTurnAlertDuration = 3000; // msecs
-    
+
     private static final String LAND_PREVIEW_DURATION = "landPreviewDuration";
     private int landPreviewDuration = 5000; // msecs
-    
+
     private static final String NONLAND_PREVIEW_DURATION = "nonLandPreviewDuration";
     private int nonLandPreviewDuration = 10000; // msecs
-    
+
     private static final String SPLITVIEW_DECKEDITOR = "splitViewDeckEditor";
     private boolean isSplitViewDeckEditor = false;
-    
+
     private static final String OVERLAY_PERMANENT_MIN_HEIGHT = "overlayPermanentMinHeight";
     private int overlayPermanentMinHeight = 30; // pixels
-    
+
     private static final String IGNORED_VERSION_ALERT = "ignoredVersionAlert";
     private String ignoredVersionAlert = "";
-    
+
     private static final String UI_SOUND = "uiSound";
     private boolean isUiSound = true;
-    
+
     private static final String PAUSE_GAME_POPUP = "pauseGamePopup";
     private boolean isGamePausedOnPopup = false;
-    
+
     private static final String MISSING_DOWNLOAD_DATE = "missingImagesDownloadDate";
     private String missingImagesDownloadDate = "1970-01-01";
-    
+
     private static final String PLAYABLE_DOWNLOAD_DATE = "imageDownloaderRunDate";
     private String playableImagesDownloadDate = "1970-01-01";
-    
+
     private static final String DUEL_SIDEBAR_LAYOUT ="duelSidebarLayout";
     private String duelSidebarLayout = "LOGSTACK,PLAYER2,TURNINFO,PLAYER1";
-    
+
     private static final String HIDE_AI_ACTION_PROMPT ="hideAiActionPrompt";
     private boolean hideAiActionPrompt = false;
-    
+
     private static final String ROLLOVER_COLOR ="rolloverColor";
     private Color rolloverColor = Color.YELLOW;
-    
+
     private static final String UI_SOUND_VOLUME = "uiSoundVolume";
     private int uiSoundVolume = 50;
-    
+
     private static final String TRANSLATION = "translation";
     public static final String DEFAULT_TRANSLATION = "";
     private String translation = DEFAULT_TRANSLATION;
-    
+
     private static final String LOG_MESSAGE_STYLE = "logMessageStyle";
     private MessageStyle logMessageStyle = MessageStyle.PLAIN;
-    
+
     private static final String PREF_IMAGE_SIZE = "prefImageSize";
     private ImageSizePresets preferredImageSize = ImageSizePresets.SIZE_ORIGINAL;
-    
+
     private static final String CARD_TEXT_LANG = "cardTextLanguage";
     private CardTextLanguage cardTextLanguage = CardTextLanguage.ENGLISH;
-    
+
     private GeneralConfig() { }
 
     public Proxy getProxy() {
@@ -206,7 +206,7 @@ public class GeneralConfig {
             proxySettings = sb.toString();
         } else {
             proxySettings = "";
-        }       
+        }
     }
 
     public int getDeckFileMaxLines() {
@@ -336,7 +336,7 @@ public class GeneralConfig {
     public void setHighlight(final String highlight) {
         this.highlight = highlight;
     }
-    
+
     public String getFiremindAccessToken() {
         return firemindAccessToken;
     }
diff --git a/src/magic/data/ImagesDownloadList.java b/src/magic/data/ImagesDownloadList.java
index c0dd06cc42..d4b48b58e3 100644
--- a/src/magic/data/ImagesDownloadList.java
+++ b/src/magic/data/ImagesDownloadList.java
@@ -25,7 +25,7 @@ public class ImagesDownloadList extends ArrayList<DownloadableFile> {
     }
 
     private void sortListByFilename() {
-        Collections.sort(this, (o1, o2) -> 
+        Collections.sort(this, (o1, o2) ->
             o1.getFilename().compareTo(o2.getFilename())
         );
     }
diff --git a/src/magic/data/MagicCustomFormat.java b/src/magic/data/MagicCustomFormat.java
index 303b425613..f0a3fece94 100644
--- a/src/magic/data/MagicCustomFormat.java
+++ b/src/magic/data/MagicCustomFormat.java
@@ -16,11 +16,11 @@ import magic.utility.MagicFileSystem.DataPath;
 import magic.model.MagicCardDefinition;
 
 public class MagicCustomFormat extends MagicFormat {
-    
+
     private final Set<String> legal = new HashSet<>();
     private final String name;
     private final File file;
-    
+
     public MagicCustomFormat(final String aName) {
         this(aName, null);
     }
@@ -46,7 +46,7 @@ public class MagicCustomFormat extends MagicFormat {
     public String getName() {
         return name;
     }
-    
+
     @Override
     public int getMinimumDeckSize() {
         return 40;
@@ -56,7 +56,7 @@ public class MagicCustomFormat extends MagicFormat {
     public String getLabel() {
         return name;
     }
-    
+
     private void load() {
         List<String> content = Collections.emptyList();
         try { //load cube
@@ -78,7 +78,7 @@ public class MagicCustomFormat extends MagicFormat {
     //
     // static members
     //
-    
+
     private static final String CUBE_FILE_EXTENSION = "_cube.txt";
     private static final FileFilter CUBE_FILE_FILTER = new FileFilter() {
         @Override
@@ -88,7 +88,7 @@ public class MagicCustomFormat extends MagicFormat {
     };
 
     private static List<MagicFormat> customFormats;
-    
+
     public static void loadCustomFormats() {
         final List<MagicFormat> fmts = new ArrayList<>();
         final File[] cubeFiles = MagicFileSystem.getDataPath(DataPath.MODS).toFile().listFiles(CUBE_FILE_FILTER);
@@ -105,7 +105,7 @@ public class MagicCustomFormat extends MagicFormat {
     static List<MagicFormat> values() {
         return customFormats;
     }
-    
+
     private static String getNameWithoutSize(final String cube) {
         final int toIndex = cube.indexOf("(");
         if (toIndex == -1) {
@@ -114,20 +114,20 @@ public class MagicCustomFormat extends MagicFormat {
             return cube.substring(0, toIndex).trim();
         }
     }
-    
+
     public static MagicFormat get(final String cubeLabel) {
 
         // prior to 1.62 the cube label including card count was saved to the duel
         // config file so for backwards compatibility during import need to check
         // for and remove card count if it exists to isolate just the cube name.
         final String cubeName = getNameWithoutSize(cubeLabel);
-        
+
         for (final MagicFormat cube : MagicFormat.getDuelFormats()) {
             if (cube.getName().equals(cubeName)) {
                 return cube;
             }
         }
-        
+
         return MagicFormat.ALL;
     }
 
diff --git a/src/magic/data/MagicFormat.java b/src/magic/data/MagicFormat.java
index 9e64e45374..831f580bfb 100644
--- a/src/magic/data/MagicFormat.java
+++ b/src/magic/data/MagicFormat.java
@@ -8,25 +8,25 @@ import magic.model.MagicDeck;
 import magic.utility.DeckUtils;
 
 public abstract class MagicFormat {
-    
+
     public abstract String getName();
-    
+
     public abstract CardLegality getCardLegality(MagicCardDefinition card, int cardCount);
-    
+
     public abstract int getMinimumDeckSize();
-   
+
     public boolean isCardLegal(MagicCardDefinition card, int cardCount) {
         return getCardLegality(card, cardCount) == CardLegality.Legal;
     }
-    
+
     public boolean isCardLegal(MagicCardDefinition card) {
         return isCardLegal(card, 1);
     }
-    
+
     public String getLabel() {
         return getName();
     }
-    
+
     public boolean isDeckLegal(final MagicDeck aDeck) {
         if (aDeck.size() < getMinimumDeckSize()) {
             return false;
@@ -49,12 +49,12 @@ public abstract class MagicFormat {
         public String getName() {
             return "All";
         }
-        
+
         @Override
         public CardLegality getCardLegality(MagicCardDefinition card, int cardCount) {
             return CardLegality.Legal;
         }
-        
+
         @Override
         public int getMinimumDeckSize() {
             return 40;
@@ -81,11 +81,11 @@ public abstract class MagicFormat {
     public static List<MagicFormat> getCubeFilterFormats() {
         return MagicCustomFormat.values();
     }
-    
+
     public static MagicFormat[] getDuelFormatsArray() {
         return getDuelFormats().toArray(new MagicFormat[0]);
     }
-    
+
     public static String[] getDuelLabels() {
         return getFormatLabels(getDuelFormats()).toArray(new String[0]);
     }
diff --git a/src/magic/data/SoundEffects.java b/src/magic/data/SoundEffects.java
index 1492c02f12..20b53748ea 100644
--- a/src/magic/data/SoundEffects.java
+++ b/src/magic/data/SoundEffects.java
@@ -31,14 +31,14 @@ public class SoundEffects {
     private static Clip clip;
 
     private SoundEffects() {}
-    
+
     public static void playGameSound(final MagicGame game, final String name) {
         if (game.isReal() && GeneralConfig.getInstance().isSound()) {
             playSound(name);
         }
     }
-    
-    public static void playUISound(final String name) { 
+
+    public static void playUISound(final String name) {
         if (GeneralConfig.getInstance().isUiSound()) {
             playSound(name);
         }
diff --git a/src/magic/data/UnimplementedParser.java b/src/magic/data/UnimplementedParser.java
index c3a677e60b..8f92df5488 100644
--- a/src/magic/data/UnimplementedParser.java
+++ b/src/magic/data/UnimplementedParser.java
@@ -110,7 +110,7 @@ public class UnimplementedParser {
             System.err.println("Failed to save " + LOG_FILE + " - " + ex);
         }
     }
-    
+
     private static void exportParseResults() {
         parsedCards.removeAll(errorCards);
         Collections.sort(errorList);
diff --git a/src/magic/data/json/NewVersionJsonParser.java b/src/magic/data/json/NewVersionJsonParser.java
index e361bc927d..7d4da100dc 100644
--- a/src/magic/data/json/NewVersionJsonParser.java
+++ b/src/magic/data/json/NewVersionJsonParser.java
@@ -55,17 +55,17 @@ public final class NewVersionJsonParser {
 
     //source: https://stackoverflow.com/questions/6701948/efficient-way-to-compare-version-strings-in-java
     /**
-     * Compares two version strings. 
-     * 
-     * Use this instead of String.compareTo() for a non-lexicographical 
+     * Compares two version strings.
+     *
+     * Use this instead of String.compareTo() for a non-lexicographical
      * comparison that works for version strings. e.g. "1.10".compareTo("1.6").
-     * 
+     *
      * @note It does not work if "1.10" is supposed to be equal to "1.10.0".
-     * 
-     * @param str1 a string of ordinal numbers separated by decimal points. 
+     *
+     * @param str1 a string of ordinal numbers separated by decimal points.
      * @param str2 a string of ordinal numbers separated by decimal points.
-     * @return The result is a negative integer if str1 is _numerically_ less than str2. 
-     *         The result is a positive integer if str1 is _numerically_ greater than str2. 
+     * @return The result is a negative integer if str1 is _numerically_ less than str2.
+     *         The result is a positive integer if str1 is _numerically_ greater than str2.
      *         The result is zero if the strings are _numerically_ equal.
      */
     public static int versionCompare(String str1, String str2) {
diff --git a/src/magic/exception/InvalidDeckException.java b/src/magic/exception/InvalidDeckException.java
index 9718999b21..70e8a60cf0 100644
--- a/src/magic/exception/InvalidDeckException.java
+++ b/src/magic/exception/InvalidDeckException.java
@@ -19,6 +19,6 @@ public class InvalidDeckException extends RuntimeException {
 
     public InvalidDeckException(final String message) {
         super(message);
-    }     
+    }
 
 }
diff --git a/src/magic/exception/handler/ExceptionHandler.java b/src/magic/exception/handler/ExceptionHandler.java
index 1696155f4c..060dc0e3f7 100644
--- a/src/magic/exception/handler/ExceptionHandler.java
+++ b/src/magic/exception/handler/ExceptionHandler.java
@@ -7,7 +7,7 @@ public abstract class ExceptionHandler implements Thread.UncaughtExceptionHandle
     // first case is actually handled. This is mainly to prevent multiple
     // error notification dialogs being created in UiExceptionReporter.
     private volatile boolean isRunning = false;
-    
+
     @Override
     public void uncaughtException(final Thread th, final Throwable ex) {
         if (!isRunning) {
diff --git a/src/magic/exception/handler/ExceptionReport.java b/src/magic/exception/handler/ExceptionReport.java
index 25f5f418f9..8d1576920f 100644
--- a/src/magic/exception/handler/ExceptionReport.java
+++ b/src/magic/exception/handler/ExceptionReport.java
@@ -20,7 +20,7 @@ import magic.exception.GameException;
 public class ExceptionReport {
 
     private final StringBuilder sb = new StringBuilder();
-    
+
     public ExceptionReport(final Thread th, final Throwable ex) {
 
         sb.append("CRASH REPORT FOR MAGARENA THREAD ").append(th);
@@ -160,5 +160,5 @@ public class ExceptionReport {
         }
         report.append("\n");
     }
-    
+
 }
diff --git a/src/magic/firemind/Duel.java b/src/magic/firemind/Duel.java
index 472e8bc599..5a0d4387c8 100644
--- a/src/magic/firemind/Duel.java
+++ b/src/magic/firemind/Duel.java
@@ -1,6 +1,6 @@
 package magic.firemind;
 public class Duel  {
-    
+
     public Integer games_to_play;
     public Integer id;
     public Integer seed;
@@ -11,5 +11,5 @@ public class Duel  {
     public Integer strAi1;
     public Integer strAi2;
     public Integer life;
-    
+
 }
diff --git a/src/magic/firemind/FiremindClient.java b/src/magic/firemind/FiremindClient.java
index 25a923189b..ada131c20f 100644
--- a/src/magic/firemind/FiremindClient.java
+++ b/src/magic/firemind/FiremindClient.java
@@ -64,13 +64,13 @@ public class FiremindClient {
                 for (int i = 0; i < scripts.length(); i++) {
                     JSONObject script = scripts.getJSONObject(i);
                     String name = script.getString("name");
-                    
+
                     saveScriptFile(name, "txt", script.getString("config"));
                     String groovyScript = script.getString("script");
                     if(groovyScript != null && !groovyScript.equals("")){
                         saveScriptFile(name, "groovy", groovyScript);
                     }
-                    
+
                     System.out.println(name);
                 }
             }
@@ -102,7 +102,7 @@ public class FiremindClient {
             addedScripts.add(f.getAbsolutePath());
         }
         try {
-            f.createNewFile(); 
+            f.createNewFile();
         }catch (IOException e){
             System.err.println("Couldn't save script file");
         }
@@ -117,7 +117,7 @@ public class FiremindClient {
             System.err.println("Couldn't save script file");
         }
     }
-    
+
     public static void resetChangedScripts(){
         File scriptsDirectory = MagicFileSystem.getDataPath(DataPath.SCRIPTS_ORIG).toFile();
         MagicFileSystem.getDataPath(DataPath.SCRIPTS_ORIG).toFile().mkdirs();
@@ -130,14 +130,14 @@ public class FiremindClient {
             (new File(path)).delete();
         }
     }
-    
+
     public static boolean postGame(
-        Integer duel_id, 
+        Integer duel_id,
         Integer game_number,
-        Date play_time, 
-        boolean win_deck1, 
+        Date play_time,
+        boolean win_deck1,
         Integer magarena_version_major,
-        Integer magarena_version_minor, 
+        Integer magarena_version_minor,
         String logFile
     ) {
         CONFIG.load();
@@ -252,8 +252,8 @@ public class FiremindClient {
             e.printStackTrace();
         }
         return true;
-    }    
-    
+    }
+
     public static JSONObject readJsonFromUrl(String url) throws IOException,
             JSONException {
         HttpURLConnection con = (HttpURLConnection) (new URL(url))
@@ -283,9 +283,9 @@ public class FiremindClient {
     }
 
     public static void setFiremindHost(String host) {
-        firemindHost = host; 
+        firemindHost = host;
     }
-    
+
 
     public static boolean checkMagarenaVersion(String magarenaVersion) {
         String url = firemindHost + "/api/v1/status/client_info";
@@ -308,7 +308,7 @@ public class FiremindClient {
             JSONObject json = new JSONObject(jsonText);
             String[] remoteVersion = json.getString("current_magarena_version").split("\\.");
             String[] localVersion = magarenaVersion.split("\\.");
-            return Integer.valueOf(localVersion[0]) >= Integer.valueOf(remoteVersion[0]) && Integer.valueOf(localVersion[1]) >= Integer.valueOf(remoteVersion[1]); 
+            return Integer.valueOf(localVersion[0]) >= Integer.valueOf(remoteVersion[0]) && Integer.valueOf(localVersion[1]) >= Integer.valueOf(remoteVersion[1]);
         } catch (IOException e) {
             e.printStackTrace();
             return false;
diff --git a/src/magic/firemind/FiremindDuelRunner.java b/src/magic/firemind/FiremindDuelRunner.java
index 87718fd57c..5f89aa5cbb 100644
--- a/src/magic/firemind/FiremindDuelRunner.java
+++ b/src/magic/firemind/FiremindDuelRunner.java
@@ -104,17 +104,17 @@ public class FiremindDuelRunner {
         final MagicDuel testDuel = new MagicDuel(config);
 
         final MagicDeckProfile profile = new MagicDeckProfile("bgruw");
-        
+
         final DuelPlayerConfig player1 = new DuelPlayerConfig(
-            AiProfile.create("Player1", ai1, str1), 
+            AiProfile.create("Player1", ai1, str1),
             profile
         );
-        
+
         final DuelPlayerConfig player2 = new DuelPlayerConfig(
             AiProfile.create("Player2", ai2, str2),
             profile
         );
-        
+
         testDuel.setPlayers(new DuelPlayerConfig[] { player1, player2 });
 
         // Set the deck.
diff --git a/src/magic/firemind/FiremindGameReport.java b/src/magic/firemind/FiremindGameReport.java
index b4ce119ba4..dd9518dc03 100644
--- a/src/magic/firemind/FiremindGameReport.java
+++ b/src/magic/firemind/FiremindGameReport.java
@@ -161,7 +161,7 @@ public class FiremindGameReport implements Thread.UncaughtExceptionHandler {
         ex.printStackTrace(printWriter);
         sb.append(result.toString());
         sb.append('\n');
-        
+
         FiremindClient.postFailure(currentDuelId, sb.toString());
 
         // print a copy to stderr
diff --git a/src/magic/firemind/FiremindJsonReader.java b/src/magic/firemind/FiremindJsonReader.java
index 9e1e8c88fc..27d58f26bf 100644
--- a/src/magic/firemind/FiremindJsonReader.java
+++ b/src/magic/firemind/FiremindJsonReader.java
@@ -37,7 +37,7 @@ public final class FiremindJsonReader {
         if (jsonFile.exists()) {
             if (!isJsonFileUpToDate(jsonFile)) {
                 // only attempt download once per day even if download fails.
-                final Calendar cal = Calendar.getInstance();                
+                final Calendar cal = Calendar.getInstance();
                 jsonFile.setLastModified(cal.getTimeInMillis());
             }
         } else {
diff --git a/src/magic/firemind/JsonOrgParser.java b/src/magic/firemind/JsonOrgParser.java
index b18800edbb..24ee47b3ac 100644
--- a/src/magic/firemind/JsonOrgParser.java
+++ b/src/magic/firemind/JsonOrgParser.java
@@ -26,7 +26,7 @@ public final class JsonOrgParser {
             final String[] deckNamesArray = JSONObject.getNames(jsonFormat);
             if (deckNamesArray == null)
                 continue;   // no decks specified for given format.
-            
+
             final List<String> deckNames = new ArrayList<>(Arrays.asList(deckNamesArray));
 
             for (String deckName : deckNames) {
@@ -41,7 +41,7 @@ public final class JsonOrgParser {
 
         return decks;
     }
-    
+
     private static void addCardsToDeck(final MagicDeck deck, final JSONArray jsonCards) {
         for (int i = 0; i < jsonCards.length(); i++) {
             final JSONObject jsonCard = jsonCards.getJSONObject(i);
diff --git a/src/magic/game/state/GameCardState.java b/src/magic/game/state/GameCardState.java
index 1335cf187a..8bd86e3a03 100644
--- a/src/magic/game/state/GameCardState.java
+++ b/src/magic/game/state/GameCardState.java
@@ -9,7 +9,7 @@ public class GameCardState {
     GameCardState(String cardName, int quantity, boolean tapped) {
         this.cardName = cardName;
         this.quantity = quantity;
-        this.isTapped = tapped;                
+        this.isTapped = tapped;
     }
     GameCardState(String cardName, int quantity) {
         this(cardName, quantity, false);
diff --git a/src/magic/game/state/GameLoader.java b/src/magic/game/state/GameLoader.java
index 4cfdea49bd..d93e37009a 100644
--- a/src/magic/game/state/GameLoader.java
+++ b/src/magic/game/state/GameLoader.java
@@ -39,7 +39,7 @@ public final class GameLoader {
         for (int i = 0; i < playerDefs.length; i++) {
             final PlayerProfile pp = gameState.getPlayer(i).isAi() ?
                 AiProfile.create(
-                    gameState.getPlayer(i).getName(), 
+                    gameState.getPlayer(i).getName(),
                     MagicAIImpl.valueOf(gameState.getPlayer(i).getAiType()),
                     gameState.getDifficulty()
                 ) :
@@ -49,7 +49,7 @@ public final class GameLoader {
             final MagicDeckProfile deckProfile = new MagicDeckProfile(gameState.getPlayer(i).getDeckProfileColors());
             playerDefs[i] = new DuelPlayerConfig(pp, deckProfile);
         }
-        
+
         duel.setPlayers(playerDefs);
         duel.setStartPlayer(gameState.getStartPlayerIndex());
         return duel;
@@ -88,7 +88,7 @@ public final class GameLoader {
         for (GameCardState card : exiled) {
             TestGameBuilder.addToExile(player, card.getCardName(), card.getQuantity());
         }
-        
+
     }
 
 }
diff --git a/src/magic/game/state/GamePlayerState.java b/src/magic/game/state/GamePlayerState.java
index e7fa465e44..b8d36f3e98 100644
--- a/src/magic/game/state/GamePlayerState.java
+++ b/src/magic/game/state/GamePlayerState.java
@@ -40,7 +40,7 @@ public class GamePlayerState {
     }
 
     public List<GameCardState> getPermanents() {
-        return permanents;                
+        return permanents;
     }
 
     public void addToHand(String cardName, int quantity) {
@@ -65,7 +65,7 @@ public class GamePlayerState {
 
     public List<GameCardState> getExiled() {
         return exiled;
-    }    
+    }
 
     public void setLife(int i) {
         this.life = i;
diff --git a/src/magic/game/state/GameStateFileReader.java b/src/magic/game/state/GameStateFileReader.java
index 006850cad7..9d716f3b1b 100644
--- a/src/magic/game/state/GameStateFileReader.java
+++ b/src/magic/game/state/GameStateFileReader.java
@@ -78,5 +78,5 @@ public final class GameStateFileReader {
             prop.remove(usedKey);
         }
     }
-    
+
 }
diff --git a/src/magic/game/state/GameStateFileWriter.java b/src/magic/game/state/GameStateFileWriter.java
index d1fb5b99ef..2a8b763b3d 100644
--- a/src/magic/game/state/GameStateFileWriter.java
+++ b/src/magic/game/state/GameStateFileWriter.java
@@ -38,7 +38,7 @@ public final class GameStateFileWriter {
             throw new RuntimeException(ex);
         }
     }
-    
+
     private static void setGameProperties(final Properties properties, final GameState gameState) {
         properties.setProperty(PROP_Version, GeneralConfig.VERSION);
         properties.setProperty(PROP_PlayerCount, Integer.toString(gameState.getPlayers().size()));
diff --git a/src/magic/game/state/GameStateSnapshot.java b/src/magic/game/state/GameStateSnapshot.java
index fac203feb3..3aed167f08 100644
--- a/src/magic/game/state/GameStateSnapshot.java
+++ b/src/magic/game/state/GameStateSnapshot.java
@@ -95,7 +95,7 @@ public final class GameStateSnapshot {
         }
         return cardDefs;
     }
- 
+
     private static void updateCardCount(final MagicCardDefinition cardDef, final Map<MagicCardDefinition, Integer> cardDefs) {
         if (cardDefs.containsKey(cardDef)) {
             int count = cardDefs.get(cardDef);
diff --git a/src/magic/generator/RandomDeckGenerator.java b/src/magic/generator/RandomDeckGenerator.java
index f4dfa451d7..015aee5157 100644
--- a/src/magic/generator/RandomDeckGenerator.java
+++ b/src/magic/generator/RandomDeckGenerator.java
@@ -92,7 +92,7 @@ public class RandomDeckGenerator {
     }
 
     public void generateDeck(final DeckGenerator deckGenerator) {
-        
+
         final MagicDeckProfile profile = deckGenerator.getDeckProfile();
         final MagicDeck deck = deckGenerator.getDeck();
         final int spells = deckGenerator.getSpellsCount();
@@ -104,9 +104,9 @@ public class RandomDeckGenerator {
 
         genSpells();
         genLands();
-        
+
         final int lands = profile.getNrOfNonBasicLands(deckGenerator.getLandsCount());
-       
+
         final int maxNonlandNoncreature = spells - maxCreatures;
         final int maxColorless = spells/6;
         final int maxHigh = spells/6;
@@ -138,7 +138,7 @@ public class RandomDeckGenerator {
         // Add spells to deck.
         boolean isGenSpellsCalled = false;
         while (condensedDeck.getNumCards() < spells && !spellCards.isEmpty()) {
-            
+
             final int index = MagicRandom.nextRNGInt(spellCards.size());
 
             final MagicCardDefinition cardDefinition=spellCards.get(index);
@@ -188,7 +188,7 @@ public class RandomDeckGenerator {
             }
 
         }
-        
+
         // Add nonbasic lands to deck.
         addRequiredLands(condensedDeck);
 
diff --git a/src/magic/headless/HeadlessGameController.java b/src/magic/headless/HeadlessGameController.java
index fb2a9a62dd..d356e3d896 100644
--- a/src/magic/headless/HeadlessGameController.java
+++ b/src/magic/headless/HeadlessGameController.java
@@ -11,7 +11,7 @@ public class HeadlessGameController implements IGameController {
     private final long maxDuration;
     private final MagicGame game;
     private boolean running;
-    
+
     /** Fully artificial test game. */
     public HeadlessGameController(final MagicGame aGame, final long duration) {
         game = aGame;
@@ -22,18 +22,18 @@ public class HeadlessGameController implements IGameController {
     public void haltGame() {
         running = false;
     }
-    
+
     @Override
     public void runGame() {
         final long startTime = System.currentTimeMillis();
-        
+
         running = true;
         while (running && game.advanceToNextEventWithChoice() && System.currentTimeMillis() - startTime <= maxDuration) {
             final MagicEvent event = game.getNextEvent();
             final Object[] result = getAIChoiceResults(event);
             game.executeNextEvent(result);
         }
-        
+
         if (game.isFinished()) {
             game.advanceDuel();
         }
diff --git a/src/magic/model/ARG.java b/src/magic/model/ARG.java
index f15a3fca46..5113e32c77 100644
--- a/src/magic/model/ARG.java
+++ b/src/magic/model/ARG.java
@@ -23,7 +23,7 @@ public class ARG {
     public static final String GRAVEYARD = "(?<choice>[^\\.]* card [^\\.]+? graveyard)";
     public static final String THING = "(permanent|creature|artifact|land|player|opponent|spell or ability|spell|ability)";
     public static final String EVENQUOTES = "(?=([^\"]*'[^\"]*')*[^\"]*$)";
-    
+
     public static final String NUMBER = "(?<number>[0-9]+)";
     public static int number(final Matcher m) {
         return Integer.parseInt(m.group("number"));
@@ -36,7 +36,7 @@ public class ARG {
     public static MagicAmount amountObj(final Matcher m) {
         return MagicAmountParser.build(m.group("amount"));
     }
-    
+
     public static final String AMOUNT2 = "(?<amount2>[^ ]+?)";
     public static int amount2(final Matcher m) {
         return EnglishToInt.convert(m.group("amount2"));
@@ -144,7 +144,7 @@ public class ARG {
             return event.getPlayer();
         }
     }
-    
+
     private static final String TNC = "(that [^ ]+'s|its) controller( or that player)?";
     public static final String PLAYERS = "((?<rnc>rn's controller)|(?<tnc>" + TNC + ")|(?<rn>rn)|(?<pn>(pn||you))|" + CHOICE + "|(?<group>[^\\.]+?))";
     public static List<MagicPlayer> players(final MagicEvent event, final Matcher m, final MagicTargetFilter<MagicPlayer> filter) {
@@ -183,7 +183,7 @@ public class ARG {
             return filter.filter(event);
         }
     }
-    
+
     public static MagicTargetFilter<MagicPermanent> permanentsParse(final Matcher m) {
         if (m.group("group") != null) {
             return MagicTargetFilterFactory.Permanent(m.group("group"));
@@ -191,7 +191,7 @@ public class ARG {
             return MagicTargetFilterFactory.ANY;
         }
     }
-    
+
     public static final String TARGETS = "((?<rnc1>rn's controller)|(?<tnc1>" + TNC + ")|(?<rn1>rn)|(?<sn1>sn)|(?<pn1>(pn||you))|" + CHOICE + "|(?<group1>[^\\.]+?))";
     public static List<? extends MagicTarget> targets(final MagicEvent event, final Matcher m, final MagicTargetFilter<MagicTarget> filter) {
         if (m.group("rnc1") != null) {
@@ -218,7 +218,7 @@ public class ARG {
             return MagicTargetFilterFactory.ONE;
         }
     }
-    
+
     public static final String TARGETS2 = "((?<tnc2>" + TNC + ")|(?<rn2>rn)|(?<sn2>sn)|(?<pn2>(pn||you))|(?<group2>[^\\.]+?))";
     public static List<? extends MagicTarget> targets2(final MagicEvent event, final Matcher m, final MagicTargetFilter<MagicTarget> filter) {
         if (m.group("tnc2") != null) {
@@ -241,7 +241,7 @@ public class ARG {
             return MagicTargetFilterFactory.ONE;
         }
     }
-    
+
     public static final String CARDS = "((?<choice>[^\\.]* card [^\\.]+?)|(?<group>[^\\.]* cards [^\\.]+?))";
     public static List<MagicCard> cards(final MagicEvent event, final Matcher m, final MagicTargetFilter<MagicCard> filter) {
         if (m.group("choice") != null) {
@@ -250,7 +250,7 @@ public class ARG {
             return filter.filter(event);
         }
     }
-    
+
     public static MagicTargetFilter<MagicCard> cardsParse(final Matcher m) {
         if (m.group("group") != null) {
             return MagicTargetFilterFactory.Card(m.group("group"));
@@ -271,7 +271,7 @@ public class ARG {
             return filter.filter(event);
         }
     }
-    
+
     public static MagicTargetFilter<MagicItemOnStack> itemsParse(final Matcher m) {
         if (m.group("group") != null) {
             return MagicTargetFilterFactory.ItemOnStack(m.group("group"));
diff --git a/src/magic/model/DuelPlayerConfig.java b/src/magic/model/DuelPlayerConfig.java
index f06faa00d0..9b611999b4 100644
--- a/src/magic/model/DuelPlayerConfig.java
+++ b/src/magic/model/DuelPlayerConfig.java
@@ -71,7 +71,7 @@ public class DuelPlayerConfig {
                 final String cardName = properties.getProperty(deckPrefix);
                 deck.add(getCard(cardName));
             }
-        }        
+        }
     }
 
     public void save(final Properties properties, final String prefix) {
diff --git a/src/magic/model/IGameController.java b/src/magic/model/IGameController.java
index a83df0f89a..81266f0fe3 100644
--- a/src/magic/model/IGameController.java
+++ b/src/magic/model/IGameController.java
@@ -1,6 +1,6 @@
 package magic.model;
 
 public interface IGameController {
-    void haltGame(); 
+    void haltGame();
     void runGame();
 }
diff --git a/src/magic/model/IUIGameController.java b/src/magic/model/IUIGameController.java
index df959237cb..7e17dd2fee 100644
--- a/src/magic/model/IUIGameController.java
+++ b/src/magic/model/IUIGameController.java
@@ -6,7 +6,7 @@ import magic.exception.UndoClickedException;
 import magic.model.choice.MagicPlayChoiceResult;
 
 public interface IUIGameController extends IGameController {
-    
+
     <T> T getChoiceClicked();
     boolean isActionClicked();
     void clearCards();
@@ -22,7 +22,7 @@ public interface IUIGameController extends IGameController {
     void updateGameView();
     void waitForInput() throws UndoClickedException;
     void refreshSidebarLayout();
-    
+
     // Choices
     MagicSubType getLandSubTypeChoice(final MagicSource source) throws UndoClickedException;
     boolean getPayBuyBackCostChoice(final MagicSource source, final String costText) throws UndoClickedException;
diff --git a/src/magic/model/MagicAbilityList.java b/src/magic/model/MagicAbilityList.java
index e0d6f483a6..f503004a8b 100644
--- a/src/magic/model/MagicAbilityList.java
+++ b/src/magic/model/MagicAbilityList.java
@@ -10,10 +10,10 @@ import java.util.List;
 import java.util.Set;
 
 public class MagicAbilityList implements MagicAbilityStore {
-    private List<MagicAbility> abilities = 
+    private List<MagicAbility> abilities =
         new LinkedList<MagicAbility>();
 
-    private List<MagicTrigger<?>> triggers = 
+    private List<MagicTrigger<?>> triggers =
         new LinkedList<MagicTrigger<?>>();
 
     private List<MagicActivation<MagicPermanent>> permActivations =
@@ -37,7 +37,7 @@ public class MagicAbilityList implements MagicAbilityStore {
     public MagicAbility getFirst() {
         return abilities.get(0);
     }
-    
+
     public void addAbility(final MagicAbility ability) {
         abilities.add(ability);
     }
@@ -55,7 +55,7 @@ public class MagicAbilityList implements MagicAbilityStore {
             permanent.addAbility(trigger);
         }
     }
-    
+
     public void loseAbility(final MagicPermanent permanent, final Set<MagicAbility> flags) {
         flags.removeAll(abilities);
     }
diff --git a/src/magic/model/MagicAmount.java b/src/magic/model/MagicAmount.java
index af1ef31c14..dd8c1b70c9 100644
--- a/src/magic/model/MagicAmount.java
+++ b/src/magic/model/MagicAmount.java
@@ -5,7 +5,7 @@ import magic.model.event.MagicEvent;
 public abstract class MagicAmount {
 
     public abstract int getAmount(final MagicSource source, final MagicPlayer player);
-    
+
     public int getAmount(final MagicEvent event) {
         return getAmount(event.getSource(), event.getPlayer());
     }
diff --git a/src/magic/model/MagicAmountFactory.java b/src/magic/model/MagicAmountFactory.java
index 221c710e7a..495cb1adb0 100644
--- a/src/magic/model/MagicAmountFactory.java
+++ b/src/magic/model/MagicAmountFactory.java
@@ -15,7 +15,7 @@ public class MagicAmountFactory {
             }
         };
     }
-    
+
     public static MagicAmount CounterOnSource(final MagicCounterType type) {
         return new MagicAmount() {
             @Override
@@ -25,7 +25,7 @@ public class MagicAmountFactory {
             }
         };
     }
-    
+
     public static MagicAmount AllCountersOnSource =
         new MagicAmount() {
             @Override
@@ -39,7 +39,7 @@ public class MagicAmountFactory {
             }
         };
 
-    public static MagicAmount One = 
+    public static MagicAmount One =
         new MagicAmount() {
             @Override
             public int getAmount(final MagicSource source, final MagicPlayer player) {
@@ -50,8 +50,8 @@ public class MagicAmountFactory {
                 return true;
             }
         };
-    
-    public static MagicAmount Constant(final int n) { 
+
+    public static MagicAmount Constant(final int n) {
         return new MagicAmount() {
             @Override
             public int getAmount(final MagicSource source, final MagicPlayer player) {
@@ -63,8 +63,8 @@ public class MagicAmountFactory {
             }
         };
     }
-    
-    public static MagicAmount Equipment = 
+
+    public static MagicAmount Equipment =
         new MagicAmount() {
             @Override
             public int getAmount(final MagicSource source, final MagicPlayer player) {
@@ -72,8 +72,8 @@ public class MagicAmountFactory {
                 return perm.getEquipmentPermanents().size();
             }
         };
-    
-    public static MagicAmount Aura = 
+
+    public static MagicAmount Aura =
         new MagicAmount() {
             @Override
             public int getAmount(final MagicSource source, final MagicPlayer player) {
@@ -81,16 +81,16 @@ public class MagicAmountFactory {
                 return perm.getAuraPermanents().size();
             }
         };
-    
-    public static MagicAmount Domain = 
+
+    public static MagicAmount Domain =
         new MagicAmount() {
             @Override
             public int getAmount(final MagicSource source, final MagicPlayer player) {
                 return player.getDomain();
             }
         };
-    
-    public static MagicAmount SN_Power = 
+
+    public static MagicAmount SN_Power =
         new MagicAmount() {
             @Override
             public int getAmount(final MagicSource source, final MagicPlayer player) {
@@ -99,15 +99,15 @@ public class MagicAmountFactory {
             }
         };
 
-    public static MagicAmount LifeTotal = 
+    public static MagicAmount LifeTotal =
         new MagicAmount() {
             @Override
             public int getAmount(final MagicSource source, final MagicPlayer player) {
                 return player.getLife();
             }
         };
-    
-    public static MagicAmount ColorsOnPerms = 
+
+    public static MagicAmount ColorsOnPerms =
         new MagicAmount() {
             @Override
             public int getAmount(final MagicSource source, final MagicPlayer player) {
@@ -120,8 +120,8 @@ public class MagicAmountFactory {
                 return amount;
             }
         };
-    
-    public static MagicAmount XCost = 
+
+    public static MagicAmount XCost =
         new MagicAmount() {
             @Override
             public int getAmount(final MagicEvent event) {
@@ -132,8 +132,8 @@ public class MagicAmountFactory {
                 throw new RuntimeException("getAmount(source, player) called on XCost");
             }
         };
-    
-    public static MagicAmount NegXCost = 
+
+    public static MagicAmount NegXCost =
         new MagicAmount() {
             @Override
             public int getAmount(final MagicEvent event) {
diff --git a/src/magic/model/MagicAmountParser.java b/src/magic/model/MagicAmountParser.java
index e08b8dc164..632b1fe0fe 100644
--- a/src/magic/model/MagicAmountParser.java
+++ b/src/magic/model/MagicAmountParser.java
@@ -10,7 +10,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public enum MagicAmountParser {
-            
+
     YourLife("your life total") {
         public MagicAmount toAmount(final Matcher arg) {
             return MagicAmountFactory.LifeTotal;
@@ -75,19 +75,19 @@ public enum MagicAmountParser {
             );
         }
     };
-    
+
     private final Pattern pattern;
-    
+
     private MagicAmountParser(final String regex) {
         pattern = Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
     }
-    
+
     public Matcher matcher(final String rule) {
         return pattern.matcher(rule);
     }
 
     public abstract MagicAmount toAmount(final Matcher arg);
-    
+
     public static final MagicAmount build(final String text) {
         if (text == null || text.isEmpty()) {
             return MagicAmountFactory.One;
@@ -101,4 +101,4 @@ public enum MagicAmountParser {
         }
         throw new RuntimeException("unknown amount \"" + text + "\"");
     }
-} 
+}
diff --git a/src/magic/model/MagicCardDefinition.java b/src/magic/model/MagicCardDefinition.java
index cc437e2708..9a01a22590 100644
--- a/src/magic/model/MagicCardDefinition.java
+++ b/src/magic/model/MagicCardDefinition.java
@@ -663,7 +663,7 @@ public class MagicCardDefinition implements MagicAbilityStore, IRenderableCard {
     public List<MagicEvent> getCostEvent(final MagicCard source) {
         final List<MagicEvent> costEvent = new ArrayList<MagicEvent>();
         final MagicManaCost modCost = source.getGame().modCost(source, cost);
-        
+
         if (modCost != MagicManaCost.ZERO) {
             costEvent.add(new MagicPayManaCostEvent(
                 source,
diff --git a/src/magic/model/MagicCardList.java b/src/magic/model/MagicCardList.java
index f004ad5c21..09eab4089c 100644
--- a/src/magic/model/MagicCardList.java
+++ b/src/magic/model/MagicCardList.java
@@ -18,7 +18,7 @@ public class MagicCardList extends ArrayList<MagicCard> implements MagicCopyable
             add(copyMap.copy(card));
         }
     }
-    
+
     @Override
     public MagicCardList copy(final MagicCopyMap copyMap) {
         return new MagicCardList(copyMap, this);
@@ -61,7 +61,7 @@ public class MagicCardList extends ArrayList<MagicCard> implements MagicCopyable
         final int size = size();
         return size > 0 ? get(size-1) : MagicCard.NONE;
     }
-    
+
     public MagicCardList getRandomCards(final int amount) {
         final MagicRandom rng = new MagicRandom(getStateId());
         final MagicCardList copy = new MagicCardList(this);
@@ -73,7 +73,7 @@ public class MagicCardList extends ArrayList<MagicCard> implements MagicCopyable
         }
         return choiceList;
     }
-    
+
     public MagicCardList getCardsFromTop(final int amount) {
         final int size = size();
         final MagicCardList choiceList = new MagicCardList();
@@ -90,7 +90,7 @@ public class MagicCardList extends ArrayList<MagicCard> implements MagicCopyable
         remove(index);
         return card;
     }
-    
+
     public MagicCard removeCardAtBottom() {
         final MagicCard card=get(0);
         remove(0);
diff --git a/src/magic/model/MagicDamage.java b/src/magic/model/MagicDamage.java
index 8975db004a..d11c876b11 100644
--- a/src/magic/model/MagicDamage.java
+++ b/src/magic/model/MagicDamage.java
@@ -33,11 +33,11 @@ public class MagicDamage {
     public MagicSource getSource() {
         return source;
     }
-    
+
     public boolean isSource(final MagicSource other) {
         return source == other;
     }
-    
+
     public boolean isSourcePermanent() {
         return source.isPermanent();
     }
@@ -49,15 +49,15 @@ public class MagicDamage {
     public MagicTarget getTarget() {
         return target;
     }
-    
+
     public boolean isTarget(final MagicTarget other) {
         return target == other;
     }
-    
+
     public boolean isTargetPlayer() {
         return target.isPlayer();
     }
-    
+
     public boolean isTargetCreature() {
         return target.isCreature();
     }
@@ -65,7 +65,7 @@ public class MagicDamage {
     public MagicPlayer getTargetPlayer() {
         return (MagicPlayer)target;
     }
-    
+
     public MagicPermanent getTargetPermanent() {
         return (MagicPermanent)target;
     }
@@ -77,13 +77,13 @@ public class MagicDamage {
     public void setAmount(final int amt) {
         amount = amt;
     }
-    
+
     public int replace() {
         final int oldAmount = amount;
         amount = 0;
         return oldAmount;
     }
-    
+
     public int prevent() {
         return prevent(amount);
     }
@@ -115,7 +115,7 @@ public class MagicDamage {
     public void setUnpreventable() {
         unpreventable=true;
     }
-    
+
     public boolean isPreventable() {
         return !unpreventable;
     }
diff --git a/src/magic/model/MagicDuel.java b/src/magic/model/MagicDuel.java
index 00f547e9f7..14872c11d0 100644
--- a/src/magic/model/MagicDuel.java
+++ b/src/magic/model/MagicDuel.java
@@ -91,7 +91,7 @@ public class MagicDuel {
     void advance(final boolean won, final MagicGame game) {
         gameNr++;
         gamesPlayed++;
-        
+
         if (won) {
             gamesWon++;
             startPlayer = opponentIndex;
@@ -167,7 +167,7 @@ public class MagicDuel {
                 break;
             case Firemind:
                 setDeckFromFile(player, DeckUtils.getFiremindDecksFolder());
-                break;            
+                break;
             default:
                 break;
             }
diff --git a/src/magic/model/MagicGame.java b/src/magic/model/MagicGame.java
index 5695dd0b01..a33b9397cc 100644
--- a/src/magic/model/MagicGame.java
+++ b/src/magic/model/MagicGame.java
@@ -545,7 +545,7 @@ public class MagicGame {
     public void addDelayedAction(final MagicAction action) {
         delayedActions.add(action);
     }
-    
+
     public void doValidAction(final MagicPermanent perm, final MagicAction action) {
         if (perm.isValid()) {
             doAction(action);
diff --git a/src/magic/model/MagicGameLog.java b/src/magic/model/MagicGameLog.java
index 67e2b3f5ac..4bd6a37dc9 100644
--- a/src/magic/model/MagicGameLog.java
+++ b/src/magic/model/MagicGameLog.java
@@ -12,9 +12,9 @@ public class MagicGameLog {
     private MagicGameLog() {}
 
     public static final String LOG_FILE = "game.log";
-    
+
     private static final String gameLog = (System.getProperty("game.log") != null) ?
-        System.getProperty("game.log") :       
+        System.getProperty("game.log") :
         MagicFileSystem.getDataPath(DataPath.LOGS).resolve(LOG_FILE).toString();
 
     private static PrintWriter writer;
@@ -22,7 +22,7 @@ public class MagicGameLog {
     public static String getLogFileName(){
         return gameLog;
     }
-    
+
     public static void initialize() {
         try {
             writer = new PrintWriter(gameLog);
diff --git a/src/magic/model/MagicLogger.java b/src/magic/model/MagicLogger.java
index 0ca7b4e829..4f0bfa96ad 100644
--- a/src/magic/model/MagicLogger.java
+++ b/src/magic/model/MagicLogger.java
@@ -34,7 +34,7 @@ public class MagicLogger {
     public void log(final String message) {
         sb.append(message).append("\n");
     }
-    
+
     public void writeLog() {
         sb.append("WRITTEN ON ").append(new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(new Date()));
         sb.append('\n');
diff --git a/src/magic/model/MagicMessage.java b/src/magic/model/MagicMessage.java
index bfe10e7f08..cf45ed3169 100644
--- a/src/magic/model/MagicMessage.java
+++ b/src/magic/model/MagicMessage.java
@@ -80,7 +80,7 @@ public class MagicMessage {
 
         for (int idx = 0; result.indexOf('$') >= 0; idx++) {
 
-            final String choice = (idx < choices.length && choices[idx] != null) 
+            final String choice = (idx < choices.length && choices[idx] != null)
                 ? getCardToken(choices[idx])
                 : "";
 
@@ -91,7 +91,7 @@ public class MagicMessage {
     }
 
     private static final String CARD_TOKEN = "<%s" + CARD_ID_DELIMITER + "%d>";
-    
+
     public static String getXCost(final Object obj) {
         if (obj != null && obj instanceof MagicPayedCost) {
             return "X (" + ((MagicPayedCost)obj).getX() + ")";
diff --git a/src/magic/model/MagicObjectImpl.java b/src/magic/model/MagicObjectImpl.java
index 550b678590..a05dc49525 100644
--- a/src/magic/model/MagicObjectImpl.java
+++ b/src/magic/model/MagicObjectImpl.java
@@ -10,45 +10,45 @@ public abstract class MagicObjectImpl implements MagicObject {
     public boolean isEnemy(final MagicObject other) {
         return getOpponent() == other.getController();
     }
-    
+
     @Override
     public MagicPlayer getOpponent() {
         return getController().getOpponent();
     }
-    
+
     @Override
     public boolean isCreature() {
         return isPermanent() && hasType(MagicType.Creature);
     }
-    
+
     @Override
     public boolean isPlaneswalker() {
         return isPermanent() && hasType(MagicType.Planeswalker);
     }
-    
+
     @Override
     public boolean isInstantOrSorcerySpell() {
         return isSpell(MagicType.Instant) || isSpell(MagicType.Sorcery);
     }
-    
+
     @Override
     public boolean isSpell(MagicType type) {
         return isSpell() && hasType(type);
     }
-    
+
     @Override
     public boolean isSpell(MagicSubType subType) {
         return isSpell() && hasSubType(subType);
     }
-    
+
     @Override
     public boolean isToken() {
         return isPermanent() && ((MagicPermanent)this).isToken();
     }
-    
+
     @Override
     public boolean hasCounters(final MagicCounterType counterType) {
-        return getCounters(counterType) > 0; 
+        return getCounters(counterType) > 0;
     }
 
     public static long getStateId(final Object obj) {
diff --git a/src/magic/model/MagicPermanentList.java b/src/magic/model/MagicPermanentList.java
index 958e9bd5ea..77084dab5f 100644
--- a/src/magic/model/MagicPermanentList.java
+++ b/src/magic/model/MagicPermanentList.java
@@ -27,7 +27,7 @@ public class MagicPermanentList extends ArrayList<MagicPermanent> implements Mag
     public MagicPermanentList copy(final MagicCopyMap copyMap) {
         return new MagicPermanentList(copyMap, this);
     }
-    
+
     public long getStateId() {
         final long[] keys = new long[size()];
         int idx = 0;
diff --git a/src/magic/model/MagicPlayerZone.java b/src/magic/model/MagicPlayerZone.java
index cd78ff9cf3..d090cd0445 100644
--- a/src/magic/model/MagicPlayerZone.java
+++ b/src/magic/model/MagicPlayerZone.java
@@ -4,12 +4,12 @@ import magic.data.MagicIcon;
 import magic.translate.UiString;
 
 public enum MagicPlayerZone {
-    
+
     HAND(MagicPlayerZoneStrings._S1, MagicIcon.HAND_ZONE),
     LIBRARY(MagicPlayerZoneStrings._S2, MagicIcon.LIBRARY_ZONE),
     GRAVEYARD(MagicPlayerZoneStrings._S3, MagicIcon.GRAVEYARD_ZONE),
     EXILE(MagicPlayerZoneStrings._S4, MagicIcon.EXILE_ZONE);
-    
+
     private final String zoneName;
     private final MagicIcon zoneIcon;
 
diff --git a/src/magic/model/MagicRandom.java b/src/magic/model/MagicRandom.java
index 1036210280..7b973fd2f3 100644
--- a/src/magic/model/MagicRandom.java
+++ b/src/magic/model/MagicRandom.java
@@ -17,7 +17,7 @@ public class MagicRandom extends Random {
         }
         System.err.println("Using random seed " + RNG.getState());
     }
-    
+
     private MagicRandom() {
         this(System.nanoTime());
     }
@@ -41,7 +41,7 @@ public class MagicRandom extends Random {
         x &= ((1L << nbits) - 1);
         return (int) x;
     }
-    
+
     public long getState() {
         return state;
     }
@@ -49,11 +49,11 @@ public class MagicRandom extends Random {
     public static void setRNGState(final long state) {
         RNG.setState(state);
     }
-    
+
     public static int nextRNGInt(final int n) {
         return RNG.nextInt(n);
     }
-    
+
     public static int nextRNGInt() {
         return RNG.nextInt(Integer.MAX_VALUE);
     }
diff --git a/src/magic/model/action/AIRevealAction.java b/src/magic/model/action/AIRevealAction.java
index cfed5f861a..a782cd94ca 100644
--- a/src/magic/model/action/AIRevealAction.java
+++ b/src/magic/model/action/AIRevealAction.java
@@ -8,15 +8,15 @@ import java.util.List;
 import java.util.Arrays;
 
 public class AIRevealAction extends MagicAction {
-    
+
     private final List<MagicCard> cards = new ArrayList<MagicCard>();
     private final List<Boolean> known = new ArrayList<Boolean>();
     private boolean newValue;
-    
+
     public AIRevealAction(final MagicCard... aCards) {
         this(Arrays.asList(aCards), true);
     }
-    
+
     public AIRevealAction(final Collection<MagicCard> aCards) {
         this(aCards, true);
     }
diff --git a/src/magic/model/action/AddTriggerAction.java b/src/magic/model/action/AddTriggerAction.java
index a28fc891ce..d28554a6ed 100644
--- a/src/magic/model/action/AddTriggerAction.java
+++ b/src/magic/model/action/AddTriggerAction.java
@@ -29,7 +29,7 @@ public class AddTriggerAction extends MagicAction {
     public void undoAction(final MagicGame game) {
         game.removeTrigger(permanentTrigger);
     }
-    
+
     @Override
     public String toString() {
         return getClass().getSimpleName()+" ("+permanent+','+trigger+')';
diff --git a/src/magic/model/action/AddTurnTriggerAction.java b/src/magic/model/action/AddTurnTriggerAction.java
index 07cdacbb49..c3f31bdb2d 100644
--- a/src/magic/model/action/AddTurnTriggerAction.java
+++ b/src/magic/model/action/AddTurnTriggerAction.java
@@ -15,7 +15,7 @@ public class AddTurnTriggerAction extends MagicAction {
         this.permanent=permanent;
         this.trigger=trigger;
     }
-    
+
     public AddTurnTriggerAction(final MagicTrigger<?> trigger) {
         this(MagicPermanent.NONE, trigger);
     }
diff --git a/src/magic/model/action/AttachAction.java b/src/magic/model/action/AttachAction.java
index 64198dfa10..e936e5d0c9 100644
--- a/src/magic/model/action/AttachAction.java
+++ b/src/magic/model/action/AttachAction.java
@@ -26,7 +26,7 @@ public class AttachAction extends MagicAction {
         attachable = aAttachable;
         creature = aCreature;
     }
-    
+
     private MagicPermanent getAttached() {
         return attachable.isEquipment() ?
             attachable.getEquippedCreature() :
@@ -40,7 +40,7 @@ public class AttachAction extends MagicAction {
             old.removeAura(attachable);
         }
     }
-            
+
     private void attach(final MagicPermanent perm) {
         if (attachable.isEquipment()) {
             perm.addEquipment(attachable);
diff --git a/src/magic/model/action/BecomesAction.java b/src/magic/model/action/BecomesAction.java
index 03765d6999..185dd62bed 100644
--- a/src/magic/model/action/BecomesAction.java
+++ b/src/magic/model/action/BecomesAction.java
@@ -26,13 +26,13 @@ public class BecomesAction extends MagicAction {
     private final boolean additionTo;
 
     public BecomesAction(
-        final MagicPermanent aPermanent, 
-        final int[] aPt, 
-        final Set<MagicColor> aColor, 
-        final Set<MagicSubType> aSubType, 
-        final Set<MagicType> aType, 
-        final MagicAbilityList aAbility, 
-        final boolean aDuration, 
+        final MagicPermanent aPermanent,
+        final int[] aPt,
+        final Set<MagicColor> aColor,
+        final Set<MagicSubType> aSubType,
+        final Set<MagicType> aType,
+        final MagicAbilityList aAbility,
+        final boolean aDuration,
         final boolean aAdditionTo
     ) {
         permanent = aPermanent;
@@ -44,7 +44,7 @@ public class BecomesAction extends MagicAction {
         duration=aDuration;
         additionTo=aAdditionTo;
     }
-    
+
     public BecomesAction(final MagicPermanent aPermanent, final Set<MagicColor> aColor, final boolean aDuration, final boolean aAdditionTo) {
         this(aPermanent, null, aColor, Collections.<MagicSubType>emptySet(), Collections.<MagicType>emptySet(), null, aDuration, aAdditionTo);
     }
@@ -86,7 +86,7 @@ public class BecomesAction extends MagicAction {
                         return flags | mask;
                     // if color change replaces original color, return changes
                     } else {
-                        return mask; 
+                        return mask;
                     }
                 }
             };
@@ -102,7 +102,7 @@ public class BecomesAction extends MagicAction {
                 @Override
                 public int getTypeFlags(final MagicPermanent permanent,final int flags) {
                     // turning into an artifact creature retains previous types
-                    if (additionTo || (type.contains(MagicType.Creature) && type.contains(MagicType.Artifact))) { 
+                    if (additionTo || (type.contains(MagicType.Creature) && type.contains(MagicType.Artifact))) {
                         return flags | mask;
                     } else {
                         return mask;
@@ -116,7 +116,7 @@ public class BecomesAction extends MagicAction {
                 @Override
                 public void modSubTypeFlags(final MagicPermanent permanent, final Set<MagicSubType> flags) {
                     // turning into an artifact creature retains previous subtypes
-                    if (additionTo || (type.contains(MagicType.Creature) && type.contains(MagicType.Artifact))) { 
+                    if (additionTo || (type.contains(MagicType.Creature) && type.contains(MagicType.Artifact))) {
                         flags.addAll(subType);
                     } else {
                         flags.clear();
diff --git a/src/magic/model/action/CastCardAction.java b/src/magic/model/action/CastCardAction.java
index e44a9b61ed..1a31064ff7 100644
--- a/src/magic/model/action/CastCardAction.java
+++ b/src/magic/model/action/CastCardAction.java
@@ -34,7 +34,7 @@ public class CastCardAction extends MagicAction {
         from = aFrom;
         to = aTo;
     }
-    
+
     @Override
     public void doAction(final MagicGame game) {
         for (final MagicEvent event : card.getAdditionalCostEvent()) {
diff --git a/src/magic/model/action/ChangeTurnPTAction.java b/src/magic/model/action/ChangeTurnPTAction.java
index 7f4fa13d5f..3885b60ba1 100644
--- a/src/magic/model/action/ChangeTurnPTAction.java
+++ b/src/magic/model/action/ChangeTurnPTAction.java
@@ -21,7 +21,7 @@ public class ChangeTurnPTAction extends MagicAction {
     @Override
     public void doAction(final MagicGame game) {
         game.doAction(new AddStaticAction(
-            permanent, 
+            permanent,
             new MagicStatic(MagicLayer.ModPT, MagicStatic.UntilEOT) {
                 @Override
                 public void modPowerToughness(final MagicPermanent source, final MagicPermanent permanent, final MagicPowerToughness pt) {
diff --git a/src/magic/model/action/CleanupPlayerAction.java b/src/magic/model/action/CleanupPlayerAction.java
index 52f810e85d..15ac864b21 100644
--- a/src/magic/model/action/CleanupPlayerAction.java
+++ b/src/magic/model/action/CleanupPlayerAction.java
@@ -24,16 +24,16 @@ public class CleanupPlayerAction extends MagicAction {
 
         oldDrawnCards=player.getDrawnCards();
         player.setDrawnCards(0);
-        
+
         oldLifeLost=player.getLifeLossThisTurn();
         player.setLifeLossThisTurn(0);
-        
+
         oldLifeGained=player.getLifeGainThisTurn();
         player.setLifeGainThisTurn(0);
-        
+
         oldCreaturesAttacked=player.getCreaturesAttackedThisTurn();
         player.setCreaturesAttackedThisTurn(0);
-        
+
 
         for (final MagicPermanent permanent : player.getPermanents()) {
             game.doAction(new CleanupPermanentAction(permanent));
diff --git a/src/magic/model/action/CombatDamageAction.java b/src/magic/model/action/CombatDamageAction.java
index ce1a735650..d9c05e79d3 100644
--- a/src/magic/model/action/CombatDamageAction.java
+++ b/src/magic/model/action/CombatDamageAction.java
@@ -56,7 +56,7 @@ public class CombatDamageAction extends MagicAction {
                             combatDamage.add(MagicDamage.Combat(blocker,attacker,power));
                         }
                         if (first) {
-                            game.doAction(ChangeStateAction.Set(blocker, MagicPermanentState.DealtFirstStrike)); 
+                            game.doAction(ChangeStateAction.Set(blocker, MagicPermanentState.DealtFirstStrike));
                         }
                     }
                 }
@@ -102,7 +102,7 @@ public class CombatDamageAction extends MagicAction {
                         }
                     }
                     if (first) {
-                        game.doAction(ChangeStateAction.Set(attacker, MagicPermanentState.DealtFirstStrike)); 
+                        game.doAction(ChangeStateAction.Set(attacker, MagicPermanentState.DealtFirstStrike));
                     }
                 }
             }
diff --git a/src/magic/model/action/CounterItemOnStackAction.java b/src/magic/model/action/CounterItemOnStackAction.java
index 3e5ab03164..ca2d5e3da9 100644
--- a/src/magic/model/action/CounterItemOnStackAction.java
+++ b/src/magic/model/action/CounterItemOnStackAction.java
@@ -25,10 +25,10 @@ public class CounterItemOnStackAction extends MagicAction {
             game.doAction(new RemoveItemFromStackAction(itemOnStack));
             if (itemOnStack.isSpell()) {
                 final MagicCardOnStack cardOnStack = (MagicCardOnStack)itemOnStack;
-                final MagicLocationType destination = (toLocation == MagicLocationType.Stack) ? 
+                final MagicLocationType destination = (toLocation == MagicLocationType.Stack) ?
                     cardOnStack.getMoveLocation() :
                     toLocation;
-                
+
                 game.doAction(new MoveCardAction(
                     cardOnStack.getCard(),
                     MagicLocationType.Stack,
diff --git a/src/magic/model/action/DealDamageAction.java b/src/magic/model/action/DealDamageAction.java
index ce098e5f49..0d5ffda710 100644
--- a/src/magic/model/action/DealDamageAction.java
+++ b/src/magic/model/action/DealDamageAction.java
@@ -21,7 +21,7 @@ public class DealDamageAction extends MagicAction {
     private final MagicDamage damage;
     private MagicTarget target;
     private int oldDamage = UNINIT;
-    
+
     public DealDamageAction(final MagicSource source, MagicTarget target, final int amt) {
         this(new MagicDamage(source, target, amt), null);
     }
@@ -42,7 +42,7 @@ public class DealDamageAction extends MagicAction {
     @Override
     public void doAction(final MagicGame game) {
         game.executeTrigger(MagicTriggerType.IfDamageWouldBeDealt,damage);
-        
+
         /*
         306.7. If damage would be dealt to a player by a source
         controlled by an opponent, that opponent may have that source deal that
diff --git a/src/magic/model/action/DiscardCardAction.java b/src/magic/model/action/DiscardCardAction.java
index 6268b2a8a3..5325344ccf 100644
--- a/src/magic/model/action/DiscardCardAction.java
+++ b/src/magic/model/action/DiscardCardAction.java
@@ -12,7 +12,7 @@ public class DiscardCardAction extends MagicAction {
     private final MagicCard card;
     private final MagicLocationType toLocation;
     private int index;
-    
+
     public DiscardCardAction(final MagicPlayer aPlayer,final MagicCard aCard) {
         this(aPlayer, aCard, MagicLocationType.Graveyard);
     }
diff --git a/src/magic/model/action/FlipAction.java b/src/magic/model/action/FlipAction.java
index c8b279eebb..a776f30fb0 100644
--- a/src/magic/model/action/FlipAction.java
+++ b/src/magic/model/action/FlipAction.java
@@ -22,7 +22,7 @@ public class FlipAction extends MagicAction {
     public void doAction(final MagicGame game) {
         if (permanent.isFlipCard() && permanent.isFlipped() == false) {
             oldStatics = permanent.getStatics();
-            
+
             game.doAction(ChangeStateAction.Set(permanent, MagicPermanentState.Flipped));
 
             newStatics = permanent.getStatics();
diff --git a/src/magic/model/action/GainAbilityAction.java b/src/magic/model/action/GainAbilityAction.java
index 8a47a8b6ad..d9222c1a8b 100644
--- a/src/magic/model/action/GainAbilityAction.java
+++ b/src/magic/model/action/GainAbilityAction.java
@@ -17,7 +17,7 @@ public class GainAbilityAction extends MagicAction {
     private final MagicPermanent permanent;
     private final MagicAbilityList abilityList;
     private final boolean duration;
-    
+
     public GainAbilityAction(final MagicPermanent permanent,final MagicAbilityList abilityList, final boolean duration) {
         this.permanent=permanent;
         this.abilityList=abilityList;
@@ -27,7 +27,7 @@ public class GainAbilityAction extends MagicAction {
     public GainAbilityAction(final MagicPermanent permanent,final Set<MagicAbility> abilities, final boolean duration) {
         this(permanent,MagicAbility.getAbilityList(abilities), duration);
     }
-    
+
     public GainAbilityAction(final MagicPermanent permanent,final MagicAbilityList abilityList) {
         this(permanent,abilityList,MagicStatic.UntilEOT);
     }
diff --git a/src/magic/model/action/GainControlAction.java b/src/magic/model/action/GainControlAction.java
index afb7059f68..b6a7142031 100644
--- a/src/magic/model/action/GainControlAction.java
+++ b/src/magic/model/action/GainControlAction.java
@@ -26,7 +26,7 @@ public class GainControlAction extends MagicAction {
     public void doAction(final MagicGame game) {
         //insert continuous effect
         game.doAction(new AddStaticAction(
-            permanent, 
+            permanent,
             new MagicStatic(MagicLayer.Control, duration) {
                 @Override
                 public MagicPlayer getController(final MagicPermanent source, final MagicPermanent permanent, final MagicPlayer controller) {
diff --git a/src/magic/model/action/LookAction.java b/src/magic/model/action/LookAction.java
index b3a9d0b75d..2a1f67d80b 100644
--- a/src/magic/model/action/LookAction.java
+++ b/src/magic/model/action/LookAction.java
@@ -13,7 +13,7 @@ import java.util.Collection;
 import java.util.List;
 
 public class LookAction extends MagicAction {
-    
+
     private final List<MagicCard> cards = new ArrayList<MagicCard>();
     private final MagicPlayer player;
     private final String desc;
diff --git a/src/magic/model/action/LoseAbilityAction.java b/src/magic/model/action/LoseAbilityAction.java
index 615edaf9b5..0e009017d0 100644
--- a/src/magic/model/action/LoseAbilityAction.java
+++ b/src/magic/model/action/LoseAbilityAction.java
@@ -17,7 +17,7 @@ public class LoseAbilityAction extends MagicAction {
     private final MagicPermanent permanent;
     private final MagicAbilityList abilityList;
     private final boolean duration;
-    
+
     public LoseAbilityAction(final MagicPermanent permanent,final MagicAbilityList abilityList, final boolean duration) {
         this.permanent=permanent;
         this.abilityList=abilityList;
@@ -27,7 +27,7 @@ public class LoseAbilityAction extends MagicAction {
     public LoseAbilityAction(final MagicPermanent permanent,final Set<MagicAbility> abilities, final boolean duration) {
         this(permanent,MagicAbility.getAbilityList(abilities), duration);
     }
-    
+
     public LoseAbilityAction(final MagicPermanent permanent,final MagicAbilityList abilityList) {
         this(permanent,abilityList,MagicStatic.UntilEOT);
     }
diff --git a/src/magic/model/action/ManifestAction.java b/src/magic/model/action/ManifestAction.java
index 466fd530f9..aac589e98d 100644
--- a/src/magic/model/action/ManifestAction.java
+++ b/src/magic/model/action/ManifestAction.java
@@ -30,6 +30,6 @@ public class ManifestAction extends MagicAction {
 
     @Override
     public void undoAction(final MagicGame game) {
-    
+
     }
 }
diff --git a/src/magic/model/action/ManifestCardAction.java b/src/magic/model/action/ManifestCardAction.java
index 91776d0b8d..f53ccb5cfb 100644
--- a/src/magic/model/action/ManifestCardAction.java
+++ b/src/magic/model/action/ManifestCardAction.java
@@ -13,7 +13,7 @@ public class ManifestCardAction extends PlayCardAction {
     public ManifestCardAction(final MagicCard card, final MagicPlayer player) {
         super(card, player, MagicPlayMod.MANIFEST);
     }
-    
+
     @Override
     public void doAction(final MagicGame game) {
         final MagicCardOnStack cardOnStack = new MagicCardOnStack(
diff --git a/src/magic/model/action/PlayCardAction.java b/src/magic/model/action/PlayCardAction.java
index b8c5803fe3..ff053bb340 100644
--- a/src/magic/model/action/PlayCardAction.java
+++ b/src/magic/model/action/PlayCardAction.java
@@ -22,19 +22,19 @@ public class PlayCardAction extends MagicAction {
         controller = aController;
         modifications = aModifications;
     }
-    
+
     public PlayCardAction(final MagicCard aCard, final MagicPlayer aController,final MagicPermanentAction... aModifications) {
         this(aCard, aController, Arrays.asList(aModifications));
     }
-    
+
     public PlayCardAction(final MagicCard card, final MagicPlayer player) {
         this(card, player, Collections.<MagicPermanentAction>emptyList());
     }
-    
+
     public PlayCardAction(final MagicCard card, final List<? extends MagicPermanentAction> modifications) {
         this(card, card.getController(), modifications);
     }
-    
+
     public PlayCardAction(final MagicCard card) {
         this(card, card.getController(), Collections.<MagicPermanentAction>emptyList());
     }
diff --git a/src/magic/model/action/PlayTokenAction.java b/src/magic/model/action/PlayTokenAction.java
index 7219ebc4da..3aac844ebb 100644
--- a/src/magic/model/action/PlayTokenAction.java
+++ b/src/magic/model/action/PlayTokenAction.java
@@ -17,7 +17,7 @@ public class PlayTokenAction extends MagicAction {
 
     private final MagicCard card;
     private final List<? extends MagicPermanentAction> modifications;
-    
+
     public PlayTokenAction(final MagicPlayer player,final MagicCardDefinition cardDefinition, final List<? extends MagicPermanentAction> aModifications) {
         card = MagicCard.createTokenCard(cardDefinition,player);
         modifications = aModifications;
@@ -27,23 +27,23 @@ public class PlayTokenAction extends MagicAction {
         card = aCard;
         modifications = Collections.<MagicPermanentAction>emptyList();
     }
-    
+
     public PlayTokenAction(final MagicPlayer player,final MagicCardDefinition cardDefinition) {
         this(player, cardDefinition, Collections.<MagicPermanentAction>emptyList());
     }
-    
+
     public PlayTokenAction(final MagicPlayer player,final MagicCardDefinition cardDefinition,final MagicPermanentAction... aModifications) {
         this(player, cardDefinition, Arrays.asList(aModifications));
     }
-    
+
     public PlayTokenAction(final MagicPlayer player,final MagicObject obj) {
         this(player, obj.getCardDefinition(), Collections.<MagicPermanentAction>emptyList());
     }
-    
+
     public PlayTokenAction(final MagicPlayer player,final MagicObject obj, final List<? extends MagicPermanentAction> aModifications) {
         this(player, obj.getCardDefinition(), aModifications);
     }
-    
+
     public PlayTokenAction(final MagicPlayer player,final MagicObject obj, final MagicPermanentAction... aModifications) {
         this(player, obj.getCardDefinition(), Arrays.asList(aModifications));
     }
@@ -53,7 +53,7 @@ public class PlayTokenAction extends MagicAction {
         final MagicCardOnStack cardOnStack = new MagicCardOnStack(card, card.getController(), MagicPayedCost.NOT_SPELL, modifications);
         game.addEvent(cardOnStack.getEvent());
     }
-    
+
     @Override
     public void undoAction(final MagicGame game) {}
 }
diff --git a/src/magic/model/action/PlayTokensAction.java b/src/magic/model/action/PlayTokensAction.java
index e5826c2fa7..4e1faf87ca 100644
--- a/src/magic/model/action/PlayTokensAction.java
+++ b/src/magic/model/action/PlayTokensAction.java
@@ -15,7 +15,7 @@ public class PlayTokensAction extends MagicAction {
         card  = MagicCard.createTokenCard(cardDefinition,player);
         count = aCount;
     }
-    
+
     public PlayTokensAction(final MagicPlayer player, final MagicObject obj, final int aCount) {
         this(player, obj.getCardDefinition(), aCount);
     }
diff --git a/src/magic/model/action/ReanimateAction.java b/src/magic/model/action/ReanimateAction.java
index 16fb2002f8..6ce39f81be 100644
--- a/src/magic/model/action/ReanimateAction.java
+++ b/src/magic/model/action/ReanimateAction.java
@@ -19,11 +19,11 @@ public class ReanimateAction extends MagicAction {
         controller = aController;
         modifications = aModifications;
     }
-    
+
     public ReanimateAction(final MagicCard aCard, final MagicPlayer aController, final MagicPermanentAction... aModifications) {
         this(aCard, aController, Arrays.asList(aModifications));
     }
-    
+
     @Override
     public void doAction(final MagicGame game) {
         if (card.isInGraveyard() && card.isPermanentCard()) {
@@ -31,7 +31,7 @@ public class ReanimateAction extends MagicAction {
             game.doAction(new PlayCardAction(card,controller,modifications));
         }
     }
-    
+
     @Override
     public void undoAction(final MagicGame game) {}
 }
diff --git a/src/magic/model/action/ReclaimExiledCardAction.java b/src/magic/model/action/ReclaimExiledCardAction.java
index 24145b8a91..369fdf5482 100644
--- a/src/magic/model/action/ReclaimExiledCardAction.java
+++ b/src/magic/model/action/ReclaimExiledCardAction.java
@@ -13,12 +13,12 @@ public class ReclaimExiledCardAction extends MagicAction {
         this.source = source;
         this.card = card;
     }
-    
+
     public void doAction(final MagicGame game) {
         game.doAction(new ShiftCardAction(card, MagicLocationType.Exile, MagicLocationType.OwnersHand));
         source.removeExiledCard(card);
     }
-    
+
     public void undoAction(final MagicGame game) {
         source.addExiledCard(card);
     }
diff --git a/src/magic/model/action/RemoveAllFromPlayAction.java b/src/magic/model/action/RemoveAllFromPlayAction.java
index 74d4ee23ce..3a97f5a722 100644
--- a/src/magic/model/action/RemoveAllFromPlayAction.java
+++ b/src/magic/model/action/RemoveAllFromPlayAction.java
@@ -9,15 +9,15 @@ import java.util.Collection;
 import java.util.ArrayList;
 
 public class RemoveAllFromPlayAction extends MagicAction {
-    
+
     private final Collection<MagicPermanent> perms = new ArrayList<MagicPermanent>();
     private final MagicLocationType toLocation;
-    
+
     public RemoveAllFromPlayAction(final Collection<MagicPermanent> aPerms, final MagicLocationType aToLocation) {
         perms.addAll(aPerms);
         toLocation = aToLocation;
     }
-    
+
     @Override
     public void doAction(final MagicGame game) {
         final boolean isLibrary = toLocation == MagicLocationType.OwnersLibrary;
@@ -42,7 +42,7 @@ public class RemoveAllFromPlayAction extends MagicAction {
             game.update();
         }
     }
-    
+
     @Override
     public void undoAction(final MagicGame game) {}
 }
diff --git a/src/magic/model/action/RemoveFromPlayAction.java b/src/magic/model/action/RemoveFromPlayAction.java
index c87314473c..4a245c97ba 100644
--- a/src/magic/model/action/RemoveFromPlayAction.java
+++ b/src/magic/model/action/RemoveFromPlayAction.java
@@ -18,7 +18,7 @@ public class RemoveFromPlayAction extends MagicAction {
         toLocation = aToLocation;
         update = aUpdate;
     }
-    
+
     // default to update after remove
     public RemoveFromPlayAction(final MagicPermanent aPermanent, final MagicLocationType aToLocation) {
         this(aPermanent, aToLocation, true);
@@ -32,11 +32,11 @@ public class RemoveFromPlayAction extends MagicAction {
     public boolean isValid() {
         return valid;
     }
-    
+
     public boolean isPermanent(final MagicPermanent aPermanent) {
         return permanent == aPermanent;
     }
-    
+
     public MagicPermanent getPermanent() {
         return permanent;
     }
diff --git a/src/magic/model/action/ReturnCardAction.java b/src/magic/model/action/ReturnCardAction.java
index ac68f17798..8766c32454 100644
--- a/src/magic/model/action/ReturnCardAction.java
+++ b/src/magic/model/action/ReturnCardAction.java
@@ -22,11 +22,11 @@ public class ReturnCardAction extends MagicAction {
         from = aFrom;
         modifications = aModifications;
     }
-    
+
     public ReturnCardAction(final MagicLocationType aFrom, final MagicCard aCard, final MagicPlayer aController, final MagicPermanentAction... aModifications) {
         this(aFrom, aCard, aController, Arrays.asList(aModifications));
     }
-    
+
     @Override
     public void doAction(final MagicGame game) {
         if (card.isIn(from) && card.isPermanentCard()) {
@@ -34,7 +34,7 @@ public class ReturnCardAction extends MagicAction {
             game.doAction(new PlayCardAction(card,controller,modifications));
         }
     }
-    
+
     @Override
     public void undoAction(final MagicGame game) {}
 }
diff --git a/src/magic/model/action/RevealAction.java b/src/magic/model/action/RevealAction.java
index e6ccf5c1a9..1d656f6cb4 100644
--- a/src/magic/model/action/RevealAction.java
+++ b/src/magic/model/action/RevealAction.java
@@ -13,7 +13,7 @@ import magic.model.event.MagicEvent;
 import magic.model.event.MagicEventAction;
 
 public class RevealAction extends MagicAction {
-    
+
     private final List<MagicCard> cards = new ArrayList<>();
 
     public RevealAction(final MagicCard aCard) {
diff --git a/src/magic/model/action/ScryComplAction.java b/src/magic/model/action/ScryComplAction.java
index a48deab648..fae7e35138 100644
--- a/src/magic/model/action/ScryComplAction.java
+++ b/src/magic/model/action/ScryComplAction.java
@@ -15,7 +15,7 @@ public class ScryComplAction extends MagicAction {
     public ScryComplAction(final MagicPlayer aPlayer, final MagicCard aCard, final boolean aDown) {
         player = aPlayer;
         card = aCard;
-        down = aDown; 
+        down = aDown;
     }
 
     @Override
diff --git a/src/magic/model/action/ShiftCardAction.java b/src/magic/model/action/ShiftCardAction.java
index 16c69b5e6d..b1cba22e50 100644
--- a/src/magic/model/action/ShiftCardAction.java
+++ b/src/magic/model/action/ShiftCardAction.java
@@ -8,13 +8,13 @@ public class ShiftCardAction extends MagicAction {
     public final MagicCard card;
     public final MagicLocationType from;
     public final MagicLocationType to;
-    
+
     public ShiftCardAction(final MagicCard aCard, final MagicLocationType fromLocation, final MagicLocationType toLocation) {
         card = aCard;
         from = fromLocation;
         to   = toLocation;
     }
-    
+
     @Override
     public void doAction(final MagicGame game) {
         if (card.isIn(from)) {
@@ -22,7 +22,7 @@ public class ShiftCardAction extends MagicAction {
             game.doAction(new MoveCardAction(card, from, to));
         }
     }
-    
+
     @Override
     public void undoAction(final MagicGame game) {}
 }
diff --git a/src/magic/model/action/SoulbondAction.java b/src/magic/model/action/SoulbondAction.java
index 631d53d307..8079266172 100644
--- a/src/magic/model/action/SoulbondAction.java
+++ b/src/magic/model/action/SoulbondAction.java
@@ -37,7 +37,7 @@ public class SoulbondAction extends MagicAction {
         if (!valid) {
             return;
         }
-        
+
         if (set) {
             permanent.setPairedCreature(MagicPermanent.NONE);
             pairedCreature.setPairedCreature(MagicPermanent.NONE);
diff --git a/src/magic/model/action/TapAction.java b/src/magic/model/action/TapAction.java
index ab55dfe9be..7caaa50f65 100644
--- a/src/magic/model/action/TapAction.java
+++ b/src/magic/model/action/TapAction.java
@@ -12,7 +12,7 @@ public class TapAction extends MagicAction {
     private final MagicPermanent permanent;
     private boolean isUntapped;
     private final boolean hasScore;
-    
+
     public TapAction(final MagicPermanent permanent) {
         this(permanent, true);
     }
diff --git a/src/magic/model/action/TransformAction.java b/src/magic/model/action/TransformAction.java
index eebc84091e..61548d62fd 100644
--- a/src/magic/model/action/TransformAction.java
+++ b/src/magic/model/action/TransformAction.java
@@ -22,13 +22,13 @@ public class TransformAction extends MagicAction {
     public void doAction(final MagicGame game) {
         if (permanent.isValid() && permanent.isDoubleFaced()) {
             oldStatics = permanent.getStatics();
-            
+
             if (permanent.isTransformed()) {
                 game.doAction(ChangeStateAction.Clear(permanent, MagicPermanentState.Transformed));
             } else {
                 game.doAction(ChangeStateAction.Set(permanent, MagicPermanentState.Transformed));
             }
-            
+
             newStatics = permanent.getStatics();
             game.removeStatics(permanent, oldStatics);
             game.addStatics(permanent, newStatics);
diff --git a/src/magic/model/action/TurnFaceDownAction.java b/src/magic/model/action/TurnFaceDownAction.java
index 48d9406c92..f8ed278f82 100644
--- a/src/magic/model/action/TurnFaceDownAction.java
+++ b/src/magic/model/action/TurnFaceDownAction.java
@@ -22,9 +22,9 @@ public class TurnFaceDownAction extends MagicAction {
     public void doAction(final MagicGame game) {
         if (permanent.isFaceDown() == false && permanent.isDoubleFaced() == false) {
             oldStatics = permanent.getStatics();
-            
+
             game.doAction(ChangeStateAction.Set(permanent, MagicPermanentState.FaceDown));
-            
+
             newStatics = permanent.getStatics();
             game.removeStatics(permanent, oldStatics);
             game.addStatics(permanent, newStatics);
diff --git a/src/magic/model/action/TurnFaceUpAction.java b/src/magic/model/action/TurnFaceUpAction.java
index 7431532e96..b45387c98a 100644
--- a/src/magic/model/action/TurnFaceUpAction.java
+++ b/src/magic/model/action/TurnFaceUpAction.java
@@ -23,14 +23,14 @@ public class TurnFaceUpAction extends MagicAction {
     public void doAction(final MagicGame game) {
         if (permanent.isFaceDown() && permanent.getRealCardDefinition().isPermanent()) {
             oldStatics = permanent.getStatics();
-            
+
             game.doAction(ChangeStateAction.Clear(permanent, MagicPermanentState.FaceDown));
             game.doAction(ChangeStateAction.Clear(permanent, MagicPermanentState.Manifest));
 
             newStatics = permanent.getStatics();
             game.removeStatics(permanent, oldStatics);
             game.addStatics(permanent, newStatics);
-            
+
             // force an update so that triggers are registered
             game.update();
 
diff --git a/src/magic/model/choice/MagicBasicLandChoice.java b/src/magic/model/choice/MagicBasicLandChoice.java
index c7620a0ed7..fc2a208d7f 100644
--- a/src/magic/model/choice/MagicBasicLandChoice.java
+++ b/src/magic/model/choice/MagicBasicLandChoice.java
@@ -113,5 +113,5 @@ public class MagicBasicLandChoice extends MagicChoice {
         controller.disableActionButton(false);
         return new Object[]{controller.getLandSubTypeChoice(source)};
     }
-    
+
 }
diff --git a/src/magic/model/choice/MagicBuilderPayManaCostResult.java b/src/magic/model/choice/MagicBuilderPayManaCostResult.java
index 7298d3355d..083be1cdf7 100644
--- a/src/magic/model/choice/MagicBuilderPayManaCostResult.java
+++ b/src/magic/model/choice/MagicBuilderPayManaCostResult.java
@@ -48,7 +48,7 @@ public class MagicBuilderPayManaCostResult implements MagicPayManaCostResult, Co
         x          = source.x;
         hashCode   = source.hashCode;
     }
-   
+
     @Override
     public MagicBuilderPayManaCostResult copy(final MagicCopyMap copyMap) {
         return new MagicBuilderPayManaCostResult(copyMap, this);
diff --git a/src/magic/model/choice/MagicCardChoiceResult.java b/src/magic/model/choice/MagicCardChoiceResult.java
index d32a70838a..587c978157 100644
--- a/src/magic/model/choice/MagicCardChoiceResult.java
+++ b/src/magic/model/choice/MagicCardChoiceResult.java
@@ -22,13 +22,13 @@ public class MagicCardChoiceResult extends ArrayList<MagicCard> implements Magic
     }
 
     MagicCardChoiceResult() {}
-    
+
     private MagicCardChoiceResult(final MagicCopyMap copyMap, final List<MagicCard> cardList) {
         for (final MagicCard card : cardList) {
             add(copyMap.copy(card));
         }
     }
-    
+
     @Override
     public MagicCardChoiceResult copy(final MagicCopyMap copyMap) {
         return new MagicCardChoiceResult(copyMap, this);
@@ -43,7 +43,7 @@ public class MagicCardChoiceResult extends ArrayList<MagicCard> implements Magic
         }
         return result;
     }
-    
+
     @Override
     public String toString() {
         final StringBuilder buffer=new StringBuilder();
diff --git a/src/magic/model/choice/MagicChoice.java b/src/magic/model/choice/MagicChoice.java
index ce93a3ab36..173a83c6c2 100644
--- a/src/magic/model/choice/MagicChoice.java
+++ b/src/magic/model/choice/MagicChoice.java
@@ -52,7 +52,7 @@ public abstract class MagicChoice {
     public MagicTargetChoice getTargetChoice() {
         return MagicTargetChoice.NONE;
     }
-    
+
     public MagicTargetChoice getTargetChoice(final Object[] chosen) {
         return getTargetChoice();
     }
diff --git a/src/magic/model/choice/MagicDelayedPayManaCostResult.java b/src/magic/model/choice/MagicDelayedPayManaCostResult.java
index 1ca42225c0..ea804e47e8 100644
--- a/src/magic/model/choice/MagicDelayedPayManaCostResult.java
+++ b/src/magic/model/choice/MagicDelayedPayManaCostResult.java
@@ -43,7 +43,7 @@ public class MagicDelayedPayManaCostResult implements MagicPayManaCostResult {
     public void doAction(final MagicGame game,final MagicPlayer player) {
         game.doAction(new PayDelayedCostAction(player,this));
     }
-    
+
     @Override
     public MagicDelayedPayManaCostResult copy(final MagicCopyMap copyMap) {
         return this;
@@ -53,7 +53,7 @@ public class MagicDelayedPayManaCostResult implements MagicPayManaCostResult {
     public MagicDelayedPayManaCostResult map(final MagicGame game) {
         return this;
     }
-    
+
     @Override
     public long getId() {
         return hashCode();
diff --git a/src/magic/model/choice/MagicFromCardFilterChoice.java b/src/magic/model/choice/MagicFromCardFilterChoice.java
index 0e002666fb..2e60e00883 100644
--- a/src/magic/model/choice/MagicFromCardFilterChoice.java
+++ b/src/magic/model/choice/MagicFromCardFilterChoice.java
@@ -23,7 +23,7 @@ public class MagicFromCardFilterChoice extends MagicChoice {
     private final String displayMessage;
     private final int amount;
     private final boolean upTo;
-    
+
     public MagicFromCardFilterChoice(final MagicTargetFilter<MagicCard> aFilter, final int aAmount, final boolean aUpTo, final String description) {
         super(genDescription(aAmount, description, aUpTo));
         filter = aFilter;
@@ -54,7 +54,7 @@ public class MagicFromCardFilterChoice extends MagicChoice {
         final int limit,
         final int index
     ) {
-        
+
         if (count == limit) {
             options.add(new MagicCardChoiceResult(cards));
             return;
@@ -69,7 +69,7 @@ public class MagicFromCardFilterChoice extends MagicChoice {
         createOptions(options,cList,cards,count+1,limit,index+1);
         createOptions(options,cList,cards,count,limit,index+1);
     }
-    
+
     private void createOptionsUpTo(
         final Collection<Object> options,
         final List<MagicCard> cList,
@@ -78,7 +78,7 @@ public class MagicFromCardFilterChoice extends MagicChoice {
         final int limit,
         final int index
     ) {
-       
+
         if (index >= cList.size() || count >= limit) {
             final MagicCardChoiceResult result = new MagicCardChoiceResult(cards);
             //System.out.println("add " + result);
@@ -95,12 +95,12 @@ public class MagicFromCardFilterChoice extends MagicChoice {
                 cards[count + i] = cList.get(index + i);
                 createOptionsUpTo(options,cList,cards,count + i + 1,limit,index + cnt);
             }
-           
+
             // use 0 copies of first
             for (int i = 0; i < cnt && count + i + 1 <= limit; i++) {
                 cards[count + i] = null;
             }
-            
+
             createOptionsUpTo(options,cList,cards,count,limit,index + cnt);
         }
     }
@@ -132,12 +132,12 @@ public class MagicFromCardFilterChoice extends MagicChoice {
         } else {
             createOptions(options,cList,new MagicCard[actualAmount],0,actualAmount,0);
         }
-        
+
         //hide the cards
         for (int i = 0; i < oList.size(); i++) {
             oList.get(i).setGameKnown(known.get(i));
         }
-        
+
         return options;
     }
 
diff --git a/src/magic/model/choice/MagicFromCardListChoice.java b/src/magic/model/choice/MagicFromCardListChoice.java
index 9ab1d077ed..5771dda6db 100644
--- a/src/magic/model/choice/MagicFromCardListChoice.java
+++ b/src/magic/model/choice/MagicFromCardListChoice.java
@@ -31,31 +31,31 @@ public class MagicFromCardListChoice extends MagicChoice {
     public MagicFromCardListChoice(final List<MagicCard> choiceList,final int amount) {
         this(choiceList, choiceList, amount, false);
     }
-    
+
     public MagicFromCardListChoice(final List<MagicCard> choiceList,final int amount, final String description) {
         this(choiceList, choiceList, amount, false, description);
     }
-    
+
     public MagicFromCardListChoice(final List<MagicCard> choiceList,final int amount, final boolean upTo) {
         this(choiceList, choiceList, amount, upTo);
     }
-    
+
     public MagicFromCardListChoice(final List<MagicCard> choiceList,final int amount, final boolean upTo, final String description) {
         this(choiceList, choiceList, amount, upTo, description);
     }
-    
+
     public MagicFromCardListChoice(final List<MagicCard> choiceList,final List<MagicCard> showList,final int amount) {
         this(choiceList, showList, amount, false);
     }
-    
+
     public MagicFromCardListChoice(final List<MagicCard> choiceList,final List<MagicCard> showList,final int amount, final String description) {
         this(choiceList, showList, amount, false, description);
     }
-    
+
     public MagicFromCardListChoice(final List<MagicCard> choiceList,final List<MagicCard> showList,final int amount, final boolean upTo) {
         this(choiceList, showList, amount, upTo, "");
     }
-    
+
     public MagicFromCardListChoice(final List<MagicCard> aChoiceList,final List<MagicCard> aShowList,final int aAmount, final boolean aUpTo, final String description) {
         super(genDescription(aAmount, description, aUpTo));
         choiceList = aChoiceList;
@@ -89,7 +89,7 @@ public class MagicFromCardListChoice extends MagicChoice {
         final int limit,
         final int index
     ) {
-        
+
         if (count == limit) {
             options.add(new MagicCardChoiceResult(cards));
             return;
@@ -104,7 +104,7 @@ public class MagicFromCardListChoice extends MagicChoice {
         createOptions(options,cList,cards,count+1,limit,index+1);
         createOptions(options,cList,cards,count,limit,index+1);
     }
-    
+
     private void createOptionsUpTo(
         final Collection<Object> options,
         final List<MagicCard> cList,
@@ -113,7 +113,7 @@ public class MagicFromCardListChoice extends MagicChoice {
         final int limit,
         final int index
     ) {
-       
+
         if (index >= cList.size() || count >= limit) {
             final MagicCardChoiceResult result = new MagicCardChoiceResult(cards);
             //System.out.println("add " + result);
@@ -130,12 +130,12 @@ public class MagicFromCardListChoice extends MagicChoice {
                 cards[count + i] = cList.get(index + i);
                 createOptionsUpTo(options,cList,cards,count + i + 1,limit,index + cnt);
             }
-           
+
             // use 0 copies of first
             for (int i = 0; i < cnt && count + i + 1 <= limit; i++) {
                 cards[count + i] = null;
             }
-            
+
             createOptionsUpTo(options,cList,cards,count,limit,index + cnt);
         }
     }
@@ -149,7 +149,7 @@ public class MagicFromCardListChoice extends MagicChoice {
         final List<Object> options = new ArrayList<Object>();
         final List<MagicCard> oList = new ArrayList<MagicCard>();
         final List<Boolean> known = new ArrayList<Boolean>(oList.size());
-        
+
         //map the cards to the current game
         for (final MagicCard card : choiceList) {
             oList.add(card.map(game));
@@ -172,12 +172,12 @@ public class MagicFromCardListChoice extends MagicChoice {
         } else {
             createOptions(options,cList,new MagicCard[actualAmount],0,actualAmount,0);
         }
-        
+
         //hide the cards
         for (int i = 0; i < oList.size(); i++) {
             oList.get(i).setGameKnown(known.get(i));
         }
-        
+
         return options;
     }
 
diff --git a/src/magic/model/choice/MagicMayChoice.java b/src/magic/model/choice/MagicMayChoice.java
index 78987a6745..9184811e3b 100644
--- a/src/magic/model/choice/MagicMayChoice.java
+++ b/src/magic/model/choice/MagicMayChoice.java
@@ -23,7 +23,7 @@ public class MagicMayChoice extends MagicChoice {
         new Object[]{YES_CHOICE},
         new Object[]{NO_CHOICE}
     );
-    
+
     private final MagicChoice[] choices;
     private final MagicTargetChoice targetChoice;
     private final int manaChoiceResultIndex;
@@ -45,7 +45,7 @@ public class MagicMayChoice extends MagicChoice {
             }
         };
     }
-    
+
     public MagicMayChoice(final String description,final MagicMatchedCostEvent cost) {
         this(description, satisfied(cost));
     }
diff --git a/src/magic/model/choice/MagicMulliganChoice.java b/src/magic/model/choice/MagicMulliganChoice.java
index 8a6c074a14..cf336d9734 100644
--- a/src/magic/model/choice/MagicMulliganChoice.java
+++ b/src/magic/model/choice/MagicMulliganChoice.java
@@ -51,7 +51,7 @@ public class MagicMulliganChoice extends MagicChoice {
             costSum += card.getConvertedCost();
             //System.err.println("MULLIGAN: card=" + card);
         }
-        
+
         // There is more fine tuning to be done here
         int minLands = 2;
         int maxLands = 3;
@@ -64,7 +64,7 @@ public class MagicMulliganChoice extends MagicChoice {
         }
 
         final int hand = player.getHandSize();
-        
+
         if (hand <= 4) {
             return NO_CHOICE_LIST;
         }
@@ -83,16 +83,16 @@ public class MagicMulliganChoice extends MagicChoice {
 
         int playable = 0;
         for (final MagicCard card : assumedPlayer.getHand()) {
-            if (card.hasType(MagicType.Land) == false && 
+            if (card.hasType(MagicType.Land) == false &&
                 card.getCost().getCondition().accept(card)) {
                 playable++;
             }
         }
-          
+
         //System.err.println("MULLIGAN: hand=" + hand + " lands=" + numLands + " playable=" + playable);
 
         if ((hand >  6 && playable > 1) ||
-            (hand <= 6 && playable > 0)) { 
+            (hand <= 6 && playable > 0)) {
             return NO_CHOICE_LIST;
         } else if (numLands < minLands || numLands > maxLands) {
             return YES_CHOICE_LIST;
diff --git a/src/magic/model/choice/MagicOrChoice.java b/src/magic/model/choice/MagicOrChoice.java
index 55601c4e72..70da809dad 100644
--- a/src/magic/model/choice/MagicOrChoice.java
+++ b/src/magic/model/choice/MagicOrChoice.java
@@ -23,7 +23,7 @@ public class MagicOrChoice extends MagicChoice {
     public MagicOrChoice(final MagicChoice... choices) {
         this("Choose the mode.", choices);
     }
-    
+
     @Override
     public MagicTargetChoice getTargetChoice(final Object[] chosen) {
         final int idx = (Integer)chosen[0] - 1;
@@ -66,7 +66,7 @@ public class MagicOrChoice extends MagicChoice {
                 }
             }
         }
-       
+
         if (choiceResultsList.isEmpty()) {
             choiceResultsList.add(new Object[]{0});
         }
@@ -78,7 +78,7 @@ public class MagicOrChoice extends MagicChoice {
     public Object[] getPlayerChoiceResults(final IUIGameController controller, final MagicGame game, final MagicEvent event) throws UndoClickedException {
         final MagicPlayer player = event.getPlayer();
         final MagicSource source = event.getSource();
-        
+
         final boolean hints = GeneralConfig.getInstance().getSmartTarget();
         final List<Integer> availableModes = new ArrayList<>();
         for (int i = 0; i < choices.length; i++) {
diff --git a/src/magic/model/choice/MagicPlayChoice.java b/src/magic/model/choice/MagicPlayChoice.java
index 616306817d..f8217fd006 100644
--- a/src/magic/model/choice/MagicPlayChoice.java
+++ b/src/magic/model/choice/MagicPlayChoice.java
@@ -28,7 +28,7 @@ public class MagicPlayChoice extends MagicChoice {
     private static final String _S_CONTINUE_MESSAGE = "Click {f} or Space to pass.";
     @StringContext(eg = "| represents a new line. Position to fit text in user prompt.")
     private static final String _S_SKIP_MESSAGE = "Right click {f} or Shift+Space to|skip till end of turn.";
-    
+
     private static final String MESSAGE = String.format("%s|%s|[%s]",
             UiString.get(_S_PLAY_MESSAGE),
             UiString.get(_S_CONTINUE_MESSAGE),
@@ -91,11 +91,11 @@ public class MagicPlayChoice extends MagicChoice {
     public Object[] getPlayerChoiceResults(final IUIGameController controller, final MagicGame game, final MagicEvent event) throws UndoClickedException {
         final MagicPlayer player = event.getPlayer();
         final MagicSource source = event.getSource();
-        
+
         controller.focusViewers(0);
 
         //always pass draw and begin combat if
-        //  option is true and 
+        //  option is true and
         //  stack is empty
         if (game.canAlwaysPass() && game.getStack().isEmpty()) {
             return PASS_CHOICE_RESULTS;
@@ -147,7 +147,7 @@ public class MagicPlayChoice extends MagicChoice {
         if (game.shouldSkip()) {
             if (game.getStack().isEmpty() == false) {
                 game.clearSkipTurnTill();
-            } else if (game.isPhase(MagicPhaseType.DeclareAttackers) && game.getNrOfPermanents(MagicPermanentState.Attacking) > 0) { 
+            } else if (game.isPhase(MagicPhaseType.DeclareAttackers) && game.getNrOfPermanents(MagicPermanentState.Attacking) > 0) {
                 game.clearSkipTurnTill();
             } else {
                 return PASS_CHOICE_RESULTS;
@@ -173,7 +173,7 @@ public class MagicPlayChoice extends MagicChoice {
             return PASS_CHOICE_RESULTS;
         }
 
-        final MagicSource activationSource = controller.getChoiceClicked(); 
+        final MagicSource activationSource = controller.getChoiceClicked();
         final List<MagicPlayChoiceResult> results=new ArrayList<>();
         for (final MagicSourceActivation<? extends MagicSource> sourceActivation : activationSource.getSourceActivations()) {
             if (sourceActivation.canPlay(game,player,false)) {
diff --git a/src/magic/model/choice/MagicPlayerPayManaCostResult.java b/src/magic/model/choice/MagicPlayerPayManaCostResult.java
index 3c72051e34..c8436846bc 100644
--- a/src/magic/model/choice/MagicPlayerPayManaCostResult.java
+++ b/src/magic/model/choice/MagicPlayerPayManaCostResult.java
@@ -33,7 +33,7 @@ public class MagicPlayerPayManaCostResult implements MagicPayManaCostResult {
     public String toString() {
         return x>0?"X="+x:"";
     }
-    
+
     @Override
     public MagicPlayerPayManaCostResult copy(final MagicCopyMap copyMap) {
         return this;
@@ -43,7 +43,7 @@ public class MagicPlayerPayManaCostResult implements MagicPayManaCostResult {
     public MagicPlayerPayManaCostResult map(final MagicGame game) {
         return this;
     }
-    
+
     @Override
     public long getId() {
         return hashCode();
diff --git a/src/magic/model/choice/MagicScryChoice.java b/src/magic/model/choice/MagicScryChoice.java
index 815bd34661..5551d1c12a 100644
--- a/src/magic/model/choice/MagicScryChoice.java
+++ b/src/magic/model/choice/MagicScryChoice.java
@@ -14,7 +14,7 @@ public class MagicScryChoice extends MagicMayChoice {
     public MagicScryChoice() {
         super("Move this card from the top of the library to the bottom?");
     }
-    
+
     @Override
     public List<Object[]> getArtificialChoiceResults(final MagicGame game, final MagicEvent event) {
         final MagicPlayer player = event.getPlayer();
@@ -32,14 +32,14 @@ public class MagicScryChoice extends MagicMayChoice {
     public Object[] getPlayerChoiceResults(final IUIGameController controller, final MagicGame game, final MagicEvent event) throws UndoClickedException {
         final MagicPlayer player = event.getPlayer();
         final MagicSource source = event.getSource();
-        
+
         final Object[] choiceResults=new Object[1];
         choiceResults[0]=NO_CHOICE;
-        
+
         if (player.getLibrary().isEmpty()) {
             return choiceResults;
         }
-        
+
         final MagicCardList cards = new MagicCardList();
         cards.add(player.getLibrary().getCardAtTop());
         controller.showCards(cards);
@@ -49,7 +49,7 @@ public class MagicScryChoice extends MagicMayChoice {
         if (controller.getMayChoice(source, getDescription())) {
             choiceResults[0]=YES_CHOICE;
         }
-        
+
         controller.clearCards();
 
         return choiceResults;
diff --git a/src/magic/model/choice/MagicSimpleMayChoice.java b/src/magic/model/choice/MagicSimpleMayChoice.java
index 7b91566273..e571f1ae9a 100644
--- a/src/magic/model/choice/MagicSimpleMayChoice.java
+++ b/src/magic/model/choice/MagicSimpleMayChoice.java
@@ -46,15 +46,15 @@ public class MagicSimpleMayChoice extends MagicChoice {
     public MagicSimpleMayChoice(final String description) {
         this(description, 0, 0, DEFAULT_YES);
     }
-    
+
     public MagicSimpleMayChoice() {
         this(0, 0, DEFAULT_YES);
     }
-    
+
     public MagicSimpleMayChoice(final int action) {
         this(action, 0, DEFAULT_YES);
     }
-    
+
     public MagicSimpleMayChoice(final int action, final int defaultChoice) {
         this(action, 0, defaultChoice);
     }
diff --git a/src/magic/model/choice/MagicTargetChoice.java b/src/magic/model/choice/MagicTargetChoice.java
index 6b73493bbb..8aa4993853 100644
--- a/src/magic/model/choice/MagicTargetChoice.java
+++ b/src/magic/model/choice/MagicTargetChoice.java
@@ -31,296 +31,296 @@ public class MagicTargetChoice extends MagicChoice {
                 return false;
             }
         };
-    
-    public static final MagicTargetChoice A_PAYABLE_CREATURE_CARD_FROM_YOUR_GRAVEYARD = 
+
+    public static final MagicTargetChoice A_PAYABLE_CREATURE_CARD_FROM_YOUR_GRAVEYARD =
         new MagicTargetChoice("a creature card with scavenge from your graveyard");
 
-    public static final MagicTargetChoice TARGET_SPELL = 
+    public static final MagicTargetChoice TARGET_SPELL =
         new MagicTargetChoice("target spell");
-    
-    public static final MagicTargetChoice NEG_TARGET_SPELL = 
+
+    public static final MagicTargetChoice NEG_TARGET_SPELL =
         MagicTargetChoice.Negative("target spell");
 
-    public static final MagicTargetChoice NEG_TARGET_CREATURE_SPELL = 
+    public static final MagicTargetChoice NEG_TARGET_CREATURE_SPELL =
         MagicTargetChoice.Negative("target creature spell");
 
-    public static final MagicTargetChoice TARGET_INSTANT_OR_SORCERY_SPELL = 
+    public static final MagicTargetChoice TARGET_INSTANT_OR_SORCERY_SPELL =
         new MagicTargetChoice("target instant or sorcery spell");
 
     public static final MagicTargetChoice NEG_TARGET_INSTANT_SPELL =
         MagicTargetChoice.Negative("target instant spell");
 
-    public static final MagicTargetChoice TARGET_PLAYER = 
+    public static final MagicTargetChoice TARGET_PLAYER =
         new MagicTargetChoice("target player");
-    
-    public static final MagicTargetChoice TARGET_PLAYER_CONTROLS_CREATURE = 
+
+    public static final MagicTargetChoice TARGET_PLAYER_CONTROLS_CREATURE =
         new MagicTargetChoice("target player that controls a creature");
-    
-    public static final MagicTargetChoice TARGET_OPPONENT = 
+
+    public static final MagicTargetChoice TARGET_OPPONENT =
         new MagicTargetChoice("target opponent");
-    
-    public static final MagicTargetChoice POS_TARGET_PLAYER = 
+
+    public static final MagicTargetChoice POS_TARGET_PLAYER =
         MagicTargetChoice.Positive("target player");
-    
-    public static final MagicTargetChoice NEG_TARGET_PLAYER = 
+
+    public static final MagicTargetChoice NEG_TARGET_PLAYER =
         MagicTargetChoice.Negative("target player");
-    
-    public static final MagicTargetChoice NEG_TARGET_SPELL_OR_PERMANENT = 
+
+    public static final MagicTargetChoice NEG_TARGET_SPELL_OR_PERMANENT =
         MagicTargetChoice.Negative("target spell or permanent");
-    
-    public static final MagicTargetChoice TARGET_PERMANENT = 
+
+    public static final MagicTargetChoice TARGET_PERMANENT =
         new MagicTargetChoice("target permanent");
-    
-    public static final MagicTargetChoice A_PERMANENT_YOU_CONTROL = 
+
+    public static final MagicTargetChoice A_PERMANENT_YOU_CONTROL =
         new MagicTargetChoice("a permanent you control");
 
-    public static final MagicTargetChoice TARGET_PERMANENT_YOU_CONTROL = 
+    public static final MagicTargetChoice TARGET_PERMANENT_YOU_CONTROL =
         new MagicTargetChoice("target permanent you control");
-    
-    public static final MagicTargetChoice TARGET_PERMANENT_YOU_OWN = 
+
+    public static final MagicTargetChoice TARGET_PERMANENT_YOU_OWN =
         new MagicTargetChoice("target permanent you own");
-    
-    public static final MagicTargetChoice NEG_TARGET_PERMANENT = 
+
+    public static final MagicTargetChoice NEG_TARGET_PERMANENT =
         MagicTargetChoice.Negative("target permanent");
-    
-    public static final MagicTargetChoice TARGET_LAND = 
+
+    public static final MagicTargetChoice TARGET_LAND =
         new MagicTargetChoice("target land");
-    
-    public static final MagicTargetChoice NEG_TARGET_LAND = 
+
+    public static final MagicTargetChoice NEG_TARGET_LAND =
         MagicTargetChoice.Negative("target land");
-    
+
     public static final MagicTargetChoice A_LAND_YOU_CONTROL =
         new MagicTargetChoice("a land you control");
-    
+
     public static final MagicTargetChoice FOREST_YOU_CONTROL =
             new MagicTargetChoice("a Forest you control");
-    
+
     public static final MagicTargetChoice ISLAND_YOU_CONTROL =
         new MagicTargetChoice("an Island you control");
 
-    public static final MagicTargetChoice TARGET_NONLAND_PERMANENT = 
+    public static final MagicTargetChoice TARGET_NONLAND_PERMANENT =
         new MagicTargetChoice("target nonland permanent");
 
-    public static final MagicTargetChoice TARGET_NONLAND_PERMANENT_YOUR_OPPONENT_CONTROLS = 
+    public static final MagicTargetChoice TARGET_NONLAND_PERMANENT_YOUR_OPPONENT_CONTROLS =
         new MagicTargetChoice("target nonland permanent an opponent controls");
 
-    public static final MagicTargetChoice NEG_TARGET_NONLAND_PERMANENT = 
+    public static final MagicTargetChoice NEG_TARGET_NONLAND_PERMANENT =
         MagicTargetChoice.Negative("target nonland permanent");
-    
+
     public static final MagicTargetChoice TARGET_ARTIFACT =
         new MagicTargetChoice("target artifact");
 
-    public static final MagicTargetChoice NEG_TARGET_ARTIFACT = 
+    public static final MagicTargetChoice NEG_TARGET_ARTIFACT =
         MagicTargetChoice.Negative("target artifact");
 
-    public static final MagicTargetChoice POS_TARGET_ARTIFACT = 
+    public static final MagicTargetChoice POS_TARGET_ARTIFACT =
         MagicTargetChoice.Positive("target artifact");
 
-    public static final MagicTargetChoice TARGET_NONCREATURE_ARTIFACT = 
+    public static final MagicTargetChoice TARGET_NONCREATURE_ARTIFACT =
         new MagicTargetChoice("target noncreature artifact");
 
-    public static final MagicTargetChoice POS_TARGET_NONCREATURE_ARTIFACT = 
+    public static final MagicTargetChoice POS_TARGET_NONCREATURE_ARTIFACT =
         MagicTargetChoice.Positive("target noncreature artifact");
 
-    public static final MagicTargetChoice TARGET_ARTIFACT_OR_ENCHANTMENT = 
+    public static final MagicTargetChoice TARGET_ARTIFACT_OR_ENCHANTMENT =
         new MagicTargetChoice("target artifact or enchantment");
 
-    public static final MagicTargetChoice NEG_TARGET_ARTIFACT_OR_ENCHANTMENT = 
+    public static final MagicTargetChoice NEG_TARGET_ARTIFACT_OR_ENCHANTMENT =
         MagicTargetChoice.Negative("target artifact or enchantment");
-    
-    public static final MagicTargetChoice AN_ARTIFACT_OR_CREATURE = 
+
+    public static final MagicTargetChoice AN_ARTIFACT_OR_CREATURE =
         new MagicTargetChoice("an artifact or creature");
 
-    public static final MagicTargetChoice TARGET_ARTIFACT_OR_CREATURE = 
+    public static final MagicTargetChoice TARGET_ARTIFACT_OR_CREATURE =
         new MagicTargetChoice("target artifact or creature");
 
-    public static final MagicTargetChoice NEG_TARGET_ARTIFACT_OR_CREATURE = 
+    public static final MagicTargetChoice NEG_TARGET_ARTIFACT_OR_CREATURE =
         MagicTargetChoice.Negative("target artifact or creature");
 
-    public static final MagicTargetChoice TARGET_ARTIFACT_OR_ENCHANTMENT_YOUR_OPPONENT_CONTROLS = 
+    public static final MagicTargetChoice TARGET_ARTIFACT_OR_ENCHANTMENT_YOUR_OPPONENT_CONTROLS =
         new MagicTargetChoice("target artifact or enchantment an opponent controls");
-    
-    public static final MagicTargetChoice POS_TARGET_ARTIFACT_CREATURE = 
+
+    public static final MagicTargetChoice POS_TARGET_ARTIFACT_CREATURE =
         MagicTargetChoice.Positive("target artifact creature");
-    
-    public static final MagicTargetChoice TARGET_ENCHANTMENT = 
+
+    public static final MagicTargetChoice TARGET_ENCHANTMENT =
         new MagicTargetChoice("target enchantment");
-    
-    public static final MagicTargetChoice TARGET_ENCHANTMENT_YOU_CONTROL = 
+
+    public static final MagicTargetChoice TARGET_ENCHANTMENT_YOU_CONTROL =
         new MagicTargetChoice("target enchantment you control");
-    
-    public static final MagicTargetChoice TARGET_ENCHANTMENT_YOUR_OPPONENT_CONTROLS = 
+
+    public static final MagicTargetChoice TARGET_ENCHANTMENT_YOUR_OPPONENT_CONTROLS =
         new MagicTargetChoice("target enchantment an opponent controls");
-    
-    public static final MagicTargetChoice NEG_TARGET_ENCHANTMENT = 
+
+    public static final MagicTargetChoice NEG_TARGET_ENCHANTMENT =
         MagicTargetChoice.Negative("target enchantment");
-    
-    public static final MagicTargetChoice TARGET_CREATURE = 
+
+    public static final MagicTargetChoice TARGET_CREATURE =
         new MagicTargetChoice("target creature");
-    
-    public static final MagicTargetChoice NEG_TARGET_CREATURE = 
+
+    public static final MagicTargetChoice NEG_TARGET_CREATURE =
         MagicTargetChoice.Negative("target creature");
-    
-    public static final MagicTargetChoice POS_TARGET_CREATURE = 
+
+    public static final MagicTargetChoice POS_TARGET_CREATURE =
         MagicTargetChoice.Positive("target creature");
-    
-    public static final MagicTargetChoice TARGET_NONCREATURE = 
+
+    public static final MagicTargetChoice TARGET_NONCREATURE =
         new MagicTargetChoice("target noncreature");
 
-    public static final MagicTargetChoice NEG_TARGET_NONCREATURE = 
+    public static final MagicTargetChoice NEG_TARGET_NONCREATURE =
         MagicTargetChoice.Negative("target noncreature");
 
-    public static final MagicTargetChoice NEG_TARGET_NONBLACK_CREATURE = 
+    public static final MagicTargetChoice NEG_TARGET_NONBLACK_CREATURE =
         MagicTargetChoice.Negative("target nonblack creature");
 
-    public static final MagicTargetChoice NEG_TARGET_UNTAPPED_CREATURE = 
+    public static final MagicTargetChoice NEG_TARGET_UNTAPPED_CREATURE =
         MagicTargetChoice.Negative("target untapped creature");
-    
-    public static final MagicTargetChoice A_CREATURE_YOU_CONTROL = 
+
+    public static final MagicTargetChoice A_CREATURE_YOU_CONTROL =
         new MagicTargetChoice("a creature you control");
-    
-    public static final MagicTargetChoice A_CREATURE = 
+
+    public static final MagicTargetChoice A_CREATURE =
         new MagicTargetChoice("a creature");
-    
-    public static final MagicTargetChoice POS_CREATURE = 
+
+    public static final MagicTargetChoice POS_CREATURE =
         MagicTargetChoice.Positive("a creature");
 
-    public static final MagicTargetChoice RED_OR_GREEN_CREATURE_YOU_CONTROL = 
+    public static final MagicTargetChoice RED_OR_GREEN_CREATURE_YOU_CONTROL =
         new MagicTargetChoice("a red or green creature you control");
 
-    public static final MagicTargetChoice TARGET_CREATURE_PLUSONE_COUNTER = 
+    public static final MagicTargetChoice TARGET_CREATURE_PLUSONE_COUNTER =
         new MagicTargetChoice("target creature with a +1/+1 counter on it");
-    
-    public static final MagicTargetChoice TARGET_CREATURE_WITH_FLYING = 
+
+    public static final MagicTargetChoice TARGET_CREATURE_WITH_FLYING =
         new MagicTargetChoice("target creature with flying");
-    
-    public static final MagicTargetChoice NEG_TARGET_CREATURE_WITH_FLYING = 
+
+    public static final MagicTargetChoice NEG_TARGET_CREATURE_WITH_FLYING =
         MagicTargetChoice.Negative("target creature with flying");
-    
-    public static final MagicTargetChoice NEG_TARGET_ATTACKING_CREATURE = 
+
+    public static final MagicTargetChoice NEG_TARGET_ATTACKING_CREATURE =
         MagicTargetChoice.Negative("target attacking creature");
-    
-    public static final MagicTargetChoice POS_TARGET_ATTACKING_CREATURE = 
+
+    public static final MagicTargetChoice POS_TARGET_ATTACKING_CREATURE =
         MagicTargetChoice.Positive("target attacking creature");
-    
-    public static final MagicTargetChoice TARGET_ATTACKING_OR_BLOCKING_CREATURE = 
+
+    public static final MagicTargetChoice TARGET_ATTACKING_OR_BLOCKING_CREATURE =
         new MagicTargetChoice("target attacking or blocking creature");
-    
-    public static final MagicTargetChoice NEG_WHITE_OR_BLUE_CREATURE = 
+
+    public static final MagicTargetChoice NEG_WHITE_OR_BLUE_CREATURE =
         MagicTargetChoice.Negative("target white or blue creature");
 
-    public static final MagicTargetChoice TARGET_CREATURE_YOU_CONTROL = 
+    public static final MagicTargetChoice TARGET_CREATURE_YOU_CONTROL =
         new MagicTargetChoice("target creature you control");
-    
+
     public static final MagicTargetChoice NEG_TARGET_EQUIPPED_CREATURE =
         MagicTargetChoice.Negative("target creature that is equipped");
 
-    public static final MagicTargetChoice TARGET_NON_LEGENDARY_CREATURE_YOU_CONTROL = 
+    public static final MagicTargetChoice TARGET_NON_LEGENDARY_CREATURE_YOU_CONTROL =
         new MagicTargetChoice("target nonlegendary creature you control");
 
-    public static final MagicTargetChoice TARGET_CREATURE_OR_PLAYER = 
+    public static final MagicTargetChoice TARGET_CREATURE_OR_PLAYER =
         new MagicTargetChoice("target creature or player");
-   
-    public static final MagicTargetChoice NEG_TARGET_CREATURE_OR_PLAYER = 
+
+    public static final MagicTargetChoice NEG_TARGET_CREATURE_OR_PLAYER =
         MagicTargetChoice.Negative("target creature or player");
-    
-    public static final MagicTargetChoice POS_TARGET_CREATURE_OR_PLAYER = 
+
+    public static final MagicTargetChoice POS_TARGET_CREATURE_OR_PLAYER =
         MagicTargetChoice.Positive("target creature or player");
-    
-    public static final MagicTargetChoice NEG_TARGET_VAMPIRE = 
+
+    public static final MagicTargetChoice NEG_TARGET_VAMPIRE =
         MagicTargetChoice.Negative("target Vampire");
 
-    public static final MagicTargetChoice SACRIFICE_PERMANENT = 
+    public static final MagicTargetChoice SACRIFICE_PERMANENT =
         new MagicTargetChoice("a permanent to sacrifice");
 
-    public static final MagicTargetChoice SACRIFICE_CREATURE = 
+    public static final MagicTargetChoice SACRIFICE_CREATURE =
         new MagicTargetChoice("a creature to sacrifice");
-    
-    public static final MagicTargetChoice SACRIFICE_ARTIFACT = 
+
+    public static final MagicTargetChoice SACRIFICE_ARTIFACT =
         new MagicTargetChoice("an artifact to sacrifice");
-    
-    public static final MagicTargetChoice SACRIFICE_LAND = 
+
+    public static final MagicTargetChoice SACRIFICE_LAND =
         new MagicTargetChoice("a land to sacrifice");
-    
-    public static final MagicTargetChoice SACRIFICE_ENCHANTMENT = 
+
+    public static final MagicTargetChoice SACRIFICE_ENCHANTMENT =
         new MagicTargetChoice("an enchantment to sacrifice");
-    
-    public static final MagicTargetChoice SACRIFICE_FOREST = 
+
+    public static final MagicTargetChoice SACRIFICE_FOREST =
         new MagicTargetChoice("a Forest to sacrifice");
-    
-    public static final MagicTargetChoice SACRIFICE_GOBLIN = 
+
+    public static final MagicTargetChoice SACRIFICE_GOBLIN =
         new MagicTargetChoice("a Goblin to sacrifice");
-    
-    public static final MagicTargetChoice SACRIFICE_MERFOLK = 
+
+    public static final MagicTargetChoice SACRIFICE_MERFOLK =
         new MagicTargetChoice("a Merfolk to sacrifice");
 
-    public static final MagicTargetChoice SACRIFICE_CLERIC = 
+    public static final MagicTargetChoice SACRIFICE_CLERIC =
         new MagicTargetChoice("a Cleric creature to sacrifice");
 
-    public static final MagicTargetChoice TARGET_CARD_FROM_GRAVEYARD = 
+    public static final MagicTargetChoice TARGET_CARD_FROM_GRAVEYARD =
         new MagicTargetChoice("target card from your graveyard");
 
-    public static final MagicTargetChoice NEG_TARGET_CARD_FROM_ALL_GRAVEYARDS = 
+    public static final MagicTargetChoice NEG_TARGET_CARD_FROM_ALL_GRAVEYARDS =
         MagicTargetChoice.Negative("target card from a graveyard");
 
-    public static final MagicTargetChoice TARGET_CREATURE_CARD_FROM_GRAVEYARD = 
+    public static final MagicTargetChoice TARGET_CREATURE_CARD_FROM_GRAVEYARD =
         new MagicTargetChoice("target creature card from your graveyard");
-    
-    public static final MagicTargetChoice AN_UNBLOCKED_ATTACKING_CREATURE_YOU_CONTROL = 
+
+    public static final MagicTargetChoice AN_UNBLOCKED_ATTACKING_CREATURE_YOU_CONTROL =
         new MagicTargetChoice("an unblocked attacking creature you control");
-    
-    public static final MagicTargetChoice TARGET_CARD_FROM_OPPONENTS_GRAVEYARD = 
+
+    public static final MagicTargetChoice TARGET_CARD_FROM_OPPONENTS_GRAVEYARD =
         new MagicTargetChoice("target card from an opponent's graveyard");
 
-    public static final MagicTargetChoice TARGET_CREATURE_CARD_FROM_OPPONENTS_GRAVEYARD = 
+    public static final MagicTargetChoice TARGET_CREATURE_CARD_FROM_OPPONENTS_GRAVEYARD =
         new MagicTargetChoice("target creature card from an opponent's graveyard");
-    
-    public static final MagicTargetChoice TARGET_INSTANT_OR_SORCERY_CARD_FROM_OPPONENTS_GRAVEYARD = 
+
+    public static final MagicTargetChoice TARGET_INSTANT_OR_SORCERY_CARD_FROM_OPPONENTS_GRAVEYARD =
         new MagicTargetChoice("target instant or sorcery card from an opponent's graveyard");
 
-    public static final MagicTargetChoice TARGET_CREATURE_CARD_FROM_ALL_GRAVEYARDS = 
+    public static final MagicTargetChoice TARGET_CREATURE_CARD_FROM_ALL_GRAVEYARDS =
         new MagicTargetChoice("target creature card from a graveyard");
 
-    public static final MagicTargetChoice A_CARD_FROM_HAND = 
+    public static final MagicTargetChoice A_CARD_FROM_HAND =
         new MagicTargetChoice("a card from your hand");
-    
-    public static final MagicTargetChoice A_CREATURE_CARD_FROM_HAND = 
+
+    public static final MagicTargetChoice A_CREATURE_CARD_FROM_HAND =
         new MagicTargetChoice("a creature card from your hand");
 
-    public static final MagicTargetChoice A_GREEN_CREATURE_CARD_FROM_HAND = 
+    public static final MagicTargetChoice A_GREEN_CREATURE_CARD_FROM_HAND =
         new MagicTargetChoice("a green creature card from your hand");
-    
-    public static final MagicTargetChoice A_CARD_FROM_LIBRARY = 
+
+    public static final MagicTargetChoice A_CARD_FROM_LIBRARY =
         new MagicTargetChoice("a card from your library");
-    
-    public static final MagicTargetChoice A_BASIC_LAND_CARD_FROM_LIBRARY = 
+
+    public static final MagicTargetChoice A_BASIC_LAND_CARD_FROM_LIBRARY =
         new MagicTargetChoice("a basic land card from your library");
-    
-    public static final MagicTargetChoice A_CREATURE_CARD_FROM_LIBRARY = 
+
+    public static final MagicTargetChoice A_CREATURE_CARD_FROM_LIBRARY =
         new MagicTargetChoice("a creature card from your library");
-    
-    public static final MagicTargetChoice SWAMP_OR_MOUNTAIN_CARD_FROM_LIBRARY = 
+
+    public static final MagicTargetChoice SWAMP_OR_MOUNTAIN_CARD_FROM_LIBRARY =
         new MagicTargetChoice("a Swamp or Mountain card from your library");
-    
-    public static final MagicTargetChoice PLAINS_ISLAND_SWAMP_OR_MOUNTAIN_CARD_FROM_LIBRARY = 
+
+    public static final MagicTargetChoice PLAINS_ISLAND_SWAMP_OR_MOUNTAIN_CARD_FROM_LIBRARY =
         new MagicTargetChoice("a Plains, Island, Swamp, or Mountain card from your library");
-    
-    public static final MagicTargetChoice LAND_CARD_WITH_BASIC_LAND_TYPE_FROM_LIBRARY = 
+
+    public static final MagicTargetChoice LAND_CARD_WITH_BASIC_LAND_TYPE_FROM_LIBRARY =
         new MagicTargetChoice("a land card with a basic land type from your library");
 
-    public static final MagicTargetChoice LAND_CARD_FROM_HAND = 
+    public static final MagicTargetChoice LAND_CARD_FROM_HAND =
         new MagicTargetChoice("a land card from your hand");
 
-    public static final MagicTargetChoice CREATURE_TOKEN_YOU_CONTROL = 
+    public static final MagicTargetChoice CREATURE_TOKEN_YOU_CONTROL =
         new MagicTargetChoice("a creature token you control");
 
-    public static final MagicTargetChoice PLANESWALKER_YOUR_OPPONENT_CONTROLS = 
+    public static final MagicTargetChoice PLANESWALKER_YOUR_OPPONENT_CONTROLS =
         new MagicTargetChoice("a planeswalker an opponent controls");
 
-    public static final MagicTargetChoice TARGET_CREATURE_YOUR_OPPONENT_CONTROLS = 
+    public static final MagicTargetChoice TARGET_CREATURE_YOUR_OPPONENT_CONTROLS =
         new MagicTargetChoice("target creature an opponent controls");
 
-    public static final MagicTargetChoice TARGET_ARTIFACT_YOUR_OPPONENT_CONTROLS = 
+    public static final MagicTargetChoice TARGET_ARTIFACT_YOUR_OPPONENT_CONTROLS =
         new MagicTargetChoice("target artifact an opponent controls");
 
     public static final MagicTargetChoice ANOTHER_CREATURE_YOU_CONTROL =
@@ -330,11 +330,11 @@ public class MagicTargetChoice extends MagicChoice {
     private final MagicTargetFilter<? extends MagicTarget> targetFilter;
     private final boolean targeted;
     private final MagicTargetHint targetHint;
-    
+
     public static MagicTargetChoice Positive(final String aTargetDescription) {
         return new MagicTargetChoice(MagicTargetHint.Positive, aTargetDescription);
     }
-    
+
     public static MagicTargetChoice Negative(final String aTargetDescription) {
         return new MagicTargetChoice(MagicTargetHint.Negative, aTargetDescription);
     }
@@ -342,15 +342,15 @@ public class MagicTargetChoice extends MagicChoice {
     public static MagicTargetChoice Other(final String aTargetDescription, final MagicPermanent permanent) {
         return Other(aTargetDescription, permanent, MagicTargetHint.None);
     }
-    
+
     public static MagicTargetChoice PosOther(final String aTargetDescription, final MagicPermanent permanent) {
         return Other(aTargetDescription, permanent, MagicTargetHint.Positive);
     }
-    
+
     public static MagicTargetChoice NegOther(final String aTargetDescription, final MagicPermanent permanent) {
         return Other(aTargetDescription, permanent, MagicTargetHint.Negative);
     }
-    
+
     private static MagicTargetChoice Other(final String aTargetDescription, final MagicPermanent permanent, final MagicTargetHint hint) {
         final MagicTargetChoice withoutOther = new MagicTargetChoice(aTargetDescription);
         final String compactDescription = aTargetDescription.replaceFirst("^a(n)? ", "");
@@ -363,15 +363,15 @@ public class MagicTargetChoice extends MagicChoice {
             "another " + compactDescription
         );
     }
-    
+
     public MagicTargetChoice(final String aTargetDescription) {
         this(MagicTargetHint.None, aTargetDescription);
     }
-        
+
     private static String decapitalize(final String text) {
         return Character.toLowerCase(text.charAt(0)) + text.substring(1);
     }
-    
+
     public MagicTargetChoice(final MagicTargetHint aTargetHint, final String aTargetDescription) {
         super("Choose " + decapitalize(aTargetDescription) + '.');
         targetHint        = aTargetHint;
@@ -393,7 +393,7 @@ public class MagicTargetChoice extends MagicChoice {
             throw new RuntimeException("unknown target choice: \"" + aTargetDescription + "\"");
         }
     }
-    
+
     public MagicTargetChoice(
         final MagicTargetFilter<? extends MagicTarget> aTargetFilter,
         final String aTargetDescription
@@ -416,7 +416,7 @@ public class MagicTargetChoice extends MagicChoice {
         targetHint   = aTargetHint;
         targetDescription = aTargetDescription;
     }
-    
+
     public MagicTargetChoice(
         final MagicTargetChoice copy,
         final boolean targeted
@@ -436,12 +436,12 @@ public class MagicTargetChoice extends MagicChoice {
     public final MagicTargetFilter<MagicTarget> getTargetFilter() {
         return (MagicTargetFilter<MagicTarget>)targetFilter;
     }
-    
+
     @SuppressWarnings("unchecked")
     public final MagicTargetFilter<MagicCard> getCardFilter() {
         return (MagicTargetFilter<MagicCard>)targetFilter;
     }
-    
+
     @SuppressWarnings("unchecked")
     public final MagicTargetFilter<MagicPermanent> getPermanentFilter() {
         return (MagicTargetFilter<MagicPermanent>)targetFilter;
@@ -464,7 +464,7 @@ public class MagicTargetChoice extends MagicChoice {
     public final int getTargetChoiceResultIndex() {
         return 0;
     }
-    
+
     @Override
     public long getStateId() {
         return magic.model.MurmurHash3.hash(new long[] {
@@ -506,7 +506,7 @@ public class MagicTargetChoice extends MagicChoice {
             controller.focusViewers(1);
         } else if (targetFilter.acceptType(MagicTargetType.OpponentsGraveyard)) {
             controller.focusViewers(2);
-        } 
+        }
         final MagicTargetHint usedTargetHint=getTargetHint(GeneralConfig.getInstance().getSmartTarget());
         final Set<Object> validChoices=new HashSet<Object>(game.getLegalTargets(player,source,this,usedTargetHint));
         if (validChoices.size()==1) {
diff --git a/src/magic/model/condition/MagicArtificialCondition.java b/src/magic/model/condition/MagicArtificialCondition.java
index 267ae31e4d..b5ab8a5f7a 100644
--- a/src/magic/model/condition/MagicArtificialCondition.java
+++ b/src/magic/model/condition/MagicArtificialCondition.java
@@ -17,7 +17,7 @@ public class MagicArtificialCondition extends MagicCondition {
     public boolean accept(final MagicSource source) {
         return source.getGame().isArtificial() ? cond.accept(source) : true;
     }
-    
+
     @Override
     public MagicEvent getEvent(final MagicSource source) {
         return new MagicConditionEvent(source, this, cond.getEventAction());
diff --git a/src/magic/model/condition/MagicCondition.java b/src/magic/model/condition/MagicCondition.java
index 462bccbcc5..6029cec00b 100644
--- a/src/magic/model/condition/MagicCondition.java
+++ b/src/magic/model/condition/MagicCondition.java
@@ -830,7 +830,7 @@ public abstract class MagicCondition implements MagicMatchedCostEvent {
                     permanent.getCardDefinition().hasType(MagicType.Creature)==false;
         }
     };
-    
+
     public static MagicCondition WAS_KICKED = new MagicCondition() {
         public boolean accept(final MagicSource source) {
             final MagicCardOnStack spell=(MagicCardOnStack)source;
diff --git a/src/magic/model/event/MagicActivation.java b/src/magic/model/event/MagicActivation.java
index 90d8b00fe0..4bb0c29d3e 100644
--- a/src/magic/model/event/MagicActivation.java
+++ b/src/magic/model/event/MagicActivation.java
@@ -55,7 +55,7 @@ public abstract class MagicActivation<T extends MagicSource> implements MagicEve
         final MagicActivationPriority actpri = player.getActivationPriority();
         actpri.setPriority(priority);
         actpri.setActivationId(id);
-        
+
         // reset activation/priority of opponent
         player.getOpponent().getActivationPriority().clear();
     }
@@ -97,7 +97,7 @@ public abstract class MagicActivation<T extends MagicSource> implements MagicEve
         }
 
         // Check able to pay costs
-        // 
+        //
         // Current method of using MagicCondition could lead to unpayable costs in certain cases:
         // * self needed to tap to pay mana cost, but self must tap as part of cost
         // Ideally execute each event with the first choice, if all events have choices then cost can be paid
diff --git a/src/magic/model/event/MagicAwakenEvent.java b/src/magic/model/event/MagicAwakenEvent.java
index dd2b37bb39..ea825c7460 100644
--- a/src/magic/model/event/MagicAwakenEvent.java
+++ b/src/magic/model/event/MagicAwakenEvent.java
@@ -45,7 +45,7 @@ public class MagicAwakenEvent extends MagicEvent {
             tchoice,
             n,
             EVENT_ACTION,
-            "PN puts RN +1/+1 counters on target land$ you control and " + 
+            "PN puts RN +1/+1 counters on target land$ you control and " +
             "it becomes a 0/0 Elemental creature with haste. It's still a land."
         );
     }
diff --git a/src/magic/model/event/MagicBestowActivation.java b/src/magic/model/event/MagicBestowActivation.java
index 0d0b4a65f0..8f5448bdd9 100644
--- a/src/magic/model/event/MagicBestowActivation.java
+++ b/src/magic/model/event/MagicBestowActivation.java
@@ -24,8 +24,8 @@ public class MagicBestowActivation extends MagicHandCastActivation {
 
     final MagicManaCost cost;
     final public static MagicPlayAuraEvent BestowEvent = new MagicPlayAuraEvent(
-        MagicTargetChoice.POS_TARGET_CREATURE, 
-        MagicTargetChoice.POS_CREATURE, 
+        MagicTargetChoice.POS_TARGET_CREATURE,
+        MagicTargetChoice.POS_CREATURE,
         MagicPumpTargetPicker.create()
     ) {
         @Override
@@ -53,12 +53,12 @@ public class MagicBestowActivation extends MagicHandCastActivation {
         );
         cost = aCost;
     }
-    
+
     @Override
     public Iterable<? extends MagicEvent> getCostEvent(final MagicCard source) {
         return Arrays.asList(new MagicPayManaCostEvent(source, cost));
     }
-    
+
     @Override
     public MagicEvent getEvent(final MagicSource source) {
         return new MagicEvent(
@@ -67,13 +67,13 @@ public class MagicBestowActivation extends MagicHandCastActivation {
             "Play SN."
         );
     }
-    
+
     private final MagicEventAction EVENT_ACTION = new MagicEventAction() {
         @Override
         public void executeEvent(final MagicGame game, final MagicEvent event) {
             final MagicCard card = event.getCard();
             game.doAction(new RemoveCardAction(card,MagicLocationType.OwnersHand));
-                
+
             final MagicCardOnStack cardOnStack=new MagicCardOnStack(
                 card,
                 BestowEvent,
diff --git a/src/magic/model/event/MagicCardAbilityActivation.java b/src/magic/model/event/MagicCardAbilityActivation.java
index 0941141c0e..824cb3d6d4 100644
--- a/src/magic/model/event/MagicCardAbilityActivation.java
+++ b/src/magic/model/event/MagicCardAbilityActivation.java
@@ -27,7 +27,7 @@ public abstract class MagicCardAbilityActivation extends MagicHandCastActivation
         );
         name = aName;
     }
-    
+
     public MagicCardAbilityActivation(final MagicActivationHints hints, final String aName) {
         this(MagicActivation.NO_COND, hints, aName);
     }
@@ -56,22 +56,22 @@ public abstract class MagicCardAbilityActivation extends MagicHandCastActivation
     final MagicChoice getChoice(final MagicCard source) {
         return getCardEvent(source, MagicPayedCost.NO_COST).getChoice();
     }
-    
+
     public static final MagicCardAbilityActivation create(final String act, final MagicLocationType loc) {
         final String[] token = act.split(ARG.COLON, 2);
-        
+
         // build the actual costs
         final String costs = token[0];
         final List<MagicMatchedCostEvent> matchedCostEvents = MagicRegularCostEvent.build(costs);
         assert matchedCostEvents.size() > 0;
-        
+
         // add restriction as a MagicMatchedCostEvent
         final String[] part = token[1].split(ActivationRestriction);
         if (part.length > 1) {
             matchedCostEvents.addAll(MagicCondition.build(part[1]));
         }
-        
-        // parse the effect        
+
+        // parse the effect
         final String rule = part[0];
         final MagicSourceEvent sourceEvent = MagicRuleEventAction.create(rule);
 
@@ -96,12 +96,12 @@ public abstract class MagicCardAbilityActivation extends MagicHandCastActivation
                 }
                 return costEvents;
             }
-       
+
             @Override
             public MagicEvent getCardEvent(final MagicCard source, final MagicPayedCost payedCost) {
                 return sourceEvent.getEvent(source, payedCost);
             }
-            
+
             @Override
             public void change(final MagicCardDefinition cdef) {
                 if (loc == MagicLocationType.OwnersHand) {
diff --git a/src/magic/model/event/MagicChainEventFactory.java b/src/magic/model/event/MagicChainEventFactory.java
index eccd719b3d..9aae3342d9 100644
--- a/src/magic/model/event/MagicChainEventFactory.java
+++ b/src/magic/model/event/MagicChainEventFactory.java
@@ -15,25 +15,25 @@ public abstract class MagicChainEventFactory {
             return new MagicTapPermanentEvent(source, tchoice);
         }
     };
-    
+
     public static final MagicChainEventFactory Untap = new MagicChainEventFactory() {
         public MagicEvent getEvent(final MagicSource source, final MagicTargetChoice tchoice) {
             return new MagicUntapPermanentEvent(source, tchoice);
         }
     };
-    
+
     public static final MagicChainEventFactory Sac = new MagicChainEventFactory() {
         public MagicEvent getEvent(final MagicSource source, final MagicTargetChoice tchoice) {
             return new MagicSacrificePermanentEvent(source, tchoice);
         }
     };
-    
+
     public static final MagicChainEventFactory Bounce = new MagicChainEventFactory() {
         public MagicEvent getEvent(final MagicSource source, final MagicTargetChoice tchoice) {
             return new MagicBounceChosenPermanentEvent(source, tchoice);
         }
     };
-    
+
     public static final MagicChainEventFactory ExileCard = new MagicChainEventFactory() {
         public MagicEvent getEvent(final MagicSource source, final MagicTargetChoice tchoice) {
             return new MagicExileCardEvent(source, tchoice);
diff --git a/src/magic/model/event/MagicClashEvent.java b/src/magic/model/event/MagicClashEvent.java
index 7a1e7204ad..9dc8d18667 100644
--- a/src/magic/model/event/MagicClashEvent.java
+++ b/src/magic/model/event/MagicClashEvent.java
@@ -9,7 +9,7 @@ import magic.model.event.MagicEvent;
 import magic.model.trigger.MagicTriggerType;
 
 public class MagicClashEvent extends MagicEvent {
-    
+
     public MagicClashEvent(final MagicEvent event, final MagicEventAction aClashAction) {
         this(event.getSource(), event.getPlayer(), aClashAction);
     }
@@ -22,7 +22,7 @@ public class MagicClashEvent extends MagicEvent {
             "Clash with an opponent."
         );
     }
-    
+
     public static final MagicEventAction EventAction(final MagicEventAction clashAction) {
         return  new MagicEventAction() {
             @Override
@@ -35,7 +35,7 @@ public class MagicClashEvent extends MagicEvent {
             }
         };
     }
-    
+
     public static MagicPlayer executeClash(final MagicGame game, final MagicEvent event) {
         final MagicPlayer player = event.getPlayer();
         final MagicPlayer opponent = player.getOpponent();
@@ -54,7 +54,7 @@ public class MagicClashEvent extends MagicEvent {
                 winner = MagicPlayer.NONE;
             }
         }
-        
+
         if (winner == MagicPlayer.NONE) {
             game.logAppendMessage(player, "It is a tie.");
         } else if (winner == player) {
@@ -62,10 +62,10 @@ public class MagicClashEvent extends MagicEvent {
         } else {
             game.logAppendMessage(player, player + " lost the clash.");
         }
-            
+
         game.addFirstEvent(MagicScryEvent.Pseudo(event.getSource(), opponent));
         game.addFirstEvent(MagicScryEvent.Pseudo(event.getSource(), player));
-                
+
         return winner;
     }
 }
diff --git a/src/magic/model/event/MagicCoinFlipEvent.java b/src/magic/model/event/MagicCoinFlipEvent.java
index 66144c52c2..44991f337f 100644
--- a/src/magic/model/event/MagicCoinFlipEvent.java
+++ b/src/magic/model/event/MagicCoinFlipEvent.java
@@ -6,11 +6,11 @@ import magic.model.MagicPlayer;
 import magic.model.choice.MagicCoinFlipChoice;
 
 public class MagicCoinFlipEvent extends MagicEvent {
-    
+
     public MagicCoinFlipEvent(final MagicEvent event, final MagicEventAction winAction, final MagicEventAction loseAction) {
         this(event, event.getRef(), winAction, loseAction);
     }
-    
+
     public MagicCoinFlipEvent(final MagicEvent event, final int ref, final MagicEventAction winAction, final MagicEventAction loseAction) {
         super(
             event.getSource(),
@@ -21,7 +21,7 @@ public class MagicCoinFlipEvent extends MagicEvent {
             "Choose one$ — (1) Heads; (2) Tails. PN flips a coin."
         );
     }
-    
+
     public MagicCoinFlipEvent(final MagicEvent event, final MagicCopyable ref, final MagicEventAction winAction, final MagicEventAction loseAction) {
         super(
             event.getSource(),
diff --git a/src/magic/model/event/MagicCostEvent.java b/src/magic/model/event/MagicCostEvent.java
index fd822d293a..a54daeddb4 100644
--- a/src/magic/model/event/MagicCostEvent.java
+++ b/src/magic/model/event/MagicCostEvent.java
@@ -17,7 +17,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public enum MagicCostEvent {
-            
+
     SacrificeSelf("Sacrifice (SN|this permanent|this land)") {
         public MagicEvent toEvent(final Matcher arg, final MagicSource source) {
             return new MagicSacrificeEvent((MagicPermanent)source);
@@ -32,11 +32,11 @@ public enum MagicCostEvent {
             final int amt = ARG.amount(arg);
             final String chosen = MagicTargetFilterFactory.toSingular(ARG.any(arg)) + " you control";
             final MagicTargetFilter<MagicPermanent> regular = MagicTargetFilterFactory.Permanent(chosen);
-            final MagicTargetFilter<MagicPermanent> filter = arg.group("another") != null ? 
+            final MagicTargetFilter<MagicPermanent> filter = arg.group("another") != null ?
                 new MagicOtherPermanentTargetFilter(regular, (MagicPermanent)source) :
                 regular;
             final MagicTargetChoice choice = new MagicTargetChoice(
-                filter, 
+                filter,
                 ("aeiou".indexOf(chosen.charAt(0)) >= 0 ? "an " : "a ") + chosen
             );
             return new MagicRepeatedPermanentsEvent(source, choice, amt, MagicChainEventFactory.Sac);
@@ -56,11 +56,11 @@ public enum MagicCostEvent {
             final int amt = ARG.amount(arg);
             final String chosen = MagicTargetFilterFactory.toSingular(ARG.any(arg));
             final MagicTargetFilter<MagicPermanent> regular = MagicTargetFilterFactory.Permanent(chosen);
-            final MagicTargetFilter<MagicPermanent> filter = arg.group("another") != null ? 
+            final MagicTargetFilter<MagicPermanent> filter = arg.group("another") != null ?
                 new MagicOtherPermanentTargetFilter(regular, (MagicPermanent)source) :
                 regular;
             final MagicTargetChoice choice = new MagicTargetChoice(
-                filter, 
+                filter,
                 ("aeiou".indexOf(chosen.charAt(0)) >= 0 ? "an " : "a ") + chosen
             );
             return new MagicRepeatedPermanentsEvent(source, choice, amt, MagicChainEventFactory.Bounce);
@@ -122,7 +122,7 @@ public enum MagicCostEvent {
             final MagicTargetFilter<MagicCard> regular = MagicTargetFilterFactory.Card(chosen);
             final MagicTargetFilter<MagicCard> filter = (source instanceof MagicCard) ? new MagicOtherCardTargetFilter(regular, (MagicCard)source) : regular;
             final MagicTargetChoice choice = new MagicTargetChoice(
-                filter, 
+                filter,
                 ("aeiou".indexOf(chosen.charAt(0)) >= 0 ? "an " : "a ") + chosen
             );
             return new MagicRepeatedCardsEvent(
@@ -156,7 +156,7 @@ public enum MagicCostEvent {
             final int amt = ARG.amount(arg);
             final String chosen = MagicTargetFilterFactory.toSingular(ARG.any(arg));
             final MagicTargetFilter<MagicPermanent> untapped = MagicTargetFilterFactory.untapped(MagicTargetFilterFactory.Permanent(chosen));
-            final MagicTargetFilter<MagicPermanent> filter = arg.group("another") != null ? 
+            final MagicTargetFilter<MagicPermanent> filter = arg.group("another") != null ?
                 new MagicOtherPermanentTargetFilter(untapped, (MagicPermanent)source) :
                 untapped;
             final MagicTargetChoice choice = new MagicTargetChoice(filter, "an untapped " + chosen);
@@ -168,7 +168,7 @@ public enum MagicCostEvent {
             final int amt = ARG.amount(arg);
             final String chosen = MagicTargetFilterFactory.toSingular(ARG.any(arg));
             final MagicTargetFilter<MagicPermanent> tapped = MagicTargetFilterFactory.tapped(MagicTargetFilterFactory.Permanent(chosen));
-            final MagicTargetFilter<MagicPermanent> filter = arg.group("another") != null ? 
+            final MagicTargetFilter<MagicPermanent> filter = arg.group("another") != null ?
                 new MagicOtherPermanentTargetFilter(tapped, (MagicPermanent)source) :
                 tapped;
             final MagicTargetChoice choice = new MagicTargetChoice(filter, "a tapped " + chosen);
@@ -243,13 +243,13 @@ public enum MagicCostEvent {
     public boolean isIndependent() {
         return true;
     }
-    
+
     private final Pattern pattern;
-    
+
     private MagicCostEvent(final String regex) {
         pattern = Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
     }
-    
+
     public Matcher matched(final String rule) {
         final Matcher matcher = pattern.matcher(rule);
         final boolean matches = matcher.matches();
@@ -258,13 +258,13 @@ public enum MagicCostEvent {
         }
         return matcher;
     }
-    
+
     private Matcher matcher(final String rule) {
         return pattern.matcher(rule);
     }
-    
+
     public abstract MagicEvent toEvent(final Matcher arg, final MagicSource source);
-    
+
     public static final MagicCostEvent build(final String cost) {
         for (final MagicCostEvent rule : values()) {
             final Matcher arg = rule.matcher(cost);
diff --git a/src/magic/model/event/MagicCounterUnlessEvent.java b/src/magic/model/event/MagicCounterUnlessEvent.java
index d2ba9f618c..4eeaba9b64 100644
--- a/src/magic/model/event/MagicCounterUnlessEvent.java
+++ b/src/magic/model/event/MagicCounterUnlessEvent.java
@@ -11,11 +11,11 @@ import magic.model.choice.MagicPayManaCostChoice;
 import magic.model.stack.MagicItemOnStack;
 
 public class MagicCounterUnlessEvent extends MagicEvent {
-    
+
     public MagicCounterUnlessEvent(final MagicSource source,final MagicItemOnStack itemOnStack,final MagicManaCost cost) {
         this(source, itemOnStack, cost, MagicLocationType.Graveyard);
     }
-    
+
     public MagicCounterUnlessEvent(final MagicSource source,final MagicItemOnStack itemOnStack,final MagicManaCost cost, final MagicLocationType toLocation) {
         super(
             source,
diff --git a/src/magic/model/event/MagicCyclingActivation.java b/src/magic/model/event/MagicCyclingActivation.java
index 84fe254390..0f1e58ead7 100644
--- a/src/magic/model/event/MagicCyclingActivation.java
+++ b/src/magic/model/event/MagicCyclingActivation.java
@@ -24,7 +24,7 @@ public class MagicCyclingActivation extends MagicCardAbilityActivation {
         );
         matchedCost = aMatchedCost;
     }
-    
+
     public MagicCyclingActivation(final MagicMatchedCostEvent aMatchedCost) {
         this(aMatchedCost, "Cycle");
     }
@@ -41,7 +41,7 @@ public class MagicCyclingActivation extends MagicCardAbilityActivation {
     public MagicEvent getCardEvent(final MagicCard card, final MagicPayedCost payedCost) {
         return new MagicDrawEvent(card, card.getController(), 1);
     }
-    
+
     @Override
     public MagicEvent getEvent(final MagicSource source) {
         return new MagicEvent(
diff --git a/src/magic/model/event/MagicDashActivation.java b/src/magic/model/event/MagicDashActivation.java
index 5fb4f16e6c..217f467c6b 100644
--- a/src/magic/model/event/MagicDashActivation.java
+++ b/src/magic/model/event/MagicDashActivation.java
@@ -35,7 +35,7 @@ public class MagicDashActivation extends MagicHandCastActivation {
             )
         );
     }
-    
+
     @Override
     public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) {
         return new MagicEvent(
diff --git a/src/magic/model/event/MagicDiscardHandEvent.java b/src/magic/model/event/MagicDiscardHandEvent.java
index e36ee3a11d..dfd3318be4 100644
--- a/src/magic/model/event/MagicDiscardHandEvent.java
+++ b/src/magic/model/event/MagicDiscardHandEvent.java
@@ -8,7 +8,7 @@ import magic.model.MagicSource;
 import magic.model.action.DiscardCardAction;
 
 public class MagicDiscardHandEvent extends MagicEvent {
-    
+
     public MagicDiscardHandEvent(final MagicSource source, final MagicPlayer player) {
         super(
             source,
@@ -17,11 +17,11 @@ public class MagicDiscardHandEvent extends MagicEvent {
             "PN discards his or her hand."
         );
     }
-    
+
     public MagicDiscardHandEvent(final MagicSource source) {
         this(source, source.getController());
     }
-    
+
     private static final MagicEventAction EVENT_ACTION=new MagicEventAction() {
         @Override
         public void executeEvent(final MagicGame game, final MagicEvent event) {
diff --git a/src/magic/model/event/MagicEquipActivation.java b/src/magic/model/event/MagicEquipActivation.java
index 0d74008e0e..13be2bff6a 100644
--- a/src/magic/model/event/MagicEquipActivation.java
+++ b/src/magic/model/event/MagicEquipActivation.java
@@ -22,7 +22,7 @@ public class MagicEquipActivation extends MagicPermanentActivation {
 
     private final List<MagicMatchedCostEvent> costs;
     private static final MagicMatchedCostEvent AI_MAX_TWICE = new MagicArtificialCondition(MagicCondition.ABILITY_TWICE_CONDITION);
-    
+
     public MagicEquipActivation(final List<MagicMatchedCostEvent> aCosts) {
         this(aCosts, "Equip");
     }
diff --git a/src/magic/model/event/MagicEvent.java b/src/magic/model/event/MagicEvent.java
index d1fde43815..a9d0718d33 100644
--- a/src/magic/model/event/MagicEvent.java
+++ b/src/magic/model/event/MagicEvent.java
@@ -313,7 +313,7 @@ public class MagicEvent implements MagicCopyable {
     public boolean isValid() {
         return true;
     }
-    
+
     public final MagicSource getSource() {
         return source;
     }
@@ -325,7 +325,7 @@ public class MagicEvent implements MagicCopyable {
     public final boolean hasRef() {
         return ref != NO_REF;
     }
-    
+
     public final MagicPermanent getPermanent() {
         return (MagicPermanent)source;
     }
@@ -333,7 +333,7 @@ public class MagicEvent implements MagicCopyable {
     public final MagicCopyable getRef() {
         return ref;
     }
-    
+
     public final MagicObject getRefObject() {
         return (MagicObject)ref;
     }
@@ -345,7 +345,7 @@ public class MagicEvent implements MagicCopyable {
     public final MagicPermanentList getRefPermanentList() {
         return (MagicPermanentList)ref;
     }
-    
+
     public final MagicCardList getRefCardList() {
         return (MagicCardList)ref;
     }
@@ -365,11 +365,11 @@ public class MagicEvent implements MagicCopyable {
     public final MagicCard getRefCard() {
         return (MagicCard)ref;
     }
-    
+
     public final MagicSource getRefSource() {
         return (MagicSource)ref;
     }
-    
+
     public final MagicTarget getRefTarget() {
         return (MagicTarget)ref;
     }
@@ -381,7 +381,7 @@ public class MagicEvent implements MagicCopyable {
     public final int getRefInt() {
         return ((MagicInteger)ref).value;
     }
-    
+
     public final MagicPayedCost getRefPayedCost() {
         return (MagicPayedCost)ref;
     }
@@ -393,7 +393,7 @@ public class MagicEvent implements MagicCopyable {
     public final MagicCardOnStack getCardOnStack() {
         return (MagicCardOnStack)source;
     }
-    
+
     public final MagicItemOnStack getItemOnStack() {
         return (MagicItemOnStack)source;
     }
@@ -414,7 +414,7 @@ public class MagicEvent implements MagicCopyable {
     public final MagicChoice getChoice() {
         return choice;
     }
-   
+
     public final MagicTargetPicker<?> getTargetPicker() {
         return targetPicker;
     }
@@ -538,7 +538,7 @@ public class MagicEvent implements MagicCopyable {
         }
         throw new RuntimeException("Unable to find chosen color");
     }
-    
+
     public MagicSubType getChosenSubType() {
         for (Object obj : chosen) {
             if (obj instanceof MagicSubType) {
@@ -560,8 +560,8 @@ public class MagicEvent implements MagicCopyable {
     public Object[] getChosen() {
         return chosen;
     }
-        
-    private MagicTarget getLegalTarget(final MagicGame game) { 
+
+    private MagicTarget getLegalTarget(final MagicGame game) {
         for (final Object obj : chosen) {
             if (obj instanceof MagicTarget) {
                 return getLegalTarget(game, (MagicTarget)obj);
@@ -592,12 +592,12 @@ public class MagicEvent implements MagicCopyable {
             return false;
         }
     }
-    
+
     public final List<MagicTarget> listTarget() {
         final MagicTarget target = chosenTarget;
         return target != MagicTargetNone.getInstance() ? Collections.singletonList(target) : Collections.emptyList();
     }
-    
+
     public final boolean processPermanent(final MagicGame game, final MagicPermanentAction effect) {
         final MagicPermanent target = getPermanent();
         if (target.isValid()) {
@@ -607,7 +607,7 @@ public class MagicEvent implements MagicCopyable {
             return false;
         }
     }
-    
+
     public final boolean processRefPermanent(final MagicGame game, final MagicPermanentAction effect) {
         final MagicPermanent target = getRefPermanent();
         if (target.isValid()) {
@@ -632,7 +632,7 @@ public class MagicEvent implements MagicCopyable {
         final MagicTarget target = chosenTarget;
         return target.isPermanent() ? Collections.singletonList((MagicPermanent)target) : Collections.emptyList();
     }
-    
+
     public final List<MagicPlayer> listTargetController() {
         final MagicTarget target = chosenTarget;
         return target != MagicTargetNone.getInstance() ? Collections.singletonList(target.getController()) : Collections.emptyList();
@@ -647,7 +647,7 @@ public class MagicEvent implements MagicCopyable {
             return false;
         }
     }
-    
+
     public final boolean processTargetItemOnStack(final MagicGame game, final MagicItemOnStackAction effect) {
         final MagicTarget target = chosenTarget;
         if (target instanceof MagicItemOnStack) {
@@ -657,12 +657,12 @@ public class MagicEvent implements MagicCopyable {
             return false;
         }
     }
-    
+
     public final List<MagicItemOnStack> listTargetItem() {
         final MagicTarget target = chosenTarget;
         return target instanceof MagicItemOnStack ? Collections.singletonList((MagicItemOnStack)target) : Collections.emptyList();
     }
-    
+
     public final void processChosenCards(final MagicGame game, final MagicCardAction effect) {
         for (final MagicCard card : getCardChoice()) {
             effect.doAction(card);
@@ -678,7 +678,7 @@ public class MagicEvent implements MagicCopyable {
             return false;
         }
     }
-    
+
     public final List<MagicCard> listTargetCard() {
         final MagicTarget target = chosenTarget;
         return target.isSpell() ? Collections.singletonList((MagicCard)target) : Collections.emptyList();
@@ -693,7 +693,7 @@ public class MagicEvent implements MagicCopyable {
             return false;
         }
     }
-    
+
     public final List<MagicPlayer> listTargetPlayer() {
         final MagicTarget target = chosenTarget;
         return target.isPlayer() ? Collections.singletonList((MagicPlayer)target) : Collections.emptyList();
@@ -721,13 +721,13 @@ public class MagicEvent implements MagicCopyable {
 
     public final void executeEvent(final MagicGame game,final Object[] choiceResults) {
         chosen = choiceResults;
-        chosenTarget = getLegalTarget(game); 
+        chosenTarget = getLegalTarget(game);
         payManaCost(game);
         action.executeEvent(game,this);
         chosen = null;
         chosenTarget = null;
     }
-    
+
     public final void executeAllEvents(final MagicGame game, final MagicSourceEvent... sourceEvents) {
         for (int i = 0; i < sourceEvents.length; i++) {
             sourceEvents[i].getAction().executeEvent(game, this);
@@ -767,7 +767,7 @@ public class MagicEvent implements MagicCopyable {
     public MagicEventAction getEventAction() {
         return action;
     }
-    
+
     public String getDescription() {
         return description;
     }
diff --git a/src/magic/model/event/MagicEventAction.java b/src/magic/model/event/MagicEventAction.java
index ff6cd744e0..f995c81961 100644
--- a/src/magic/model/event/MagicEventAction.java
+++ b/src/magic/model/event/MagicEventAction.java
@@ -4,7 +4,7 @@ import magic.model.MagicGame;
 
 public interface MagicEventAction {
     void executeEvent(final MagicGame game, final MagicEvent event);
-    
+
     public static final MagicEventAction NONE = new MagicEventAction() {
         public void executeEvent(final MagicGame game, final MagicEvent event) {
             //do nothing
diff --git a/src/magic/model/event/MagicEventActionFactory.java b/src/magic/model/event/MagicEventActionFactory.java
index cfec1e8bc5..57db8fe7bb 100644
--- a/src/magic/model/event/MagicEventActionFactory.java
+++ b/src/magic/model/event/MagicEventActionFactory.java
@@ -7,7 +7,7 @@ public class MagicEventActionFactory {
         return new MagicEventAction() {
             @Override
             public void executeEvent(final MagicGame game, final MagicEvent event) {
-                if (event.getTargetChoice().isValid() && 
+                if (event.getTargetChoice().isValid() &&
                     event.getTargetChoice().isTargeted() &&
                     event.hasLegalTarget(game) == false) {
                     //countered on resolution due to illegal target
diff --git a/src/magic/model/event/MagicExileTopLibraryEvent.java b/src/magic/model/event/MagicExileTopLibraryEvent.java
index 99ed039961..d5b259c1e1 100644
--- a/src/magic/model/event/MagicExileTopLibraryEvent.java
+++ b/src/magic/model/event/MagicExileTopLibraryEvent.java
@@ -11,13 +11,13 @@ import magic.model.condition.MagicCondition;
 import magic.model.condition.MagicConditionFactory;
 
 public class MagicExileTopLibraryEvent extends MagicEvent{
-    
+
     private final MagicCondition cond;
 
     public MagicExileTopLibraryEvent(final MagicSource source, final int amount) {
         this(source, source.getController(), amount);
     }
-    
+
     public MagicExileTopLibraryEvent(final MagicSource source, final MagicPlayer player, final int amount) {
         super(
             source,
@@ -38,7 +38,7 @@ public class MagicExileTopLibraryEvent extends MagicEvent{
             }
         }
     };
-    
+
     @Override
     public boolean isSatisfied() {
         return cond.accept(getSource()) && super.isSatisfied();
diff --git a/src/magic/model/event/MagicFlashbackActivation.java b/src/magic/model/event/MagicFlashbackActivation.java
index 9b25a0d188..0cd1685e16 100644
--- a/src/magic/model/event/MagicFlashbackActivation.java
+++ b/src/magic/model/event/MagicFlashbackActivation.java
@@ -12,9 +12,9 @@ import java.util.LinkedList;
 import java.util.List;
 
 public class MagicFlashbackActivation extends MagicGraveyardCastActivation {
-    
+
     private final List<MagicMatchedCostEvent> matchedCostEvents;
-    
+
     public MagicFlashbackActivation(final MagicCardDefinition cdef, final List<MagicMatchedCostEvent> aMatchedCostEvents) {
         super(
             MagicHandCastActivation.CARD_CONDITION,
@@ -23,7 +23,7 @@ public class MagicFlashbackActivation extends MagicGraveyardCastActivation {
         );
         matchedCostEvents = aMatchedCostEvents;
     }
-   
+
     @Override
     public Iterable<? extends MagicEvent> getCostEvent(final MagicCard source) {
         final List<MagicEvent> costEvents = new LinkedList<MagicEvent>();
@@ -32,7 +32,7 @@ public class MagicFlashbackActivation extends MagicGraveyardCastActivation {
         }
         return costEvents;
     }
-    
+
     @Override
     public MagicEvent getEvent(final MagicSource source) {
         return new MagicEvent(
@@ -41,7 +41,7 @@ public class MagicFlashbackActivation extends MagicGraveyardCastActivation {
             "Flashback SN."
         );
     }
-    
+
     @Override
     public void executeEvent(final MagicGame game, final MagicEvent event) {
         game.doAction(CastCardAction.WithoutManaCost(
diff --git a/src/magic/model/event/MagicGainLifeEvent.java b/src/magic/model/event/MagicGainLifeEvent.java
index 4bfbf5ca94..1198c3ff9c 100644
--- a/src/magic/model/event/MagicGainLifeEvent.java
+++ b/src/magic/model/event/MagicGainLifeEvent.java
@@ -15,7 +15,7 @@ public class MagicGainLifeEvent extends MagicEvent {
             "PN gains RN life."
         );
     }
-    
+
     public MagicGainLifeEvent(final MagicPermanent permanent, final int amt) {
         this(permanent, permanent.getController(), amt);
     }
diff --git a/src/magic/model/event/MagicGraveyardCastActivation.java b/src/magic/model/event/MagicGraveyardCastActivation.java
index 0ad855873b..b8eff9625a 100644
--- a/src/magic/model/event/MagicGraveyardCastActivation.java
+++ b/src/magic/model/event/MagicGraveyardCastActivation.java
@@ -11,7 +11,7 @@ public class MagicGraveyardCastActivation extends MagicHandCastActivation {
     protected MagicGraveyardCastActivation(final MagicCondition[] conditions, final MagicActivationHints hints, final String txt) {
         super(conditions, hints, txt);
     }
-    
+
     @Override
     public MagicEvent getEvent(final MagicSource source) {
         return new MagicEvent(
@@ -20,8 +20,8 @@ public class MagicGraveyardCastActivation extends MagicHandCastActivation {
             "Play SN."
         );
     }
-    
-    private final MagicEventAction EVENT_ACTION = genPlayEventAction(MagicLocationType.Graveyard);   
+
+    private final MagicEventAction EVENT_ACTION = genPlayEventAction(MagicLocationType.Graveyard);
 
     @Override
     public void change(final MagicCardDefinition cdef) {
diff --git a/src/magic/model/event/MagicHandCastActivation.java b/src/magic/model/event/MagicHandCastActivation.java
index 71469d049a..0513b368b8 100644
--- a/src/magic/model/event/MagicHandCastActivation.java
+++ b/src/magic/model/event/MagicHandCastActivation.java
@@ -23,11 +23,11 @@ import java.util.List;
 import java.util.Collections;
 
 public class MagicHandCastActivation extends MagicActivation<MagicCard> implements MagicChangeCardDefinition, MagicCardEvent {
-    
+
     public static final MagicCondition[] CARD_CONDITION = new MagicCondition[]{
-        MagicCondition.CARD_CONDITION,  
+        MagicCondition.CARD_CONDITION,
     };
-    
+
     final boolean usesStack;
 
     public MagicHandCastActivation(final MagicCardDefinition cdef) {
@@ -67,8 +67,8 @@ public class MagicHandCastActivation extends MagicActivation<MagicCard> implemen
         );
     }
 
-    private final MagicEventAction EVENT_ACTION = genPlayEventAction(MagicLocationType.OwnersHand);   
-        
+    private final MagicEventAction EVENT_ACTION = genPlayEventAction(MagicLocationType.OwnersHand);
+
     protected MagicEventAction genPlayEventAction(final MagicLocationType fromLocation) {
         return new MagicEventAction() {
             @Override
@@ -77,9 +77,9 @@ public class MagicHandCastActivation extends MagicActivation<MagicCard> implemen
                 if (card.getCardDefinition().isLand()) {
                     game.incLandsPlayed();
                 }
-                
-                game.doAction(new RemoveCardAction(card, fromLocation)); 
-                
+
+                game.doAction(new RemoveCardAction(card, fromLocation));
+
                 if (usesStack) {
                     final MagicCardOnStack cardOnStack=new MagicCardOnStack(
                         card,
@@ -115,7 +115,7 @@ public class MagicHandCastActivation extends MagicActivation<MagicCard> implemen
     public void change(final MagicCardDefinition cdef) {
         cdef.addHandAct(this);
     }
-    
+
     public static final MagicHandCastActivation create(final MagicCardDefinition cardDef, final String costs, final String name) {
         final List<MagicMatchedCostEvent> matchedCostEvents = MagicRegularCostEvent.build(costs);
         assert matchedCostEvents.size() > 0;
@@ -138,9 +138,9 @@ public class MagicHandCastActivation extends MagicActivation<MagicCard> implemen
             public Iterable<MagicEvent> getCostEvent(final MagicCard source) {
                 return Collections.<MagicEvent>singletonList(
                     new MagicPayManaCostEvent(
-                        source, 
+                        source,
                         source.getCost().reduce(
-                            MagicCostManaType.Generic, 
+                            MagicCostManaType.Generic,
                             source.getController().getNrOfPermanents(filter)
                         )
                     )
@@ -152,7 +152,7 @@ public class MagicHandCastActivation extends MagicActivation<MagicCard> implemen
             }
         };
     }
-    
+
     public static final MagicHandCastActivation awaken(final MagicCardDefinition cardDef, final int n, final String costs) {
         final List<MagicMatchedCostEvent> matchedCostEvents = MagicRegularCostEvent.build(costs);
         assert matchedCostEvents.size() > 0;
diff --git a/src/magic/model/event/MagicKickerCost.java b/src/magic/model/event/MagicKickerCost.java
index a51d4859e7..9fc09c1159 100644
--- a/src/magic/model/event/MagicKickerCost.java
+++ b/src/magic/model/event/MagicKickerCost.java
@@ -22,7 +22,7 @@ public class MagicKickerCost extends MagicAdditionalCost implements MagicEventAc
     public static MagicKickerCost Buyback(final MagicMatchedCostEvent aCost) {
         return new MagicKickerCost(aCost, "buyback");
     }
-    
+
     public static MagicKickerCost Entwine(final MagicMatchedCostEvent aCost) {
         return new MagicKickerCost(aCost, "entwine");
     }
diff --git a/src/magic/model/event/MagicManaActivation.java b/src/magic/model/event/MagicManaActivation.java
index 0de5366b72..d2ed360e7c 100644
--- a/src/magic/model/event/MagicManaActivation.java
+++ b/src/magic/model/event/MagicManaActivation.java
@@ -13,13 +13,13 @@ import java.util.List;
 import java.util.LinkedList;
 
 public abstract class MagicManaActivation implements MagicChangeCardDefinition {
-    
+
     protected static final String ActivationRestriction = ", Activate this ability ";
-    
+
     private final List<MagicManaType> manaTypes;
     private final MagicCondition[] conditions;
     private final int weight;
-    
+
     public MagicManaActivation(final List<MagicManaType> manaTypes) {
         this(manaTypes, MagicActivation.NO_COND, manaTypes.size() - 1);
     }
@@ -48,7 +48,7 @@ public abstract class MagicManaActivation implements MagicChangeCardDefinition {
             source.getController().hasState(MagicPlayerState.CantActivateAbilities)) {
             return false;
         }
-        
+
         // Check conditions for activation
         for (final MagicCondition condition : conditions) {
             if (!condition.accept(source)) {
@@ -72,13 +72,13 @@ public abstract class MagicManaActivation implements MagicChangeCardDefinition {
     public void change(final MagicCardDefinition cdef) {
         cdef.addManaAct(this);
     }
-    
+
     public static final MagicManaActivation create(final String costs, final List<MagicManaType> manaTypes) {
         final String[] part = costs.split(ActivationRestriction);
-        
+
         final List<MagicMatchedCostEvent> matchedCostEvents = MagicRegularCostEvent.build(part[0]);
         assert matchedCostEvents.size() > 0;
-        
+
         if (part.length > 1) {
             matchedCostEvents.addAll(MagicCondition.build(part[1]));
         }
diff --git a/src/magic/model/event/MagicMatchedCostEvent.java b/src/magic/model/event/MagicMatchedCostEvent.java
index 948d3b041b..e12c53d4f6 100644
--- a/src/magic/model/event/MagicMatchedCostEvent.java
+++ b/src/magic/model/event/MagicMatchedCostEvent.java
@@ -3,6 +3,6 @@ package magic.model.event;
 import magic.model.MagicSource;
 
 public interface MagicMatchedCostEvent {
-    MagicEvent getEvent(final MagicSource source); 
+    MagicEvent getEvent(final MagicSource source);
     boolean isIndependent();
 }
diff --git a/src/magic/model/event/MagicMegamorphActivation.java b/src/magic/model/event/MagicMegamorphActivation.java
index 80a608539f..e85045b4d6 100644
--- a/src/magic/model/event/MagicMegamorphActivation.java
+++ b/src/magic/model/event/MagicMegamorphActivation.java
@@ -8,7 +8,7 @@ import java.util.List;
 import magic.model.MagicMessage;
 
 public class MagicMegamorphActivation extends MagicMorphActivation {
-    
+
     public MagicMegamorphActivation(final List<MagicMatchedCostEvent> aMatchedCostEvents) {
         super(aMatchedCostEvents, "Megamorph");
     }
diff --git a/src/magic/model/event/MagicMillEvent.java b/src/magic/model/event/MagicMillEvent.java
index 2ec836d39e..2a69c0a7bc 100644
--- a/src/magic/model/event/MagicMillEvent.java
+++ b/src/magic/model/event/MagicMillEvent.java
@@ -11,13 +11,13 @@ import magic.model.condition.MagicCondition;
 import magic.model.condition.MagicConditionFactory;
 
 public class MagicMillEvent extends MagicEvent{
-    
+
     private final MagicCondition cond;
 
     public MagicMillEvent(final MagicSource source, final int amount) {
         this(source, source.getController(), amount);
     }
-    
+
     public MagicMillEvent(final MagicSource source, final MagicPlayer player, final int amount) {
         super(
             source,
@@ -38,7 +38,7 @@ public class MagicMillEvent extends MagicEvent{
             }
         }
     };
-    
+
     @Override
     public boolean isSatisfied() {
         return cond.accept(getSource()) && super.isSatisfied();
diff --git a/src/magic/model/event/MagicMorphActivation.java b/src/magic/model/event/MagicMorphActivation.java
index 630e11d83d..15f81a1df7 100644
--- a/src/magic/model/event/MagicMorphActivation.java
+++ b/src/magic/model/event/MagicMorphActivation.java
@@ -12,11 +12,11 @@ import java.util.LinkedList;
 import magic.model.MagicMessage;
 
 public class MagicMorphActivation extends MagicPermanentActivation {
-    
+
     private static final MagicActivationHints HINT = new MagicActivationHints(MagicTiming.Pump);
     private static final MagicCondition COND[] = new MagicCondition[]{ MagicCondition.FACE_DOWN_PERMANENT_CONDITION };
     private final List<MagicMatchedCostEvent> matchedCostEvents;
-    
+
     public MagicMorphActivation(final List<MagicMatchedCostEvent> aMatchedCostEvents) {
         this(aMatchedCostEvents, "Morph");
     }
@@ -25,7 +25,7 @@ public class MagicMorphActivation extends MagicPermanentActivation {
         super(COND, HINT, name);
         matchedCostEvents = aMatchedCostEvents;
     }
-    
+
     @Override
     public Iterable<? extends MagicEvent> getCostEvent(final MagicPermanent source) {
         final List<MagicEvent> costEvents = new LinkedList<MagicEvent>();
@@ -34,7 +34,7 @@ public class MagicMorphActivation extends MagicPermanentActivation {
         }
         return costEvents;
     }
-    
+
     @Override
     public final MagicEvent getEvent(final MagicSource source) {
         return new MagicEvent(
@@ -55,17 +55,17 @@ public class MagicMorphActivation extends MagicPermanentActivation {
             )
         );
     }
-    
+
     @Override
     public boolean usesStack() {
         return false;
     }
-    
+
     @Override
     public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) {
         return MagicEvent.NONE;
     }
-    
+
     @Override
     public void change(final MagicCardDefinition cdef) {
         cdef.addMorphAct(this);
diff --git a/src/magic/model/event/MagicMorphCastActivation.java b/src/magic/model/event/MagicMorphCastActivation.java
index 895ea8b6b3..cf5761c60c 100644
--- a/src/magic/model/event/MagicMorphCastActivation.java
+++ b/src/magic/model/event/MagicMorphCastActivation.java
@@ -46,7 +46,7 @@ public class MagicMorphCastActivation extends MagicHandCastActivation {
             )
         );
     }
-    
+
     @Override
     public MagicEvent getEvent(final MagicSource source) {
         return new MagicEvent(
@@ -101,7 +101,7 @@ public class MagicMorphCastActivation extends MagicHandCastActivation {
             }
         };
     }
-    
+
     private final MagicEventAction EVENT_ACTION = new MagicEventAction() {
         @Override
         public void executeEvent(final MagicGame game, final MagicEvent event) {
@@ -110,7 +110,7 @@ public class MagicMorphCastActivation extends MagicHandCastActivation {
             game.doAction(new PutItemOnStackAction(genMorphSpell(card)));
         }
     };
-    
+
     @Override
     public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) {
         return new MagicEvent(
@@ -119,7 +119,7 @@ public class MagicMorphCastActivation extends MagicHandCastActivation {
             "Put " + MagicMessage.getCardToken("face-down creature", cardOnStack.getCard()) + " onto the battlefield."
         );
     }
-    
+
     @Override
     public void executeEvent(final MagicGame game, final MagicEvent event) {
         final MagicCardOnStack spell = event.getCardOnStack();
diff --git a/src/magic/model/event/MagicNinjutsuActivation.java b/src/magic/model/event/MagicNinjutsuActivation.java
index a895806673..6887ac9de2 100644
--- a/src/magic/model/event/MagicNinjutsuActivation.java
+++ b/src/magic/model/event/MagicNinjutsuActivation.java
@@ -48,7 +48,7 @@ public class MagicNinjutsuActivation extends MagicCardAbilityActivation {
             "Put SN onto the battlefield from your hand tapped and attacking."
         );
     }
-                
+
     @Override
     public void executeEvent(final MagicGame game, final MagicEvent event) {
         game.doAction(new ReturnCardAction(
diff --git a/src/magic/model/event/MagicOutlastActivation.java b/src/magic/model/event/MagicOutlastActivation.java
index 1473c1f6dd..2440fcbd2d 100644
--- a/src/magic/model/event/MagicOutlastActivation.java
+++ b/src/magic/model/event/MagicOutlastActivation.java
@@ -11,7 +11,7 @@ import magic.model.action.ChangeCountersAction;
 import magic.model.condition.MagicCondition;
 
 public class MagicOutlastActivation extends MagicPermanentActivation{
-    
+
     private static final MagicActivationHints HINT = new MagicActivationHints(MagicTiming.Pump);
     private static final MagicCondition COND[] = new MagicCondition[] {MagicCondition.SORCERY_CONDITION};
     private final List<MagicMatchedCostEvent> matchedCostEvents;
@@ -30,7 +30,7 @@ public class MagicOutlastActivation extends MagicPermanentActivation{
         }
         return costEvents;
     }
-    
+
     @Override
     public MagicEvent getPermanentEvent(MagicPermanent source, MagicPayedCost payedCost) {
         return new MagicEvent(
diff --git a/src/magic/model/event/MagicPermanentActivation.java b/src/magic/model/event/MagicPermanentActivation.java
index 534f86f04a..f226ef15b5 100644
--- a/src/magic/model/event/MagicPermanentActivation.java
+++ b/src/magic/model/event/MagicPermanentActivation.java
@@ -46,11 +46,11 @@ public abstract class MagicPermanentActivation extends MagicActivation<MagicPerm
             "Play activated ability of SN."
         );
     }
-    
+
     @Override
     public final boolean canPlay(final MagicGame game, final MagicPlayer player, final MagicPermanent source, final boolean useHints) {
         boolean canPlay = super.canPlay(game, player, source, useHints);
-       
+
         // More complex check that first executes events without choice, then check conditions of the others
         if (canPlay && source.producesMana()) {
             game.snapshot();
@@ -108,10 +108,10 @@ public abstract class MagicPermanentActivation extends MagicActivation<MagicPerm
     public void change(final MagicCardDefinition cdef) {
         cdef.addAct(this);
     }
-    
+
     public static final MagicPermanentActivation create(final String act) {
         final String[] token = act.split(ARG.COLON, 2);
-       
+
         // build the actual costs
         final String costs = token[0];
         final List<MagicMatchedCostEvent> matchedCostEvents = MagicRegularCostEvent.build(costs);
@@ -123,7 +123,7 @@ public abstract class MagicPermanentActivation extends MagicActivation<MagicPerm
             matchedCostEvents.addAll(MagicCondition.build(part[i]));
         }
 
-        // parse the effect        
+        // parse the effect
         final String rule = part[0];
         final MagicSourceEvent sourceEvent = MagicRuleEventAction.create(rule);
 
@@ -148,7 +148,7 @@ public abstract class MagicPermanentActivation extends MagicActivation<MagicPerm
                 }
                 return costEvents;
             }
-       
+
             @Override
             public MagicEvent getPermanentEvent(final MagicPermanent source, final MagicPayedCost payedCost) {
                 return sourceEvent.getEvent(source, payedCost);
diff --git a/src/magic/model/event/MagicPlayAbilityEvent.java b/src/magic/model/event/MagicPlayAbilityEvent.java
index 4afe9450f0..897e7d2b2a 100644
--- a/src/magic/model/event/MagicPlayAbilityEvent.java
+++ b/src/magic/model/event/MagicPlayAbilityEvent.java
@@ -8,7 +8,7 @@ import magic.model.condition.MagicCondition;
 public class MagicPlayAbilityEvent extends MagicEvent {
 
     private final MagicCondition cond;
-    
+
     public MagicPlayAbilityEvent(final MagicPermanent source) {
         this(source, MagicCondition.ABILITY_ONCE_CONDITION);
     }
diff --git a/src/magic/model/event/MagicPlayAuraEvent.java b/src/magic/model/event/MagicPlayAuraEvent.java
index b15398271b..1a70b3cb1b 100644
--- a/src/magic/model/event/MagicPlayAuraEvent.java
+++ b/src/magic/model/event/MagicPlayAuraEvent.java
@@ -21,7 +21,7 @@ public class MagicPlayAuraEvent extends MagicSpellCardEvent {
         targetChoiceOther = aTargetChoiceOther;
         targetPicker = aTargetPicker;
     }
-    
+
     public MagicTargetChoice getTargetChoice() {
         return targetChoiceOther;
     }
diff --git a/src/magic/model/event/MagicPutOntoBattlefieldEvent.java b/src/magic/model/event/MagicPutOntoBattlefieldEvent.java
index fda3cf93b8..4070e4c05e 100644
--- a/src/magic/model/event/MagicPutOntoBattlefieldEvent.java
+++ b/src/magic/model/event/MagicPutOntoBattlefieldEvent.java
@@ -16,15 +16,15 @@ import java.util.List;
 import magic.model.MagicMessage;
 
 public class MagicPutOntoBattlefieldEvent extends MagicEvent {
-    
+
     public MagicPutOntoBattlefieldEvent(final MagicEvent event, final MagicChoice choice, final List<? extends MagicPermanentAction> mods) {
         this(event.getSource(), event.getPlayer(), choice, mods);
     }
-    
+
     public MagicPutOntoBattlefieldEvent(final MagicEvent event, final MagicChoice choice, final MagicPermanentAction... mods) {
         this(event.getSource(), event.getPlayer(), choice, Arrays.asList(mods));
     }
-    
+
     public MagicPutOntoBattlefieldEvent(final MagicSource source, final MagicPlayer player, final MagicChoice choice, final List<? extends MagicPermanentAction> mods) {
         super(
             source,
diff --git a/src/magic/model/event/MagicRegularCostEvent.java b/src/magic/model/event/MagicRegularCostEvent.java
index f26a154fba..669bf63206 100644
--- a/src/magic/model/event/MagicRegularCostEvent.java
+++ b/src/magic/model/event/MagicRegularCostEvent.java
@@ -7,7 +7,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 public class MagicRegularCostEvent implements MagicMatchedCostEvent {
-    
+
     private static final String COMMA = "\\s*,\\s*";
 
     private final Matcher arg;
@@ -37,7 +37,7 @@ public class MagicRegularCostEvent implements MagicMatchedCostEvent {
         }
         return matched;
     }
-    
+
     private static String capitalize(final String text) {
         return Character.toUpperCase(text.charAt(0)) + text.substring(1);
     }
diff --git a/src/magic/model/event/MagicReinforceActivation.java b/src/magic/model/event/MagicReinforceActivation.java
index 262e594294..497a0474fb 100644
--- a/src/magic/model/event/MagicReinforceActivation.java
+++ b/src/magic/model/event/MagicReinforceActivation.java
@@ -27,7 +27,7 @@ public class MagicReinforceActivation extends MagicCardAbilityActivation {
             new MagicDiscardSelfEvent(source)
         );
     }
-    
+
     @Override
     public MagicEvent getCardEvent(final MagicCard card, final MagicPayedCost payedCost) {
         return new MagicPutCounterEvent(card, amount);
diff --git a/src/magic/model/event/MagicRepeatedCardsEvent.java b/src/magic/model/event/MagicRepeatedCardsEvent.java
index 65b05db6fc..632ed4d646 100644
--- a/src/magic/model/event/MagicRepeatedCardsEvent.java
+++ b/src/magic/model/event/MagicRepeatedCardsEvent.java
@@ -7,7 +7,7 @@ import magic.model.condition.MagicCondition;
 import magic.model.condition.MagicConditionFactory;
 
 public class MagicRepeatedCardsEvent extends MagicEvent {
-    
+
     private final MagicCondition cond;
 
     public MagicRepeatedCardsEvent(final MagicSource source, final MagicTargetChoice targetChoice, final int amt, final MagicChainEventFactory factory) {
diff --git a/src/magic/model/event/MagicRepeatedPermanentsEvent.java b/src/magic/model/event/MagicRepeatedPermanentsEvent.java
index dda160c14a..b50a40532a 100644
--- a/src/magic/model/event/MagicRepeatedPermanentsEvent.java
+++ b/src/magic/model/event/MagicRepeatedPermanentsEvent.java
@@ -7,7 +7,7 @@ import magic.model.condition.MagicCondition;
 import magic.model.condition.MagicConditionFactory;
 
 public class MagicRepeatedPermanentsEvent extends MagicEvent {
-    
+
     private final MagicCondition cond;
 
     public MagicRepeatedPermanentsEvent(final MagicSource source, final MagicTargetChoice targetChoice, final int amt, final MagicChainEventFactory factory) {
diff --git a/src/magic/model/event/MagicRetraceActivation.java b/src/magic/model/event/MagicRetraceActivation.java
index 3199deebad..9194acaa54 100644
--- a/src/magic/model/event/MagicRetraceActivation.java
+++ b/src/magic/model/event/MagicRetraceActivation.java
@@ -7,7 +7,7 @@ import magic.model.choice.MagicTargetChoice;
 import java.util.Arrays;
 
 public class MagicRetraceActivation extends MagicGraveyardCastActivation {
-    
+
     public MagicRetraceActivation(final MagicCardDefinition cdef) {
         super(
             MagicHandCastActivation.CARD_CONDITION,
@@ -15,7 +15,7 @@ public class MagicRetraceActivation extends MagicGraveyardCastActivation {
             "Retrace"
         );
     }
-   
+
     @Override
     public Iterable<? extends MagicEvent> getCostEvent(final MagicCard source) {
         return Arrays.asList(
diff --git a/src/magic/model/event/MagicReturnCardEvent.java b/src/magic/model/event/MagicReturnCardEvent.java
index a26f258377..25747ae9e8 100644
--- a/src/magic/model/event/MagicReturnCardEvent.java
+++ b/src/magic/model/event/MagicReturnCardEvent.java
@@ -20,7 +20,7 @@ public class MagicReturnCardEvent extends MagicEvent {
             "PN puts a card from his or her hand on top of his or her library."
         );
     }
-    
+
     private static final MagicEventAction EVENT_ACTION=new MagicEventAction() {
         @Override
         public void executeEvent(final MagicGame game, final MagicEvent event) {
diff --git a/src/magic/model/event/MagicRuleEventAction.java b/src/magic/model/event/MagicRuleEventAction.java
index f7f2ac3529..958120a2f9 100644
--- a/src/magic/model/event/MagicRuleEventAction.java
+++ b/src/magic/model/event/MagicRuleEventAction.java
@@ -618,7 +618,7 @@ public enum MagicRuleEventAction {
                         for (final MagicTarget it : ARG.targets(event, matcher, filter)) {
                             if (it.isPermanent()) {
                                 game.doAction(new AddTurnTriggerAction(
-                                    (MagicPermanent)it, 
+                                    (MagicPermanent)it,
                                     PreventDamageTrigger.PreventCombatDamageDealtTo
                                 ));
                             } else {
@@ -890,7 +890,7 @@ public enum MagicRuleEventAction {
                     for (final MagicPlayer it : players) {
                         game.doAction(new ChangeLifeAction(it, -amount1));
                     }
-                    //continue to the second part if 
+                    //continue to the second part if
                     //  there is no target OR
                     //  there is a target and it is legal
                     if (matcher.group("choice") == null || players.isEmpty() == false) {
@@ -1186,7 +1186,7 @@ public enum MagicRuleEventAction {
         }
         @Override
         public String getName(final Matcher matcher) {
-            return "+Counters"; 
+            return "+Counters";
         }
     },
     CounterFromSelfClockwork(
@@ -1790,7 +1790,7 @@ public enum MagicRuleEventAction {
         }
         @Override
         public MagicCondition[] getConditions(final Matcher matcher) {
-            return matcher.group("sn") != null ? 
+            return matcher.group("sn") != null ?
                 new MagicCondition[] { new MagicArtificialCondition(MagicCondition.TAPPED_CONDITION) } :
                 MagicActivation.NO_COND;
         }
@@ -2036,7 +2036,7 @@ public enum MagicRuleEventAction {
         }
         @Override
         public MagicCondition[] getConditions(final Matcher matcher) {
-            return matcher.group("sn") != null ? 
+            return matcher.group("sn") != null ?
                 new MagicCondition[] { MagicCondition.CAN_REGENERATE_CONDITION } :
                 MagicActivation.NO_COND;
         }
@@ -2304,7 +2304,7 @@ public enum MagicRuleEventAction {
         }
         @Override
         public MagicCondition[] getConditions(final Matcher matcher) {
-            return matcher.group("sn") != null ? 
+            return matcher.group("sn") != null ?
                 new MagicCondition[]{ MagicCondition.NOT_EXCLUDE_COMBAT_CONDITION } :
                 MagicActivation.NO_COND;
         }
@@ -2821,7 +2821,7 @@ public enum MagicRuleEventAction {
 
     public MagicChoice getChoice(final Matcher matcher) {
         try {
-            return matcher.group("choice") != null ? 
+            return matcher.group("choice") != null ?
                 new MagicTargetChoice(getHint(matcher), matcher.group("choice")) :
                 MagicChoice.NONE;
         } catch (IllegalArgumentException e) {
@@ -2959,7 +2959,7 @@ public enum MagicRuleEventAction {
     static final Pattern INTERVENING_IF = Pattern.compile("if " + ARG.COND + ", " + ARG.ANY, Pattern.CASE_INSENSITIVE);
     static final Pattern MAY_PAY = Pattern.compile("you may pay " + ARG.MANACOST + "\\. if you do, .+", Pattern.CASE_INSENSITIVE);
     static final Pattern MAY_COST = Pattern.compile("you may " + ARG.COST + "\\. if you don't, .+", Pattern.CASE_INSENSITIVE);
-    
+
     public static MagicSourceEvent create(final String text) {
         return build(renameThisThat(text));
     }
@@ -2979,12 +2979,12 @@ public enum MagicRuleEventAction {
         final boolean mayPayMatched = mayPayMatcher.matches();
         final MagicManaCost manaCost = mayPayMatched ? MagicManaCost.create(ARG.manacost(mayPayMatcher)) : MagicManaCost.ZERO;
         String prefix = mayPayMatched ? "^(Y|y)ou may pay [^\\.]+\\. If you do, " : "^(Y|y)ou may ";
-        
+
         // handle you <cost>. if you don't, <effect>
         final Matcher mayCostMatcher = MAY_COST.matcher(ruleWithoutIf);
         final boolean mayCostMatched = mayCostMatcher.matches();
         final MagicMatchedCostEvent mayCost = mayCostMatched ?
-            new MagicRegularCostEvent(ARG.cost(mayCostMatcher)) : 
+            new MagicRegularCostEvent(ARG.cost(mayCostMatcher)) :
             MagicRegularCostEvent.NONE;
         prefix = mayCostMatched ? "^(Y|y)ou may [^\\.]+\\. If you don't, " : prefix;
 
diff --git a/src/magic/model/event/MagicSacrificePermanentEvent.java b/src/magic/model/event/MagicSacrificePermanentEvent.java
index fc75b0a043..3c57acd605 100644
--- a/src/magic/model/event/MagicSacrificePermanentEvent.java
+++ b/src/magic/model/event/MagicSacrificePermanentEvent.java
@@ -16,7 +16,7 @@ public class MagicSacrificePermanentEvent extends MagicEvent {
     public MagicSacrificePermanentEvent(final MagicSource source, final MagicTargetChoice targetChoice) {
         this(source, source.getController(), targetChoice);
     }
-    
+
     public MagicSacrificePermanentEvent(final MagicSource source, final MagicPlayer player, final MagicTargetChoice targetChoice) {
         this(source, player, targetChoice, EVENT_ACTION);
     }
diff --git a/src/magic/model/event/MagicScavengeActivation.java b/src/magic/model/event/MagicScavengeActivation.java
index c08e699435..4d5e882463 100644
--- a/src/magic/model/event/MagicScavengeActivation.java
+++ b/src/magic/model/event/MagicScavengeActivation.java
@@ -35,7 +35,7 @@ public class MagicScavengeActivation extends MagicCardAbilityActivation {
         cost = aCost;
         power = aCdef.getCardPower();
     }
-            
+
     @Override
     public void change(final MagicCardDefinition cdef) {
         cdef.addGraveyardAct(this);
@@ -60,7 +60,7 @@ public class MagicScavengeActivation extends MagicCardAbilityActivation {
             "Put RN +1/+1 counters on target creature$."
         );
     }
-    
+
     @Override
     public void executeEvent(final MagicGame game, final MagicEvent event) {
         event.processTargetPermanent(game, new MagicPermanentAction() {
diff --git a/src/magic/model/event/MagicScryXEvent.java b/src/magic/model/event/MagicScryXEvent.java
index c44c3a4ee9..e2c1c7960c 100644
--- a/src/magic/model/event/MagicScryXEvent.java
+++ b/src/magic/model/event/MagicScryXEvent.java
@@ -14,14 +14,14 @@ public class MagicScryXEvent extends MagicEvent {
 
     public MagicScryXEvent(final MagicSource source, final MagicPlayer player, final int X) {
         super(
-            source, 
-            player, 
-            X, 
-            StartScrying, 
+            source,
+            player,
+            X,
+            StartScrying,
             ""
         );
     }
-    
+
     private static final MagicEventAction StartScrying = new MagicEventAction() {
         @Override
         public void executeEvent(final MagicGame game, final MagicEvent event) {
@@ -30,21 +30,21 @@ public class MagicScryXEvent extends MagicEvent {
             game.addFirstEvent(new MagicEvent(
                 event.getSource(),
                 event.getPlayer(),
-                new MagicFromCardListChoice(choiceList, choiceList.size(), true, "to be put on the bottom of your library"), 
+                new MagicFromCardListChoice(choiceList, choiceList.size(), true, "to be put on the bottom of your library"),
                 choiceList.size(),
-                BottomAction, 
+                BottomAction,
                 ""
             ));
         }
     };
-    
+
     private static final MagicEventAction BottomAction = new MagicEventAction() {
         @Override
         public void executeEvent(final MagicGame game, final MagicEvent event) {
-            final MagicCardList processedCards = new MagicCardList();                                                                  
+            final MagicCardList processedCards = new MagicCardList();
             event.processChosenCards(game, new MagicCardAction() {
                 public void doAction(final MagicCard card) {
-                    processedCards.add(card);  
+                    processedCards.add(card);
                     game.doAction(new ScryComplAction(event.getPlayer(), card, true));
                     game.logAppendMessage(event.getPlayer(), event.getPlayer() + " moves a card from top of his or her library to the bottom.");
                 }
@@ -52,7 +52,7 @@ public class MagicScryXEvent extends MagicEvent {
             final int X = event.getRefInt() - processedCards.size();
             final MagicCardList choiceList = event.getPlayer().getLibrary().getCardsFromTop(X);
             if (choiceList.size() > 1) {
-                game.addFirstEvent(new MagicEvent(                    
+                game.addFirstEvent(new MagicEvent(
                     event.getSource(),
                     event.getPlayer(),
                     new MagicFromCardListChoice(choiceList, choiceList.size(), "to be put on the top of your library"),
@@ -62,7 +62,7 @@ public class MagicScryXEvent extends MagicEvent {
             }
         }
     };
-    
+
     private static final MagicEventAction TopAction = new MagicEventAction() {
         @Override
         public void executeEvent(final MagicGame game, final MagicEvent event) {
diff --git a/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java b/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java
index e82587088d..d8e13a9469 100644
--- a/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java
+++ b/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java
@@ -22,11 +22,11 @@ public class MagicSearchOntoBattlefieldEvent extends MagicEvent {
     public MagicSearchOntoBattlefieldEvent(final MagicEvent event, final MagicChoice choice, final MagicPermanentAction... mods) {
         this(event.getSource(), event.getPlayer(), choice, Arrays.asList(mods));
     }
-    
+
     public MagicSearchOntoBattlefieldEvent(final MagicEvent event, final MagicChoice choice, final List<? extends MagicPermanentAction> mods) {
         this(event.getSource(), event.getPlayer(), choice, mods);
     }
-    
+
     public MagicSearchOntoBattlefieldEvent(final MagicSource source, final MagicPlayer player, final MagicChoice choice, final MagicPermanentAction... mods) {
         this(source, player, choice, Arrays.asList(mods));
     }
diff --git a/src/magic/model/event/MagicSoulbondEvent.java b/src/magic/model/event/MagicSoulbondEvent.java
index 9a10201bfa..bd584a030e 100644
--- a/src/magic/model/event/MagicSoulbondEvent.java
+++ b/src/magic/model/event/MagicSoulbondEvent.java
@@ -11,8 +11,8 @@ import magic.model.target.MagicTargetFilterFactory;
 import magic.model.target.MagicTargetHint;
 
 public class MagicSoulbondEvent extends MagicEvent {
-    
-    private static final MagicTargetChoice AN_UNPAIRED_SOULBOND_CREATURE = 
+
+    private static final MagicTargetChoice AN_UNPAIRED_SOULBOND_CREATURE =
         new MagicTargetChoice("an unpaired Soulbond creature");
 
     public MagicSoulbondEvent(final MagicPermanent permanent,final boolean hasSoulbond) {
diff --git a/src/magic/model/event/MagicSourceActivation.java b/src/magic/model/event/MagicSourceActivation.java
index d68f1bb072..e803849db3 100644
--- a/src/magic/model/event/MagicSourceActivation.java
+++ b/src/magic/model/event/MagicSourceActivation.java
@@ -17,35 +17,35 @@ public class MagicSourceActivation<T extends MagicSource & MagicMappable<T> & Co
     public static <S extends MagicSource & MagicMappable<S> & Comparable<S>> MagicSourceActivation<S> create(final S aSource, final MagicActivation<S> aActivation) {
         return new MagicSourceActivation<S>(aSource, aActivation);
     }
-    
+
     public static <S extends MagicSource & MagicMappable<S> & Comparable<S>> MagicSourceActivation<S> create(final MagicGame game, final MagicSourceActivation<S> aSourceActivation) {
         return new MagicSourceActivation<S>(aSourceActivation.source.map(game), aSourceActivation.activation);
     }
-    
+
     public final boolean canPlay(final MagicGame game, final MagicPlayer player, final boolean useHints) {
         return activation.canPlay(game, player, source, useHints);
     }
-    
+
     public Iterable<? extends MagicEvent> getCostEvent() {
         return activation.getCostEvent(source);
     }
-    
+
     public MagicEvent getEvent() {
         return activation.getEvent(source);
     }
-    
+
     public boolean usesStack() {
         return activation.usesStack();
     }
-    
+
     public boolean isIndependent() {
         return activation.getActivationHints().isIndependent();
     }
-    
+
     public void changeActivationPriority() {
         activation.changeActivationPriority(source.getController());
     }
-    
+
     @Override
     public int compareTo(final MagicSourceActivation<T> other) {
         int c1 = activation.compareTo(other.activation);
diff --git a/src/magic/model/event/MagicSourceEvent.java b/src/magic/model/event/MagicSourceEvent.java
index 4dc82dc419..12a1c25901 100644
--- a/src/magic/model/event/MagicSourceEvent.java
+++ b/src/magic/model/event/MagicSourceEvent.java
@@ -36,19 +36,19 @@ public class MagicSourceEvent {
         action = aAction;
         text = aText;
     }
-    
+
     public MagicEvent getTriggerEvent(final MagicSource source, final MagicPlayer player, final MagicCopyable ref) {
         return ifCond.accept(source) ? getEvent(source, player, ref) : MagicEvent.NONE;
     }
-    
+
     public MagicEvent getTriggerEvent(final MagicSource source, final MagicCopyable ref) {
         return ifCond.accept(source) ? getEvent(source, ref) : MagicEvent.NONE;
     }
-    
+
     public MagicEvent getTriggerEvent(final MagicSource source) {
         return ifCond.accept(source) ? getEvent(source) : MagicEvent.NONE;
     }
-    
+
     public MagicEvent getEvent(final MagicSource source, final MagicPlayer player, final MagicCopyable ref) {
         return new MagicEvent(
             source,
@@ -60,19 +60,19 @@ public class MagicSourceEvent {
             text
         );
     }
-    
+
     public MagicEvent getEvent(final MagicSource source, final MagicCopyable ref) {
         return getEvent(source, source.getController(), ref);
     }
-    
+
     public MagicEvent getEvent(final MagicSource source) {
         return getEvent(source, source.getController(), MagicEvent.NO_REF);
     }
-    
+
     public MagicEvent getEvent(final MagicEvent event) {
         return getEvent(event.getSource(), event.getPlayer(), MagicEvent.NO_REF);
     }
-    
+
     public MagicCondition[] getConditions() {
         return rule.getConditions(matcher);
     }
@@ -80,11 +80,11 @@ public class MagicSourceEvent {
     public MagicTiming getTiming() {
         return rule.getTiming(matcher);
     }
-    
+
     public String getName() {
         return rule.getName(matcher);
     }
-    
+
     public boolean isIndependent() {
         return rule.isIndependent();
     }
@@ -96,7 +96,7 @@ public class MagicSourceEvent {
     public MagicChoice getChoice() {
         return rule.getChoice(matcher);
     }
-    
+
     public MagicTargetPicker<?> getPicker() {
         return rule.getPicker(matcher);
     }
diff --git a/src/magic/model/event/MagicSourceManaActivationResult.java b/src/magic/model/event/MagicSourceManaActivationResult.java
index f9d97e55c6..22b98c029e 100644
--- a/src/magic/model/event/MagicSourceManaActivationResult.java
+++ b/src/magic/model/event/MagicSourceManaActivationResult.java
@@ -15,7 +15,7 @@ public class MagicSourceManaActivationResult implements MagicMappable<MagicSourc
         this.permanent=permanent;
         this.activation=activation;
     }
-    
+
     @Override
     public MagicSourceManaActivationResult copy(final MagicCopyMap copyMap) {
         return new MagicSourceManaActivationResult(copyMap.copy(permanent), activation);
diff --git a/src/magic/model/event/MagicSpellCardEvent.java b/src/magic/model/event/MagicSpellCardEvent.java
index 8914fa7525..0ce65f8020 100644
--- a/src/magic/model/event/MagicSpellCardEvent.java
+++ b/src/magic/model/event/MagicSpellCardEvent.java
@@ -21,7 +21,7 @@ public abstract class MagicSpellCardEvent implements MagicCardEvent,MagicEventAc
     public void change(final MagicCardDefinition cdef) {
         cdef.setEvent(this);
     }
-    
+
     @Override
     public void executeEvent(final MagicGame game, final MagicEvent event) {
         throw new RuntimeException(getClass() + " did not override executeEvent");
@@ -42,7 +42,7 @@ public abstract class MagicSpellCardEvent implements MagicCardEvent,MagicEventAc
             }
         };
     }
-   
+
     private static MagicSpellCardEvent Buyback(final String rule) {
         final MagicSourceEvent effect = MagicRuleEventAction.create(rule);
         return new MagicSpellCardEvent() {
@@ -74,7 +74,7 @@ public abstract class MagicSpellCardEvent implements MagicCardEvent,MagicEventAc
             }
         };
     }
-    
+
     private static MagicSpellCardEvent Entwine(final String rule) {
         final Pattern pattern = Pattern.compile("choose one — \\(1\\) (?<effect1>.*) \\(2\\) (?<effect2>.*)", Pattern.CASE_INSENSITIVE);
         final Matcher matcher = pattern.matcher(rule);
@@ -98,10 +98,10 @@ public abstract class MagicSpellCardEvent implements MagicCardEvent,MagicEventAc
             public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) {
                 return new MagicEvent(
                     cardOnStack,
-                    payedCost.isKicked() ? 
+                    payedCost.isKicked() ?
                         (choice1.isValid() ? choice1 : choice2):
                         new MagicOrChoice(
-                            choice1, 
+                            choice1,
                             choice2
                         ),
                     payedCost,
diff --git a/src/magic/model/event/MagicTransmuteActivation.java b/src/magic/model/event/MagicTransmuteActivation.java
index 0404916c85..091da4eeac 100644
--- a/src/magic/model/event/MagicTransmuteActivation.java
+++ b/src/magic/model/event/MagicTransmuteActivation.java
@@ -17,7 +17,7 @@ import java.util.Arrays;
 public class MagicTransmuteActivation extends MagicCardAbilityActivation {
 
     final MagicManaCost cost;
-        
+
     private static MagicTargetChoice getTransmuteChoice(final int cmc) {
         final MagicCardFilterImpl transmuteFilter = new MagicCardFilterImpl() {
             public boolean accept(final MagicSource source,final MagicPlayer player,final MagicCard target) {
@@ -29,7 +29,7 @@ public class MagicTransmuteActivation extends MagicCardAbilityActivation {
         };
         return new MagicTargetChoice(transmuteFilter,"a card with converted mana cost of " + cmc);
     }
-    
+
     public MagicTransmuteActivation(final MagicManaCost aCost) {
         super(
             new MagicCondition[]{MagicCondition.SORCERY_CONDITION},
@@ -46,7 +46,7 @@ public class MagicTransmuteActivation extends MagicCardAbilityActivation {
             new MagicDiscardSelfEvent(source)
         );
     }
-    
+
     @Override
     public MagicEvent getCardEvent(final MagicCard card, final MagicPayedCost payedCost) {
         return new MagicEvent(
@@ -61,7 +61,7 @@ public class MagicTransmuteActivation extends MagicCardAbilityActivation {
     @Override
     public void executeEvent(final MagicGame game, final MagicEvent event) {
         game.addEvent(new MagicSearchToLocationEvent(
-            event, 
+            event,
             getTransmuteChoice(event.getRefInt()),
             MagicLocationType.OwnersHand
         ));
diff --git a/src/magic/model/event/MagicTuckCardEvent.java b/src/magic/model/event/MagicTuckCardEvent.java
index af2f5ed9a0..77355b7ce8 100644
--- a/src/magic/model/event/MagicTuckCardEvent.java
+++ b/src/magic/model/event/MagicTuckCardEvent.java
@@ -20,7 +20,7 @@ public class MagicTuckCardEvent extends MagicEvent {
             "PN puts a card from his or her hand on the bottom of his or her library."
         );
     }
-    
+
     public MagicTuckCardEvent(final MagicSource source, final MagicPlayer player, final boolean log) {
         super(
             source,
@@ -30,7 +30,7 @@ public class MagicTuckCardEvent extends MagicEvent {
             ""
         );
     }
-    
+
     private static final MagicEventAction EVENT_ACTION=new MagicEventAction() {
         @Override
         public void executeEvent(final MagicGame game, final MagicEvent event) {
diff --git a/src/magic/model/event/MagicTypeCyclingActivation.java b/src/magic/model/event/MagicTypeCyclingActivation.java
index d350edc0d0..33e799f2a9 100644
--- a/src/magic/model/event/MagicTypeCyclingActivation.java
+++ b/src/magic/model/event/MagicTypeCyclingActivation.java
@@ -36,7 +36,7 @@ public class MagicTypeCyclingActivation extends MagicCyclingActivation {
     @Override
     public void executeEvent(final MagicGame game, final MagicEvent event) {
         game.addEvent(new MagicSearchToLocationEvent(
-            event, 
+            event,
             new MagicTargetChoice("a "+type+" card from your library"),
             MagicLocationType.OwnersHand
         ));
diff --git a/src/magic/model/event/MagicUnearthActivation.java b/src/magic/model/event/MagicUnearthActivation.java
index 22dcce99e9..8778b9f27d 100644
--- a/src/magic/model/event/MagicUnearthActivation.java
+++ b/src/magic/model/event/MagicUnearthActivation.java
@@ -27,7 +27,7 @@ public class MagicUnearthActivation extends MagicCardAbilityActivation {
         );
         cost = aCost;
     }
-    
+
     @Override
     public void change(final MagicCardDefinition cdef) {
         cdef.addGraveyardAct(this);
@@ -48,7 +48,7 @@ public class MagicUnearthActivation extends MagicCardAbilityActivation {
             "Return SN from PN's graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield."
         );
     }
-    
+
     @Override
     public void executeEvent(final MagicGame game, final MagicEvent event) {
         game.doAction(new ReanimateAction(
diff --git a/src/magic/model/event/PermanentSpecParser.java b/src/magic/model/event/PermanentSpecParser.java
index eb958097a7..165fb1ebb8 100644
--- a/src/magic/model/event/PermanentSpecParser.java
+++ b/src/magic/model/event/PermanentSpecParser.java
@@ -22,7 +22,7 @@ public class PermanentSpecParser {
     public final boolean additionTo;
 
     public PermanentSpecParser(final Matcher matcher) {
-        final String[] ptStr = matcher.group("pt") == null ? null : 
+        final String[] ptStr = matcher.group("pt") == null ? null :
             matcher.group("pt").split("/");
         pt = ptStr == null ? null :
             new int[]{Integer.parseInt(ptStr[0]), Integer.parseInt(ptStr[1])};
diff --git a/src/magic/model/mstatic/MagicCDA.java b/src/magic/model/mstatic/MagicCDA.java
index a23a7ddc0b..7f9e53e900 100644
--- a/src/magic/model/mstatic/MagicCDA.java
+++ b/src/magic/model/mstatic/MagicCDA.java
@@ -50,7 +50,7 @@ public abstract class MagicCDA implements MagicChangeCardDefinition {
             }
         };
     }
-    
+
     public static MagicCDA setPower(final int base, final MagicAmount count) {
         return new MagicCDA() {
             @Override
@@ -60,7 +60,7 @@ public abstract class MagicCDA implements MagicChangeCardDefinition {
             }
         };
     }
-    
+
     public static MagicCDA setToughness(final int base, final MagicAmount count) {
         return new MagicCDA() {
             @Override
diff --git a/src/magic/model/mstatic/MagicDummyModifier.java b/src/magic/model/mstatic/MagicDummyModifier.java
index d598c5c5c8..1e4b915d28 100644
--- a/src/magic/model/mstatic/MagicDummyModifier.java
+++ b/src/magic/model/mstatic/MagicDummyModifier.java
@@ -52,12 +52,12 @@ public class MagicDummyModifier implements MagicModifier {
     public void modGame(final MagicPermanent source, final MagicGame game) {
         //leave game unchanged
     }
-    
+
     @Override
     public MagicManaCost reduceCost(final MagicPermanent source, final MagicCard card, final MagicManaCost cost) {
         return cost;
     }
-    
+
     @Override
     public MagicManaCost increaseCost(final MagicPermanent source, final MagicCard card, final MagicManaCost cost) {
         return cost;
diff --git a/src/magic/model/mstatic/MagicModifier.java b/src/magic/model/mstatic/MagicModifier.java
index 693aee890b..286f7f5111 100644
--- a/src/magic/model/mstatic/MagicModifier.java
+++ b/src/magic/model/mstatic/MagicModifier.java
@@ -29,8 +29,8 @@ public interface MagicModifier {
     void modPlayer(final MagicPermanent source, final MagicPlayer player);
 
     void modGame(final MagicPermanent source, final MagicGame game);
-    
+
     MagicManaCost reduceCost(final MagicPermanent source, final MagicCard card, final MagicManaCost cost);
-    
+
     MagicManaCost increaseCost(final MagicPermanent source, final MagicCard card, final MagicManaCost cost);
 }
diff --git a/src/magic/model/phase/MagicBeginOfCombatPhase.java b/src/magic/model/phase/MagicBeginOfCombatPhase.java
index 5d77b9bf13..98df953a4b 100644
--- a/src/magic/model/phase/MagicBeginOfCombatPhase.java
+++ b/src/magic/model/phase/MagicBeginOfCombatPhase.java
@@ -19,7 +19,7 @@ public class MagicBeginOfCombatPhase extends MagicPhase {
     public void executeBeginStep(final MagicGame game) {
         // Begin of combat triggers
         game.executeTrigger(MagicTriggerType.AtBeginOfCombat,game.getTurnPlayer());
-        
+
         game.setStep(MagicStep.ActivePlayer);
     }
 }
diff --git a/src/magic/model/phase/MagicCleanupPhase.java b/src/magic/model/phase/MagicCleanupPhase.java
index 85c08c84ec..bf70008811 100644
--- a/src/magic/model/phase/MagicCleanupPhase.java
+++ b/src/magic/model/phase/MagicCleanupPhase.java
@@ -74,7 +74,7 @@ public class MagicCleanupPhase extends MagicPhase {
             game.setStep(MagicStep.ActivePlayer);
         }
     }
-    
+
     @Override
     public void executeEndOfPhase(final MagicGame game) {
         nextTurn(game);
diff --git a/src/magic/model/phase/MagicEndOfCombatPhase.java b/src/magic/model/phase/MagicEndOfCombatPhase.java
index bdb86b3fbd..871a13b127 100644
--- a/src/magic/model/phase/MagicEndOfCombatPhase.java
+++ b/src/magic/model/phase/MagicEndOfCombatPhase.java
@@ -27,7 +27,7 @@ public class MagicEndOfCombatPhase extends MagicPhase {
     public void executeEndOfPhase(final MagicGame game) {
         // End of combat triggers
         game.executeTrigger(MagicTriggerType.AtEndOfCombat,game.getTurnPlayer());
-        
+
         // Remove permanents from combat
         for (final MagicPlayer player : game.getPlayers()) {
             for (final MagicPermanent permanent : player.getPermanents()) {
diff --git a/src/magic/model/phase/MagicPhaseType.java b/src/magic/model/phase/MagicPhaseType.java
index ee470f69a8..565faf3fce 100644
--- a/src/magic/model/phase/MagicPhaseType.java
+++ b/src/magic/model/phase/MagicPhaseType.java
@@ -43,5 +43,5 @@ public enum MagicPhaseType {
     public String getAbbreviation() {
         return abbreviation;
     }
-    
+
 }
diff --git a/src/magic/model/player/AiProfile.java b/src/magic/model/player/AiProfile.java
index 237ac0f581..7534fbac3d 100644
--- a/src/magic/model/player/AiProfile.java
+++ b/src/magic/model/player/AiProfile.java
@@ -27,20 +27,20 @@ public class AiProfile extends PlayerProfile {
     private int extraLife = DEFAULT_EXTRA_LIFE;
     private int aiLevel = DEFAULT_AI_LEVEL;
     private MagicAIImpl aiType = DEFAULT_AI_TYPE;
-    
+
     public AiProfile(final String profileId) {
         super(profileId);
         loadProperties();
     }
-    
+
     public AiProfile() {
         loadProperties();
     }
-    
+
     public static AiProfile create(final MagicAIImpl aiImpl, final int level) {
         return create(aiImpl.name(), aiImpl, level);
     }
-    
+
     public static AiProfile create(final String name, final MagicAIImpl aiImpl, final int level) {
         final AiProfile ap = new AiProfile();
         ap.setPlayerName(name);
@@ -86,7 +86,7 @@ public class AiProfile extends PlayerProfile {
         aiLevel = Integer.parseInt(properties.getProperty(KEY_AI_LEVEL, Integer.toString(DEFAULT_AI_LEVEL)));
         aiType = MagicAIImpl.valueOf(properties.getProperty(KEY_AI_TYPE, DEFAULT_AI_TYPE.name()));
     }
-    
+
     @Override
     protected String getPlayerType() {
         return PLAYER_TYPE;
@@ -96,12 +96,12 @@ public class AiProfile extends PlayerProfile {
     public String getPlayerTypeLabel() {
         return UiString.get(_S1, getAiType());
     }
-    
+
     @Override
     public String getPlayerAttributeLabel() {
         return UiString.get(_S2, getAiLevel(), getExtraLife());
     }
-    
+
     @Override
     public String getPlayerLabel() {
         return UiString.get(_S3, getPlayerName(), getAiLevel(), getAiType().name());
diff --git a/src/magic/model/player/HumanProfile.java b/src/magic/model/player/HumanProfile.java
index 76a952c050..26f3509694 100644
--- a/src/magic/model/player/HumanProfile.java
+++ b/src/magic/model/player/HumanProfile.java
@@ -14,7 +14,7 @@ public class HumanProfile extends PlayerProfile {
     public HumanProfile() {
         loadProperties();
     }
-    
+
     public static HumanProfile create(final String name) {
         final HumanProfile hp = new HumanProfile();
         hp.setPlayerName(name);
@@ -38,5 +38,5 @@ public class HumanProfile extends PlayerProfile {
     protected String getPlayerType() {
         return PLAYER_TYPE;
     }
-        
+
 }
diff --git a/src/magic/model/player/PlayerProfile.java b/src/magic/model/player/PlayerProfile.java
index f3272b84dd..4b4cb542a2 100644
--- a/src/magic/model/player/PlayerProfile.java
+++ b/src/magic/model/player/PlayerProfile.java
@@ -138,11 +138,11 @@ public abstract class PlayerProfile {
     public int hashCode() {
         return this.getId().hashCode();
     }
-    
+
     public String getPlayerTypeLabel() {
         return "";
     }
-    
+
     public String getPlayerAttributeLabel() {
         return "";
     }
diff --git a/src/magic/model/player/PlayerStatistics.java b/src/magic/model/player/PlayerStatistics.java
index 22a9e98cae..0de133a2ba 100644
--- a/src/magic/model/player/PlayerStatistics.java
+++ b/src/magic/model/player/PlayerStatistics.java
@@ -198,7 +198,7 @@ public class PlayerStatistics {
 
         save();
     }
-    
+
     public int getDuelsWinPercentage() {
         return getPercentage(duelsWon, duelsPlayed);
     }
diff --git a/src/magic/model/stack/MagicItemOnStack.java b/src/magic/model/stack/MagicItemOnStack.java
index e2059c851f..aa2761d33e 100644
--- a/src/magic/model/stack/MagicItemOnStack.java
+++ b/src/magic/model/stack/MagicItemOnStack.java
@@ -41,7 +41,7 @@ public abstract class MagicItemOnStack extends MagicObjectImpl implements MagicT
     MagicItemOnStack(final MagicSource aSource, final MagicPlayer aController, final MagicEvent aEvent) {
         this(aSource, aController, aEvent, null);
     }
-    
+
     MagicItemOnStack(final MagicSource aSource, final MagicPlayer aController) {
         this(aSource, aController, null, null);
     }
@@ -49,7 +49,7 @@ public abstract class MagicItemOnStack extends MagicObjectImpl implements MagicT
     MagicItemOnStack(final MagicCopyMap copyMap, final MagicItemOnStack sourceItem) {
         id = sourceItem.id;
         activation = sourceItem.activation;
-        
+
         copyMap.put(sourceItem, this);
 
         source = copyMap.copy(sourceItem.source);
@@ -71,17 +71,17 @@ public abstract class MagicItemOnStack extends MagicObjectImpl implements MagicT
     public MagicPlayer getController() {
         return controller;
     }
-    
+
     @Override
     public MagicCardDefinition getCardDefinition() {
         return getSource().getCardDefinition();
     }
-    
+
     // only for rendering the card image popup
     final public MagicCardDefinition getRealCardDefinition() {
         return getSource().getCardDefinition();
     }
-    
+
     public int getConvertedCost() {
         return 0;
     }
@@ -185,7 +185,7 @@ public abstract class MagicItemOnStack extends MagicObjectImpl implements MagicT
     public boolean hasSubType(final MagicSubType subType) {
         return source.hasSubType(subType);
     }
-    
+
     @Override
     public int getCounters(final MagicCounterType counterType) {
         return 0;
@@ -200,7 +200,7 @@ public abstract class MagicItemOnStack extends MagicObjectImpl implements MagicT
     public boolean isLegalTarget(final MagicPlayer player, final MagicTargetFilter<? extends MagicTarget> targetFilter) {
         return source.getGame().getStack().contains(this);
     }
-    
+
     private long getStateId(final Object[] arr) {
         final long[] keys = new long[arr.length];
         for (int i = 0; i < arr.length; i++) {
@@ -219,7 +219,7 @@ public abstract class MagicItemOnStack extends MagicObjectImpl implements MagicT
             getStateId(choiceResults)
         });
     }
-   
+
     public abstract boolean isSpell();
 
     public abstract boolean canBeCountered();
diff --git a/src/magic/model/stack/MagicStack.java b/src/magic/model/stack/MagicStack.java
index acaeb67488..268868ef8b 100644
--- a/src/magic/model/stack/MagicStack.java
+++ b/src/magic/model/stack/MagicStack.java
@@ -78,7 +78,7 @@ public class MagicStack extends LinkedList<MagicItemOnStack> {
         }
         throw new RuntimeException("No corresponding MagicItemOnStack with id " + id);
     }
-    
+
     public boolean hasItem() {
         return isEmpty() == false;
     }
diff --git a/src/magic/model/target/MagicCardFilterImpl.java b/src/magic/model/target/MagicCardFilterImpl.java
index 308c5a5b27..5be869cb47 100644
--- a/src/magic/model/target/MagicCardFilterImpl.java
+++ b/src/magic/model/target/MagicCardFilterImpl.java
@@ -19,15 +19,15 @@ public abstract class MagicCardFilterImpl implements MagicTargetFilter<MagicCard
     public List<MagicCard> filter(final MagicSource source) {
         return filter(source, source.getController(), MagicTargetHint.None);
     }
-    
+
     public List<MagicCard> filter(final MagicPlayer player) {
         return filter(MagicSource.NONE, player, MagicTargetHint.None);
     }
-    
+
     public List<MagicCard> filter(final MagicEvent event) {
         return filter(event.getSource(), event.getPlayer(), MagicTargetHint.None);
     }
-    
+
     public List<MagicCard> filter(final MagicSource source, final MagicPlayer player, final MagicTargetHint targetHint) {
         final List<MagicCard> targets = new ArrayList<MagicCard>();
 
@@ -45,7 +45,7 @@ public abstract class MagicCardFilterImpl implements MagicTargetFilter<MagicCard
         if (acceptType(MagicTargetType.Hand)) {
             add(source, player, player.getHand(), targets, false);
         }
-        
+
         // Cards in library
         if (acceptType(MagicTargetType.Library)) {
             // only consider unique cards, possible as cards in library will not be counted
@@ -67,7 +67,7 @@ public abstract class MagicCardFilterImpl implements MagicTargetFilter<MagicCard
             card.setGameKnown(old);
         }
     }
-        
+
     public MagicCardFilterImpl or(final MagicType type) {
         final MagicCardFilterImpl curr = this;
         return new MagicCardFilterImpl() {
@@ -200,7 +200,7 @@ public abstract class MagicCardFilterImpl implements MagicTargetFilter<MagicCard
             }
         };
     }
-    
+
     public MagicCardFilterImpl except(final MagicCard invalid) {
         return new MagicOtherCardTargetFilter(this, invalid);
     }
diff --git a/src/magic/model/target/MagicCountersTargetPicker.java b/src/magic/model/target/MagicCountersTargetPicker.java
index 484dc13641..c0aefe308f 100644
--- a/src/magic/model/target/MagicCountersTargetPicker.java
+++ b/src/magic/model/target/MagicCountersTargetPicker.java
@@ -17,7 +17,7 @@ public class MagicCountersTargetPicker extends MagicTargetPicker<MagicPermanent>
         for (final MagicCounterType counterType : MagicCounterType.values()) {
             calculation += (permanent.getCounters(counterType)*counterType.getScore());
         }
-        
+
         final int score=calculation;
         return permanent.getController()==player?-score:score;
     }
diff --git a/src/magic/model/target/MagicDamageTargetPicker.java b/src/magic/model/target/MagicDamageTargetPicker.java
index 8932028a52..c8363ac4ba 100644
--- a/src/magic/model/target/MagicDamageTargetPicker.java
+++ b/src/magic/model/target/MagicDamageTargetPicker.java
@@ -34,7 +34,7 @@ public class MagicDamageTargetPicker extends MagicTargetPicker<MagicTarget> {
     public MagicDamageTargetPicker(final MagicAmount count) {
         this(-1, false, count);
     }
-    
+
     @Override
     protected void setEvent(final MagicEvent event) {
         if (amount < 0 || count.isConstant() == false) {
diff --git a/src/magic/model/target/MagicDestroyTargetPicker.java b/src/magic/model/target/MagicDestroyTargetPicker.java
index 61651ebf7c..6bf99af49d 100644
--- a/src/magic/model/target/MagicDestroyTargetPicker.java
+++ b/src/magic/model/target/MagicDestroyTargetPicker.java
@@ -8,7 +8,7 @@ import magic.model.MagicPlayer;
 public class MagicDestroyTargetPicker extends MagicTargetPicker<MagicPermanent> {
 
     private final boolean noRegeneration;
-    
+
     public static MagicDestroyTargetPicker Destroy = new MagicDestroyTargetPicker(false);
     public static MagicDestroyTargetPicker DestroyNoRegen = new MagicDestroyTargetPicker(true);
 
diff --git a/src/magic/model/target/MagicGraveyardTargetPicker.java b/src/magic/model/target/MagicGraveyardTargetPicker.java
index 26b11f64b5..782b63b993 100644
--- a/src/magic/model/target/MagicGraveyardTargetPicker.java
+++ b/src/magic/model/target/MagicGraveyardTargetPicker.java
@@ -9,15 +9,15 @@ public class MagicGraveyardTargetPicker extends MagicTargetPicker<MagicCard> {
 
     private final boolean free;
     private int order;
-    
+
     public static MagicGraveyardTargetPicker ExileOwn = new MagicGraveyardTargetPicker(true, -1);
-    
+
     public static MagicGraveyardTargetPicker ExileOpp = new MagicGraveyardTargetPicker(true, 1);
-    
+
     public static MagicGraveyardTargetPicker ReturnToHand = new MagicGraveyardTargetPicker(false, 1);
-    
+
     public static MagicGraveyardTargetPicker PutOntoBattlefield = new MagicGraveyardTargetPicker(true, 1);
-    
+
     private MagicGraveyardTargetPicker(final boolean aFree, final int aOrder) {
         free = aFree;
         order = aOrder;
@@ -25,7 +25,7 @@ public class MagicGraveyardTargetPicker extends MagicTargetPicker<MagicCard> {
 
     @Override
     protected int getTargetScore(final MagicGame game,final MagicPlayer player,final MagicCard target) {
-        return order * 
+        return order *
             (free ? ArtificialScoringSystem.getFreeCardScore(target):
                     ArtificialScoringSystem.getCardScore(target));
     }
diff --git a/src/magic/model/target/MagicLoseAbilityTargetPicker.java b/src/magic/model/target/MagicLoseAbilityTargetPicker.java
index b98ab69589..1459153b8d 100644
--- a/src/magic/model/target/MagicLoseAbilityTargetPicker.java
+++ b/src/magic/model/target/MagicLoseAbilityTargetPicker.java
@@ -19,21 +19,21 @@ public class MagicLoseAbilityTargetPicker extends MagicTargetPicker<MagicPermane
         }
         final int power = permanent.getPower();
         if ((permanent.hasAbility(ability) && permanent.isBlocking()) &&
-           (ability != MagicAbility.Flying || 
-            ability != MagicAbility.Defender || 
-            ability != MagicAbility.Trample || 
+           (ability != MagicAbility.Flying ||
+            ability != MagicAbility.Defender ||
+            ability != MagicAbility.Trample ||
             ability != MagicAbility.Haste)
            ) {
             return 120 + power;
         }
         if ((permanent.hasAbility(ability) && permanent.isBlocked()) &&
-           (ability != MagicAbility.Flying || 
-            ability != MagicAbility.Defender || 
+           (ability != MagicAbility.Flying ||
+            ability != MagicAbility.Defender ||
             ability != MagicAbility.Haste)
            ) {
             return 120 + power;
         }
-        if (permanent.hasAbility(ability) && permanent.isAttacking() && 
+        if (permanent.hasAbility(ability) && permanent.isAttacking() &&
            (ability != MagicAbility.Defender ||
             ability != MagicAbility.Haste)) {
             return 120 + power;
diff --git a/src/magic/model/target/MagicNameTargetFilter.java b/src/magic/model/target/MagicNameTargetFilter.java
index 613b042c1f..dba0dd48c5 100644
--- a/src/magic/model/target/MagicNameTargetFilter.java
+++ b/src/magic/model/target/MagicNameTargetFilter.java
@@ -8,7 +8,7 @@ public class MagicNameTargetFilter extends MagicPermanentFilterImpl {
 
     private final String name;
     private final MagicTargetFilter<MagicPermanent> targetFilter;
-    
+
     public MagicNameTargetFilter(final String aName) {
         this(MagicTargetFilterFactory.ANY, aName);
     }
diff --git a/src/magic/model/target/MagicOtherPermanentTargetFilter.java b/src/magic/model/target/MagicOtherPermanentTargetFilter.java
index 54179207a7..2efb067f91 100644
--- a/src/magic/model/target/MagicOtherPermanentTargetFilter.java
+++ b/src/magic/model/target/MagicOtherPermanentTargetFilter.java
@@ -9,7 +9,7 @@ public class MagicOtherPermanentTargetFilter extends MagicPermanentFilterImpl {
 
     private final MagicTargetFilter<MagicPermanent> targetFilter;
     private final long id;
-    
+
     public MagicOtherPermanentTargetFilter(final MagicTargetFilter<MagicPermanent> aTargetFilter) {
         targetFilter = aTargetFilter;
         id = 0;
diff --git a/src/magic/model/target/MagicOtherTargetFilter.java b/src/magic/model/target/MagicOtherTargetFilter.java
index 545f7b935f..1d437ee1b3 100644
--- a/src/magic/model/target/MagicOtherTargetFilter.java
+++ b/src/magic/model/target/MagicOtherTargetFilter.java
@@ -9,7 +9,7 @@ public class MagicOtherTargetFilter extends MagicTargetFilterImpl {
 
     private final MagicTargetFilter<MagicTarget> targetFilter;
     private final long id;
-    
+
     public MagicOtherTargetFilter(final MagicTargetFilter<MagicTarget> aTargetFilter) {
         targetFilter = aTargetFilter;
         id = 0;
diff --git a/src/magic/model/target/MagicPTTargetFilter.java b/src/magic/model/target/MagicPTTargetFilter.java
index 36195dead1..53c979d443 100644
--- a/src/magic/model/target/MagicPTTargetFilter.java
+++ b/src/magic/model/target/MagicPTTargetFilter.java
@@ -11,15 +11,15 @@ public class MagicPTTargetFilter extends MagicPermanentFilterImpl {
     private final int power;
     private final Operator tOp;
     private final int toughness;
-    
+
     public MagicPTTargetFilter(final MagicPermanentFilterImpl aTargetFilter, final int power) {
         this(aTargetFilter, Operator.LESS_THAN_OR_EQUAL, power, Operator.ANY, 0);
     }
-    
+
     public MagicPTTargetFilter(final MagicPermanentFilterImpl aTargetFilter, final Operator powerOp, final int power) {
         this(aTargetFilter, powerOp, power, Operator.ANY, 0);
     }
-    
+
     public static MagicPTTargetFilter Toughness(final MagicPermanentFilterImpl aTargetFilter, final Operator toughnessOp, final int toughness) {
         return new MagicPTTargetFilter(aTargetFilter, Operator.ANY, 0, toughnessOp, toughness);
     }
diff --git a/src/magic/model/target/MagicPermanentFilterImpl.java b/src/magic/model/target/MagicPermanentFilterImpl.java
index e3c1794d55..87426e247b 100644
--- a/src/magic/model/target/MagicPermanentFilterImpl.java
+++ b/src/magic/model/target/MagicPermanentFilterImpl.java
@@ -13,7 +13,7 @@ public abstract class MagicPermanentFilterImpl implements MagicTargetFilter<Magi
     public List<MagicPermanent> filter(final MagicSource source) {
         return filter(source, source.getController(), MagicTargetHint.None);
     }
-    
+
     public List<MagicPermanent> filter(final MagicPlayer player) {
         return filter(MagicSource.NONE, player, MagicTargetHint.None);
     }
@@ -21,7 +21,7 @@ public abstract class MagicPermanentFilterImpl implements MagicTargetFilter<Magi
     public List<MagicPermanent> filter(final MagicEvent event) {
         return filter(event.getSource(), event.getPlayer(), MagicTargetHint.None);
     }
-    
+
     public List<MagicPermanent> filter(final MagicSource source, final MagicPlayer player, final MagicTargetHint targetHint) {
         final MagicGame game = player.getGame();
         final List<MagicPermanent> targets=new ArrayList<MagicPermanent>();
@@ -37,7 +37,7 @@ public abstract class MagicPermanentFilterImpl implements MagicTargetFilter<Magi
         }
         return targets;
     }
-    
+
     public boolean acceptType(final MagicTargetType targetType) {
         return targetType==MagicTargetType.Permanent;
     }
diff --git a/src/magic/model/target/MagicPlayerFilterImpl.java b/src/magic/model/target/MagicPlayerFilterImpl.java
index a7d4dfce16..df0357cf3f 100644
--- a/src/magic/model/target/MagicPlayerFilterImpl.java
+++ b/src/magic/model/target/MagicPlayerFilterImpl.java
@@ -12,15 +12,15 @@ public abstract class MagicPlayerFilterImpl implements MagicTargetFilter<MagicPl
     public List<MagicPlayer> filter(final MagicSource source) {
         return filter(source, source.getController(), MagicTargetHint.None);
     }
-    
+
     public List<MagicPlayer> filter(final MagicPlayer player) {
         return filter(MagicSource.NONE, player, MagicTargetHint.None);
     }
-    
+
     public List<MagicPlayer> filter(final MagicEvent event) {
         return filter(event.getSource(), event.getPlayer(), MagicTargetHint.None);
     }
-    
+
     public List<MagicPlayer> filter(final MagicSource source, final MagicPlayer player, final MagicTargetHint targetHint) {
         final MagicGame game = player.getGame();
         final List<MagicPlayer> targets=new ArrayList<MagicPlayer>();
diff --git a/src/magic/model/target/MagicStackFilterImpl.java b/src/magic/model/target/MagicStackFilterImpl.java
index 8c6ab95929..162f961ca8 100644
--- a/src/magic/model/target/MagicStackFilterImpl.java
+++ b/src/magic/model/target/MagicStackFilterImpl.java
@@ -13,15 +13,15 @@ public abstract class MagicStackFilterImpl implements MagicTargetFilter<MagicIte
     public List<MagicItemOnStack> filter(final MagicSource source) {
         return filter(source, source.getController(), MagicTargetHint.None);
     }
-    
+
     public List<MagicItemOnStack> filter(final MagicPlayer player) {
         return filter(MagicSource.NONE, player, MagicTargetHint.None);
     }
-    
+
     public List<MagicItemOnStack> filter(final MagicEvent event) {
         return filter(event.getSource(), event.getPlayer(), MagicTargetHint.None);
     }
-    
+
     public List<MagicItemOnStack> filter(final MagicSource source, final MagicPlayer player, final MagicTargetHint targetHint) {
         final MagicGame game = player.getGame();
         final List<MagicItemOnStack> targets=new ArrayList<MagicItemOnStack>();
diff --git a/src/magic/model/target/MagicTapTargetPicker.java b/src/magic/model/target/MagicTapTargetPicker.java
index 4e2d6c9a8c..00bc82a204 100644
--- a/src/magic/model/target/MagicTapTargetPicker.java
+++ b/src/magic/model/target/MagicTapTargetPicker.java
@@ -5,7 +5,7 @@ import magic.model.MagicPermanent;
 import magic.model.MagicPlayer;
 
 public abstract class MagicTapTargetPicker extends MagicTargetPicker<MagicPermanent> {
-                
+
     private static final int score(final MagicPermanent permanent) {
         return 1 + permanent.getPower() + permanent.getActivations().size();
     }
@@ -20,7 +20,7 @@ public abstract class MagicTapTargetPicker extends MagicTargetPicker<MagicPerman
             }
         }
     };
-    
+
     public static MagicTapTargetPicker Untap = new MagicTapTargetPicker() {
         @Override
         protected int getTargetScore(final MagicGame game,final MagicPlayer player,final MagicPermanent permanent) {
diff --git a/src/magic/model/target/MagicTargetFilter.java b/src/magic/model/target/MagicTargetFilter.java
index 61788fad5b..f5c59983e8 100644
--- a/src/magic/model/target/MagicTargetFilter.java
+++ b/src/magic/model/target/MagicTargetFilter.java
@@ -16,12 +16,12 @@ public interface MagicTargetFilter<T extends MagicTarget> {
     boolean acceptType(final MagicTargetType targetType);
 
     boolean accept(final MagicSource source,final MagicPlayer player,final T target);
-    
+
     List<T> filter(final MagicSource source, final MagicPlayer player, final MagicTargetHint targetHint);
-    
+
     List<T> filter(final MagicSource source);
 
     List<T> filter(final MagicPlayer player);
-    
+
     List<T> filter(final MagicEvent event);
 }
diff --git a/src/magic/model/target/MagicTargetFilterFactory.java b/src/magic/model/target/MagicTargetFilterFactory.java
index c1f53b240a..f179ceffae 100644
--- a/src/magic/model/target/MagicTargetFilterFactory.java
+++ b/src/magic/model/target/MagicTargetFilterFactory.java
@@ -377,7 +377,7 @@ public class MagicTargetFilterFactory {
             return target.isLand() && !target.hasType(MagicType.Basic) && target.isController(player);
         }
     };
-    
+
     public static final MagicPermanentFilterImpl NON_LAIR_LAND_YOU_CONTROL=new MagicPermanentFilterImpl() {
         public boolean accept(final MagicSource source,final MagicPlayer player,final MagicPermanent target) {
             return target.isLand() && !target.hasSubType(MagicSubType.Lair) && target.isController(player);
@@ -1063,7 +1063,7 @@ public class MagicTargetFilterFactory {
     public static final MagicPermanentFilterImpl TAPPED_CREATURE = MagicTargetFilterFactory.creature(MagicPermanentState.Tapped, Control.Any);
 
     public static final MagicPermanentFilterImpl TAPPED_CREATURE_YOU_CONTROL = MagicTargetFilterFactory.creature(MagicPermanentState.Tapped, Control.You);
-    
+
     public static final MagicPermanentFilterImpl TAPPED_CREATURE_AN_OPPONENT_CONTROLS = MagicTargetFilterFactory.creature(MagicPermanentState.Tapped, Control.Opp);
 
     public static final MagicPermanentFilterImpl TAPPED_ARTIFACT_YOU_CONTROL = MagicTargetFilterFactory.permanent(MagicPermanentState.Tapped, MagicType.Artifact, Control.You);
@@ -1092,7 +1092,7 @@ public class MagicTargetFilterFactory {
                    target.isController(player);
         }
     };
-    
+
     public static final MagicPermanentFilterImpl UNTAPPED_ISLAND_YOU_CONTROL = new MagicPermanentFilterImpl() {
         public boolean accept(final MagicSource source,final MagicPlayer player,final MagicPermanent target) {
             return target.hasSubType(MagicSubType.Island) &&
@@ -1530,7 +1530,7 @@ public class MagicTargetFilterFactory {
             return targetType == MagicTargetType.Graveyard;
         }
     };
-    
+
     public static final MagicCardFilterImpl COLORLESS_CREATURE_CARD_FROM_LIBRARY=new MagicCardFilterImpl() {
         public boolean accept(final MagicSource source,final MagicPlayer player,final MagicCard target) {
             return MagicColor.isColorless(target) && target.isCreature();
@@ -1921,7 +1921,7 @@ public class MagicTargetFilterFactory {
             return targetType == MagicTargetType.Hand;
         }
     };
-    
+
     public static final MagicCardFilterImpl NONCREATURE_CARD_FROM_HAND = new MagicCardFilterImpl() {
         public boolean accept(final MagicSource source,final MagicPlayer player,final MagicCard target) {
             return target.hasType(MagicType.Creature) == false;
diff --git a/src/magic/model/target/MagicTargetFilterImpl.java b/src/magic/model/target/MagicTargetFilterImpl.java
index e8ca2331e6..dff3459b52 100644
--- a/src/magic/model/target/MagicTargetFilterImpl.java
+++ b/src/magic/model/target/MagicTargetFilterImpl.java
@@ -15,15 +15,15 @@ public abstract class MagicTargetFilterImpl implements MagicTargetFilter<MagicTa
     public List<MagicTarget> filter(final MagicSource source) {
         return filter(source, source.getController(), MagicTargetHint.None);
     }
-    
+
     public List<MagicTarget> filter(final MagicPlayer player) {
         return filter(MagicSource.NONE, player, MagicTargetHint.None);
     }
-    
+
     public List<MagicTarget> filter(final MagicEvent event) {
         return filter(event.getSource(), event.getPlayer(), MagicTargetHint.None);
     }
-    
+
     public List<MagicTarget> filter(final MagicSource source, final MagicPlayer player, final MagicTargetHint targetHint) {
         final MagicGame game = player.getGame();
         final List<MagicTarget> targets=new ArrayList<MagicTarget>();
@@ -86,7 +86,7 @@ public abstract class MagicTargetFilterImpl implements MagicTargetFilter<MagicTa
                 }
             }
         }
-        
+
         // Cards in library
         if (acceptType(MagicTargetType.Library)) {
             for (final MagicCard targetCard : player.getLibrary()) {
diff --git a/src/magic/model/target/MagicTargetFilterParser.java b/src/magic/model/target/MagicTargetFilterParser.java
index 41c29e0b35..713990343b 100644
--- a/src/magic/model/target/MagicTargetFilterParser.java
+++ b/src/magic/model/target/MagicTargetFilterParser.java
@@ -8,7 +8,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public enum MagicTargetFilterParser {
-    
+
     CardNamedFromYourLibrary("card named " + ARG.ANY + " from your library") {
         public MagicTargetFilter<?> toTargetFilter(final Matcher arg) {
             return MagicTargetFilterFactory.cardName(ARG.any(arg)).from(MagicTargetType.Library);
@@ -180,9 +180,9 @@ public enum MagicTargetFilterParser {
         }
     },
     ;
-    
+
     private final Pattern pattern;
-    
+
     private MagicTargetFilterParser(final String regex) {
         pattern = Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
     }
@@ -191,7 +191,7 @@ public enum MagicTargetFilterParser {
     }
 
     public abstract MagicTargetFilter<?> toTargetFilter(final Matcher arg);
-    
+
     public static final MagicTargetFilter<?> build(final String text) {
         for (final MagicTargetFilterParser rule : values()) {
             final Matcher matcher = rule.matcher(text);
diff --git a/src/magic/model/target/MagicTargetHint.java b/src/magic/model/target/MagicTargetHint.java
index da8f1042a6..bd6abd56a2 100644
--- a/src/magic/model/target/MagicTargetHint.java
+++ b/src/magic/model/target/MagicTargetHint.java
@@ -17,7 +17,7 @@ public enum MagicTargetHint {
                 return true;
         }
     }
-    
+
     public static MagicTargetHint getHint(final String target) {
         if (target.startsWith("pos")) {
             return Positive;
diff --git a/src/magic/model/target/MagicTargetNone.java b/src/magic/model/target/MagicTargetNone.java
index 0d928ffe98..d1c09ecb0c 100644
--- a/src/magic/model/target/MagicTargetNone.java
+++ b/src/magic/model/target/MagicTargetNone.java
@@ -98,7 +98,7 @@ public class MagicTargetNone extends MagicObjectImpl implements MagicTarget, Mag
     public MagicPlayer getController() {
         throw new RuntimeException("MagicTargetNone has no controller");
     }
-    
+
     @Override
     public MagicCardDefinition getCardDefinition() {
         throw new RuntimeException("MagicTargetNone has no card definition");
@@ -115,7 +115,7 @@ public class MagicTargetNone extends MagicObjectImpl implements MagicTarget, Mag
     public long getStateId() {
         return hashCode();
     }
-    
+
     @Override
     public int getCounters(final MagicCounterType counterType) {
         return 0;
diff --git a/src/magic/model/target/MagicTargetPicker.java b/src/magic/model/target/MagicTargetPicker.java
index c50c8fe1a8..f380a496a9 100644
--- a/src/magic/model/target/MagicTargetPicker.java
+++ b/src/magic/model/target/MagicTargetPicker.java
@@ -15,7 +15,7 @@ public abstract class MagicTargetPicker<T> {
     protected void setEvent(final MagicEvent event) {
         //do nothing
     }
-    
+
     protected abstract int getTargetScore(final MagicGame game,final MagicPlayer event,final T target);
 
     public Collection<T> pickTargets(final MagicGame game,final MagicEvent event,final Collection<T> options) {
diff --git a/src/magic/model/target/MagicTrampleTargetPicker.java b/src/magic/model/target/MagicTrampleTargetPicker.java
index 05ed4e48a2..cb674e19b7 100644
--- a/src/magic/model/target/MagicTrampleTargetPicker.java
+++ b/src/magic/model/target/MagicTrampleTargetPicker.java
@@ -28,7 +28,7 @@ public class MagicTrampleTargetPicker extends MagicTargetPicker<MagicPermanent>
                 for (final MagicPermanent blocker : blockers) {
                     blockersToughness += blocker.getToughness();
                 }
-                if (blockersToughness < power || 
+                if (blockersToughness < power ||
                    (permanent.hasAbility(MagicAbility.Deathtouch) && power > blockers.size())) {
                     return 10+power;
                 }
diff --git a/src/magic/model/target/MagicWeakenTargetPicker.java b/src/magic/model/target/MagicWeakenTargetPicker.java
index 5eda37323e..20f6eed580 100644
--- a/src/magic/model/target/MagicWeakenTargetPicker.java
+++ b/src/magic/model/target/MagicWeakenTargetPicker.java
@@ -17,24 +17,24 @@ public class MagicWeakenTargetPicker extends MagicTargetPicker<MagicPermanent> {
 
     private int amountToughness;
     private final MagicAmount count;
-    
+
     public MagicWeakenTargetPicker(final MagicAmount aCount) {
         amountToughness = -1;
         count = aCount;
     }
-           
+
     public MagicWeakenTargetPicker(final int amountPower,final int aAmountToughness) {
         amountToughness = aAmountToughness;
         count = MagicAmountFactory.One;
     }
-    
+
     public MagicWeakenTargetPicker create(final String arg) {
         final String[] args = arg.replace('+','0').split("/");
         final int p = -Integer.parseInt(args[0]);
         final int t = -Integer.parseInt(args[1]);
         return new MagicWeakenTargetPicker(p, t);
     }
-    
+
     @Override
     protected void setEvent(final MagicEvent event) {
         if (amountToughness < 0 || count.isConstant() == false) {
diff --git a/src/magic/model/trigger/AtEndOfTurnTrigger.java b/src/magic/model/trigger/AtEndOfTurnTrigger.java
index 663311458d..df1c92d712 100644
--- a/src/magic/model/trigger/AtEndOfTurnTrigger.java
+++ b/src/magic/model/trigger/AtEndOfTurnTrigger.java
@@ -57,7 +57,7 @@ public abstract class AtEndOfTurnTrigger extends MagicTrigger<MagicPlayer> {
             game.doAction(new SacrificeAction(event.getPermanent()));
         }
     };
-    
+
     public static final AtEndOfTurnTrigger Destroy = new AtEndOfTurnTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer eotPlayer) {
diff --git a/src/magic/model/trigger/AtUpkeepTrigger.java b/src/magic/model/trigger/AtUpkeepTrigger.java
index 503023aa11..321776d255 100644
--- a/src/magic/model/trigger/AtUpkeepTrigger.java
+++ b/src/magic/model/trigger/AtUpkeepTrigger.java
@@ -28,7 +28,7 @@ public abstract class AtUpkeepTrigger extends MagicTrigger<MagicPlayer> {
             }
         };
     }
-    
+
     public static AtUpkeepTrigger createOpp(final MagicSourceEvent sourceEvent) {
         return new AtUpkeepTrigger() {
             @Override
diff --git a/src/magic/model/trigger/AttacksTrigger.java b/src/magic/model/trigger/AttacksTrigger.java
index 636da4dab7..161b3dfed9 100644
--- a/src/magic/model/trigger/AttacksTrigger.java
+++ b/src/magic/model/trigger/AttacksTrigger.java
@@ -29,12 +29,12 @@ public abstract class AttacksTrigger extends MagicTrigger<MagicPermanent> {
             }
         };
     }
-    
+
     public static AttacksTrigger createAlone(final MagicTargetFilter<MagicPermanent> filter, final MagicSourceEvent sourceEvent) {
         return new AttacksTrigger() {
             @Override
             public boolean accept(final MagicPermanent permanent, final MagicPermanent attacker) {
-                return filter.accept(permanent, permanent.getController(), attacker) && 
+                return filter.accept(permanent, permanent.getController(), attacker) &&
                        attacker.getController().getNrOfAttackers() == 1;
             }
             @Override
diff --git a/src/magic/model/trigger/BecomesTargetTrigger.java b/src/magic/model/trigger/BecomesTargetTrigger.java
index 038e6e2390..9d585e4e0c 100644
--- a/src/magic/model/trigger/BecomesTargetTrigger.java
+++ b/src/magic/model/trigger/BecomesTargetTrigger.java
@@ -18,7 +18,7 @@ public abstract class BecomesTargetTrigger extends MagicTrigger<MagicItemOnStack
     public MagicTriggerType getType() {
         return MagicTriggerType.WhenTargeted;
     }
-    
+
     public static BecomesTargetTrigger createThis(final MagicTargetFilter<MagicItemOnStack> ifilter, final MagicSourceEvent sourceEvent) {
         return new BecomesTargetTrigger() {
             @Override
diff --git a/src/magic/model/trigger/MagicPermanentTriggerMap.java b/src/magic/model/trigger/MagicPermanentTriggerMap.java
index fe4299627b..b2c57ee05c 100644
--- a/src/magic/model/trigger/MagicPermanentTriggerMap.java
+++ b/src/magic/model/trigger/MagicPermanentTriggerMap.java
@@ -24,7 +24,7 @@ public class MagicPermanentTriggerMap {
     }
 
     public MagicPermanentTriggerMap() {}
-    
+
     public MagicPermanentTriggerMap(final MagicPermanentTriggerMap other) {
         for (final Map.Entry<MagicTriggerType, PriorityQueue<MagicPermanentTrigger>> type : other.effects.entrySet()) {
             for (final MagicPermanentTrigger mptrigger : type.getValue()) {
diff --git a/src/magic/model/trigger/MagicTrigger.java b/src/magic/model/trigger/MagicTrigger.java
index 86420e8248..1aaa09b1b3 100644
--- a/src/magic/model/trigger/MagicTrigger.java
+++ b/src/magic/model/trigger/MagicTrigger.java
@@ -24,7 +24,7 @@ public abstract class MagicTrigger<T> implements MagicEventAction,MagicChangeCar
     protected MagicTrigger(final int aPriority) {
         priority = aPriority;
     }
-    
+
     protected MagicTrigger() {
         this(DEFAULT_PRIORITY);
     }
@@ -43,7 +43,7 @@ public abstract class MagicTrigger<T> implements MagicEventAction,MagicChangeCar
     }
 
     public abstract MagicTriggerType getType();
-            
+
     public abstract MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final T data);
 
     public boolean accept(final MagicPermanent permanent, final T data) {
diff --git a/src/magic/model/trigger/PreventDamageTrigger.java b/src/magic/model/trigger/PreventDamageTrigger.java
index db2f8d46bb..0041e9f2a9 100644
--- a/src/magic/model/trigger/PreventDamageTrigger.java
+++ b/src/magic/model/trigger/PreventDamageTrigger.java
@@ -220,14 +220,14 @@ public abstract class PreventDamageTrigger extends IfDamageWouldBeDealtTrigger {
             }
         };
     }
-    
+
     // prevent all combat damage dealt by
     public static final PreventDamageTrigger PreventCombatDamageDealtBy(final MagicTargetFilter<MagicPermanent> filter) {
         return new PreventDamageTrigger() {
             @Override
             public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) {
-                if (damage.isCombat() && 
-                    damage.isSourcePermanent() && 
+                if (damage.isCombat() &&
+                    damage.isSourcePermanent() &&
                     filter.accept(permanent, permanent.getController(), damage.getSourcePermanent())) {
                     damage.prevent();
                 }
@@ -235,13 +235,13 @@ public abstract class PreventDamageTrigger extends IfDamageWouldBeDealtTrigger {
             }
         };
     }
-    
+
     // prevent all damage dealt by
     public static final PreventDamageTrigger PreventDamageDealtBy(final MagicTargetFilter<MagicPermanent> filter) {
         return new PreventDamageTrigger() {
             @Override
             public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) {
-                if (damage.isSourcePermanent() && 
+                if (damage.isSourcePermanent() &&
                     filter.accept(permanent, permanent.getController(), damage.getSourcePermanent())) {
                     damage.prevent();
                 }
diff --git a/src/magic/test/TestAwaken.java b/src/magic/test/TestAwaken.java
index 0a24635a1f..fd34665b43 100644
--- a/src/magic/test/TestAwaken.java
+++ b/src/magic/test/TestAwaken.java
@@ -23,7 +23,7 @@ class TestAwaken extends TestGameBuilder {
         createPermanent(P, "Chromatic Lantern", false, 1);
         addToHand(P, "Sheer Drop", 1);
         addToHand(P, "Pressure Point", 1);
-        
+
         P = opponent;
 
         P.setLife(1);
@@ -31,7 +31,7 @@ class TestAwaken extends TestGameBuilder {
         createPermanent(P, "Swamp", false, 7);
         createPermanent(P, "Chromatic Lantern", false, 1);
         createPermanent(P, "Grizzly Bears", false, 1);
-        
+
         return game;
     }
 }
diff --git a/src/magic/test/TestColfenorsUrn.java b/src/magic/test/TestColfenorsUrn.java
index 136bddd26c..d68f13aedb 100644
--- a/src/magic/test/TestColfenorsUrn.java
+++ b/src/magic/test/TestColfenorsUrn.java
@@ -24,7 +24,7 @@ class TestColfenorsUrn extends TestGameBuilder {
         createPermanent(P, "Megatog", false, 3);
         createPermanent(P, "Colfenor's Urn", false, 1);
         addToHand(P, "Wrath of God", 1);
-        
+
         P = opponent;
 
         P.setLife(2);
diff --git a/src/magic/test/TestCostReduction.java b/src/magic/test/TestCostReduction.java
index bba59b4ff3..94961fce1b 100644
--- a/src/magic/test/TestCostReduction.java
+++ b/src/magic/test/TestCostReduction.java
@@ -29,7 +29,7 @@ class TestCostReduction extends TestGameBuilder {
         addToHand(P, "Ruby Medallion", 1);
         addToHand(P, "Enrage", 1);
         addToHand(P, "Bonfire of the Damned", 1);
-        
+
         P = opponent;
 
         P.setLife(4);
@@ -38,7 +38,7 @@ class TestCostReduction extends TestGameBuilder {
         createPermanent(P, "Mountain", false, 6);
         addToHand(P, "Bonfire of the Damned", 1);
         addToHand(P, "Ruby Medallion", 1);
-        
+
         return game;
     }
 }
diff --git a/src/magic/test/TestGameBuilder.java b/src/magic/test/TestGameBuilder.java
index 6086034cd7..00a0afe561 100644
--- a/src/magic/test/TestGameBuilder.java
+++ b/src/magic/test/TestGameBuilder.java
@@ -79,11 +79,11 @@ public abstract class TestGameBuilder {
         }
         return lastPermanent;
     }
-    
+
     public static MagicPermanent createPermanent(final MagicPlayer player,final String name,final int amount){
         return createPermanent(player,name,false,amount);
     }
-    
+
     public static MagicPermanent createPermanent(final MagicPlayer player,final String name){
         return createPermanent(player,name,false,1);
     }
diff --git a/src/magic/test/TestManaCrash.java b/src/magic/test/TestManaCrash.java
index 420e798bda..8121b69bc0 100644
--- a/src/magic/test/TestManaCrash.java
+++ b/src/magic/test/TestManaCrash.java
@@ -27,7 +27,7 @@ class TestManaCrash extends TestGameBuilder {
         addToHand(P, "Yavimaya Scion", 1);
         addToHand(P, "Temple of Plenty", 1);
         addToHand(P, "Reaping the Rewards", 1);
-        
+
         P = opponent;
 
         P.setLife(20);
@@ -39,7 +39,7 @@ class TestManaCrash extends TestGameBuilder {
         addToHand(P, "Savage Lands", 1);
         addToHand(P, "Forest", 1);
         addToHand(P, "Rupture Spire", 1);
-        
+
         return game;
     }
 }
diff --git a/src/magic/test/TestNoChoice.java b/src/magic/test/TestNoChoice.java
index 5e654189be..b2e1652cee 100644
--- a/src/magic/test/TestNoChoice.java
+++ b/src/magic/test/TestNoChoice.java
@@ -22,7 +22,7 @@ class TestNoChoice extends TestGameBuilder {
         addToLibrary(P, "Forest", 20);
         createPermanent(P, "Vesper Ghoul", false, 1);
         createPermanent(P, "Foul Familiar", false, 1);
-        
+
         P = opponent;
 
         P.setLife(1);
diff --git a/src/magic/test/TestReaperKing.java b/src/magic/test/TestReaperKing.java
index 99a39e454c..39ca94ab03 100644
--- a/src/magic/test/TestReaperKing.java
+++ b/src/magic/test/TestReaperKing.java
@@ -28,7 +28,7 @@ class TestReaperKing extends TestGameBuilder {
         createPermanent(P,"Volcanic Island",false,2);
         createPermanent(P,"Badlands",false,2);
         addToHand(P,"Reaper King",4);
-        
+
         P = opponent;
 
         P.setLife(20);
diff --git a/src/magic/test/TestRishadan.java b/src/magic/test/TestRishadan.java
index 41e3322947..7472f11829 100644
--- a/src/magic/test/TestRishadan.java
+++ b/src/magic/test/TestRishadan.java
@@ -27,7 +27,7 @@ class TestRishadan extends TestGameBuilder {
         createPermanent(P,"Soldevi Digger",false,1);
         addToHand(P,"Howling Wolf",3);
         addToHand(P,"Skyshroud Sentinel",2);
-        
+
         addToGraveyard(P,"Skyshroud Sentinel",1);
         addToGraveyard(P,"Howling Wolf",1);
         addToGraveyard(P,"Golgari Cluestone",1);
diff --git a/src/magic/test/TestSlowLog.java b/src/magic/test/TestSlowLog.java
index c7ab710284..b051009143 100644
--- a/src/magic/test/TestSlowLog.java
+++ b/src/magic/test/TestSlowLog.java
@@ -27,7 +27,7 @@ class TestSlowLog extends TestGameBuilder {
         createPermanent(P, "Chromatic Lantern", false, 1);
         createPermanent(P, "Grizzly Bears", false, 1);
         addToHand(P, "Lightning Bolt", 15);
-        
+
         P = opponent;
 
         P.setLife(2);
@@ -35,11 +35,11 @@ class TestSlowLog extends TestGameBuilder {
         createPermanent(P, "Island", false, 7);
         createPermanent(P, "Chromatic Lantern", false, 1);
         createPermanent(P, "Grizzly Bears", false, 1);
-        
+
         for (int i = 0; i < 1000; i++) {
             game.logMessage(P, "msg " + i);
         }
-        
+
         return game;
     }
 }
diff --git a/src/magic/translate/UiString.java b/src/magic/translate/UiString.java
index 235e61e37c..16dc1918fd 100644
--- a/src/magic/translate/UiString.java
+++ b/src/magic/translate/UiString.java
@@ -29,7 +29,7 @@ public final class UiString {
     private UiString() { }
 
     private static final String UTF_CHAR_SET = "UTF-8";
-    
+
     private static final CRC32 crc = new CRC32();
     private static final Map<Long, String> translationsMap = new HashMap<>();
     private static final Map<Long, String> annotations = new HashMap<>();
@@ -155,7 +155,7 @@ public final class UiString {
 
         final Map<Long, String> stringsMap = new LinkedHashMap<>();
         annotations.clear();
-        
+
         for (final String c : getClassNamesInPackage(MagicSystem.getJarFile(), "magic")) {
             final String className = c.substring(0, c.length() - ".class".length());
             try {
diff --git a/src/magic/ui/CardFilterPanel.java b/src/magic/ui/CardFilterPanel.java
index dd28119a6a..2886a9e23c 100644
--- a/src/magic/ui/CardFilterPanel.java
+++ b/src/magic/ui/CardFilterPanel.java
@@ -135,9 +135,9 @@ public class CardFilterPanel extends TexturedPanel implements ActionListener {
     private int totalFilteredCards = 0;
     private int playableCards = 0;
     private int missingCards = 0;
-    
+
     private static List<MagicCardDefinition> cardPool;
-    
+
     private boolean disableUpdate; // so when we change several filters, it doesn't update until the end
 
     public CardFilterPanel(final ICardFilterPanelListener aListener) {
@@ -147,7 +147,7 @@ public class CardFilterPanel extends TexturedPanel implements ActionListener {
         cardPool = listener.isDeckEditor()
             ? CardDefinitions.getDefaultPlayableCardDefs()
             : CardDefinitions.getAllCards();
-        
+
         disableUpdate = false;
 
         layout.setLayoutConstraints("flowy, wrap 2, gap 4");
diff --git a/src/magic/ui/ImageFileIO.java b/src/magic/ui/ImageFileIO.java
index 3317cdbc2c..2b758c6640 100644
--- a/src/magic/ui/ImageFileIO.java
+++ b/src/magic/ui/ImageFileIO.java
@@ -23,7 +23,7 @@ public final class ImageFileIO {
             return null;
         }
     }
-    
+
     public static BufferedImage toImg(final File input, final BufferedImage def) {
         return toImg(input, () -> def);
     }
diff --git a/src/magic/ui/ImportWorker.java b/src/magic/ui/ImportWorker.java
index db090f21e5..03882daf5c 100644
--- a/src/magic/ui/ImportWorker.java
+++ b/src/magic/ui/ImportWorker.java
@@ -175,10 +175,10 @@ public class ImportWorker extends SwingWorker<Boolean, Void> {
 
         // not interested in importing these settings.
         thisSettings.removeAll(Arrays.asList(
-                "left", 
-                "fullScreen", 
-                "top", 
-                "height", 
+                "left",
+                "fullScreen",
+                "top",
+                "height",
                 "width",
                 "translation"));
 
@@ -199,7 +199,7 @@ public class ImportWorker extends SwingWorker<Boolean, Void> {
         GeneralConfig.getInstance().setMissingImagesDownloadDate(dt.getTime());
         GeneralConfig.getInstance().setPlayableImagesDownloadDate(dt.getTime());
         GeneralConfig.getInstance().save();
-        
+
         setProgressNote(OK_STRING);
     }
 
@@ -341,5 +341,5 @@ public class ImportWorker extends SwingWorker<Boolean, Void> {
             logger.log(progressNote);
         }
     }
-    
+
 }
diff --git a/src/magic/ui/MagarenaDirectoryChooser.java b/src/magic/ui/MagarenaDirectoryChooser.java
index d7dd9ccc07..737f50f6ca 100644
--- a/src/magic/ui/MagarenaDirectoryChooser.java
+++ b/src/magic/ui/MagarenaDirectoryChooser.java
@@ -42,5 +42,5 @@ public class MagarenaDirectoryChooser extends JFileChooser {
                 && importPath.resolve("Magarena").toFile().exists()
                 && !importPath.resolve("Magarena").equals(MagicFileSystem.getDataPath());
     }
-    
+
 }
diff --git a/src/magic/ui/MagicFrame.java b/src/magic/ui/MagicFrame.java
index 78b9348a02..ab116a9fb7 100644
--- a/src/magic/ui/MagicFrame.java
+++ b/src/magic/ui/MagicFrame.java
@@ -63,7 +63,7 @@ public class MagicFrame extends JFrame implements IImageDragDropListener {
     public MagicFrame(final String frameTitle) {
 
         ToolTipManager.sharedInstance().setInitialDelay(400);
-        
+
         config = GeneralConfig.getInstance();
 
         // Setup frame.
diff --git a/src/magic/ui/MagicImages.java b/src/magic/ui/MagicImages.java
index bed12d4be2..4588a155dd 100644
--- a/src/magic/ui/MagicImages.java
+++ b/src/magic/ui/MagicImages.java
@@ -38,7 +38,7 @@ public final class MagicImages {
     public static final BufferedImage MISSING_BIG = loadImage("missing.png");
     private static final BufferedImage MISSING_SMALL = loadImage("missing2.png");
     public static final BufferedImage MISSING_CARD = loadImage("missing_card.png");
-    
+
     // "M" logo variations.
     public static final BufferedImage LOGO = loadImage("logo.png");
     public static final BufferedImage MENU_LOGO = GraphicsUtils.scale(LOGO, 40, 40);
diff --git a/src/magic/ui/MagicSound.java b/src/magic/ui/MagicSound.java
index 7da344eaa6..38ae506aae 100644
--- a/src/magic/ui/MagicSound.java
+++ b/src/magic/ui/MagicSound.java
@@ -39,7 +39,7 @@ public enum MagicSound {
                 GeneralConfig.getInstance().save();
                 throw new RuntimeException(ex);
             }
-        }        
+        }
     }
 
     public void play() {
diff --git a/src/magic/ui/ScreenController.java b/src/magic/ui/ScreenController.java
index 0e65581c20..ab7e9caa75 100644
--- a/src/magic/ui/ScreenController.java
+++ b/src/magic/ui/ScreenController.java
@@ -187,7 +187,7 @@ public final class ScreenController {
         screens.clear();
         showScreen(new ImportScreen());
     }
-    
+
     public static void showAboutDialog() {
         new AboutDialog(getMainFrame());
     }
diff --git a/src/magic/ui/ScreenOptionsOverlay.java b/src/magic/ui/ScreenOptionsOverlay.java
index e93a6ada82..3662dbee73 100644
--- a/src/magic/ui/ScreenOptionsOverlay.java
+++ b/src/magic/ui/ScreenOptionsOverlay.java
@@ -31,7 +31,7 @@ public abstract class ScreenOptionsOverlay extends TexturedPanel implements IThe
     private static final String _S6 = "Quit to main menu";
     private static final String _S7 = "Quit to desktop";
     private static final String _S8 = "Close Menu";
-    
+
     private final MenuPanel screenMenu;
     private MenuPanel menu = null;
 
diff --git a/src/magic/ui/URLUtils.java b/src/magic/ui/URLUtils.java
index 7a3a038a34..909c54fe3e 100644
--- a/src/magic/ui/URLUtils.java
+++ b/src/magic/ui/URLUtils.java
@@ -59,13 +59,13 @@ public class URLUtils {
         if (url == null)
             return false;
 
-        try {            
+        try {
             final HttpURLConnection huc = (HttpURLConnection) url.openConnection();
             huc.setRequestMethod("HEAD");
             huc.setConnectTimeout(2000);
             final int responseCode = huc.getResponseCode();
             return responseCode == HttpURLConnection.HTTP_OK;
-        
+
         } catch (IOException ex) {
             return false;
         }
diff --git a/src/magic/ui/canvas/cards/CardImageOverlay.java b/src/magic/ui/canvas/cards/CardImageOverlay.java
index cde305d008..74547b10ef 100644
--- a/src/magic/ui/canvas/cards/CardImageOverlay.java
+++ b/src/magic/ui/canvas/cards/CardImageOverlay.java
@@ -56,7 +56,7 @@ public class CardImageOverlay extends TexturedPanel {
         setFocusTraversalKeysEnabled(false);
 
         setBackground(MagicStyle.getTranslucentColor(Color.DARK_GRAY, 200));
-      
+
         ScreenController.getMainFrame().setGlassPane(this);
         setVisible(true);
 
diff --git a/src/magic/ui/canvas/cards/CardsCanvas.java b/src/magic/ui/canvas/cards/CardsCanvas.java
index 2d15b93e4e..4f19366480 100644
--- a/src/magic/ui/canvas/cards/CardsCanvas.java
+++ b/src/magic/ui/canvas/cards/CardsCanvas.java
@@ -76,7 +76,7 @@ public class CardsCanvas extends JPanel {
     public void setListener(ICardsCanvasListener aListener) {
         this.listener = aListener;
     }
-    
+
     private void setMouseListener() {
         addMouseListener(new MouseAdapter() {
             @Override
@@ -284,7 +284,7 @@ public class CardsCanvas extends JPanel {
 //            drawHighlightBorder(g2d, rect);
         }
     }
-    
+
     private void drawHighlightBorder(Graphics2D g2d, Rectangle rect) {
         final int w = 4;
         g2d.setStroke(new BasicStroke(w));
diff --git a/src/magic/ui/card/AnnotatedCardPanel.java b/src/magic/ui/card/AnnotatedCardPanel.java
index cbfe83ffcc..0639f11750 100644
--- a/src/magic/ui/card/AnnotatedCardPanel.java
+++ b/src/magic/ui/card/AnnotatedCardPanel.java
@@ -73,7 +73,7 @@ public class AnnotatedCardPanel extends JPanel {
     private final MagicInfoWindow infoWindow = new MagicInfoWindow();
     private final Rectangle containerRect;
     private boolean preferredVisibility = false;
-    
+
     public AnnotatedCardPanel() {
 
         this.containerRect = getWindowRect();
@@ -99,7 +99,7 @@ public class AnnotatedCardPanel extends JPanel {
                 infoWindow.setVisible(false);
             }
         });
-        
+
         setVisible(false);
 
     }
@@ -161,7 +161,7 @@ public class AnnotatedCardPanel extends JPanel {
     public void hideNoDelay() {
         hideCardPanel(0);
     }
-    
+
     private void showPopup() {
         if (MagicAnimations.isOn(AnimationFx.CARD_FADEIN)) {
             if (opacity == 0f) {
@@ -243,7 +243,7 @@ public class AnnotatedCardPanel extends JPanel {
             g.setFont(FontsAndBorders.FONT1);
             GraphicsUtils.drawStringWithOutline(g, Long.toString(card.getCard().getId()), 2, 14);
         }
-        
+
     }
 
     private BufferedImage getImageCopy(final BufferedImage image) {
@@ -281,7 +281,7 @@ public class AnnotatedCardPanel extends JPanel {
      * and drawn on top of the original card image.
      */
     private void drawPowerToughnessOverlay(final BufferedImage cardImage) {
-        
+
         if (modifiedPT.isEmpty())
             return;
 
@@ -298,7 +298,7 @@ public class AnnotatedCardPanel extends JPanel {
             cardImage.getWidth(),
             cardImage.getHeight()
         );
-        
+
         // draw tranparent P/T overlay on top of original card.
         final Graphics2D g2d = cardImage.createGraphics();
         g2d.drawImage(overlay, 0, 0, null);
@@ -322,12 +322,12 @@ public class AnnotatedCardPanel extends JPanel {
             final MagicPermanent perm = (MagicPermanent)magicObject;
             return canRevealTrueFace(perm) ?
                 getCardImage(perm.getRealCardDefinition()) :
-                getCardImage(perm.getCardDefinition()); 
+                getCardImage(perm.getCardDefinition());
         } else {
             return getCardImage(magicObject.getCardDefinition());
         }
     }
-    
+
     /**
      * primarily used to determine whether a face-down card will
      * show its hidden face when displaying mouse-over popup.
diff --git a/src/magic/ui/card/CardIcon.java b/src/magic/ui/card/CardIcon.java
index 5cf876fa52..b5d55f1c38 100644
--- a/src/magic/ui/card/CardIcon.java
+++ b/src/magic/ui/card/CardIcon.java
@@ -31,5 +31,5 @@ public class CardIcon {
     public void setDescription(String description) {
         this.description = description;
     }
-    
+
 }
diff --git a/src/magic/ui/cardtable/BasicDeckTablePanel.java b/src/magic/ui/cardtable/BasicDeckTablePanel.java
index 0255951d5a..1c110fc16c 100644
--- a/src/magic/ui/cardtable/BasicDeckTablePanel.java
+++ b/src/magic/ui/cardtable/BasicDeckTablePanel.java
@@ -20,7 +20,7 @@ public class BasicDeckTablePanel extends TexturedPanel {
     public static final String CP_CARD_LCLICKED = "cardLeftClicked";
     public static final String CP_CARD_RCLICKED = "cardRightClicked";
     public static final String CP_CARD_DCLICKED = "cardDoubleClicked";
-    
+
     private final MigLayout migLayout = new MigLayout();
     private final JScrollPane scrollpane = new JScrollPane();
     private JTable table;
@@ -35,9 +35,9 @@ public class BasicDeckTablePanel extends TexturedPanel {
         scrollpane.setBorder(FontsAndBorders.NO_BORDER);
         scrollpane.setOpaque(false);
         scrollpane.getViewport().setOpaque(false);
-        
+
         setLayout(migLayout);
-        
+
     }
 
     private ListSelectionListener getTableListSelectionListener() {
@@ -72,7 +72,7 @@ public class BasicDeckTablePanel extends TexturedPanel {
 
         this.table = aDeckTable;
         table.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
-        table.getTableHeader().setReorderingAllowed(false);        
+        table.getTableHeader().setReorderingAllowed(false);
         table.getSelectionModel().addListSelectionListener(getTableListSelectionListener());
         firePropertyChange(CP_CARD_SELECTED, false, true);
 
diff --git a/src/magic/ui/cardtable/CardTablePanel.java b/src/magic/ui/cardtable/CardTablePanel.java
index ac0c38d639..b3a51d6d31 100644
--- a/src/magic/ui/cardtable/CardTablePanel.java
+++ b/src/magic/ui/cardtable/CardTablePanel.java
@@ -38,10 +38,10 @@ public class CardTablePanel extends TexturedPanel {
     public static final String CP_CARD_LCLICKED = "cardLeftClicked";
     public static final String CP_CARD_RCLICKED = "cardRightClicked";
     public static final String CP_CARD_DCLICKED = "cardDoubleClicked";
-    
+
     // renderer that centers the contents of a column.
     static final DefaultTableCellRenderer centerRenderer = new DefaultTableCellRenderer();
-    static { centerRenderer.setHorizontalAlignment(SwingConstants.CENTER); }    
+    static { centerRenderer.setHorizontalAlignment(SwingConstants.CENTER); }
 
     private static final Color GRID_COLOR = new Color(194, 197, 203);
     private static final int ROW_HEIGHT = 20; //pixels
@@ -90,7 +90,7 @@ public class CardTablePanel extends TexturedPanel {
         table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); // otherwise horizontal scrollbar won't work
         table.setRowHeight(ROW_HEIGHT);
         table.setGridColor(GRID_COLOR);
-        
+
         final TableColumnModel model = table.getColumnModel();
         setColumnWidths(model);
 
@@ -125,10 +125,10 @@ public class CardTablePanel extends TexturedPanel {
         if (!GeneralConfig.getInstance().isPreviewCardOnSelect()) {
             table.addMouseMotionListener(new RowMouseOverListener());
         }
-        
+
         setLayout(migLayout);
         refreshLayout();
-        
+
     }
 
     private ListSelectionListener getTableListSelectionListener() {
@@ -350,11 +350,11 @@ public class CardTablePanel extends TexturedPanel {
             table.getSelectionModel().addSelectionInterval(0, 0);
         }
     }
-    
+
     public TitleBar getTitleBar() {
         return titleBar;
     }
-    
+
     public void showCardCount(final boolean b) {
         tableModel.showCardCount(b);
     }
diff --git a/src/magic/ui/cardtable/DeckTablePanel.java b/src/magic/ui/cardtable/DeckTablePanel.java
index 733601e32b..3da0014051 100644
--- a/src/magic/ui/cardtable/DeckTablePanel.java
+++ b/src/magic/ui/cardtable/DeckTablePanel.java
@@ -38,10 +38,10 @@ public class DeckTablePanel extends TexturedPanel {
     public static final String CP_CARD_LCLICKED = "cardLeftClicked";
     public static final String CP_CARD_RCLICKED = "cardRightClicked";
     public static final String CP_CARD_DCLICKED = "cardDoubleClicked";
-    
+
     // renderer that centers the contents of a column.
     static final DefaultTableCellRenderer centerRenderer = new DefaultTableCellRenderer();
-    static { centerRenderer.setHorizontalAlignment(SwingConstants.CENTER); }    
+    static { centerRenderer.setHorizontalAlignment(SwingConstants.CENTER); }
 
     private static final Color GRID_COLOR = new Color(194, 197, 203);
     private static final int ROW_HEIGHT = 20; //pixels
@@ -126,10 +126,10 @@ public class DeckTablePanel extends TexturedPanel {
         if (!GeneralConfig.getInstance().isPreviewCardOnSelect()) {
             table.addMouseMotionListener(new RowMouseOverListener());
         }
-        
+
         setLayout(migLayout);
         refreshLayout();
-        
+
     }
 
     private ListSelectionListener getTableListSelectionListener() {
@@ -347,11 +347,11 @@ public class DeckTablePanel extends TexturedPanel {
             table.getSelectionModel().addSelectionInterval(0, 0);
         }
     }
-    
+
     public TitleBar getTitleBar() {
         return titleBar;
     }
-    
+
     public void showCardCount(final boolean b) {
         tableModel.showCardCount(b);
     }
diff --git a/src/magic/ui/deck/editor/CardLegalityInfo.java b/src/magic/ui/deck/editor/CardLegalityInfo.java
index e25ea528f4..88aef6ac47 100644
--- a/src/magic/ui/deck/editor/CardLegalityInfo.java
+++ b/src/magic/ui/deck/editor/CardLegalityInfo.java
@@ -27,7 +27,7 @@ public class CardLegalityInfo {
     public MagicCardDefinition getCard() {
         return card;
     }
-    
+
     public CardLegality getLegality() {
         return legality;
     }
diff --git a/src/magic/ui/deck/editor/CardPoolViewPanel.java b/src/magic/ui/deck/editor/CardPoolViewPanel.java
index 763347bee1..3e6034a658 100644
--- a/src/magic/ui/deck/editor/CardPoolViewPanel.java
+++ b/src/magic/ui/deck/editor/CardPoolViewPanel.java
@@ -31,7 +31,7 @@ class CardPoolViewPanel extends JPanel implements IDeckEditorView, FocusListener
     // translatable strings
     private static final String _S1 = "Random Deck";
     private static final String _S2 = "Generate a random deck using current set of cards in card pool.";
-    
+
     // fired when card selection changes
     public static final String CP_CARD_SELECTED = FilteredCardPoolPanel.CP_CARD_SELECTED;
 
@@ -124,7 +124,7 @@ class CardPoolViewPanel extends JPanel implements IDeckEditorView, FocusListener
     }
 
     private void addSelectedCardToDeck() {
-        
+
         final MagicCardDefinition card = getSelectedCard();
 
         if (card == null || card == MagicCardDefinition.UNKNOWN) {
@@ -208,7 +208,7 @@ class CardPoolViewPanel extends JPanel implements IDeckEditorView, FocusListener
 
     private boolean generateRandomDeck() {
         final RandomDeckGeneratorDialog dialog = new RandomDeckGeneratorDialog(
-                ScreenController.getMainFrame(), 
+                ScreenController.getMainFrame(),
                 getCardPoolSize(),
                 getDefaultDeckSize()
         );
diff --git a/src/magic/ui/deck/editor/CardRecallPanel.java b/src/magic/ui/deck/editor/CardRecallPanel.java
index 7ce837b4ce..164d64b061 100644
--- a/src/magic/ui/deck/editor/CardRecallPanel.java
+++ b/src/magic/ui/deck/editor/CardRecallPanel.java
@@ -231,7 +231,7 @@ class CardRecallPanel extends JPanel implements IDeckEditorView, FocusListener {
     public List<ActionBarButton> getActionButtons() {
         return new ArrayList<>();
     }
-    
+
     private void doFocusLostAction(FocusEvent e) {
         if (e.getOppositeComponent() == deckPanel.getTable()) {
             clearRecallSelection();
diff --git a/src/magic/ui/deck/editor/CardsLegalityPanel.java b/src/magic/ui/deck/editor/CardsLegalityPanel.java
index ce7e4226e8..74198dc878 100644
--- a/src/magic/ui/deck/editor/CardsLegalityPanel.java
+++ b/src/magic/ui/deck/editor/CardsLegalityPanel.java
@@ -47,7 +47,7 @@ public class CardsLegalityPanel extends JPanel {
     public static final String CP_CARD_SELECTED = "cardTableSelection";
     // fired on mouse event.
     public static final String CP_CARD_DCLICKED = "cardDoubleClicked";
-    
+
     private static final Color GRID_COLOR = new Color(194, 197, 203);
     private static final int ROW_HEIGHT = 23; //pixels
 
@@ -92,7 +92,7 @@ public class CardsLegalityPanel extends JPanel {
         table.getSelectionModel().addListSelectionListener(getTableListSelectionListener());
         table.addMouseListener(getTableMouseAdapter());
         table.setShowVerticalLines(false);
-        
+
         final TableColumnModel model = table.getColumnModel();
         setColumnWidths(model);
         // special renderer for legality indicator icon.
@@ -200,9 +200,9 @@ public class CardsLegalityPanel extends JPanel {
     private boolean hasDoubleClickListeners() {
         return getPropertyChangeListeners(CP_CARD_DCLICKED).length > 0;
     }
-    
+
     private static class LegalityCellRenderer extends DefaultTableCellRenderer {
-        
+
         private static final JLabel BANNED_ICON = new JLabel(MagicImages.getIcon(MagicIcon.BANNED_ICON));
         private static final JLabel RESTRICTED_ICON = new JLabel(MagicImages.getIcon(MagicIcon.RESTRICTED_ICON));
         private static final JLabel LEGAL_ICON = new JLabel(MagicImages.getIcon(MagicIcon.LEGAL_ICON));
@@ -224,7 +224,7 @@ public class CardsLegalityPanel extends JPanel {
 
             final CardsLegalityTableModel tableModel = (CardsLegalityTableModel) table.getModel();
             final CardLegalityInfo cardLegality = tableModel.getCardLegality(row);
-            
+
             final JLabel lbl = getLegalityIcon(cardLegality);
 
             lbl.setToolTipText(String.format("<html>%s</html>",
diff --git a/src/magic/ui/deck/editor/DeckActionPanel.java b/src/magic/ui/deck/editor/DeckActionPanel.java
index 56b19dfe6e..515698300c 100644
--- a/src/magic/ui/deck/editor/DeckActionPanel.java
+++ b/src/magic/ui/deck/editor/DeckActionPanel.java
@@ -28,7 +28,7 @@ class DeckActionPanel extends TexturedPanel {
     }
 
     DeckActionPanel(final AbstractAction plusButtonAction, final AbstractAction minusButtonAction) {
-        
+
         setBackground(BACKGROUND_COLOR);
 
         viewActionPanel = new JPanel(new MigLayout("insets 4 0 0 0, flowy"));
diff --git a/src/magic/ui/deck/editor/DeckEditorScreenPanel.java b/src/magic/ui/deck/editor/DeckEditorScreenPanel.java
index d6bed057ae..dd109d9410 100644
--- a/src/magic/ui/deck/editor/DeckEditorScreenPanel.java
+++ b/src/magic/ui/deck/editor/DeckEditorScreenPanel.java
@@ -27,7 +27,7 @@ public class DeckEditorScreenPanel extends JPanel implements IDeckEditorListener
     private boolean isStandalone = true;
 
     public DeckEditorScreenPanel(final MagicDeck deck, final IDeckEditorListener aListener) {
-        
+
         MagicSystem.waitForAllCards();
 
         this.listener = aListener;
diff --git a/src/magic/ui/deck/editor/DeckEditorSplitPanel.java b/src/magic/ui/deck/editor/DeckEditorSplitPanel.java
index 7bd9dbaf05..f4ad2f919b 100644
--- a/src/magic/ui/deck/editor/DeckEditorSplitPanel.java
+++ b/src/magic/ui/deck/editor/DeckEditorSplitPanel.java
@@ -94,9 +94,9 @@ public class DeckEditorSplitPanel extends JPanel implements ICardSelectionListen
             migLayout.setColumnConstraints("[" + imageSize.width + "!][100%]");
             setLayout(migLayout);
             add(sideBarPanel, "h 100%, w " + imageSize.width + "!");
-            add(rhs, "w 100%, h 100%");                    
+            add(rhs, "w 100%, h 100%");
         }
-        
+
         // set initial card image
         if (cardPoolDefs.isEmpty()) {
             sideBarPanel.setCard(MagicCardDefinition.UNKNOWN);
@@ -196,7 +196,7 @@ public class DeckEditorSplitPanel extends JPanel implements ICardSelectionListen
                 this.deck.remove(card);
             }
             updateDeck();
-            
+
         } else {
             ScreenController.showWarningMessage("Please select a valid card in the deck to remove it.");
         }
diff --git a/src/magic/ui/deck/editor/DeckPanel.java b/src/magic/ui/deck/editor/DeckPanel.java
index 8500746c2d..ffd25f84cd 100644
--- a/src/magic/ui/deck/editor/DeckPanel.java
+++ b/src/magic/ui/deck/editor/DeckPanel.java
@@ -39,7 +39,7 @@ class DeckPanel extends JPanel implements IDeckEditorView {
     public static final String CP_ADD_TO_DECK = "addCardToDeck";
     // fired on remove card from deck action.
     public static final String CP_REMOVE_FROM_DECK = "removeCardFromDeck";
-   
+
     // UI components
     private final CardQuantityActionPanel quantityPanel;
     private final DeckTablePanel deckTablePanel;
@@ -50,7 +50,7 @@ class DeckPanel extends JPanel implements IDeckEditorView {
     private final List<ActionBarButton> actionButtons = new ArrayList<>();
 
     DeckPanel(final MagicDeck originalDeck, final IDeckEditorListener aListener, final CardQuantityActionPanel aPanel) {
-        
+
         this.quantityPanel = aPanel;
         this.listener = aListener;
         this.originalDeck = originalDeck;
@@ -82,7 +82,7 @@ class DeckPanel extends JPanel implements IDeckEditorView {
         }
         return deckCopy;
     }
-   
+
     private ActionBarButton getClearDeckActionButton() {
         return new ActionBarButton(
                 MagicImages.getIcon(MagicIcon.CLEAR_ICON),
@@ -224,7 +224,7 @@ class DeckPanel extends JPanel implements IDeckEditorView {
     }
 
     void updateOriginalDeck() {
-        originalDeck.setContent(deck);        
+        originalDeck.setContent(deck);
     }
 
     boolean isUpdatingExistingDeck() {
@@ -250,7 +250,7 @@ class DeckPanel extends JPanel implements IDeckEditorView {
 
     @Override
     public void doMinusButtonAction() {
-        removeSelectedCardFromDeck(false);        
+        removeSelectedCardFromDeck(false);
     }
 
     @Override
diff --git a/src/magic/ui/deck/editor/FilteredCardPoolPanel.java b/src/magic/ui/deck/editor/FilteredCardPoolPanel.java
index 40a06b7d0c..addb583ee5 100644
--- a/src/magic/ui/deck/editor/FilteredCardPoolPanel.java
+++ b/src/magic/ui/deck/editor/FilteredCardPoolPanel.java
@@ -41,7 +41,7 @@ class FilteredCardPoolPanel extends JPanel implements ICardFilterPanelListener {
 
         setLookAndFeel();
         refreshLayout();
-        
+
         setPropertyChangeListeners();
 
     }
diff --git a/src/magic/ui/deck/editor/FormatsLegalityPanel.java b/src/magic/ui/deck/editor/FormatsLegalityPanel.java
index f1ed1faa0f..6fcb67d819 100644
--- a/src/magic/ui/deck/editor/FormatsLegalityPanel.java
+++ b/src/magic/ui/deck/editor/FormatsLegalityPanel.java
@@ -32,7 +32,7 @@ public class FormatsLegalityPanel extends JPanel {
 
     // fired when selection changes.
     public static final String CP_FORMAT_SELECTED = "FormatSelected";
-         
+
     private final MigLayout migLayout = new MigLayout();
     private final JScrollPane scrollpane = new JScrollPane();
     private final JList<DeckLegalityInfo> formatsJList = new JList<>();
@@ -135,9 +135,9 @@ public class FormatsLegalityPanel extends JPanel {
                             ? list.getBackground()
                             : ALT_BCOLOR
             );
-          
+
             setBorder(BorderFactory.createCompoundBorder(
-                    BorderFactory.createMatteBorder(0, 0, 1, 0, Color.LIGHT_GRAY), 
+                    BorderFactory.createMatteBorder(0, 0, 1, 0, Color.LIGHT_GRAY),
                     BorderFactory.createEmptyBorder(0, 6, 0, 4))
             );
 
diff --git a/src/magic/ui/deck/editor/LegalityPanel.java b/src/magic/ui/deck/editor/LegalityPanel.java
index 93e2c6d00b..b7a51fd808 100644
--- a/src/magic/ui/deck/editor/LegalityPanel.java
+++ b/src/magic/ui/deck/editor/LegalityPanel.java
@@ -32,7 +32,7 @@ class LegalityPanel extends JPanel implements IDeckEditorView {
     private static final String _S7 = "Too many copies of a card in deck.";
     private static final String _S8 = "Does not apply to basic lands,";
     private static final String _S9 = "or";
-    
+
     // fired when card selection changes
     public static final String CP_CARD_SELECTED = CardTablePanel.CP_CARD_SELECTED;
 
@@ -40,14 +40,14 @@ class LegalityPanel extends JPanel implements IDeckEditorView {
 
     private final CardsLegalityPanel cardsLegalityPanel;
     private final FormatsLegalityPanel formatsLegalityPanel;
-    private final MigLayout miglayout = new MigLayout();    
+    private final MigLayout miglayout = new MigLayout();
     private MagicDeck deck = new MagicDeck();
 
     LegalityPanel() {
 
         formatsLegalityPanel = new FormatsLegalityPanel();
         cardsLegalityPanel = new CardsLegalityPanel();
-        
+
         setPropertyChangeListeners();
 
         setLookAndFeel();
@@ -91,7 +91,7 @@ class LegalityPanel extends JPanel implements IDeckEditorView {
         miglayout.setLayoutConstraints("insets 0, gap 0, wrap 2");
         add(HELP_PANEL, "w 100%, spanx 2");
         add(formatsLegalityPanel, "w 280!, h 100%");
-        add(cardsLegalityPanel, "w 100%, h 100%");       
+        add(cardsLegalityPanel, "w 100%, h 100%");
         revalidate();
     }
 
@@ -133,7 +133,7 @@ class LegalityPanel extends JPanel implements IDeckEditorView {
             add(getIconLabel(MagicIcon.ILLEGAL_ICON, UiString.get(_S2)));
             add(getIconLabel(MagicIcon.BANNED_ICON, UiString.get(_S3)));
             add(getIconLabel(MagicIcon.RESTRICTED_ICON, UiString.get(_S4), UiString.get(_S5)));
-            add(getIconLabel(MagicIcon.RESTRICTED_ICON, UiString.get(_S6), 
+            add(getIconLabel(MagicIcon.RESTRICTED_ICON, UiString.get(_S6),
                     String.format("<html><b>%s</b><br>%s<br><i>Relentless Rats</i> %s <i>Shadowborn Apostle</i>.</html>",
                             UiString.get(_S7),
                             UiString.get(_S8),
diff --git a/src/magic/ui/deck/editor/MainViewsPanel.java b/src/magic/ui/deck/editor/MainViewsPanel.java
index d5edb236d5..bbbd2a2eca 100644
--- a/src/magic/ui/deck/editor/MainViewsPanel.java
+++ b/src/magic/ui/deck/editor/MainViewsPanel.java
@@ -42,7 +42,7 @@ class MainViewsPanel extends JPanel implements IDeckEditorListener {
         this.listener = aListener;
 
         deckActionPanel = new DeckActionPanel(getPlusButtonAction(), getMinusButtonAction());
-        
+
         deckPanel = new DeckPanel(deck, this, deckActionPanel.getQuantityPanel());
         cardPoolPanel = new CardPoolViewPanel(this, deckActionPanel.getQuantityPanel());
         recallPanel = new CardRecallPanel(this, deckActionPanel.getQuantityPanel());
@@ -138,7 +138,7 @@ class MainViewsPanel extends JPanel implements IDeckEditorListener {
             CardRecallPanel.CP_CARD_SELECTED,
             evt -> listener.cardSelected(getSelectedCard())
         );
-        
+
         // LegalityPanel
         legalityPanel.addPropertyChangeListener(
             LegalityPanel.CP_CARD_SELECTED,
@@ -167,7 +167,7 @@ class MainViewsPanel extends JPanel implements IDeckEditorListener {
             MagicSound.REMOVE_CARD.play();
         }
     }
-    
+
     private void refreshLayout() {
         removeAll();
         miglayout.setLayoutConstraints("insets 0, gap 0, flowx, wrap 2");
diff --git a/src/magic/ui/deck/editor/ToggleButtonsPanel.java b/src/magic/ui/deck/editor/ToggleButtonsPanel.java
index 5d69552561..ecaee85acb 100644
--- a/src/magic/ui/deck/editor/ToggleButtonsPanel.java
+++ b/src/magic/ui/deck/editor/ToggleButtonsPanel.java
@@ -17,7 +17,7 @@ class ToggleButtonsPanel extends TexturedPanel {
     ToggleButtonsPanel() {
         setBackground(DeckActionPanel.BACKGROUND_COLOR);
     }
-    
+
     void refreshLayout() {
         removeAll();
         setLayout(new MigLayout("insets 2 0 0 6, aligny top"));
diff --git a/src/magic/ui/dialog/AboutDialog.java b/src/magic/ui/dialog/AboutDialog.java
index 4ed214d522..b2161a1cd1 100644
--- a/src/magic/ui/dialog/AboutDialog.java
+++ b/src/magic/ui/dialog/AboutDialog.java
@@ -38,7 +38,7 @@ public class AboutDialog extends MagicDialog implements ActionListener {
     public AboutDialog(final MagicFrame frame) {
 
         super(ScreenController.getMainFrame(), UiString.get("About..."), new Dimension(600, 320));
-      
+
         final JPanel aboutPanel = new JPanel();
         aboutPanel.setLayout(null);
 
diff --git a/src/magic/ui/dialog/DeckChooserDialog.java b/src/magic/ui/dialog/DeckChooserDialog.java
index 64b3b4c384..9871acdf97 100644
--- a/src/magic/ui/dialog/DeckChooserDialog.java
+++ b/src/magic/ui/dialog/DeckChooserDialog.java
@@ -41,7 +41,7 @@ public class DeckChooserDialog extends MagicDialog {
     public DeckChooserDialog(final DeckType aDeckType, final String aDeckName) {
 
         super(ScreenController.getMainFrame(), UiString.get(_S2), new Dimension(300, 180));
-        
+
         deckTypeCombo = getDeckTypeComboBox();
         deckTypeCombo.setSelectedItem(aDeckType);
         addDeckTypeComboBoxListener();
diff --git a/src/magic/ui/dialog/DeckDescriptionPreview.java b/src/magic/ui/dialog/DeckDescriptionPreview.java
index c18a1cd16b..31adb9f4c2 100644
--- a/src/magic/ui/dialog/DeckDescriptionPreview.java
+++ b/src/magic/ui/dialog/DeckDescriptionPreview.java
@@ -15,7 +15,7 @@ import magic.utility.FileIO;
 
 @SuppressWarnings("serial")
 public class DeckDescriptionPreview extends JComponent implements PropertyChangeListener {
-    
+
     File file = null;
     String description;
     private final JTextArea textArea = new JTextArea();
@@ -51,7 +51,7 @@ public class DeckDescriptionPreview extends JComponent implements PropertyChange
                 }
             }
         }
-                
+
         showDescription();
     }
 
@@ -59,7 +59,7 @@ public class DeckDescriptionPreview extends JComponent implements PropertyChange
         textArea.setText(description);
         textArea.setCaretPosition(0);
     }
-    
+
     @Override
     public void propertyChange(PropertyChangeEvent e) {
         String prop = e.getPropertyName();
diff --git a/src/magic/ui/dialog/DecksFilterDialog.java b/src/magic/ui/dialog/DecksFilterDialog.java
index e447fd836c..c6db4d6399 100644
--- a/src/magic/ui/dialog/DecksFilterDialog.java
+++ b/src/magic/ui/dialog/DecksFilterDialog.java
@@ -62,12 +62,12 @@ public class DecksFilterDialog extends MagicDialog {
         if (filterHistory.size() > 0) {
             deckFilter = filterHistory.get(historyIndex-1);
         }
-        
+
         deckSizeFilterPanel = new DeckSizeFilterPanel(deckFilter);
         deckNameFilterText.setText(deckFilter != null ? deckFilter.getDeckNameFilterText() : "");
         deckDescFilterText.setText(deckFilter != null ? deckFilter.getDeckDescFilterText() : "");
         cardNameFilterText.setText(deckFilter != null ? deckFilter.getCardNameFilterText() : "");
-               
+
         refreshLayout();
         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
 
diff --git a/src/magic/ui/dialog/DuelSidebarLayoutDialog.java b/src/magic/ui/dialog/DuelSidebarLayoutDialog.java
index 5a91bc5d60..b9fbaf0714 100644
--- a/src/magic/ui/dialog/DuelSidebarLayoutDialog.java
+++ b/src/magic/ui/dialog/DuelSidebarLayoutDialog.java
@@ -30,7 +30,7 @@ public class DuelSidebarLayoutDialog extends MagicDialog {
 
     private static final Color HIGHLIGHT_BACK = MagicStyle.getTheme().getColor(Theme.COLOR_TITLE_BACKGROUND);
     private static final Color HIGHLIGHT_FORE = MagicStyle.getTheme().getColor(Theme.COLOR_TITLE_FOREGROUND);
-    
+
     private boolean isCancelled = false;
     private final JList<String> jlist = new JList<>();
     private DefaultListModel<String> listModel;
@@ -57,7 +57,7 @@ public class DuelSidebarLayoutDialog extends MagicDialog {
         jlist.setFocusable(true);
         jlist.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     }
-    
+
     private String getLayoutString() {
         final StringBuffer sb = new StringBuffer();
         final Enumeration<String> en = listModel.elements();
@@ -74,7 +74,7 @@ public class DuelSidebarLayoutDialog extends MagicDialog {
         panel.add(jlist, "w 100%, h 100%, aligny top, gapbottom 6");
         panel.add(getDialogButtonPanel(), "w 100%, h 30!, pushy, aligny bottom");
     }
-    
+
     private JPanel getListButtonPanel() {
         final JPanel buttonPanel = new JPanel(new MigLayout("insets 0, gap 0"));
         buttonPanel.add(getMoveDownButton(), "w 50%");
diff --git a/src/magic/ui/dialog/FiremindWorkerDialog.java b/src/magic/ui/dialog/FiremindWorkerDialog.java
index 6941f29acb..70f58251a5 100644
--- a/src/magic/ui/dialog/FiremindWorkerDialog.java
+++ b/src/magic/ui/dialog/FiremindWorkerDialog.java
@@ -26,7 +26,7 @@ import net.miginfocom.swing.MigLayout;
 
 @SuppressWarnings("serial")
 public class FiremindWorkerDialog extends JDialog implements ActionListener, PropertyChangeListener {
-    
+
     // translatable strings
     private static final String _S1 = "Run Firemind Worker";
     private static final String _S3 = "Run in background...";
diff --git a/src/magic/ui/dialog/GameStateRunner.java b/src/magic/ui/dialog/GameStateRunner.java
index e088cea3b8..a0104e6a18 100644
--- a/src/magic/ui/dialog/GameStateRunner.java
+++ b/src/magic/ui/dialog/GameStateRunner.java
@@ -33,7 +33,7 @@ public class GameStateRunner
     private JList<String> testClasses = new JList<>();
 
     public GameStateRunner(final MagicFrame frame) {
-        
+
         super(ScreenController.getMainFrame(), UiString.get("Test Classes (double-click to select)"), new Dimension(500, 460));
 
         setLookAndFeel();
@@ -76,7 +76,7 @@ public class GameStateRunner
     }
 
     private JPanel getMainPanel() {
-        
+
         try {
             testClasses = new JList<>(getListOfTestClasses());
         } catch (IOException | URISyntaxException ex) {
@@ -95,7 +95,7 @@ public class GameStateRunner
 
         final JScrollPane listScroller = new JScrollPane(testClasses);
         listScroller.setPreferredSize(new Dimension(getWidth(), getHeight()));
-        
+
         final JPanel panel = new JPanel(new MigLayout("insets 0, gap 0"));
         panel.add(listScroller, "w 100%, h 100%");
         return panel;
diff --git a/src/magic/ui/dialog/MagicDialog.java b/src/magic/ui/dialog/MagicDialog.java
index 07253f1f63..f2a99e8068 100644
--- a/src/magic/ui/dialog/MagicDialog.java
+++ b/src/magic/ui/dialog/MagicDialog.java
@@ -39,9 +39,9 @@ public abstract class MagicDialog extends JDialog {
 
         setLookAndFeel();
         refreshLayout();
-        
+
     }
-    
+
     protected JPanel getDialogContentPanel() {
         return contentPanel;
     }
@@ -64,7 +64,7 @@ public abstract class MagicDialog extends JDialog {
                         BorderFactory.createMatteBorder(0, 8, 8, 8, MagicStyle.getTheme().getColor(Theme.COLOR_TITLE_BACKGROUND)))
         );
     }
-    
+
     private JLabel getDialogCaptionLabel() {
         final JLabel lbl = new JLabel(getTitle());
         lbl.setOpaque(true);
@@ -84,5 +84,5 @@ public abstract class MagicDialog extends JDialog {
     private JComponent getContentComponent() {
         return (JComponent)getContentPane();
     }
-    
+
 }
diff --git a/src/magic/ui/dialog/RandomDeckGeneratorDialog.java b/src/magic/ui/dialog/RandomDeckGeneratorDialog.java
index eb6c2edd54..8f752b9e58 100644
--- a/src/magic/ui/dialog/RandomDeckGeneratorDialog.java
+++ b/src/magic/ui/dialog/RandomDeckGeneratorDialog.java
@@ -22,7 +22,7 @@ import net.miginfocom.swing.MigLayout;
 
 @SuppressWarnings("serial")
 public class RandomDeckGeneratorDialog extends MagicDialog implements ChangeListener {
-    
+
     // translatable strings
     private static final String _S1 = "Create Deck";
     private static final String _S2 = "Percentage of deck size allocated to non-land cards.";
@@ -98,7 +98,7 @@ public class RandomDeckGeneratorDialog extends MagicDialog implements ChangeList
         creaturesLabel.setText(Integer.toString(deckGenerator.getMaxCreaturesCount()));
         landsLabel.setText(Integer.toString(deckGenerator.getLandsCount()));
     }
-    
+
     private void setListeners() {
         // save button
         saveButton.addActionListener(new AbstractAction() {
diff --git a/src/magic/ui/dialog/button/SaveButton.java b/src/magic/ui/dialog/button/SaveButton.java
index 625ce6f8ea..44157df777 100644
--- a/src/magic/ui/dialog/button/SaveButton.java
+++ b/src/magic/ui/dialog/button/SaveButton.java
@@ -9,7 +9,7 @@ public class SaveButton extends MagicDialogButton {
 
     // translatable strings
     private static final String _S1 = "Save";
-    
+
     public SaveButton(String text) {
         super(text);
         setIcon(MagicImages.getIcon(MagicIcon.LEGAL_ICON));
diff --git a/src/magic/ui/duel/BattlefieldTextOverlay.java b/src/magic/ui/duel/BattlefieldTextOverlay.java
index 7d143b5cf8..3ed251b989 100644
--- a/src/magic/ui/duel/BattlefieldTextOverlay.java
+++ b/src/magic/ui/duel/BattlefieldTextOverlay.java
@@ -10,7 +10,7 @@ import magic.ui.utility.GraphicsUtils;
 
 
 public class BattlefieldTextOverlay {
-    
+
     private static final Font ZONE_FONT = new Font("Dialog", Font.BOLD, 12);
 
     private BufferedImage textOverlayImage = null;
diff --git a/src/magic/ui/duel/CounterOverlay.java b/src/magic/ui/duel/CounterOverlay.java
index 43e5835520..30b140c21b 100644
--- a/src/magic/ui/duel/CounterOverlay.java
+++ b/src/magic/ui/duel/CounterOverlay.java
@@ -99,5 +99,5 @@ public class CounterOverlay {
         g2d.setColor(new Color(255, 0, 0, 200));
         g2d.fillRect(0, 0, image.getWidth()-1, image.getHeight()-1);
     }
-    
+
 }
diff --git a/src/magic/ui/duel/DuelLayeredPane.java b/src/magic/ui/duel/DuelLayeredPane.java
index 73c6d0301d..9e19aa558a 100644
--- a/src/magic/ui/duel/DuelLayeredPane.java
+++ b/src/magic/ui/duel/DuelLayeredPane.java
@@ -27,9 +27,9 @@ public class DuelLayeredPane extends JLayeredPane {
         backgroundLabel = new ZoneBackgroundLabel();
         backgroundLabel.setGame(true);
         duelPanel.setBackgroundLabel(backgroundLabel);
-        
+
         animationPanel = new AnimationPanel();
-        dialogPanel = new DuelDialogPanel();       
+        dialogPanel = new DuelDialogPanel();
         imageCardViewer = new AnnotatedCardPanel();
 
         updateLayout();
diff --git a/src/magic/ui/duel/DuelPanel.java b/src/magic/ui/duel/DuelPanel.java
index 855673bd33..21b8924f80 100644
--- a/src/magic/ui/duel/DuelPanel.java
+++ b/src/magic/ui/duel/DuelPanel.java
@@ -42,8 +42,8 @@ public final class DuelPanel extends JPanel {
     private static final String PASS_KEY="pass";
 
     private ZoneBackgroundLabel backgroundLabel;
-    private SwingGameController controller;  
-  
+    private SwingGameController controller;
+
     private DuelSideBarPanel sidebarPanel;
     private BattlefieldPanel battlefieldPanel;
     private BattlefieldPanel textView;
@@ -51,7 +51,7 @@ public final class DuelPanel extends JPanel {
     private ResolutionProfileResult result;
 
     public DuelPanel(final MagicGame game) {
-        
+
         setOpaque(false);
         setFocusable(true);
     }
@@ -63,7 +63,7 @@ public final class DuelPanel extends JPanel {
         textView = new TextModeBattlefieldPanel(controller);
         imageView = new ImageModeBattlefieldPanel(controller);
         battlefieldPanel = isTextView() ? textView : imageView;
-        
+
         sidebarPanel = new DuelSideBarPanel(controller, battlefieldPanel.getStackViewer());
 
         updateView();
@@ -84,7 +84,7 @@ public final class DuelPanel extends JPanel {
             @Override
             public void mouseEntered(MouseEvent e) {
                 controller.hideInfo();
-            }            
+            }
         });
     }
 
diff --git a/src/magic/ui/duel/PermanentFilter.java b/src/magic/ui/duel/PermanentFilter.java
index 99a5a4685e..2daf65bac2 100644
--- a/src/magic/ui/duel/PermanentFilter.java
+++ b/src/magic/ui/duel/PermanentFilter.java
@@ -45,7 +45,7 @@ public class PermanentFilter implements ActionListener {
         MagicImages.getIcon(MagicIcon.ARTIFACT),
         MagicImages.getIcon(MagicIcon.ENCHANTMENT),
         MagicImages.getIcon(MagicIcon.VALID)};
-    
+
     private static final String[] FILTER_TOOLTIPS={
         "All","Mana","Creatures","Artifacts","Enchantments","Choices"
     };
diff --git a/src/magic/ui/duel/SwingGameController.java b/src/magic/ui/duel/SwingGameController.java
index 58fdda2459..f6438787ab 100644
--- a/src/magic/ui/duel/SwingGameController.java
+++ b/src/magic/ui/duel/SwingGameController.java
@@ -114,7 +114,7 @@ public class SwingGameController implements IUIGameController {
     private PlayerZoneViewer playerZoneViewer;
     private final List<IPlayerZoneListener> playerZoneListeners = new ArrayList<>();
     private MagicAnimation animation = null;
-    
+
     private static boolean isControlKeyDown = false;
     private static final KeyEventDispatcher keyEventDispatcher = new KeyEventDispatcher() {
         @Override
@@ -127,7 +127,7 @@ public class SwingGameController implements IUIGameController {
     public SwingGameController(final DuelLayeredPane aDuelPane, final MagicGame aGame) {
         this.duelPane = aDuelPane;
         this.game = aGame;
-        gameViewerInfo = new GameViewerInfo(game);        
+        gameViewerInfo = new GameViewerInfo(game);
         gamePanel = duelPane.getDuelPanel();
         duelPane.getDuelPanel().setController(this);
         duelPane.getCardViewer().setController(this);
@@ -222,7 +222,7 @@ public class SwingGameController implements IUIGameController {
             throw new UndoClickedException();
         }
     }
-    
+
     private <E extends JComponent> E waitForInput(final Callable<E> func) throws UndoClickedException {
         final AtomicReference<E> ref = new AtomicReference<>();
         final AtomicReference<Exception> except = new AtomicReference<>();
@@ -249,7 +249,7 @@ public class SwingGameController implements IUIGameController {
     private void resume(final boolean undoClicked) {
         input.offer(undoClicked);
     }
-    
+
     public void switchKeyPressed() {
         playerZoneViewer.switchPlayerZone();
     }
@@ -356,7 +356,7 @@ public class SwingGameController implements IUIGameController {
         final int x = containerZone.x + (int)((containerZone.getWidth() / 2) - (cardPopup.getWidth() / 2));
         final int y = containerZone.y + (int)((containerZone.getHeight() / 2) - (cardPopup.getHeight() / 2));
         cardPopup.setLocation(x,y);
-        
+
         cardPopup.showDelayed(popupDelay);
     }
 
@@ -385,7 +385,7 @@ public class SwingGameController implements IUIGameController {
         if (isControlKeyDown && cardPopup.isVisible()) {
             return;
         }
-        
+
         final boolean isAutoPopup = !CONFIG.isMouseWheelPopup();
         final int VERTICAL_INSET = 4; // pixels
         final int PAD2 = 0;
@@ -568,7 +568,7 @@ public class SwingGameController implements IUIGameController {
         });
         showMessage(MagicSource.NONE, "");
     }
-    
+
     private void clearDisplayedValidChoices() {
         assert SwingUtilities.isEventDispatchThread();
         if (!validChoices.isEmpty()) {
@@ -648,11 +648,11 @@ public class SwingGameController implements IUIGameController {
         gameViewerInfo = new GameViewerInfo(game);
 
         doPlayAnimationAndWait(oldGameInfo, gameViewerInfo);
-       
+
         SwingUtilities.invokeLater(() -> {
             gamePanel.update(gameViewerInfo);
         });
-        
+
         waitForUIUpdates();
     }
 
@@ -837,7 +837,7 @@ public class SwingGameController implements IUIGameController {
             });
         }
         showMessage(MagicSource.NONE,
-                String.format("{L} %s", 
+                String.format("{L} %s",
                         UiString.get(_S3,
                                 game.getLosingPlayer(),
                                 gameConceded.get() ? UiString.get(_S1) : UiString.get(_S2))));
@@ -902,7 +902,7 @@ public class SwingGameController implements IUIGameController {
         final boolean isHumanTurn = game.getTurnPlayer().isHuman();
         final boolean isHumanPriority = game.getPriorityPlayer().isHuman();
         final boolean isStackEmpty = game.getStack().isEmpty();
-        final boolean isFirstMain = game.isPhase(MagicPhaseType.FirstMain); 
+        final boolean isFirstMain = game.isPhase(MagicPhaseType.FirstMain);
         return isHumanTurn && isHumanPriority && isFirstMain && isStackEmpty;
     }
 
diff --git a/src/magic/ui/duel/animation/AnimationFx.java b/src/magic/ui/duel/animation/AnimationFx.java
index 2983c05a59..2065996090 100644
--- a/src/magic/ui/duel/animation/AnimationFx.java
+++ b/src/magic/ui/duel/animation/AnimationFx.java
@@ -31,7 +31,7 @@ public class AnimationFx {
     }
 
     private static void setOff(long flag) {
-        flags &= ~flag;      
+        flags &= ~flag;
     }
 
     public static long getFlags() {
diff --git a/src/magic/ui/duel/animation/CardAnimation.java b/src/magic/ui/duel/animation/CardAnimation.java
index c638bcb7c0..8aaa74cf0f 100644
--- a/src/magic/ui/duel/animation/CardAnimation.java
+++ b/src/magic/ui/duel/animation/CardAnimation.java
@@ -123,13 +123,13 @@ abstract class CardAnimation extends MagicAnimation {
         } else if (isStaticArrowOn()) {
             ArrowBuilder.drawArrow(g, getStart(), getPreviewRectangle());
         }
-        
+
         if (isCardShadowOn()) {
             drawCardShadow(g);
         }
 
         drawCardImage(g);
-        
+
     }
 
     private Dimension getCardPreviewSize(Image image) {
@@ -142,7 +142,7 @@ abstract class CardAnimation extends MagicAnimation {
             return prefSize;
         }
     }
-    
+
     /**
      * Returns the dimensions and position of the full size card image.
      */
@@ -192,7 +192,7 @@ abstract class CardAnimation extends MagicAnimation {
 
     /**
     * This is called by a timeline (do not delete!).
-    */    
+    */
     public void setShrinkRectangle(final Rectangle rect) {
         assert !SwingUtilities.isEventDispatchThread();
         imageRect = rect;
@@ -239,7 +239,7 @@ abstract class CardAnimation extends MagicAnimation {
         });
         return timeline;
     }
-    
+
     private void playTimelineScenario() {
 
         growTimeline = getGrowTimeline();
@@ -247,14 +247,14 @@ abstract class CardAnimation extends MagicAnimation {
         viewTimeline = getViewTimeline();
         shrinkTimeline = getShrinkTimeline();
 
-        scenario = new TimelineScenario.RendezvousSequence();        
+        scenario = new TimelineScenario.RendezvousSequence();
         scenario.addScenarioActor(growTimeline);
         if (flipTimeline != null) { scenario.addScenarioActor(flipTimeline); }
         scenario.rendezvous();
         scenario.addScenarioActor(viewTimeline);
         scenario.rendezvous();
         scenario.addScenarioActor(shrinkTimeline);
-        
+
         scenario.addCallback(() -> {
             SwingUtilities.invokeLater(() -> {
                 imageRect = new Rectangle();
diff --git a/src/magic/ui/duel/animation/MagicAnimation.java b/src/magic/ui/duel/animation/MagicAnimation.java
index 6b79385925..4f5ec5884b 100644
--- a/src/magic/ui/duel/animation/MagicAnimation.java
+++ b/src/magic/ui/duel/animation/MagicAnimation.java
@@ -14,7 +14,7 @@ public abstract class MagicAnimation {
     protected abstract void play();
     protected abstract void cancel();
     protected abstract void doCancelAction();
-    
+
     protected void setCanvas(JComponent aCanvas) {
         this.canvas = aCanvas;
     }
diff --git a/src/magic/ui/duel/animation/MagicAnimations.java b/src/magic/ui/duel/animation/MagicAnimations.java
index 16eeb760b1..de55490f7a 100644
--- a/src/magic/ui/duel/animation/MagicAnimations.java
+++ b/src/magic/ui/duel/animation/MagicAnimations.java
@@ -43,9 +43,9 @@ public class MagicAnimations {
         final boolean isValid = newGameInfo.getTurnPlayer().isHuman() || MagicSystem.isAiVersusAi();
         return isDrawPhase && isValid;
     }
-    
+
     private static boolean isPlayCardEvent(GameViewerInfo newGameInfo) {
-        return newGameInfo.getPhaseType().isMain() && newGameInfo.getTurnPlayer().isAi();        
+        return newGameInfo.getPhaseType().isMain() && newGameInfo.getTurnPlayer().isAi();
     }
 
     private static boolean isNewTurnEvent(GameViewerInfo oldGameInfo, GameViewerInfo newGameInfo) {
diff --git a/src/magic/ui/duel/animation/NewTurnAnimation.java b/src/magic/ui/duel/animation/NewTurnAnimation.java
index 77e3885aff..d3bd4886f2 100644
--- a/src/magic/ui/duel/animation/NewTurnAnimation.java
+++ b/src/magic/ui/duel/animation/NewTurnAnimation.java
@@ -30,14 +30,14 @@ class NewTurnAnimation extends MagicAnimation {
 
     @Override
     protected void render(Graphics g) {
-        
+
         final Graphics2D g2d = (Graphics2D) g.create();
 
         g2d.setColor(MagicStyle.getTheme().getColor(Theme.COLOR_TITLE_BACKGROUND));
         final Rectangle rect = layoutInfo.getTurnPanelLayout();
         g2d.fillRect(rect.x, rect.y, rect.width, rect.height);
-        
-        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);        
+
+        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
         g2d.setColor(Color.WHITE);
         final Font f = g2d.getFont().deriveFont(28f);
         g2d.setFont(f);
diff --git a/src/magic/ui/duel/choice/MayChoicePanel.java b/src/magic/ui/duel/choice/MayChoicePanel.java
index 1f15724ade..39e3fe6b48 100644
--- a/src/magic/ui/duel/choice/MayChoicePanel.java
+++ b/src/magic/ui/duel/choice/MayChoicePanel.java
@@ -72,7 +72,7 @@ public class MayChoicePanel extends JPanel implements ActionListener {
         buttonPanel.add(noButton);
 
         noButton.getInputMap(2).put(KeyStroke.getKeyStroke('n'),"no");
-        
+
         @SuppressWarnings("serial")
         final AbstractAction noAction = new AbstractAction() {
             public void actionPerformed(final ActionEvent evt) {
diff --git a/src/magic/ui/duel/player/AnimationPanel.java b/src/magic/ui/duel/player/AnimationPanel.java
index c84a0aa33e..40fc788fc2 100644
--- a/src/magic/ui/duel/player/AnimationPanel.java
+++ b/src/magic/ui/duel/player/AnimationPanel.java
@@ -20,7 +20,7 @@ public class AnimationPanel extends JPanel {
     private static final int PULSE_BORDER_OFFSET = PULSE_BORDER_WIDTH / 2;
     private static final Stroke PULSE_BORDER_STROKE = new BasicStroke(PULSE_BORDER_WIDTH);
     private static final Color PULSE_BORDER_COLOR = ThemeFactory.getInstance().getCurrentTheme().getColor(Theme.COLOR_CHOICE_BORDER);
-    
+
     private int pulsingBorderOpacity = 0;
     private final Timeline pulseBorderTimeline = new Timeline();
 
diff --git a/src/magic/ui/duel/player/GamePlayerPanel.java b/src/magic/ui/duel/player/GamePlayerPanel.java
index e091bbe83a..804cd36205 100644
--- a/src/magic/ui/duel/player/GamePlayerPanel.java
+++ b/src/magic/ui/duel/player/GamePlayerPanel.java
@@ -19,7 +19,7 @@ import net.miginfocom.swing.MigLayout;
 
 @SuppressWarnings("serial")
 public class GamePlayerPanel extends TexturedPanel implements IChoiceViewer {
-    
+
     private PlayerViewerInfo playerInfo;
     private PlayerZoneButtonsPanel zoneButtonsPanel;
     private PlayerImagePanel avatarPanel;
diff --git a/src/magic/ui/duel/player/PlayerImagePanel.java b/src/magic/ui/duel/player/PlayerImagePanel.java
index 0dd7f94f5d..5d834577db 100644
--- a/src/magic/ui/duel/player/PlayerImagePanel.java
+++ b/src/magic/ui/duel/player/PlayerImagePanel.java
@@ -26,7 +26,7 @@ public class PlayerImagePanel extends AnimationPanel {
     private static final Font HEALTH_FONT = new Font("Dialog", Font.BOLD, 20);
 
     private final CounterOverlay poisonCounter;
-    private final CounterOverlay damageCounter;    
+    private final CounterOverlay damageCounter;
     private final BufferedImage activeImage;
     private final Image inactiveImage;
     private PlayerViewerInfo playerInfo;
@@ -51,7 +51,7 @@ public class PlayerImagePanel extends AnimationPanel {
     @Override
     protected void paintComponent(Graphics g) {
         super.paintComponent(g);
-        
+
         final Graphics2D g2d = (Graphics2D) g;
 
         g2d.drawImage(playerInfo.isPlayerTurn() ? activeImage : inactiveImage, 0, 0, this);
@@ -76,7 +76,7 @@ public class PlayerImagePanel extends AnimationPanel {
             drawPulsingBorder(g2d);
         } else {
             drawValidChoiceOverlay(g2d);
-        }        
+        }
     }
 
     private void drawValidChoiceOverlay(Graphics2D g2d) {
@@ -106,7 +106,7 @@ public class PlayerImagePanel extends AnimationPanel {
         final int textX = x + 4;
         final int textY = y + image.getHeight(null) - 6;
         GraphicsUtils.drawStringWithOutline(g2d, text, textX, textY);
-    }    
+    }
 
     public void updateDisplay(final PlayerViewerInfo playerInfo) {
         this.playerInfo = playerInfo;
diff --git a/src/magic/ui/duel/player/ZoneToggleButton.java b/src/magic/ui/duel/player/ZoneToggleButton.java
index a256edacc2..3da13319ca 100644
--- a/src/magic/ui/duel/player/ZoneToggleButton.java
+++ b/src/magic/ui/duel/player/ZoneToggleButton.java
@@ -55,7 +55,7 @@ public class ZoneToggleButton extends JToggleButton {
         this.imageOffset = value * 2;
         repaint();
     }
-    
+
     // CTR
     private ZoneToggleButton(final MagicPlayerZone zone, final int cardCount, final ValueStyle valueStyle, final boolean isActive) {
 
@@ -72,7 +72,7 @@ public class ZoneToggleButton extends JToggleButton {
         setNumberOfCardsInZone(cardCount);
         setMinimumSize(new Dimension(40, 60));
     }
-    
+
     // CTR
     ZoneToggleButton(final MagicPlayerZone playerZone, final int cardCount, final boolean isActive) {
         this(playerZone, cardCount, ValueStyle.NORMAL, isActive);
@@ -92,7 +92,7 @@ public class ZoneToggleButton extends JToggleButton {
         if (isHighlighted) {
             drawSelectedFill(g);
         }
-        
+
         if (animateOnChange) {
             g.drawImage(image, x, 4, x+32, 4+32, 0+imageOffset, 0+imageOffset, 32-imageOffset, 32-imageOffset, null);
         } else {
diff --git a/src/magic/ui/duel/sidebar/DuelSideBarPanel.java b/src/magic/ui/duel/sidebar/DuelSideBarPanel.java
index 9c87912707..f97fa0df42 100644
--- a/src/magic/ui/duel/sidebar/DuelSideBarPanel.java
+++ b/src/magic/ui/duel/sidebar/DuelSideBarPanel.java
@@ -35,7 +35,7 @@ public class DuelSideBarPanel extends JPanel implements IPlayerZoneListener {
         LOGSTACK,
         TURNINFO;
     }
-    
+
     private static final int TOTAL_PLAYERS = 2;
 
     private final PlayerCompositePanel[] playerCompositePanels = new PlayerCompositePanel[TOTAL_PLAYERS];
@@ -66,7 +66,7 @@ public class DuelSideBarPanel extends JPanel implements IPlayerZoneListener {
     private void createPlayerPanels() {
 
         PlayerZoneButtonsPanel.clearButtonGroup();
-        
+
         final PlayerViewerInfo playerInfo = controller.getViewerInfo().getPlayerInfo(false);
 
         if (playerInfo.isAi() || MagicSystem.isAiVersusAi()) {
diff --git a/src/magic/ui/duel/sidebar/LogStackViewer.java b/src/magic/ui/duel/sidebar/LogStackViewer.java
index ff165e5c71..8036466854 100644
--- a/src/magic/ui/duel/sidebar/LogStackViewer.java
+++ b/src/magic/ui/duel/sidebar/LogStackViewer.java
@@ -46,7 +46,7 @@ class LogStackViewer extends JPanel {
     private MessageStyle messageStyle = GeneralConfig.getInstance().getLogMessageStyle();
 
     LogStackViewer(LogViewer aLogBookViewer, StackViewer aStackViewer) {
-        
+
         this.logViewer = aLogBookViewer;
         this.stackViewer = aStackViewer;
 
@@ -164,7 +164,7 @@ class LogStackViewer extends JPanel {
         final boolean isLogVisible = !isLogVisible();
         GeneralConfig.getInstance().setLogMessagesVisible(isLogVisible);
         setLogVisible(isLogVisible);
-        GeneralConfig.getInstance().save();        
+        GeneralConfig.getInstance().save();
     }
 
 }
diff --git a/src/magic/ui/duel/sidebar/LogViewer.java b/src/magic/ui/duel/sidebar/LogViewer.java
index 15a5099feb..7688c639b8 100644
--- a/src/magic/ui/duel/sidebar/LogViewer.java
+++ b/src/magic/ui/duel/sidebar/LogViewer.java
@@ -25,7 +25,7 @@ class LogViewer extends TexturedPanel {
     private final JScrollPane scrollPane;
 
     LogViewer(final SwingGameController aController) {
-        
+
         this.controller = aController;
 
         messagePanels = new JPanel();
diff --git a/src/magic/ui/duel/sidebar/MessagePanel.java b/src/magic/ui/duel/sidebar/MessagePanel.java
index 924b45b127..0bb0e82da9 100644
--- a/src/magic/ui/duel/sidebar/MessagePanel.java
+++ b/src/magic/ui/duel/sidebar/MessagePanel.java
@@ -50,7 +50,7 @@ class MessagePanel extends JPanel {
 
         JPanel playerPanel = getPlayerPanel();
         JPanel turnPanel = getTurnPanel();
-        
+
         final Insets insets1 = container.getInsets();
         final Insets insets2 = SEPARATOR_BORDER.getBorderInsets(this);
         final int totalInsets = insets1.left + insets1.right + insets2.left + insets2.right;
@@ -62,7 +62,7 @@ class MessagePanel extends JPanel {
                     turnPanel.getPreferredSize().width -
                     totalInsets -
                     (GAP * 2);
-        }        
+        }
 
         final TextLabel textLabel = new TextLabel(
             message.getText(),
diff --git a/src/magic/ui/duel/textmode/HandGraveyardExileViewer.java b/src/magic/ui/duel/textmode/HandGraveyardExileViewer.java
index 0a75561474..3f9a6977a6 100644
--- a/src/magic/ui/duel/textmode/HandGraveyardExileViewer.java
+++ b/src/magic/ui/duel/textmode/HandGraveyardExileViewer.java
@@ -58,7 +58,7 @@ class HandGraveyardExileViewer extends JPanel implements ChangeListener {
             viewer.update();
         }
     }
-    
+
     void showCards(final MagicCardList cards) {
         other.clear();
         other.addAll(cards);
diff --git a/src/magic/ui/duel/viewer/CardViewer.java b/src/magic/ui/duel/viewer/CardViewer.java
index 04752784aa..e27e66886a 100644
--- a/src/magic/ui/duel/viewer/CardViewer.java
+++ b/src/magic/ui/duel/viewer/CardViewer.java
@@ -66,7 +66,7 @@ public class CardViewer extends JPanel implements ICardSelectionListener {
         }
 
     }
-    
+
     private void setDelayedVisibilityTimer() {
         timer = new Timer(0, new ActionListener() {
             @Override
@@ -74,7 +74,7 @@ public class CardViewer extends JPanel implements ICardSelectionListener {
                 setVisible(true);
             }
         });
-        timer.setRepeats(false);        
+        timer.setRepeats(false);
     }
 
     private void setTransformCardListener() {
@@ -121,7 +121,7 @@ public class CardViewer extends JPanel implements ICardSelectionListener {
     }
 
     public void setCard(final MagicCardDefinition cardDefinition, final int index) {
-        
+
         if (cardDefinition == null) {
             currentCardDefinition = MagicCardDefinition.UNKNOWN;
             setCardImage(MagicImages.getMissingCardImage());
diff --git a/src/magic/ui/duel/viewer/DeckDescriptionViewer.java b/src/magic/ui/duel/viewer/DeckDescriptionViewer.java
index 380371f95e..cb5728d0b3 100644
--- a/src/magic/ui/duel/viewer/DeckDescriptionViewer.java
+++ b/src/magic/ui/duel/viewer/DeckDescriptionViewer.java
@@ -111,5 +111,5 @@ public class DeckDescriptionViewer extends JPanel implements FocusListener {
             setDeckDescription("");
         }
     }
-        
+
 }
diff --git a/src/magic/ui/duel/viewer/DeckEditorCardViewer.java b/src/magic/ui/duel/viewer/DeckEditorCardViewer.java
index 1c2a5100a7..4e8096b877 100644
--- a/src/magic/ui/duel/viewer/DeckEditorCardViewer.java
+++ b/src/magic/ui/duel/viewer/DeckEditorCardViewer.java
@@ -10,7 +10,7 @@ import magic.model.MagicCardDefinition;
 
 @SuppressWarnings("serial")
 public class DeckEditorCardViewer extends CardViewer {
-    
+
     private final static Dimension COUNTER_SIZE = new Dimension(100, 461);
     private int cardCount = 0;
 
@@ -25,7 +25,7 @@ public class DeckEditorCardViewer extends CardViewer {
         final int x = (getWidth() - COUNTER_SIZE.width) / 2;
         drawCardCount(g, x, 30, COUNTER_SIZE.width, COUNTER_SIZE.height);
     }
-    
+
     private void drawCardCount(Graphics g, int X, int Y, int W, int H) {
         if (cardCount > 0) {
             Graphics2D g2d = (Graphics2D)g;
diff --git a/src/magic/ui/duel/viewer/ImageCardListViewer.java b/src/magic/ui/duel/viewer/ImageCardListViewer.java
index 445ed5c4dc..472f50cf8c 100644
--- a/src/magic/ui/duel/viewer/ImageCardListViewer.java
+++ b/src/magic/ui/duel/viewer/ImageCardListViewer.java
@@ -61,7 +61,7 @@ public class ImageCardListViewer extends JPanel implements IChoiceViewer {
     private int cardStep = 0;
 
     public ImageCardListViewer(final SwingGameController controller) {
-        
+
         setOpaque(false);
 
         this.controller=controller;
@@ -230,7 +230,7 @@ public class ImageCardListViewer extends JPanel implements IChoiceViewer {
         SwingUtilities.convertPointFromScreen(mousePoint, this);
         Rectangle mouseOverRect = new Rectangle();
         final CardImagesProvider imageCache = CachedImagesProvider.getInstance();
-        
+
         for (int index=0; index < cardList.size(); index++) {
             final MagicCard card=cardList.get(index);
             final MagicCardDefinition cardDefinition=card.getCardDefinition();
@@ -239,7 +239,7 @@ public class ImageCardListViewer extends JPanel implements IChoiceViewer {
             final int y1=point.y;
             final int x2=point.x+CARD_WIDTH;
             final int y2=point.y+CARD_HEIGHT;
-                        
+
             final BufferedImage image = GraphicsUtils.scale(
                 imageCache.getImage(cardDefinition, card.getImageIndex(), true),
                 CARD_WIDTH,
diff --git a/src/magic/ui/duel/viewer/ImagePermanentViewer.java b/src/magic/ui/duel/viewer/ImagePermanentViewer.java
index 59bf10e062..29b3b67e2d 100644
--- a/src/magic/ui/duel/viewer/ImagePermanentViewer.java
+++ b/src/magic/ui/duel/viewer/ImagePermanentViewer.java
@@ -251,19 +251,19 @@ public class ImagePermanentViewer extends JPanel {
 
         g.setFont(FontsAndBorders.FONT1);
         final FontMetrics metrics = g.getFontMetrics();
-        
+
         final Graphics2D g2d = (Graphics2D)g;
         g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
 
         final Stroke defaultStroke = g2d.getStroke();
 
         final CardImagesProvider imageCache = CachedImagesProvider.getInstance();
-        
+
         for (int index = 0; index < linkedScreenRectangles.size(); index++) {
-            
+
             final PermanentViewerInfo linkedInfo = linkedInfos.get(index);
             final BufferedImage image = imageCache.getImage(linkedInfo.cardDefinition, linkedInfo.index, false);
-            
+
             final Rectangle linkedRect = linkedScreenRectangles.get(index);
             final int x1 = linkedRect.x;
             final int y1 = linkedRect.y;
@@ -301,11 +301,11 @@ public class ImagePermanentViewer extends JPanel {
                 // Mana symbols
                 if (linkedInfo.permanent.getManaActivations().size() > 0) {
                     ax = ImageDrawingUtils.drawManaInfo(
-                        g, 
-                        this, 
-                        linkedInfo.permanent.getManaActivations(), 
+                        g,
+                        this,
+                        linkedInfo.permanent.getManaActivations(),
                         linkedInfo.permanent.hasType(MagicType.Snow),
-                        ax, 
+                        ax,
                         ay
                     );
                 }
diff --git a/src/magic/ui/duel/viewer/PlayerZoneViewer.java b/src/magic/ui/duel/viewer/PlayerZoneViewer.java
index 9b5bc4a8f7..f01d036c0c 100644
--- a/src/magic/ui/duel/viewer/PlayerZoneViewer.java
+++ b/src/magic/ui/duel/viewer/PlayerZoneViewer.java
@@ -42,7 +42,7 @@ public class PlayerZoneViewer extends JPanel implements ChangeListener {
 
         this.controller = controller;
         this.imageCardsListViewer = new ImageCardListViewer(controller);
- 
+
         setOpaque(false);
         setLayout(new BorderLayout(6, 0));
 
diff --git a/src/magic/ui/duel/viewer/TurnTitlePanel.java b/src/magic/ui/duel/viewer/TurnTitlePanel.java
index a655955c6a..3f967693ad 100644
--- a/src/magic/ui/duel/viewer/TurnTitlePanel.java
+++ b/src/magic/ui/duel/viewer/TurnTitlePanel.java
@@ -35,7 +35,7 @@ public class TurnTitlePanel extends JPanel {
     private static final String _S3 = "First player to %d wins the duel.";
     @StringContext(eg = "as in 'Game 2 of 3'")
     private static final String _S4 = "Game %d / %d";
-    private static final String _S5 = "Turn %d"; 
+    private static final String _S5 = "Turn %d";
 
     private final MigLayout miglayout = new MigLayout();
     private final JLabel scoreLabel = new JLabel();
@@ -118,7 +118,7 @@ public class TurnTitlePanel extends JPanel {
                 gameInfo.getTurnPlayer().getName())
         );
     }
-    
+
     private String getScoreString(final GameViewerInfo gameInfo) {
         return String.format("%s %d - %d %s",
                 gameInfo.getPlayerInfo(false).getName(),
diff --git a/src/magic/ui/duel/viewer/UserActionPanel.java b/src/magic/ui/duel/viewer/UserActionPanel.java
index 9baa930124..7dcf2db47e 100644
--- a/src/magic/ui/duel/viewer/UserActionPanel.java
+++ b/src/magic/ui/duel/viewer/UserActionPanel.java
@@ -65,7 +65,7 @@ public class UserActionPanel extends JPanel implements ActionListener {
             public void mouseReleased(MouseEvent e) {
                 if (SwingUtilities.isRightMouseButton(e)) {
                     controller.passKeyPressed();
-                }               
+                }
             }
         });
         actionPanel.add(actionButton,"2");
diff --git a/src/magic/ui/duel/viewer/info/CardViewerInfo.java b/src/magic/ui/duel/viewer/info/CardViewerInfo.java
index df7c9a0e60..6136d8f897 100644
--- a/src/magic/ui/duel/viewer/info/CardViewerInfo.java
+++ b/src/magic/ui/duel/viewer/info/CardViewerInfo.java
@@ -61,7 +61,7 @@ public class CardViewerInfo {
     public BufferedImage getImage() {
         return CachedImagesProvider.getInstance().getImage(frontFace, 0, true);
     }
- 
+
     public BufferedImage getBackFaceImage() {
         return backFace == MagicCardDefinition.UNKNOWN
             ? MagicImages.BACK_IMAGE
@@ -83,7 +83,7 @@ public class CardViewerInfo {
     public boolean usesStack() {
         return frontFace.usesStack();
     }
-    
+
     private MagicCardDefinition getFrontFace(MagicCardOnStack aCard) {
         return aCard.getController().isHuman() || MagicSystem.isAiVersusAi()
             ? aCard.getRealCardDefinition()
diff --git a/src/magic/ui/duel/viewer/info/GameViewerInfo.java b/src/magic/ui/duel/viewer/info/GameViewerInfo.java
index 59e989ff2a..81889ffd1a 100644
--- a/src/magic/ui/duel/viewer/info/GameViewerInfo.java
+++ b/src/magic/ui/duel/viewer/info/GameViewerInfo.java
@@ -30,7 +30,7 @@ public class GameViewerInfo {
     private final int maxGames;
     private final MagicPhaseType phaseType;
     private final int undoPoints;
-        
+
     public GameViewerInfo(final MagicGame game) {
 
         final MagicPlayer player = game.getVisiblePlayer();
@@ -61,7 +61,7 @@ public class GameViewerInfo {
     private void setStackViewerInfo(final MagicGame game) {
         for (final MagicItemOnStack itemOnStack : game.getStack()) {
             stack.add(new StackViewerInfo(game,itemOnStack));
-        }        
+        }
     }
 
     /**
@@ -102,7 +102,7 @@ public class GameViewerInfo {
     public List<StackViewerInfo> getStack() {
         return stack;
     }
-    
+
     public List<MagicMessage> getLog() {
         return log;
     }
@@ -172,15 +172,15 @@ public class GameViewerInfo {
         }
         throw new RuntimeException("Invalid MagicPlayerZone : " + aZone);
     }
-    
+
     private MagicCard searchForCardInZone(long magicCardId, MagicPlayerZone zone, PlayerViewerInfo[] players) {
         for (final PlayerViewerInfo player : players) {
-            final MagicCardList cards = getMagicCardList(zone, player);            
+            final MagicCardList cards = getMagicCardList(zone, player);
             for (final MagicCard card : cards) {
                 if (card.getId() == magicCardId) {
                     return card;
                 }
-            }            
+            }
         }
         return MagicCard.NONE;
     }
diff --git a/src/magic/ui/explorer/CardDecksPanel.java b/src/magic/ui/explorer/CardDecksPanel.java
index 2fda84aa65..3e4719144d 100644
--- a/src/magic/ui/explorer/CardDecksPanel.java
+++ b/src/magic/ui/explorer/CardDecksPanel.java
@@ -51,7 +51,7 @@ class CardDecksPanel extends JPanel {
     private Timer cooldownTimer;
 
     public CardDecksPanel() {
-        
+
         decksJList.setOpaque(false);
         decksJList.setBackground(new Color(0, 0, 0, 1));
         decksJList.setForeground(Color.BLACK);
@@ -110,7 +110,7 @@ class CardDecksPanel extends JPanel {
         if (worker != null && worker.isDone() == false && worker.isCancelled() == false) {
             worker.cancel(true);
         }
-        
+
         this.card = aCard;
 
         decksJList.setListData(new File[]{});
@@ -212,5 +212,5 @@ class CardDecksPanel extends JPanel {
     int getDecksCount() {
         return decksJList.getModel().getSize();
     }
-    
+
 }
diff --git a/src/magic/ui/explorer/CardPanel.java b/src/magic/ui/explorer/CardPanel.java
index ab77d3491d..93b1fb1b1d 100644
--- a/src/magic/ui/explorer/CardPanel.java
+++ b/src/magic/ui/explorer/CardPanel.java
@@ -103,12 +103,12 @@ public class CardPanel extends JPanel {
 
         decksButton.setForeground(Color.GRAY);
         decksButton.setText(UiString.get(_S4));
-        
+
         cardViewer.setCard(aCardDef);
         decksPanel.setCard(aCardDef);
 
         refreshLayout();
-        
+
     }
 
 }
diff --git a/src/magic/ui/explorer/ExplorerPanel.java b/src/magic/ui/explorer/ExplorerPanel.java
index acf2d4c27f..95949e3896 100644
--- a/src/magic/ui/explorer/ExplorerPanel.java
+++ b/src/magic/ui/explorer/ExplorerPanel.java
@@ -77,7 +77,7 @@ public class ExplorerPanel extends JPanel implements ICardSelectionListener, ICa
             add(sideBarPanel, "h 100%, w " + imageSize.width + "!");
             add(rhs, "w 100%, h 100%");
         }
-        
+
         // set initial card image
         if (cardPoolDefs.isEmpty()) {
             sideBarPanel.setCard(MagicCardDefinition.UNKNOWN);
@@ -97,7 +97,7 @@ public class ExplorerPanel extends JPanel implements ICardSelectionListener, ICa
         cardPoolTable.addMouseListener(new CardPoolMouseListener());
         cardPoolTable.addCardSelectionListener(this);
         return cardPoolTable;
-        
+
     }
 
     private String generatePoolTitle() {
diff --git a/src/magic/ui/explorer/SplitterButton.java b/src/magic/ui/explorer/SplitterButton.java
index 70ecea14c8..c9984f52f1 100644
--- a/src/magic/ui/explorer/SplitterButton.java
+++ b/src/magic/ui/explorer/SplitterButton.java
@@ -52,13 +52,13 @@ public class SplitterButton extends JButton {
                 repaint();
             }
         });
-        
+
     }
 
     public SplitterButton() {
         this(null);
     }
-    
+
     public void setIsArrowUp(final boolean b) {
         this.isArrowUp = b;
         isMouseOver = false;
@@ -105,5 +105,5 @@ public class SplitterButton extends JButton {
         p.addPoint(x + TRIANGLE_WIDTH, y + 1);
         return p;
     };
-    
+
 }
diff --git a/src/magic/ui/image/download/DialogMainPanel.java b/src/magic/ui/image/download/DialogMainPanel.java
index 7976d0dbec..b406dce7ee 100644
--- a/src/magic/ui/image/download/DialogMainPanel.java
+++ b/src/magic/ui/image/download/DialogMainPanel.java
@@ -44,7 +44,7 @@ class DialogMainPanel extends JPanel implements PropertyChangeListener {
         optionsPanel = new OptionsPanel();
         optionsPanel.addHintSources(hintPanel);
         optionsPanel.setEnabled(false);
-        optionsPanel.addPropertyChangeListener(OptionsPanel.CP_OPTIONS_CHANGED, 
+        optionsPanel.addPropertyChangeListener(OptionsPanel.CP_OPTIONS_CHANGED,
             (e) -> { refreshDownloadList(); }
         );
 
@@ -61,9 +61,9 @@ class DialogMainPanel extends JPanel implements PropertyChangeListener {
         setDownloadPanels();
         setLookAndFeel();
         refreshLayout();
-        
+
     }
-    
+
     private void doRunInBackground() {
         firePropertyChange(CP_RUN_BACKGROUND, true, false);
     }
diff --git a/src/magic/ui/image/download/DirectoryChooser.java b/src/magic/ui/image/download/DirectoryChooser.java
index df87e33e15..e2c6151c8d 100644
--- a/src/magic/ui/image/download/DirectoryChooser.java
+++ b/src/magic/ui/image/download/DirectoryChooser.java
@@ -35,7 +35,7 @@ class DirectoryChooser extends JPanel {
     private static final String _S5 = "Card images folder";
     private static final String _S6 = "Card images will be downloaded here into the \"cards\" and \"tokens\" sub-folders. Double-click to to open this location in file manager.";
     private static final String _S7 = "Select or create a new folder in which card images will be stored.";
-    
+
     private static final long MIN_FREE_SPACE = 1610612736; // bytes = 1.5 GB
 
     private final MigLayout layout = new MigLayout();
@@ -50,7 +50,7 @@ class DirectoryChooser extends JPanel {
         setLayout(layout);
         refreshLayout();
     }
-    
+
     private void openFolderInFileManager() {
         setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         try {
diff --git a/src/magic/ui/image/download/DownloadDialogPanel.java b/src/magic/ui/image/download/DownloadDialogPanel.java
index 2e4fae1584..008af3d03d 100644
--- a/src/magic/ui/image/download/DownloadDialogPanel.java
+++ b/src/magic/ui/image/download/DownloadDialogPanel.java
@@ -20,11 +20,11 @@ import net.miginfocom.swing.MigLayout;
 public class DownloadDialogPanel extends JPanel implements PropertyChangeListener {
 
     private static final String _S1 = "Download card images";
-    
+
     private final DialogMainPanel mainPanel;
 
     public DownloadDialogPanel() {
-       
+
         setPreferredSize(new Dimension(440, 460));
         setBorder(
             BorderFactory.createCompoundBorder(
diff --git a/src/magic/ui/image/download/DownloadPanel.java b/src/magic/ui/image/download/DownloadPanel.java
index f08e78e6fd..9155d57571 100644
--- a/src/magic/ui/image/download/DownloadPanel.java
+++ b/src/magic/ui/image/download/DownloadPanel.java
@@ -73,12 +73,12 @@ abstract class DownloadPanel extends JPanel implements IScanListener, IDownloadL
         imagesDownloader.execute();
         notifyStatusChanged(DownloadState.DOWNLOADING);
     }
-    
+
     private void setActions() {
         downloadButton.addActionListener(action -> { doRunImageDownloadWorker(); });
         cancelButton.addActionListener(action -> { doCancelImageDownloadWorker(); });
     }
-    
+
     void doCancel() {
         isCancelled = true;
         doCancelImageDownloadWorker();
diff --git a/src/magic/ui/image/download/DownloadWorker.java b/src/magic/ui/image/download/DownloadWorker.java
index 70c58d2c23..eb27c2b827 100644
--- a/src/magic/ui/image/download/DownloadWorker.java
+++ b/src/magic/ui/image/download/DownloadWorker.java
@@ -23,7 +23,7 @@ import magic.utility.MagicSystem;
 class DownloadWorker extends SwingWorker<Void, Integer> {
 
     private static final MagicLogFile missingLog = new MagicLogFile("downloaded-images");
-    
+
     private final Proxy proxy;
     private ImagesDownloadList downloadList;
     private final IDownloadListener listener;
@@ -31,12 +31,12 @@ class DownloadWorker extends SwingWorker<Void, Integer> {
     private final DownloadMode downloadMode;
     private boolean updateDownloadDate = true;
     private boolean isLogging = true;
-   
+
     DownloadWorker(
         IDownloadListener aListener,
         CardTextLanguage aLanguage,
         DownloadMode aDownloadMode) {
-        
+
         this.listener = aListener;
         this.textLanguage = aLanguage;
         this.downloadMode = aDownloadMode;
@@ -223,5 +223,5 @@ class DownloadWorker extends SwingWorker<Void, Integer> {
         assert SwingUtilities.isEventDispatchThread();
         listener.resetProgress();
     }
-    
+
 }
diff --git a/src/magic/ui/image/download/ErrorPanel.java b/src/magic/ui/image/download/ErrorPanel.java
index 29773a8399..e08139d5f4 100644
--- a/src/magic/ui/image/download/ErrorPanel.java
+++ b/src/magic/ui/image/download/ErrorPanel.java
@@ -22,7 +22,7 @@ class ErrorPanel extends JPanel {
 
     private static final String _S4 = "Copy to clipboard";
     private static final String _S5 = "Error details have been copied to the clipboard.";
-    
+
     private final JTextArea textArea;
 
     ErrorPanel() {
diff --git a/src/magic/ui/image/download/OptionsPanel.java b/src/magic/ui/image/download/OptionsPanel.java
index 003341e00c..14920ceb04 100644
--- a/src/magic/ui/image/download/OptionsPanel.java
+++ b/src/magic/ui/image/download/OptionsPanel.java
@@ -43,7 +43,7 @@ class OptionsPanel extends JPanel {
         add(getBoldLabel(UiString.get(_S3)));
         add(cboDownloadMode);
 
-        
+
     }
 
     private JLabel getBoldLabel(String text) {
diff --git a/src/magic/ui/image/download/PlayablePanel.java b/src/magic/ui/image/download/PlayablePanel.java
index 408ba6f572..632de0f0a2 100644
--- a/src/magic/ui/image/download/PlayablePanel.java
+++ b/src/magic/ui/image/download/PlayablePanel.java
@@ -18,7 +18,7 @@ class PlayablePanel extends DownloadPanel {
     PlayablePanel(DownloadMode aMode, CardTextLanguage aLang, DialogMainPanel aPanel) {
         super(aMode, aLang, aPanel);
     }
-    
+
     @Override
     protected String getProgressCaption() {
         return UiString.get(_S1);
@@ -44,5 +44,5 @@ class PlayablePanel extends DownloadPanel {
         GeneralConfig.getInstance().setPlayableImagesDownloadDate(new Date());
         GeneralConfig.getInstance().save();
     }
-    
+
 }
diff --git a/src/magic/ui/image/filter/GrayScaleImageFilter.java b/src/magic/ui/image/filter/GrayScaleImageFilter.java
index 34f37f7300..832aaf52dd 100644
--- a/src/magic/ui/image/filter/GrayScaleImageFilter.java
+++ b/src/magic/ui/image/filter/GrayScaleImageFilter.java
@@ -15,5 +15,5 @@ public class GrayScaleImageFilter extends MagicRGBImageFilter {
         );
         return (argb & ALPHA_MASK) | (gray << 16) | (gray << 8) | gray;
     }
-    
+
 }
diff --git a/src/magic/ui/image/filter/WhiteColorSwapImageFilter.java b/src/magic/ui/image/filter/WhiteColorSwapImageFilter.java
index 664c1c7e7c..982d3c04ec 100644
--- a/src/magic/ui/image/filter/WhiteColorSwapImageFilter.java
+++ b/src/magic/ui/image/filter/WhiteColorSwapImageFilter.java
@@ -18,12 +18,12 @@ public class WhiteColorSwapImageFilter extends MagicRGBImageFilter {
         int b = (int)(getBlue(argb) * filter[2]);
         return (argb & ALPHA_MASK) | (r << 16) | (g << 8) | b;
     }
-    
+
     private float[] getImageFilterValues(final Color color) {
         return new float[]{
             color.getRed() / 255f,
             color.getGreen() / 255f,
             color.getBlue() / 255f};
     }
-    
+
 }
diff --git a/src/magic/ui/message/TComponentBuilder.java b/src/magic/ui/message/TComponentBuilder.java
index a73b3c2ee6..abeae06518 100644
--- a/src/magic/ui/message/TComponentBuilder.java
+++ b/src/magic/ui/message/TComponentBuilder.java
@@ -12,7 +12,7 @@ import magic.utility.MagicSystem;
 
 class TComponentBuilder {
     private TComponentBuilder() {}
-    
+
     static final TComponent SPACE_COMPONENT = new EmptyComponent();
     static final TComponent BREAK_COMPONENT = new EmptyComponent();
 
diff --git a/src/magic/ui/message/TextComponent.java b/src/magic/ui/message/TextComponent.java
index 7f72d27533..25e5578c67 100644
--- a/src/magic/ui/message/TextComponent.java
+++ b/src/magic/ui/message/TextComponent.java
@@ -37,11 +37,11 @@ public class TextComponent extends TComponent {
         this.fontColor = getTextColor(isChoice, choiceColor, interactiveColor);
         this.font = getTextFont(aFont);
         this.metrics = component.getFontMetrics(this.font);
-        
+
         this.newLine = !(".".equals(text) || ",".equals(text));
 
     }
-    
+
     private Color getTextColor(boolean isChoice, Color choiceColor, Color interactiveColor) {
         if (isCardId() && isChoice == false) {
             return Color.DARK_GRAY;
diff --git a/src/magic/ui/player/IPlayerStatsViewerInfo.java b/src/magic/ui/player/IPlayerStatsViewerInfo.java
index 88230bcd95..8e1dc7147a 100644
--- a/src/magic/ui/player/IPlayerStatsViewerInfo.java
+++ b/src/magic/ui/player/IPlayerStatsViewerInfo.java
@@ -3,7 +3,7 @@ package magic.ui.player;
 interface IPlayerStatsViewerInfo {
 
     static final String NO_VALUE = "---";
-    
+
     String getLastPlayedDate();
     String getDuelsPlayed();
     String getDuelsWonLost();
diff --git a/src/magic/ui/player/NullPlayerStatsViewerInfo.java b/src/magic/ui/player/NullPlayerStatsViewerInfo.java
index 3b8058ad0c..8e95451f6b 100644
--- a/src/magic/ui/player/NullPlayerStatsViewerInfo.java
+++ b/src/magic/ui/player/NullPlayerStatsViewerInfo.java
@@ -1,7 +1,7 @@
 package magic.ui.player;
 
 public class NullPlayerStatsViewerInfo implements IPlayerStatsViewerInfo {
-    
+
     @Override
     public String getLastPlayedDate() {
         return NO_VALUE;
diff --git a/src/magic/ui/player/PlayerStatsPanel.java b/src/magic/ui/player/PlayerStatsPanel.java
index 888314c4da..83312f2908 100644
--- a/src/magic/ui/player/PlayerStatsPanel.java
+++ b/src/magic/ui/player/PlayerStatsPanel.java
@@ -21,7 +21,7 @@ public class PlayerStatsPanel extends JPanel {
     private static final String _S9 = "Most used color:";
 
     private static final IPlayerStatsViewerInfo NO_STATS = new NullPlayerStatsViewerInfo();
-    
+
     public PlayerStatsPanel(PlayerStatistics stats) {
 
         final MigLayout miglayout = new MigLayout("wrap 2, insets 2");
@@ -29,7 +29,7 @@ public class PlayerStatsPanel extends JPanel {
         setLayout(miglayout);
 
         setOpaque(false);
-        
+
         refreshStats(getPlayerStatsViewerInfo(stats));
     }
 
@@ -39,7 +39,7 @@ public class PlayerStatsPanel extends JPanel {
 
         add(getStatsLabel(UiString.get(_S1)));
         add(getStatsLabel(stats.getLastPlayedDate()));
-        
+
         add(getStatsLabel(UiString.get(_S2)));
         add(getStatsLabel(stats.getDuelsPlayed()));
 
diff --git a/src/magic/ui/prefs/AnimationsPanel.java b/src/magic/ui/prefs/AnimationsPanel.java
index b42434b15a..905e8502b7 100644
--- a/src/magic/ui/prefs/AnimationsPanel.java
+++ b/src/magic/ui/prefs/AnimationsPanel.java
@@ -22,7 +22,7 @@ class AnimationsPanel extends JPanel {
     private static final String _S6 = "When playing a land card, this setting determines how long (in seconds) it should be displayed at full size. Left-click or space key cancels preview.";
     private static final String _S70 = "Play animations / effects";
     private static final String _S71 = "Turning animations off will speed up gameplay but make it harder to follow the action.";
-    
+
     private final static GeneralConfig CONFIG = GeneralConfig.getInstance();
 
     private final JCheckBox animateCheckBox;
@@ -40,7 +40,7 @@ class AnimationsPanel extends JPanel {
         newTurnAlertSlider = getNewTurnAlertSlider(aListener);
         subPanel = getAnimationSubPanel();
         animateCheckBox = getAnimateCheckbox(aListener, subPanel);
-        
+
         setLayout(new MigLayout("flowy, insets 16, gapy 6"));
         add(animateCheckBox);
         add(subPanel, "w 100%");
@@ -52,7 +52,7 @@ class AnimationsPanel extends JPanel {
         panel.setEnabled(CONFIG.getAnimateGameplay());
         return panel;
     }
-    
+
     private JCheckBox getAnimateCheckbox(MouseListener aListener, JPanel panel) {
         final JCheckBox cb = new JCheckBox(UiString.get(_S70), CONFIG.getAnimateGameplay());
         cb.setToolTipText(UiString.get(_S71));
@@ -71,7 +71,7 @@ class AnimationsPanel extends JPanel {
         sp.setFontBold(false);
         return sp;
     }
-    
+
     private SliderPanel getNonLandPreviewSlider(MouseListener aListener) {
         final SliderPanel sp = new SliderPanel(UiString.get(_S3), 1, 20, 1, CONFIG.getNonLandPreviewDuration() / 1000);
         sp.setToolTipText(UiString.get(_S4));
@@ -114,5 +114,5 @@ class AnimationsPanel extends JPanel {
             super.setEnabled(b);
         }
     }
-    
+
 }
diff --git a/src/magic/ui/prefs/GameplayImagesPanel.java b/src/magic/ui/prefs/GameplayImagesPanel.java
index fd859f746d..143396099c 100644
--- a/src/magic/ui/prefs/GameplayImagesPanel.java
+++ b/src/magic/ui/prefs/GameplayImagesPanel.java
@@ -25,7 +25,7 @@ class GameplayImagesPanel extends JPanel {
     private final JCheckBox mouseWheelPopupCheckBox;
     private final SliderPanel popupDelaySlider;
     private final JCheckBox pauseGamePopupCheckBox;
-    
+
     GameplayImagesPanel(final MouseListener aListener) {
 
         preferredSizePanel = new PreferredSizePanel(aListener);
@@ -50,7 +50,7 @@ class GameplayImagesPanel extends JPanel {
         add(mouseWheelPopupCheckBox);
         add(popupDelaySlider, "w 100%");
     }
-    
+
     void saveSettings() {
         preferredSizePanel.saveSettings();
         CONFIG.setMouseWheelPopup(mouseWheelPopupCheckBox.isSelected());
diff --git a/src/magic/ui/prefs/PreferencesDialog.java b/src/magic/ui/prefs/PreferencesDialog.java
index 47899c3e85..32dc50c9f5 100644
--- a/src/magic/ui/prefs/PreferencesDialog.java
+++ b/src/magic/ui/prefs/PreferencesDialog.java
@@ -369,7 +369,7 @@ public class PreferencesDialog
         return scroller;
 
     }
-    
+
     private void saveSettings() {
         animationsPanel.saveSettings();
         gameImagesPanel.saveSettings();
diff --git a/src/magic/ui/prefs/ScrollablePanel.java b/src/magic/ui/prefs/ScrollablePanel.java
index e49ca6e4fb..98b3347d85 100644
--- a/src/magic/ui/prefs/ScrollablePanel.java
+++ b/src/magic/ui/prefs/ScrollablePanel.java
@@ -6,7 +6,7 @@ import javax.swing.*;
 /**
  * https://tips4java.wordpress.com/2009/12/20/scrollable-panel/
  *
- * A panel that implements the Scrollable interface. 
+ * A panel that implements the Scrollable interface.
  * This class allows you to customize the scrollable features by using newly provided
  * setter methods so you don't have to extend this class every time.
  *
diff --git a/src/magic/ui/screen/AvatarImagesScreen.java b/src/magic/ui/screen/AvatarImagesScreen.java
index 9a8395b118..2ab68af18f 100644
--- a/src/magic/ui/screen/AvatarImagesScreen.java
+++ b/src/magic/ui/screen/AvatarImagesScreen.java
@@ -187,7 +187,7 @@ public class AvatarImagesScreen extends AbstractScreen implements IStatusBar, IA
     }
 
     private class AvatarImageSetsPanel extends TexturedPanel implements IThemeStyle {
-        
+
         public AvatarImageSetsPanel() {
 
             // List of avatar image sets.
@@ -285,10 +285,10 @@ public class AvatarImagesScreen extends AbstractScreen implements IStatusBar, IA
 
         @Override
         public Component getListCellRendererComponent(
-            JList<? extends AvatarImageSet> list, 
-            AvatarImageSet value, 
+            JList<? extends AvatarImageSet> list,
+            AvatarImageSet value,
             int index,
-            boolean isSelected, 
+            boolean isSelected,
             boolean cellHasFocus
         ) {
 
diff --git a/src/magic/ui/screen/DeckEditorScreen.java b/src/magic/ui/screen/DeckEditorScreen.java
index a064defc33..d7873d66f3 100644
--- a/src/magic/ui/screen/DeckEditorScreen.java
+++ b/src/magic/ui/screen/DeckEditorScreen.java
@@ -97,7 +97,7 @@ public class DeckEditorScreen
         }
         return null;
     }
-    
+
     private static MagicDeck loadDeck(final Path deckFilePath) {
         try {
             return DeckUtils.loadDeckFromFile(deckFilePath);
diff --git a/src/magic/ui/screen/DeckEditorSplitScreen.java b/src/magic/ui/screen/DeckEditorSplitScreen.java
index 4c2d3741f7..a0cc3baa69 100644
--- a/src/magic/ui/screen/DeckEditorSplitScreen.java
+++ b/src/magic/ui/screen/DeckEditorSplitScreen.java
@@ -65,7 +65,7 @@ public class DeckEditorSplitScreen
             }
         }
     }
-    
+
     private MagicDeck loadDeck(final Path deckFilePath) {
         try {
             return DeckUtils.loadDeckFromFile(deckFilePath);
diff --git a/src/magic/ui/screen/DeckTiledCardsScreen.java b/src/magic/ui/screen/DeckTiledCardsScreen.java
index 4c3f08aeeb..13d3a613ef 100644
--- a/src/magic/ui/screen/DeckTiledCardsScreen.java
+++ b/src/magic/ui/screen/DeckTiledCardsScreen.java
@@ -103,7 +103,7 @@ public class DeckTiledCardsScreen
             setLayout(new MigLayout("insets 0, gap 0"));
             refreshLayout();
 
-            sidebar.setCard(deck.isEmpty() 
+            sidebar.setCard(deck.isEmpty()
                 ? MagicCardDefinition.UNKNOWN
                 : deck.get(0)
             );
@@ -118,7 +118,7 @@ public class DeckTiledCardsScreen
         }
 
         public void refresh(List<MagicCard> cards, Dimension cardSize) {
-            sidebar.setCard(cards.isEmpty() 
+            sidebar.setCard(cards.isEmpty()
                 ? MagicCardDefinition.UNKNOWN
                 : cards.get(0).getCardDefinition()
             );
@@ -166,7 +166,7 @@ public class DeckTiledCardsScreen
         Collections.sort(cards);
         return cards;
     }
-    
+
     @Override
     public String getScreenCaption() {
         return UiString.get(_S1);
diff --git a/src/magic/ui/screen/DecksScreen.java b/src/magic/ui/screen/DecksScreen.java
index 617cf35a86..261902f13e 100644
--- a/src/magic/ui/screen/DecksScreen.java
+++ b/src/magic/ui/screen/DecksScreen.java
@@ -32,7 +32,7 @@ import magic.ui.widget.deck.DeckStatusPanel;
 import net.miginfocom.swing.MigLayout;
 
 @SuppressWarnings("serial")
-public class DecksScreen 
+public class DecksScreen
     extends AbstractScreen
     implements IStatusBar, IActionBar {
 
@@ -171,7 +171,7 @@ public class DecksScreen
             setLayout(new MigLayout("insets 0, gap 0"));
             add(getDeckNamesPanel(), "w 300!, h 100%");
             add(getDeckDetailsPane(), "w 100%, h 100%");
-            
+
         }
 
         public MagicDeck getDeck() {
@@ -185,12 +185,12 @@ public class DecksScreen
         private JSplitPane getDeckDetailsPane() {
             splitter.setOneTouchExpandable(false);
             splitter.setLeftComponent(deckTable);
-            splitter.setRightComponent(getCardDetailsPanel());            
+            splitter.setRightComponent(getCardDetailsPanel());
             splitter.setDividerSize(14);
             splitter.setBorder(null);
             splitter.setOpaque(false);
             splitter.getRightComponent().setMinimumSize(new Dimension());
-            splitter.setResizeWeight(1.0);                    
+            splitter.setResizeWeight(1.0);
             return splitter;
         }
 
@@ -210,7 +210,7 @@ public class DecksScreen
             deckPicker.addListener(this);
 
             descViewer.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 1, Color.BLACK));
-            
+
             // main container panel
             final JPanel container = new TexturedPanel();
             container.setBackground(FontsAndBorders.TRANSLUCENT_WHITE_STRONG);
diff --git a/src/magic/ui/screen/DuelDecksScreen.java b/src/magic/ui/screen/DuelDecksScreen.java
index 8b8b6949b3..17b8e4de6b 100644
--- a/src/magic/ui/screen/DuelDecksScreen.java
+++ b/src/magic/ui/screen/DuelDecksScreen.java
@@ -70,9 +70,9 @@ public class DuelDecksScreen
         if (duel.getGamesPlayed() > 0 && MagicSystem.isAiVersusAi() == false) {
             saveDuel();
         }
-        
+
         setContent(screenContent);
-        
+
         if (MagicSystem.isAiVersusAi() == false) {
             doGameSetupInBackground(duel);
             screenContent.addPropertyChangeListener(
diff --git a/src/magic/ui/screen/HelpMenuScreen.java b/src/magic/ui/screen/HelpMenuScreen.java
index d4c3d1d028..8ce515b577 100644
--- a/src/magic/ui/screen/HelpMenuScreen.java
+++ b/src/magic/ui/screen/HelpMenuScreen.java
@@ -12,7 +12,7 @@ import magic.ui.widget.KeysStripPanel;
 import net.miginfocom.swing.MigLayout;
 
 @SuppressWarnings("serial")
-public class HelpMenuScreen extends AbstractScreen {   
+public class HelpMenuScreen extends AbstractScreen {
 
     // translatable strings
     private static final String _S1 = "Help Menu";
diff --git a/src/magic/ui/screen/ImportScreen.java b/src/magic/ui/screen/ImportScreen.java
index 99dfb81c3b..b8db32d49f 100644
--- a/src/magic/ui/screen/ImportScreen.java
+++ b/src/magic/ui/screen/ImportScreen.java
@@ -150,7 +150,7 @@ public class ImportScreen extends AbstractScreen {
                                 }
                             }
                         });
-                
+
                 cancelButton.setVisible(true);
 
                 panel.setOpaque(false);
diff --git a/src/magic/ui/screen/MainMenuScreen.java b/src/magic/ui/screen/MainMenuScreen.java
index faac8f23a1..0683f5e1d0 100644
--- a/src/magic/ui/screen/MainMenuScreen.java
+++ b/src/magic/ui/screen/MainMenuScreen.java
@@ -135,7 +135,7 @@ public class MainMenuScreen extends AbstractScreen implements IWikiPage {
 
         private void refreshLayout() {
             miglayout.setLayoutConstraints("insets 4 0 0 0");
-            final ActionBarButton btn = new ActionBarButton(                    
+            final ActionBarButton btn = new ActionBarButton(
                     "Game file", "Select a saved public or private game file.",
                     new AbstractAction() {
                         @Override
diff --git a/src/magic/ui/screen/SettingsMenuScreen.java b/src/magic/ui/screen/SettingsMenuScreen.java
index f565995e0d..04b032fa89 100644
--- a/src/magic/ui/screen/SettingsMenuScreen.java
+++ b/src/magic/ui/screen/SettingsMenuScreen.java
@@ -55,7 +55,7 @@ public class SettingsMenuScreen extends AbstractScreen {
                 ScreenController.showDownloadImagesScreen();
             }
         });
-        
+
         menuPanel.addMenuItem(UiString.get(_S6), new AbstractAction() {
             @Override
             public void actionPerformed(final ActionEvent e) {
@@ -66,7 +66,7 @@ public class SettingsMenuScreen extends AbstractScreen {
                 }
             }
         });
-        
+
         menuPanel.addMenuItem(UiString.get(_S7), new AbstractAction() {
             @Override
             public void actionPerformed(final ActionEvent e) {
@@ -90,7 +90,7 @@ public class SettingsMenuScreen extends AbstractScreen {
         });
 
         menuPanel.refreshLayout();
-        
+
         final MigLayout layout = new MigLayout();
         layout.setLayoutConstraints("insets 0, gap 0, flowy");
         layout.setRowConstraints("[30!][100%, center][30!, bottom]");
@@ -103,7 +103,7 @@ public class SettingsMenuScreen extends AbstractScreen {
         content.add(new KeysStripPanel(), "w 100%, cell 0 2");
 
         return content;
-        
+
     }
 
     private void doReset() {
diff --git a/src/magic/ui/screen/StartScreen.java b/src/magic/ui/screen/StartScreen.java
index 941ddb131d..ac3b75b150 100644
--- a/src/magic/ui/screen/StartScreen.java
+++ b/src/magic/ui/screen/StartScreen.java
@@ -39,7 +39,7 @@ public class StartScreen extends AbstractScreen {
 
             setOpaque(false);
             setLayout(migLayout);
-            
+
             translations = MagicFileSystem.getTranslationFilenames();
             if (translations.isEmpty()) {
                 SwingUtilities.invokeLater(new Runnable() {
diff --git a/src/magic/ui/screen/widget/DialButton.java b/src/magic/ui/screen/widget/DialButton.java
index 71cc410ccc..a3fe46a4f5 100644
--- a/src/magic/ui/screen/widget/DialButton.java
+++ b/src/magic/ui/screen/widget/DialButton.java
@@ -25,7 +25,7 @@ public class DialButton extends ActionBarButton {
 
         increment = 360 / count;
         position = increment * start;
-        
+
         rotateIconImage();
 
         addMouseListener(new MouseAdapter() {
diff --git a/src/magic/ui/theme/AbilityIcon.java b/src/magic/ui/theme/AbilityIcon.java
index 7d1da819ce..5a9154f622 100644
--- a/src/magic/ui/theme/AbilityIcon.java
+++ b/src/magic/ui/theme/AbilityIcon.java
@@ -113,7 +113,7 @@ public enum AbilityIcon {
         }
         return icons;
     }
-    
+
     public static List<CardIcon> getIcons(final Set<MagicAbility> abilities) {
         final List<CardIcon> icons = new ArrayList<>();
         for (AbilityIcon abilityIcon : AbilityIcon.values()) {
diff --git a/src/magic/ui/theme/AbstractTheme.java b/src/magic/ui/theme/AbstractTheme.java
index a86d6a3603..21ff8ed51e 100644
--- a/src/magic/ui/theme/AbstractTheme.java
+++ b/src/magic/ui/theme/AbstractTheme.java
@@ -132,7 +132,7 @@ public abstract class AbstractTheme implements Theme {
     public ImageIcon getAvatarIcon(final int index,final int size) {
         return AvatarImages.getInstance().getAvatarIcon(index,size);
     }
-    
+
     @Override
     public ImageIcon getAbilityIcon(AbilityIcon ability) {
         final String key = "icon_" + ability.name().toLowerCase();
diff --git a/src/magic/ui/theme/ThemeFactory.java b/src/magic/ui/theme/ThemeFactory.java
index 331496faa8..3ddf2782f0 100644
--- a/src/magic/ui/theme/ThemeFactory.java
+++ b/src/magic/ui/theme/ThemeFactory.java
@@ -39,7 +39,7 @@ public class ThemeFactory {
         loadCustomExternalThemes();
         setCurrentTheme(GeneralConfig.getInstance().getTheme());
     }
-    
+
     private void loadCustomExternalThemes() {
         final File[] files = MagicFileSystem.getDataPath(DataPath.MODS).toFile().listFiles(THEME_FILE_FILTER);
         if (files != null) {
diff --git a/src/magic/ui/utility/GraphicsUtils.java b/src/magic/ui/utility/GraphicsUtils.java
index cb83b3006d..906b4b31af 100644
--- a/src/magic/ui/utility/GraphicsUtils.java
+++ b/src/magic/ui/utility/GraphicsUtils.java
@@ -210,7 +210,7 @@ final public class GraphicsUtils {
         } catch (IOException e) {
             e.printStackTrace();
         }
-                
+
         return (image != null) ?
             GraphicsUtils.getOptimizedImage(image) :
             MagicStyle.getTheme().getTexture(Theme.TEXTURE_BACKGROUND);
@@ -243,7 +243,7 @@ final public class GraphicsUtils {
     }
 
     public static BufferedImage getConvertedIcon(final ImageIcon icon) {
-        final BufferedImage bi = 
+        final BufferedImage bi =
                 GraphicsUtils.getCompatibleBufferedImage(
                         icon.getIconWidth(), icon.getIconHeight(), Transparency.TRANSLUCENT);
         final Graphics g = bi.createGraphics();
diff --git a/src/magic/ui/utility/MagicStyle.java b/src/magic/ui/utility/MagicStyle.java
index bad6d3dd82..e151c45d93 100644
--- a/src/magic/ui/utility/MagicStyle.java
+++ b/src/magic/ui/utility/MagicStyle.java
@@ -88,7 +88,7 @@ public final class MagicStyle {
     public static Color getRolloverColor() {
         return GeneralConfig.getInstance().getRolloverColor();
     }
-    
+
     public static Color getPressedColor() {
         return getRolloverColor().darker();
     }
diff --git a/src/magic/ui/widget/ButtonControlledPopup.java b/src/magic/ui/widget/ButtonControlledPopup.java
index 634908c943..36f1b6544d 100644
--- a/src/magic/ui/widget/ButtonControlledPopup.java
+++ b/src/magic/ui/widget/ButtonControlledPopup.java
@@ -53,7 +53,7 @@ public class ButtonControlledPopup extends TexturedPanel implements ActionListen
     private void setEscapeKeyAction() {
         JRootPane root = dialog.getRootPane();
         root.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "closeDialog");
-        
+
         @SuppressWarnings("serial")
         final AbstractAction closeAction = new AbstractAction() {
             @Override
diff --git a/src/magic/ui/widget/ColorButton.java b/src/magic/ui/widget/ColorButton.java
index 40dd0aa389..9a9dabe7f2 100644
--- a/src/magic/ui/widget/ColorButton.java
+++ b/src/magic/ui/widget/ColorButton.java
@@ -40,7 +40,7 @@ public class ColorButton extends JButton {
             public void mouseExited(MouseEvent e) {
                 super.mouseExited(e);
                 setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-            }            
+            }
         });
 
         setPreferredSize(new Dimension(48, 24));
@@ -49,5 +49,5 @@ public class ColorButton extends JButton {
     public Color getColor() {
         return getBackground();
     }
-    
+
 }
diff --git a/src/magic/ui/widget/GameLoadingMessage.java b/src/magic/ui/widget/GameLoadingMessage.java
index 7a5a6af2a5..85fed9908a 100644
--- a/src/magic/ui/widget/GameLoadingMessage.java
+++ b/src/magic/ui/widget/GameLoadingMessage.java
@@ -18,7 +18,7 @@ public class GameLoadingMessage {
         "assembling Urzatron",
         "seasoning flavor text"
     };
-    
+
     private static final Color COLOR1 = new Color(255, 255, 255, 0);
     private static final Color COLOR2 = new Color(255, 255, 255, 180);
     private static final Font MSGFONT = new Font("Dialog", Font.BOLD, 24);
@@ -29,8 +29,8 @@ public class GameLoadingMessage {
 
     public GameLoadingMessage() {
         message = getRandomWaitMessage();
-    }        
-    
+    }
+
     private String getRandomWaitMessage() {
         final Random rand = new Random();
         return "..." + MSG[rand.nextInt(MSG.length)] + "..." ;
diff --git a/src/magic/ui/widget/MenuedTitleBar.java b/src/magic/ui/widget/MenuedTitleBar.java
index 014f01154d..9990503277 100644
--- a/src/magic/ui/widget/MenuedTitleBar.java
+++ b/src/magic/ui/widget/MenuedTitleBar.java
@@ -5,10 +5,10 @@ import javax.swing.JPopupMenu;
 
 @SuppressWarnings("serial")
 public class MenuedTitleBar extends TitleBar {
-    
+
     private final MenuIconLabel iconLabel = new MenuIconLabel();
 
-    public MenuedTitleBar(String text, final JPopupMenu aMenu) {        
+    public MenuedTitleBar(String text, final JPopupMenu aMenu) {
         super(text);
         setPreferredSize(new Dimension(getPreferredSize().width, 26));
         setPreferredSize(getPreferredSize());
diff --git a/src/magic/ui/widget/SliderPanel.java b/src/magic/ui/widget/SliderPanel.java
index e62af75c88..23ecbc1d8d 100644
--- a/src/magic/ui/widget/SliderPanel.java
+++ b/src/magic/ui/widget/SliderPanel.java
@@ -21,7 +21,7 @@ public class SliderPanel extends JPanel implements ChangeListener {
     private final JLabel valueLabel;
 
     public SliderPanel(final String title, final int min,final int max,final int spacing,final int value,final boolean snapToTick) {
-        
+
         titleLabel=new JLabel(title);
         titleLabel.setPreferredSize(new Dimension(title.isEmpty() ? 0 : 90, 0));
         titleLabel.setFont(titleLabel.getFont().deriveFont(Font.BOLD));
diff --git a/src/magic/ui/widget/TitleBar.java b/src/magic/ui/widget/TitleBar.java
index 49f58c4dec..5bd4348e7d 100644
--- a/src/magic/ui/widget/TitleBar.java
+++ b/src/magic/ui/widget/TitleBar.java
@@ -24,7 +24,7 @@ public class TitleBar extends JPanel {
         add(label, "pushx");
 
         setBackground(MagicStyle.getTheme().getColor(Theme.COLOR_TITLE_BACKGROUND));
-        
+
     }
 
     public void setText(final String text) {
diff --git a/src/magic/ui/widget/alerter/AlertPanel.java b/src/magic/ui/widget/alerter/AlertPanel.java
index c5780abfb7..99802f0e61 100644
--- a/src/magic/ui/widget/alerter/AlertPanel.java
+++ b/src/magic/ui/widget/alerter/AlertPanel.java
@@ -7,7 +7,7 @@ import net.miginfocom.swing.MigLayout;
 
 @SuppressWarnings("serial")
 public class AlertPanel extends JPanel {
-    
+
     private final MigLayout miglayout = new MigLayout();
     private final List<AlertButton> alertButtons = new ArrayList<>();
 
diff --git a/src/magic/ui/widget/alerter/MissingImagesAlertButton.java b/src/magic/ui/widget/alerter/MissingImagesAlertButton.java
index 84c80645c0..6c7e34403c 100644
--- a/src/magic/ui/widget/alerter/MissingImagesAlertButton.java
+++ b/src/magic/ui/widget/alerter/MissingImagesAlertButton.java
@@ -40,7 +40,7 @@ public class MissingImagesAlertButton extends AlertButton {
 
     @Override
     protected String getAlertCaption() {
-        
+
         assert !SwingUtilities.isEventDispatchThread();
 
         if (!hasChecked || isVisible()) {
diff --git a/src/magic/ui/widget/deck/DeckFilter.java b/src/magic/ui/widget/deck/DeckFilter.java
index f54b40bc34..a8ad56c1fa 100644
--- a/src/magic/ui/widget/deck/DeckFilter.java
+++ b/src/magic/ui/widget/deck/DeckFilter.java
@@ -41,7 +41,7 @@ public class DeckFilter {
             return spinnersRequired;
         }
     }
-    
+
     private NumericFilter deckSizeFilter = NumericFilter.Any;
     private int deckSizeFilterValue1 = 40;
     private int deckSizeFilterValue2 = 60;
@@ -140,7 +140,7 @@ public class DeckFilter {
         this.deckSizeFilterValue1 = filterValue1;
         this.deckSizeFilterValue2 = filterValue2;
     }
-    
+
     public NumericFilter getDeckSizeFilterType() {
         return deckSizeFilter;
     }
diff --git a/src/magic/ui/widget/deck/DeckPicker.java b/src/magic/ui/widget/deck/DeckPicker.java
index 7968079c35..8eccd15bd7 100644
--- a/src/magic/ui/widget/deck/DeckPicker.java
+++ b/src/magic/ui/widget/deck/DeckPicker.java
@@ -138,7 +138,7 @@ public class DeckPicker extends JPanel {
         // deck names list : need to be able to add/remove to prevent multiple events.
         listSelectionListener = getListSelectionListener();
     }
-    
+
 
 
     final public void refreshContent() {
@@ -161,7 +161,7 @@ public class DeckPicker extends JPanel {
             filterPanel.setDecksCount(0);
             for (IDeckConsumer listener : listeners) {
                 listener.setDeck(new MagicDeck(), null);
-            }                        
+            }
         }
     }
 
diff --git a/src/magic/ui/widget/firemind/FiremindWorkerPanel.java b/src/magic/ui/widget/firemind/FiremindWorkerPanel.java
index 8352909536..bf7fd44324 100644
--- a/src/magic/ui/widget/firemind/FiremindWorkerPanel.java
+++ b/src/magic/ui/widget/firemind/FiremindWorkerPanel.java
@@ -46,9 +46,9 @@ public class FiremindWorkerPanel extends JPanel {
     protected final JLabel captionLabel = getCaptionLabel(getProgressCaption());
     private final JButton runButton = new JButton();
     private final JButton cancelButton = new JButton(UiString.get(_S1));
-   
+
     private SwingWorker<String, Void> firemindWorker;
-    private boolean isRunning = false;    
+    private boolean isRunning = false;
 
     protected SwingWorker<String, Void> getFiremindWorker(final Proxy proxy) {
         return new FiremindWorkerRunner(); //TODO (downloadList, CONFIG.getProxy());
@@ -59,13 +59,13 @@ public class FiremindWorkerPanel extends JPanel {
         }else{
             return UiString.get(_S3);
         }
-        
+
     }
-    
+
     protected String getLogFilename() {
         return "fireindWorker.log";
     }
-    
+
     protected String getStartButtonCaption() {
         return UiString.get(_S4);
     }
@@ -80,7 +80,7 @@ public class FiremindWorkerPanel extends JPanel {
     public boolean isRunning() {
         return this.isRunning;
     }
-    
+
     protected void saveDownloadLog(final List<String> downloadLog) {
         final Path logPath = MagicFileSystem.getDataPath(DataPath.LOGS).resolve(getLogFilename());
         System.out.println("saving log : " + logPath);
@@ -118,7 +118,7 @@ public class FiremindWorkerPanel extends JPanel {
             }
         });
     }
-    
+
     public void doCancel() {
         doCancelFiremindWorker();
         isRunning = false;
@@ -129,7 +129,7 @@ public class FiremindWorkerPanel extends JPanel {
             firemindWorker.cancel(true);
             setButtonState(false);
         }
-    } 
+    }
 
     protected void setButtonState(final boolean isRunning) {
         runButton.setVisible(!isRunning);
@@ -159,7 +159,7 @@ public class FiremindWorkerPanel extends JPanel {
         runButton.setEnabled(true);
         runButton.setText(getStartButtonCaption());
     }
-    
+
     private JLabel getAccessKeyLabel() {
         final JLabel lbl = new JLabel();
         lbl.setText(UiString.get(_S6));
@@ -169,7 +169,7 @@ public class FiremindWorkerPanel extends JPanel {
         lbl.setFont(lbl.getFont().deriveFont(Font.BOLD));
         return lbl;
     }
-    
+
     private JLabel getCaptionLabel(final String text) {
         final ImageIcon ii = MagicImages.getIcon(MagicIcon.BUSY16);
         final JLabel lbl = new JLabel(ii);
diff --git a/src/magic/utility/DeckUtils.java b/src/magic/utility/DeckUtils.java
index 83106fee39..eed57885c8 100644
--- a/src/magic/utility/DeckUtils.java
+++ b/src/magic/utility/DeckUtils.java
@@ -148,7 +148,7 @@ public class DeckUtils {
             deck.setInvalidDeck(UiString.get(_S1));
             return deck;
         }
-        
+
         if (content.size() > DECK_FILE_MAX_LINES) {
             deck.setInvalidDeck(UiString.get(_S2, DECK_FILE_MAX_LINES));
             return deck;
@@ -158,7 +158,7 @@ public class DeckUtils {
         final int MAX_LINE_LENGTH = 50; // characters.
         int lineNumber = 0;
         final List<String> lineErrors = new ArrayList<>();
-        
+
         for (final String nextLine: content) {
 
             if (lineErrors.size() > MAX_LINE_ERRORS) {
@@ -240,7 +240,7 @@ public class DeckUtils {
     public static void loadAndSetPlayerDeck(final String filename, final DuelPlayerConfig player) {
 
         final MagicDeck deck = loadDeckFromFile(Paths.get(filename));
-        
+
         if (deck.isValid()) {
             player.setDeck(deck);
             player.setDeckProfile(getDeckProfile(deck));