Merge branch 'master' into 'master'

Memory Leaks, Unused code, compiler warnings, etc.

See merge request core-developers/forge!423

forge-ai/.settings/org.eclipse.core.resources.prefs

@@ -1,4 +1,3 @@
 eclipse.preferences.version=1
 encoding//src/main/java=ISO-8859-1
-encoding//src/test/java=ISO-8859-1
 encoding/<project>=UTF-8

forge-ai/src/main/java/forge/ai/ability/StoreSVarAi.java

@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCombat;
 import forge.ai.ComputerUtilMana;
 import forge.ai.SpellAbilityAi;
 import forge.game.Game;

forge-ai/src/test/java/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

forge-core/src/main/java/forge/card/CardFace.java

@@ -1,7 +1,6 @@
 package forge.card;
 
 import forge.card.mana.ManaCost;
-import forge.util.TextUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.*;

forge-core/src/main/java/forge/deck/Deck.java

@@ -21,7 +21,6 @@ import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 
 import forge.StaticData;
-import forge.card.CardDb.SetPreference;
 import forge.card.CardDb;
 import forge.item.IPaperCard;
 import forge.item.PaperCard;

forge-core/src/main/java/forge/token/TokenDb.java

@@ -3,7 +3,6 @@ package forge.token;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Maps;
 import forge.card.*;
-import forge.item.PaperCard;
 import forge.item.PaperToken;
 
 import java.util.*;

forge-core/src/main/java/forge/util/ImageUtil.java

@@ -7,8 +7,6 @@ import forge.card.CardRules;
 import forge.card.CardSplitType;
 import forge.item.PaperCard;
 
