- * Setter for the field randomPicture.
- *
- * Getter for the field randomPicture.
- *
* addMultiKickerMagnitude.
@@ -8495,27 +8468,12 @@ public class Card extends GameEntity implements Comparable
- * setImageFilename.
- *
- * getImageFilename.
- *
- * CardUtil class.
- *
- * getShortColor.
- *
- * getColors.
- *
- * isStackingKeyword.
- *
- * buildFilename.
- *
- * getShortColorsString.
- *
- * reflectableMana.
- *
* Constant interface.
@@ -36,9 +33,6 @@ import forge.properties.NewConstants;
* @version $Id$
*/
public final class Constant {
- /** Constant
- * getImage.
- *
diff --git a/src/main/java/forge/card/CardCharacteristics.java b/src/main/java/forge/card/CardCharacteristics.java
index 59c5932d9f6..fc7aef06ef0 100644
--- a/src/main/java/forge/card/CardCharacteristics.java
+++ b/src/main/java/forge/card/CardCharacteristics.java
@@ -50,7 +50,7 @@ public class CardCharacteristics {
private ArrayList
- * CardRarity class.
- *
- * isACardType.
- *
- * getAllCardTypes.
- *
- * getBasicTypes.
- *
- * getCreatureTypes.
- *
- * isASuperType.
- *
- * isASubType.
- *
- * isACreatureType.
- *
- * isALandType.
- *
- * isABasicLandType.
- *
- * makeToken.
- *
- * TriggerHandler class.
- *
- * registerDelayedTrigger.
- *
- * clearDelayedTrigger.
- *
- * clearDelayedTrigger.
- *
- * suppressMode.
- *
- * clearSuppression.
- *
- * parseTrigger.
- *
- * parseTrigger.
- *
- * parseTrigger.
- *
- * parseParams.
- *
- * runTrigger.
- *
- * runSingleTrigger.
- *
- * Input_PayManaCost class.
- *
@@ -101,9 +99,6 @@ public class Generate2ColorDeck extends GenerateColoredDeckBase {
adjustDeckSize(size);
tmpDeck.append("DeckSize:").append(tDeck.countAll()).append("\n");
- if (ForgeProps.getProperty("showdeck/2color", "false").equals("true")) {
- BugReporter.reportBug(tmpDeck.toString());
- }
return tDeck;
}
diff --git a/src/main/java/forge/deck/generate/Generate3ColorDeck.java b/src/main/java/forge/deck/generate/Generate3ColorDeck.java
index d0d6c68b548..bc1e7c7aac6 100644
--- a/src/main/java/forge/deck/generate/Generate3ColorDeck.java
+++ b/src/main/java/forge/deck/generate/Generate3ColorDeck.java
@@ -20,14 +20,12 @@ package forge.deck.generate;
import java.util.Arrays;
import java.util.List;
-import forge.card.MagicColor;
import forge.card.ColorSet;
+import forge.card.MagicColor;
import forge.deck.generate.GenerateDeckUtil.FilterCMC;
-import forge.error.BugReporter;
import forge.game.player.PlayerType;
import forge.item.CardPrinted;
import forge.item.ItemPoolView;
-import forge.properties.ForgeProps;
/**
*
@@ -99,9 +97,6 @@ public class Generate3ColorDeck extends GenerateColoredDeckBase {
adjustDeckSize(size);
tmpDeck.append("DeckSize:").append(tDeck.countAll()).append("\n");
- if (ForgeProps.getProperty("showdeck/3color", "false").equals("true")) {
- BugReporter.reportBug(tmpDeck.toString());
- }
return tDeck;
}
diff --git a/src/main/java/forge/deck/generate/Generate5ColorDeck.java b/src/main/java/forge/deck/generate/Generate5ColorDeck.java
index 35ac5e6b08d..10f9475517e 100644
--- a/src/main/java/forge/deck/generate/Generate5ColorDeck.java
+++ b/src/main/java/forge/deck/generate/Generate5ColorDeck.java
@@ -19,13 +19,12 @@ package forge.deck.generate;
import java.util.Arrays;
import java.util.List;
+
import forge.card.ColorSet;
import forge.deck.generate.GenerateDeckUtil.FilterCMC;
-import forge.error.BugReporter;
import forge.game.player.PlayerType;
import forge.item.CardPrinted;
import forge.item.ItemPoolView;
-import forge.properties.ForgeProps;
/**
*
@@ -88,9 +87,6 @@ public class Generate5ColorDeck extends GenerateColoredDeckBase {
adjustDeckSize(size);
tmpDeck.append("DeckSize:").append(tDeck.countAll()).append("\n");
- if (ForgeProps.getProperty("showdeck/5color", "false").equals("true")) {
- BugReporter.reportBug(tmpDeck.toString());
- }
return tDeck;
}
diff --git a/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java b/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java
index 0807dcb8b83..138366f0b18 100644
--- a/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java
+++ b/src/main/java/forge/deck/generate/GenerateColoredDeckBase.java
@@ -28,12 +28,13 @@ import java.util.TreeMap;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
+
import forge.Constant;
import forge.Singletons;
-import forge.card.MagicColor;
-import forge.card.ColorSet;
-import forge.card.CardRulesPredicates;
import forge.card.CardRules;
+import forge.card.CardRulesPredicates;
+import forge.card.ColorSet;
+import forge.card.MagicColor;
import forge.deck.generate.GenerateDeckUtil.FilterCMC;
import forge.game.player.PlayerType;
import forge.item.CardDb;
@@ -67,19 +68,6 @@ public abstract class GenerateColoredDeckBase {
StringBuilder tmpDeck = new StringBuilder();
-// protected final float landsPercentage = 0.42f;
-// protected float creatPercentage = 0.34f;
-// protected float spellPercentage = 0.24f;
- /**
- *
- * Constructor for Generate2ColorDeck.
- *
@@ -90,9 +88,6 @@ public class GenerateMonoColorDeck extends GenerateColoredDeckBase {
adjustDeckSize(size);
tmpDeck.append("DeckSize:").append(tDeck.countAll()).append("\n");
- if (ForgeProps.getProperty("showdeck/1color", "false").equals("true")) {
- BugReporter.reportBug(tmpDeck.toString());
- }
return tDeck;
}
diff --git a/src/main/java/forge/deck/io/DeckSerializer.java b/src/main/java/forge/deck/io/DeckSerializer.java
index 80831732fc0..e9e0d23727c 100644
--- a/src/main/java/forge/deck/io/DeckSerializer.java
+++ b/src/main/java/forge/deck/io/DeckSerializer.java
@@ -34,8 +34,8 @@ import javax.swing.filechooser.FileFilter;
import org.apache.commons.lang3.StringUtils;
import forge.deck.Deck;
-import forge.gui.download.GuiDownloadSetPicturesLQ;
import forge.item.CardPrinted;
+import forge.properties.NewConstants;
import forge.util.FileSection;
import forge.util.FileSectionManual;
import forge.util.FileUtil;
@@ -48,27 +48,15 @@ import freemarker.template.TemplateException;
/**
* This class knows how to make a file out of a deck object and vice versa.
- *
*/
public class DeckSerializer extends StorageReaderFolder
- * writeDeck.
- *
- * Write deck to HTML.
- *
- * getSetCombos.
- *
- * HumanPlayer class.
- *
- * loadData.
- *
- * saveData.
- * ProgramName="Forge - http://cardforge.org". */
- public static final String PROGRAM_NAME = "Forge - " + ForgeProps.getProperty(NewConstants.CARDFORGE_URL);
-
// used to pass information between the GUI screens
/**
* The Class Runtime.
diff --git a/src/main/java/forge/ImageCache.java b/src/main/java/forge/ImageCache.java
index d0bfd66222b..1902b86697e 100644
--- a/src/main/java/forge/ImageCache.java
+++ b/src/main/java/forge/ImageCache.java
@@ -19,14 +19,21 @@ package forge;
import java.awt.image.BufferedImage;
import java.util.concurrent.ExecutionException;
+
+import javax.swing.ImageIcon;
+
+import org.apache.commons.lang3.StringUtils;
+
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader.InvalidCacheLoadException;
import com.google.common.cache.LoadingCache;
import com.mortennobel.imagescaling.ResampleOp;
-import forge.gui.GuiDisplayUtil;
+import forge.game.player.IHasIcon;
+import forge.gui.toolbox.FSkin;
import forge.item.InventoryItem;
import forge.properties.ForgePreferences.FPref;
+import forge.properties.NewConstants;
/**
* This class stores ALL card images in a cache with soft values. this means
@@ -43,42 +50,53 @@ import forge.properties.ForgePreferences.FPref;
* @version $Id$
*/
public class ImageCache {
- /** Constant imageCache. */
- static final LoadingCacheFULL_SIZE. */
+ // short prefixes to save memory
+ public static final String TOKEN_PREFIX = "t:";
+ public static final String ICON_PREFIX = "i:";
+ public static final String BOOSTER_PREFIX = "b:";
+ public static final String FATPACK_PREFIX = "f:";
+ public static final String PRECON_PREFIX = "p:";
+ public static final String TOURNAMENTPACK_PREFIX = "o:";
+
+ static private final LoadingCacheserialVersionUID=3467312982164195091L. */
diff --git a/src/main/java/forge/control/input/InputPayManaX.java b/src/main/java/forge/control/input/InputPayManaX.java
index 50a0029fbc1..9edb2ec4090 100644
--- a/src/main/java/forge/control/input/InputPayManaX.java
+++ b/src/main/java/forge/control/input/InputPayManaX.java
@@ -6,10 +6,10 @@ import forge.card.cost.CostPartMana;
import forge.card.cost.CostPayment;
import forge.card.mana.ManaCostBeingPaid;
import forge.card.spellability.SpellAbility;
+import forge.game.GameState;
import forge.game.zone.ZoneType;
import forge.gui.match.CMatchUI;
import forge.view.ButtonUtil;
-import forge.game.GameState;
public class InputPayManaX extends InputPayManaBase {
private static final long serialVersionUID = -6900234444347364050L;
diff --git a/src/main/java/forge/control/input/InputPayReturnCost.java b/src/main/java/forge/control/input/InputPayReturnCost.java
index 9764a89eccf..7793f08336e 100644
--- a/src/main/java/forge/control/input/InputPayReturnCost.java
+++ b/src/main/java/forge/control/input/InputPayReturnCost.java
@@ -20,7 +20,6 @@ package forge.control.input;
import java.util.List;
import forge.Card;
-
import forge.CardLists;
import forge.Command;
import forge.Singletons;
diff --git a/src/main/java/forge/control/input/InputPaySacCost.java b/src/main/java/forge/control/input/InputPaySacCost.java
index 2a6100fc79c..8141755d7ae 100644
--- a/src/main/java/forge/control/input/InputPaySacCost.java
+++ b/src/main/java/forge/control/input/InputPaySacCost.java
@@ -20,7 +20,6 @@ package forge.control.input;
import java.util.List;
import forge.Card;
-
import forge.CardLists;
import forge.Command;
import forge.Singletons;
diff --git a/src/main/java/forge/deck/CardCollections.java b/src/main/java/forge/deck/CardCollections.java
index 556a291c4e6..23c503818c1 100644
--- a/src/main/java/forge/deck/CardCollections.java
+++ b/src/main/java/forge/deck/CardCollections.java
@@ -22,6 +22,7 @@ import java.io.File;
import forge.deck.io.DeckGroupSerializer;
import forge.deck.io.DeckSerializer;
import forge.deck.io.OldDeckParser;
+import forge.properties.NewConstants;
import forge.util.storage.IStorage;
import forge.util.storage.StorageImmediatelySerialized;
@@ -42,18 +43,18 @@ public class CardCollections {
*
* @param file the file
*/
- public CardCollections(final File file) {
- this.constructed = new StorageImmediatelySerialized
(S at beginning of class name denotes a static factory.)
*/
public final class GauntletData {
+ @XStreamOmitField
+ private String name; // set based on the the filename on load
+
private int completed;
- private File activeFile;
private String timestamp;
private List