-import java.io.File;
-
 import org.apache.commons.lang3.StringUtils;
 
 public class ImageUtil {

forge-core/src/test/java/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

forge-game/src/main/java/forge/game/GameActionUtil.java

@@ -40,6 +40,7 @@ import forge.game.zone.ZoneType;
 import forge.util.TextUtil;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
@@ -215,7 +216,7 @@ public final class GameActionUtil {
 
             // reset static abilities
             if (lkicheck) {
-                game.getAction().checkStaticAbilities(false, Sets.newHashSet(), CardCollection.EMPTY);
+                game.getAction().checkStaticAbilities(false, new HashSet<Card>(), CardCollection.EMPTY);
             }
         }
 

forge-game/src/main/java/forge/game/GameFormat.java

@@ -34,7 +34,6 @@ import forge.item.PaperCard;
 import forge.util.FileSection;
 import forge.util.FileUtil;
 import forge.util.storage.StorageBase;
-import forge.util.storage.StorageReaderFileSections;
 import forge.util.storage.StorageReaderFolder;
 
 import java.io.File;

forge-game/src/main/java/forge/game/cost/Cost.java

@@ -47,6 +47,10 @@ import forge.util.TextUtil;
  * @version $Id$
  */
 public class Cost implements Serializable {
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
     private boolean isAbility = true;
     private final List<CostPart> costParts = Lists.newArrayList();
     private boolean isMandatory = false;

forge-game/src/main/java/forge/game/cost/CostAddMana.java

@@ -32,6 +32,11 @@ import forge.game.spellability.SpellAbility;
  * The Class CostAddMana.
  */
 public class CostAddMana extends CostPart {
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
     /**
      * CostCostAddMana.
      * @param amount

forge-game/src/main/java/forge/game/cost/CostChooseCreatureType.java

@@ -25,6 +25,11 @@ import forge.game.spellability.SpellAbility;
  */
 public class CostChooseCreatureType extends CostPart {
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
     /**
      * Instantiates a new cost mill.
      * 

forge-game/src/main/java/forge/game/cost/CostDamage.java

@@ -27,6 +27,11 @@ import forge.game.spellability.SpellAbility;
  */
 public class CostDamage extends CostPart {
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
     public CostDamage(final String amount) {
         this.setAmount(amount);
     }

forge-game/src/main/java/forge/game/cost/CostDiscard.java

@@ -34,6 +34,11 @@ public class CostDiscard extends CostPartWithList {
 
     // Inputs
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
     /**
      * Instantiates a new cost discard.
      * 

forge-game/src/main/java/forge/game/cost/CostDraw.java

@@ -28,6 +28,11 @@ import java.util.List;
  * The Class CostPayLife.
  */
 public class CostDraw extends CostPart {
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
     /**
      * CostDraw.
      * @param amount

forge-game/src/main/java/forge/game/cost/CostExert.java

@@ -29,6 +29,11 @@ import forge.game.zone.ZoneType;
  */
 public class CostExert extends CostPartWithList {
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
     /**
      * Instantiates a new cost Exert.
      * 

forge-game/src/main/java/forge/game/cost/CostExile.java

@@ -38,6 +38,10 @@ public class CostExile extends CostPartWithList {
     // ExileFromTop<Num/Type{/TypeDescription}> (of library)
     // ExileSameGrave<Num/Type{/TypeDescription}>
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
     public final ZoneType from;
     public final boolean sameZone;
 

forge-game/src/main/java/forge/game/cost/CostExileFromStack.java

@@ -33,6 +33,11 @@ public class CostExileFromStack extends CostPart {
     // ExileFromStack<Num/Type{/TypeDescription}>
 
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
     /**
      * Instantiates a new cost exile.
      * 

forge-game/src/main/java/forge/game/cost/CostExiledMoveToGrave.java

@@ -29,6 +29,11 @@ import forge.game.zone.ZoneType;
  * This is for the "ExiledMoveToGrave" Cost.
  */
 public class CostExiledMoveToGrave extends CostPartWithList {
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
     // ExiledMoveToGrave<Num/Type{/TypeDescription}>
     public CostExiledMoveToGrave(final String amount, final String type, final String description) {
         super(amount, type, description);

forge-game/src/main/java/forge/game/cost/CostFlipCoin.java

@@ -27,6 +27,11 @@ import forge.game.spellability.SpellAbility;
  */
 public class CostFlipCoin extends CostPartWithList {
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
     /**
      * Instantiates a new cost FlipCoin.
      * 

forge-game/src/main/java/forge/game/cost/CostGainControl.java

@@ -31,6 +31,11 @@ import forge.game.zone.ZoneType;
 public class CostGainControl extends CostPartWithList {
     // GainControl<Num/Type{/TypeDescription}>
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
     /**
      * Instantiates a new cost return.
      * 

forge-game/src/main/java/forge/game/cost/CostGainLife.java

@@ -28,6 +28,10 @@ import java.util.List;
  * The Class CostGainLife.
  */
 public class CostGainLife extends CostPart {
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
     private final int cntPlayers; // MAX_VALUE means ALL/EACH PLAYERS
 
     /**

forge-game/src/main/java/forge/game/cost/CostMill.java

@@ -31,6 +31,11 @@ import forge.game.zone.ZoneType;
  */
 public class CostMill extends CostPartWithList {
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
     /**
      * Instantiates a new cost mill.
      * 

forge-game/src/main/java/forge/game/cost/CostPart.java

@@ -31,6 +31,10 @@ import java.io.Serializable;
  * The Class CostPart.
  */
 public abstract class CostPart implements Comparable<CostPart>, Cloneable, Serializable {
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
     private String originalAmount;
     private String amount;
     private final String originalType, originalTypeDescription;

forge-game/src/main/java/forge/game/cost/CostPartMana.java

@@ -22,12 +22,14 @@ import forge.card.mana.ManaCostShard;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 
-import java.io.Serializable;
-
 /**
  * The mana component of any spell or ability cost
  */
 public class CostPartMana extends CostPart {
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
     // "Leftover"
     private final ManaCost cost;
     private boolean xCantBe0 = false;

forge-game/src/main/java/forge/game/cost/CostPartWithList.java

@@ -28,6 +28,10 @@ import forge.game.spellability.SpellAbility;
  * The Class CostPartWithList.
  */
 public abstract class CostPartWithList extends CostPart {
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
     /** The lists: one for LKI, one for the actual cards. */
     private final CardCollection lkiList = new CardCollection();
     protected final CardCollection cardList = new CardCollection();

forge-game/src/main/java/forge/game/cost/CostPayEnergy.java

@@ -27,6 +27,11 @@ import forge.game.spellability.SpellAbility;
 
 
 public class CostPayEnergy extends CostPart {
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+    
     int paidAmount = 0;
 
     /**

forge-game/src/main/java/forge/game/cost/CostPayLife.java

@@ -26,6 +26,10 @@ import forge.game.spellability.SpellAbility;
  * The Class CostPayLife.
  */
 public class CostPayLife extends CostPart {
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
     int paidAmount = 0;
 
     /**

forge-game/src/main/java/forge/game/cost/CostPutCardToLib.java

@@ -36,6 +36,10 @@ public class CostPutCardToLib extends CostPartWithList {
     // PutCardToLibFromSameGrave<Num/LibPos/Type{/TypeDescription}>
     // PutCardToLibFromGrave<Num/LibPos/Type{/TypeDescription}>
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
     public final ZoneType from;
     public final boolean sameZone;
     private String libPosition = "0";

forge-game/src/main/java/forge/game/cost/CostPutCounter.java

@@ -32,7 +32,11 @@ import java.util.List;
  * The Class CostPutCounter.
  */
 public class CostPutCounter extends CostPartWithList {
-     // Put Counter doesn't really have a "Valid" portion of the cost
+     /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+    // Put Counter doesn't really have a "Valid" portion of the cost
     private final CounterType counter;
     private int lastPaidAmount = 0;
 

forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java

@@ -30,6 +30,10 @@ import java.util.Map;
  * The Class CostRemoveAnyCounter.
  */
 public class CostRemoveAnyCounter extends CostPartWithList {
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
     // RemoveAnyCounter<Num/Type/{TypeDescription}>
     // Power Conduit and Chisei, Heart of Oceans
     // Both cards have "Remove a counter from a permanent you control"

forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java

@@ -40,6 +40,10 @@ public class CostRemoveCounter extends CostPartWithList {
     // Quillspike, Rift Elemental, Sage of Fables, Spike Rogue
 
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
     public final CounterType counter;
     public final ZoneType zone;
     private int cntRemoved;

forge-game/src/main/java/forge/game/cost/CostReturn.java

@@ -30,6 +30,12 @@ import forge.game.zone.ZoneType;
 public class CostReturn extends CostPartWithList {
     // Return<Num/Type{/TypeDescription}>
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
+
     /**
      * Instantiates a new cost return.
      * 

forge-game/src/main/java/forge/game/cost/CostReveal.java

@@ -33,6 +33,11 @@ import forge.game.zone.ZoneType;
 public class CostReveal extends CostPartWithList {
     // Reveal<Num/Type/TypeDescription>
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
     public CostReveal(final String amount, final String type, final String description) {
         super(amount, type, description);
     }

forge-game/src/main/java/forge/game/cost/CostSacrifice.java

@@ -30,6 +30,11 @@ import forge.game.zone.ZoneType;
  */
 public class CostSacrifice extends CostPartWithList {
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
     /**
      * Instantiates a new cost sacrifice.
      * 

forge-game/src/main/java/forge/game/cost/CostTap.java

@@ -26,6 +26,11 @@ import forge.game.spellability.SpellAbility;
  */
 public class CostTap extends CostPart {
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
     /**
      * Instantiates a new cost tap.
      */

forge-game/src/main/java/forge/game/cost/CostTapType.java

@@ -32,6 +32,10 @@ import forge.util.TextUtil;
  */
 public class CostTapType extends CostPartWithList {
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
     public final boolean canTapSource;
 
     /**

forge-game/src/main/java/forge/game/cost/CostUnattach.java

@@ -32,6 +32,12 @@ public class CostUnattach extends CostPartWithList {
     // Unattach<CARDNAME> if ability is on the Equipment
     // Unattach<Card.Attached+namedHeartseeker/Equipped Heartseeker> if equipped creature has the ability
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
+
     /**
      * Instantiates a new cost unattach.
      */

forge-game/src/main/java/forge/game/cost/CostUntap.java

@@ -26,6 +26,11 @@ import forge.game.spellability.SpellAbility;
  */
 public class CostUntap extends CostPart {
 
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
+
     /**
      * Instantiates a new cost untap.
      */

forge-game/src/main/java/forge/game/cost/CostUntapType.java

@@ -29,6 +29,10 @@ import forge.game.zone.ZoneType;
  * The Class CostUntapType.
  */
 public class CostUntapType extends CostPartWithList {
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
     public final boolean canUntapSource;
 
     public CostUntapType(final String amount, final String type, final String description, boolean hasUntapInPrice) {

forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java

@@ -20,8 +20,6 @@ package forge.game.mana;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
 import forge.card.ColorSet;
 import forge.card.MagicColor;
 import forge.card.mana.IParserManaCost;

forge-game/src/main/java/forge/game/spellability/OptionalCostValue.java

@@ -5,6 +5,10 @@ import forge.game.cost.Cost;
 import java.io.Serializable;
 
 public class OptionalCostValue implements Serializable {
+    /**
+     * Serializables need a version ID.
+     */
+    private static final long serialVersionUID = 1L;
     private OptionalCost type;
     private Cost cost;
 

forge-gui-desktop/src/main/java/forge/screens/deckeditor/SEditorIO.java

@@ -14,7 +14,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.ImmutableList;
 import forge.model.FModel;
-import forge.quest.data.QuestPreferences.QPref;
 
 /** 
  * Handles editor preferences saving and loading.

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java

@@ -500,7 +500,6 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
          * @param qty           a negative quantity will prompt the user for a number
          */
         private void addMakeFoil(final int qty) {
-            final int shortcutModifiers = 0;
             String label = "Foil " + SItemManagerUtil.getItemDisplayString(getItemManager().getSelectedItems(), qty, false);
 
             GuiUtils.addMenuItem(menu, label, null, new Runnable() {
@@ -526,7 +525,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
                             cardManager.addItem(foiledCard, quantity);
                             cardManager.setSelectedItem(foiledCard);
                         }
-                    }, true, shortcutModifiers == 0);
+                    }, true, true);
         }
 
         private void addItem(final String verb, final String dest, final boolean toAlternate, final int qty, final int shortcutModifiers) {

forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java

@@ -8,7 +8,6 @@ import javax.swing.SwingUtilities;
 
 import com.google.common.collect.Iterables;
 
-import forge.deck.CommanderDeckGenerator;
 import forge.deck.DeckProxy;
 import forge.deck.DeckType;
 import forge.deckchooser.DecksComboBoxEvent;

forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java

@@ -19,7 +19,6 @@ import javax.swing.SwingConstants;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import forge.deckchooser.DecksComboBoxEvent;
 import net.miginfocom.swing.MigLayout;
 
 import com.google.common.collect.ImmutableList;

forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java

@@ -7,7 +7,6 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
 import forge.screens.home.StartButton;

forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java

@@ -932,7 +932,7 @@ public final class CMatchUI
         if (delayedReveal != null) {
             reveal(delayedReveal.getMessagePrefix(), delayedReveal.getCards()); //TODO: Merge this into search dialog
         }
-        return (List) order(title,"Selected", 0, optionList.size(), optionList, null, null, false);
+        return (List<GameEntityView>) order(title,"Selected", 0, optionList.size(), optionList, null, null, false);
     }
 
     @Override

forge-gui-desktop/src/main/java/forge/view/FView.java

@@ -287,6 +287,11 @@ public enum FView {
 			updateWarningOverlay.add(updateWarningContentPanel, constraints);
 
 			btnRemindMeLater.setCommand(new UiCommand() {
+				/**
+			     * 
+			     */
+			    private static final long serialVersionUID = 1L;
+
 				@Override
 				public void run() {
 					SOverlayUtils.hideOverlay();
@@ -294,6 +299,11 @@ public enum FView {
 			});
 
 			btnDoNotRemindMe.setCommand(new UiCommand() {
+				/**
+			     * 
+			     */
+			    private static final long serialVersionUID = 1L;
+
 				@Override
 				public void run() {
 					if (FOptionPane.showConfirmDialog("Are you sure? You can re-enable this warning in Forge's general preferences.")) {
@@ -305,6 +315,11 @@ public enum FView {
 			});
 
 			btnDownloadLatestJava.setCommand(new UiCommand() {
+				/**
+			     * 
+			     */
+			    private static final long serialVersionUID = 1L;
+
 				@Override
 				public void run() {
 					try {

forge-gui-desktop/src/main/java/forge/view/Main.java

@@ -28,7 +28,7 @@ import forge.error.ExceptionHandler;
  */
 public final class Main {
     /**
-     * Main entrypoint for Forge
+     * Main entry point for Forge
      */
     public static void main(final String[] args) {
         // HACK - temporary solution to "Comparison method violates it's general contract!" crash

forge-gui-mobile/src/forge/card/CardFaceSymbols.java

@@ -17,7 +17,6 @@
  */
 package forge.card;
 
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import forge.Graphics;
 import forge.assets.FSkinImage;
 import forge.card.mana.ManaCost;

forge-gui-mobile/src/forge/card/CardZoom.java

@@ -13,7 +13,6 @@ import forge.assets.FSkinImage;
 import forge.deck.CardThemedDeckGenerator;
 import forge.deck.CommanderDeckGenerator;
 import forge.deck.DeckProxy;
-import forge.deck.FDeckViewer;
 import forge.game.GameView;
 import forge.game.card.CardView;
 import forge.item.IPaperCard;

forge-gui-mobile/src/forge/deck/FDeckEditor.java

@@ -13,7 +13,6 @@ import forge.Graphics;
 import forge.assets.*;
 import forge.card.*;
 import forge.deck.io.DeckPreferences;
-import forge.item.IPaperCard;
 import forge.item.PaperCard;
 import forge.itemmanager.CardManager;
 import forge.itemmanager.ColumnDef;
@@ -29,7 +28,6 @@ import forge.menu.FPopupMenu;
 import forge.model.FModel;
 import forge.planarconquest.ConquestUtil;
 import forge.properties.ForgePreferences.FPref;
-import forge.quest.data.QuestPreferences.QPref;
 import forge.screens.FScreen;
 import forge.screens.TabPageScreen;
 import forge.toolbox.*;
@@ -927,6 +925,9 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
                             break;
                         case Brawl:
                             additionalFilter = DeckFormat.Brawl.isLegalCommanderPredicate();
+                            break;
+                        default:
+                            // Do nothing
                     }
                     cardManager.setCaption("Commanders");
                 }
@@ -939,10 +940,13 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
                             break;
                         case Brawl:
                             additionalFilter = DeckFormat.Brawl.isLegalCardForCommanderOrLegalPartnerPredicate(commanders);
+                            break;
+                        default:
+                            // Do nothing
                     }
                     cardManager.setCaption("Cards");
                 }
-                //fall through to below
+                // fall through to below
             default:
                 if (cardManager.getWantUnique()) {
                     cardManager.setPool(editorType.applyCardFilter(ItemPool.createFrom(FModel.getMagicDb().getCommonCards().getUniqueCards(), PaperCard.class), additionalFilter), true);

forge-gui-mobile/src/forge/screens/match/TargetingOverlay.java

@@ -22,8 +22,6 @@ import forge.assets.FSkinColor;
 import forge.assets.FSkinColor.Colors;
 import forge.game.card.CardView;
 import forge.game.player.PlayerView;
-import forge.model.FModel;
-import forge.properties.ForgePreferences;
 import forge.screens.match.views.VCardDisplayArea.CardAreaPanel;
 import forge.toolbox.FDisplayObject;
 import forge.util.Utils;

forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java

@@ -43,6 +43,7 @@ import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FLabel;
 import forge.util.Aggregates;
 import forge.util.Callback;
+import forge.util.MyRandom;
 import forge.util.Utils;
 
 public class ConquestAEtherScreen extends FScreen {
@@ -148,7 +149,7 @@ public class ConquestAEtherScreen extends FScreen {
         //determine final pool to pull from based on rarity odds
         Iterable<PaperCard> rewardPool;
         CardRarity minRarity = btnRarityFilter.selectedOption.getRarity();
-        CardRarity rarity = btnRarityFilter.selectedOption.getRarity(Math.random());
+        CardRarity rarity = btnRarityFilter.selectedOption.getRarity(MyRandom.getRandom().nextDouble());
         while (true) {
             final CardRarity allowedRarity = rarity;
             rewardPool = Iterables.filter(filteredPool, new Predicate<PaperCard>() {

forge-gui/src/main/html/connectionTest.html

@@ -1,100 +0,0 @@
-<html>
-	<head>
-		<title>Tail-based by Web Sockets</title>
-		
-
-		<link href="css/core.css" media="all" rel="stylesheet" type="text/css" />
-		<script type="text/javascript" src="js/jquery/jquery-1.9.1.min.js"></script>
-		<script type="text/javascript" src="js/observable.js"></script>
-		<script type="text/javascript" src="js/socket.js"></script>
-		<script type='text/javascript' src="js/main.js"></script>
-	</head>
-	<body>
-		<div class="wrap">
-			<div class="title">
-				<span>Your server: <b>ws://</b></span>
-				<input id="ws_uri" type="text" value="localhost:81/" name="uri"/>
-				<button id="connect" name="connect" class="cn">Connect</button>
-				<button id="disconn" name="disconn" class="dc" disabled="disabled">Disconnect</button>
-			</div>
-			<ul class="messages" id='messages'></ul>
-			<div class="packets" id='input'>
-				<span>Raw text to send:</span>
-				<input type="text" name="packet" value="" />
-				<button id="send" class="send">Send</button>
-			</div>
-		</div>
-
-		<script type="text/javascript">
-		if (!window.WebSocket)
-			alert("WebSocket not supported by this browser");
-		
-		var server = Socket();
-		var listener = {
-			onOpen : function() {
-				$('#input').slideDown();
-			},
-		
-			onMessage : function(m) {
-				if (m.data) {
-					addLi("incoming", m.data);
-				}
-			},
-		
-			onClose : function(m) {
-				addLi("error", "Connection was closed (" + m.code + "): " + m.reason);
-				onDisconnectClicked();
-				$('#input').fadeOut();
-			}
-		};
-		server.addObserver(listener);
-		
-		function addLi(className, text) {
-			var spanText = document.createElement('li');
-			spanText.className = className;
-			spanText.innerHTML = text;
-			var messageBox = $('#messages')[0];
-			messageBox.appendChild(spanText);
-			messageBox.scrollTop = messageBox.scrollHeight - messageBox.clientHeight;
-		}
-		
-		function onConnectClicked() {
-			var uri = $("#ws_uri").val()
-			addLi("connecting", "Connecting to ws://" + uri + " ..." )
-			server.connect(uri);
-			$('#connect').attr("disabled", "disabled")
-			$('#disconn').removeAttr("disabled")
-		
-		}
-		
-		function onDisconnectClicked() {
-			server.close();
-			$('#disconn').attr("disabled", "disabled")
-			$('#connect').removeAttr("disabled")
-			
-		}
-		
-		function onSendClicked() { 
-			var toSend = $("#input input").val();
-			$("#input input").val("");
-			addLi("outcoming", toSend);
-			server.send(toSend)
-		}
-		
-		function onInputKey(event) {
-			if( event.keyCode == 13 )
-				onSendClicked();
-		}
-		
-		function onReady() { 
-			$('#connect').on("click", onConnectClicked);
-			$('#disconn').on("click", onDisconnectClicked);
-			$('#send').on("click", onSendClicked);
-			$("#input input").on("keypress", onInputKey);
-		}
-		
-		$(onReady)
-		</script>
-	
-	</body>
-</html> 

forge-gui/src/main/html/css/core.css

@@ -1,23 +0,0 @@
-ul, ol { margin: 0; }
-
-div { border: 0px solid black; }
-div.wrap { width: 640px; margin: 100px auto;}
-
-.title { height: 24px; background-color: #ddd; padding: 4px; border: 1px solid black; border-bottom: 0px }
-.title input {width: 300px; }
-.title span { display: inline-block; width: 120px; text-align: right; }
-
-.messages { height: 30ex; overflow: auto; background-color: #fff; padding: 4px; border: 1px solid black; list-style: none; }
-.messages .incoming { color: #006; }
-.messages .incoming:before { content: "<< "}
-.messages .outcoming { color: #060; }
-.messages .outcoming:before { content: ">> "}
-.messages .error { color: #600; }
-.messages li:nth-child(2n) { background-color: #f7f7f7; }
-
-.packets { padding: 4px; background-color: #ddd; border: 1px solid black; border-top: 0px; display: none; }
-.packets span { display: inline-block; width: 120px; text-align: right; }
-.packets input {width: 400px; }
-.packets button { width: 100px; }
-
-span.alert { font-style: italic; }

forge-gui/src/main/html/js/observable.js

@@ -1,23 +0,0 @@
-var Observable = function(eventNames) { 
-	var _t = {};
-	var observers = {};
-
-	_t.addObserver = function(obj) {
-		for(var i = 0; i < eventNames.length; i++) {
-			var evName = eventNames[i]
-			var method = obj["on" + evName];
-			if( typeof(method) === 'function') {
-				var handlers = observers[evName]
-				if( 'undefined' === typeof(handler))
-					handlers = observers[evName] = [];
-				handlers.push(obj);
-			}
-		}
-	}
-	
-	_t.fireEvent = function() { // usually invoked as .apply(EventName, args)
-		var q = observers[this]
-		if ( q ) for( var i = 0; i < q.length; i++ ) q[i]['on'+ this].apply(q[i], arguments);
-	}
-	return _t;
-}

forge-gui/src/main/html/js/socket.js

@@ -1,27 +0,0 @@
-
-// There should be some kind of fallback to Flash-powered sockets (IE 9-, Opera with sockets switched off) 
-var Socket = function() {
-	var _t = Observable(["Open", "Message", "Close", "Error"]); 
-
-	function onOpen()    { _t.fireEvent.apply("Open", arguments); }
-	function onClose()   { _t.fireEvent.apply("Close", arguments); }
-	function onError()   { _t.fireEvent.apply("Error", arguments); }
-	function onMessage() { _t.fireEvent.apply("Message", arguments); }
-
-	var ws;
-	_t.connect = function(location) {
-		ws = new WebSocket("ws://" + location);
-		ws.onopen = onOpen;
-		ws.onmessage = onMessage;
-		ws.onclose = onClose;
-		ws.onerror = onError;
-	}
-
-//	_t.getWs = function() { return ws; }
-	_t.isOpen = function() { return ws && ws.readyState == ws.OPEN; }
-	_t.close = function() { ws && ws.close(); }
-	_t.send = function(text) { text != null && text.length > 0 && ws && ws.send(text); };
-
-	return _t;
-};
-

forge-gui/src/main/java/forge/card/CardDetailUtil.java

@@ -4,7 +4,6 @@ import com.google.common.collect.Sets;
 import forge.card.mana.ManaCostShard;
 import forge.game.GameView;
 import forge.game.card.Card;
-import forge.game.card.CardUtil;
 import forge.game.card.CardView;
 import forge.game.card.CardView.CardStateView;
 import forge.game.card.CounterType;

forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java

@@ -6,7 +6,6 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import forge.card.CardRules;
 import forge.card.CardRulesPredicates;
-import forge.deck.generation.DeckGeneratorBase;
 import forge.deck.io.CardThemedMatrixIO;
 import forge.deck.io.DeckStorage;
 import forge.game.GameFormat;

forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java

@@ -1,7 +1,5 @@
 package forge.deck;
 
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
 import forge.card.CardEdition;
 import forge.game.GameFormat;
 import forge.item.PaperCard;

forge-gui/src/main/java/forge/deck/CommanderDeckGenerator.java

@@ -7,16 +7,12 @@ import forge.card.CardEdition;
 import forge.card.CardRules;
 import forge.card.CardRulesPredicates;
 import forge.deck.generation.DeckGeneratorBase;
-import forge.deck.generation.IDeckGenPool;
-import forge.game.GameFormat;
-import forge.game.GameType;
 import forge.item.PaperCard;
 import forge.model.FModel;
 import forge.util.ItemPool;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by maustin on 09/05/2017.

forge-gui/src/main/java/forge/deck/DeckType.java

@@ -1,7 +1,6 @@
 package forge.deck;
 
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
 
 public enum DeckType {
     CUSTOM_DECK ("Custom User Decks"),

forge-gui/src/main/java/forge/deck/DeckgenUtil.java

@@ -322,7 +322,7 @@ public class DeckgenUtil {
     /** @return {@link forge.deck.Deck} */
     public static Deck getRandomCustomDeck() {
         final IStorage<Deck> allDecks = FModel.getDecks().getConstructed();
-        final int rand = (int) (Math.floor(Math.random() * allDecks.size()));
+        final int rand = (int) (Math.floor(MyRandom.getRandom().nextDouble() * allDecks.size()));
         final String name = allDecks.getItemNames().toArray(new String[0])[rand];
         return allDecks.get(name);
     }
@@ -330,14 +330,14 @@ public class DeckgenUtil {
     /** @return {@link forge.deck.Deck} */
     public static Deck getRandomPreconDeck() {
         final List<DeckProxy> allDecks = DeckProxy.getAllPreconstructedDecks(QuestController.getPrecons());
-        final int rand = (int) (Math.floor(Math.random() * allDecks.size()));
+        final int rand = (int) (Math.floor(MyRandom.getRandom().nextDouble() * allDecks.size()));
         return allDecks.get(rand).getDeck();
     }
 
     /** @return {@link forge.deck.Deck} */
     public static Deck getRandomThemeDeck() {
         final List<DeckProxy> allDecks = DeckProxy.getAllThemeDecks();
-        final int rand = (int) (Math.floor(Math.random() * allDecks.size()));
+        final int rand = (int) (Math.floor(MyRandom.getRandom().nextDouble() * allDecks.size()));
         return allDecks.get(rand).getDeck();
     }
 
@@ -353,7 +353,7 @@ public class DeckgenUtil {
             allQuestDecks.add(e.getEventDeck());
         }
 
-        final int rand = (int) (Math.floor(Math.random() * allQuestDecks.size()));
+        final int rand = (int) (Math.floor(MyRandom.getRandom().nextDouble() * allQuestDecks.size()));
         return allQuestDecks.get(rand);
     }
 

forge-gui/src/main/java/forge/gauntlet/GauntletUtil.java

@@ -8,6 +8,7 @@ import forge.deck.DeckType;
 import forge.deck.DeckgenUtil;
 import forge.deck.NetDeckCategory;
 import forge.model.FModel;
+import forge.util.MyRandom;
 
 public class GauntletUtil {
     public static GauntletData createQuickGauntlet(final Deck userDeck, final int numOpponents, final List<DeckType> allowedDeckTypes, NetDeckCategory netDecks) {
@@ -23,7 +24,7 @@ public class GauntletUtil {
         final Object[] netDeckNames = netDecks != null ? netDecks.getItemNames().toArray() : null;
 
         for (int i = 0; i < numOpponents; i++) {
-            int randType = (int)Math.floor(Math.random() * allowedDeckTypes.size());
+            int randType = (int)Math.floor(MyRandom.getRandom().nextDouble() * allowedDeckTypes.size());
             switch (allowedDeckTypes.get(randType)) {
             case COLOR_DECK:
                 deck = DeckgenUtil.getRandomColorDeck(true);
@@ -58,7 +59,7 @@ public class GauntletUtil {
                 eventNames.add(deck.getName());
                 break;
             case NET_DECK:
-                int deckIndex = (int)Math.floor(Math.random() * netDeckNames.length);
+                int deckIndex = (int)Math.floor(MyRandom.getRandom().nextDouble() * netDeckNames.length);
                 deck = netDecks.get((String) netDeckNames[deckIndex]);
                 eventNames.add(deck.getName());
                 break;

forge-gui/src/main/java/forge/model/FModel.java

@@ -27,8 +27,6 @@ import forge.ai.AiProfileUtil;
 import forge.card.CardPreferences;
 import forge.card.CardType;
 import forge.deck.CardRelationMatrixGenerator;
-import forge.deck.DeckFormat;
-import forge.deck.io.CardThemedMatrixIO;
 import forge.deck.io.DeckPreferences;
 import forge.game.GameFormat;
 import forge.game.GameType;

forge-gui/src/main/java/forge/net/NetConnectUtil.java

@@ -1,7 +1,6 @@
 package forge.net;
 
 import forge.match.LobbySlotType;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import forge.GuiBase;

forge-gui/src/main/java/forge/net/server/FServerManager.java

@@ -221,22 +221,25 @@ public final class FServerManager {
         DatagramSocket s = new DatagramSocket();
         s.connect(InetAddress.getByAddress(this.externalAddress), 0);
         NetworkInterface n = NetworkInterface.getByInetAddress(s.getLocalAddress());
-        Enumeration en = n.getInetAddresses();
+        Enumeration<InetAddress> en = n.getInetAddresses();
         while (en.hasMoreElements()) {
             InetAddress addr = (InetAddress) en.nextElement();
             if (addr instanceof Inet4Address) {
                 if (preferIPv6) {
                     continue;
                 }
+                s.close();
                 return addr.getHostAddress();
             }
             if (addr instanceof Inet6Address) {
                 if (preferIpv4) {
                     continue;
                 }
+                s.close();
                 return addr.getHostAddress();
             }
         }
+        s.close();
         return null;
     }
 

forge-gui/src/main/java/forge/quest/BoosterUtils.java

@@ -209,7 +209,7 @@ public final class BoosterUtils {
 
                 case RANDOM_BALANCED:
                     preferredColors.clear();
-                    int numberOfColors = COLOR_COUNT_PROBABILITIES[(int) (Math.random() * COLOR_COUNT_PROBABILITIES.length)];
+                    int numberOfColors = COLOR_COUNT_PROBABILITIES[(int) (MyRandom.getRandom().nextDouble() * COLOR_COUNT_PROBABILITIES.length)];
                     if (numberOfColors < 6) {
                         Collections.shuffle(possibleColors);
                         for (int i = 0; i < numberOfColors; i++) {
@@ -218,13 +218,16 @@ public final class BoosterUtils {
                     } else {
                         preferredColors.addAll(possibleColors);
                     }
-                    includeArtifacts = Math.random() < 0.5;
+                    includeArtifacts = MyRandom.getRandom().nextDouble() < 0.5;
+                    // Fall through
                 case BALANCED:
                     populateBalancedFilters(colorFilters, preferredColors, cardPool, includeArtifacts);
                     break;
                 case RANDOM:
                     populateRandomFilters(colorFilters);
                     break;
+                default:
+                    // Do nothing
 
             }
 
@@ -238,13 +241,13 @@ public final class BoosterUtils {
 
         for (int i = 0; i < MAX_BIAS; i++) {
             Predicate<CardRules> predicate;
-            byte color = possibleColors.get((int) (Math.random() * 6));
+            byte color = possibleColors.get((int) (MyRandom.getRandom().nextDouble() * 6));
-            if (Math.random() < 0.6) {
+            if (MyRandom.getRandom().nextDouble() < 0.6) {
                 predicate = CardRulesPredicates.isMonoColor(color);
             } else {
                 predicate = CardRulesPredicates.hasColor(color);
             }
-            if (Math.random() < 0.1) {
+            if (MyRandom.getRandom().nextDouble() < 0.1) {
                 predicate = Predicates.and(predicate, CardRulesPredicates.Presets.IS_MULTICOLOR);
             }
             colorFilters.add(predicate);

forge-gui/src/main/java/forge/quest/QuestEventDraft.java

@@ -36,6 +36,7 @@ import forge.quest.io.ReadPriceList;
 import forge.tournament.system.TournamentBracket;
 import forge.tournament.system.TournamentPairing;
 import forge.tournament.system.TournamentPlayer;
+import forge.util.MyRandom;
 import forge.util.NameGenerator;
 import forge.util.TextUtil;
 import forge.util.storage.IStorage;
@@ -478,7 +479,7 @@ public class QuestEventDraft implements IQuestEvent {
         int attempts = 25;
 
         while (promo == null && attempts-- > 0) {
-            randomCard = cardsInEdition.get((int) (Math.random() * cardsInEdition.size()));
+            randomCard = cardsInEdition.get((int) (MyRandom.getRandom().nextDouble() * cardsInEdition.size()));
             promo = FModel.getMagicDb().getCommonCards().getCard(randomCard.name, randomEdition.getCode());
         }
 
@@ -497,7 +498,7 @@ public class QuestEventDraft implements IQuestEvent {
             editions.add(FModel.getMagicDb().getEditions().get(booster));
         }
 
-        return editions.get((int) (Math.random() * editions.size()));
+        return editions.get((int) (MyRandom.getRandom().nextDouble() * editions.size()));
 
     }
 
@@ -925,7 +926,7 @@ public class QuestEventDraft implements IQuestEvent {
             int attempts = 50;
 
             do {
-                icon = (int) Math.floor(Math.random() * numberOfIcons);
+                icon = (int) Math.floor(MyRandom.getRandom().nextDouble() * numberOfIcons);
             } while ((icon < 0 || usedIcons.contains(icon)) && attempts-- > 0);
 
             event.aiIcons[i] = icon;

forge-gui/src/main/java/forge/quest/QuestEventDuelManager.java

@@ -126,7 +126,7 @@ public class QuestEventDuelManager {
             }
         }
 
-        QuestEventDuel randomOpponent = possibleDuels.get(((int) (possibleDuels.size() * Math.random())));
+        QuestEventDuel randomOpponent = possibleDuels.get(((int) (possibleDuels.size() * MyRandom.getRandom().nextDouble())));
 
         duel.setTitle("Random Opponent");
         duel.setIconImageKey(randomOpponent.getIconImageKey());
@@ -183,7 +183,7 @@ public class QuestEventDuelManager {
         } else {
             addDuel(duelOpponents, QuestEventDifficulty.HARD, 2);
             addDuel(duelOpponents, QuestEventDifficulty.EXPERT, 1);
-            if (Math.random() * 3 < 2) {
+            if (MyRandom.getRandom().nextDouble() * 3 < 2) {
                 randomDuelDifficulty = QuestEventDifficulty.HARD;
             } else {
                 randomDuelDifficulty = QuestEventDifficulty.EXPERT;

forge-gui/src/main/java/forge/quest/QuestUtil.java

@@ -43,7 +43,6 @@ import forge.quest.bazaar.QuestItemType;
 import forge.quest.bazaar.QuestPetController;
 import forge.quest.data.QuestAchievements;
 import forge.quest.data.QuestAssets;
-import forge.quest.data.QuestPreferences.QPref;
 import forge.util.gui.SGuiChoose;
 import forge.util.gui.SOptionPane;
 

forge-gui/src/main/java/forge/quest/QuestUtilCards.java

@@ -610,7 +610,7 @@ public final class QuestUtilCards {
 	    }
 
 	    if (!temp.isEmpty()) {
-		    toAddTo.add(temp.get((int) (Math.random() * temp.size())));
+		    toAddTo.add(temp.get((int) (MyRandom.getRandom().nextDouble() * temp.size())));
 		    return amount - 1;
 	    }
 

forge-gui/src/main/java/forge/tournament/TournamentUtil.java

@@ -4,6 +4,7 @@ import forge.deck.Deck;
 import forge.deck.DeckType;
 import forge.deck.DeckgenUtil;
 import forge.model.FModel;
+import forge.util.MyRandom;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -23,7 +24,7 @@ public class TournamentUtil {
         final List<Deck> decks = new ArrayList<Deck>();
 
         for (int i = 0; i < numOpponents; i++) {
-            int randType = (int)Math.floor(Math.random() * allowedDeckTypes.size());
+            int randType = (int)Math.floor(MyRandom.getRandom().nextDouble() * allowedDeckTypes.size());
             switch (allowedDeckTypes.get(randType)) {
                 case COLOR_DECK:
                     deck = DeckgenUtil.getRandomColorDeck(true);