From dd97288037c4f09d439ceca944806d0d18b92bde Mon Sep 17 00:00:00 2001 From: slapshot5 Date: Tue, 30 Aug 2011 05:16:43 +0000 Subject: [PATCH] clean up a bunch of java warnings --- src/main/java/forge/Gui_DeckEditorBase.java | 2 -- src/main/java/forge/card/CardRules.java | 1 - src/main/java/forge/card/CardRulesReader.java | 32 ++++++------------- src/main/java/forge/card/MtgDataParser.java | 4 --- .../forge/view/swing/ApplicationView.java | 2 -- .../java/forge/view/swing/SplashFrame.java | 2 +- 6 files changed, 11 insertions(+), 32 deletions(-) diff --git a/src/main/java/forge/Gui_DeckEditorBase.java b/src/main/java/forge/Gui_DeckEditorBase.java index 3013a8fb0e8..58e28e29750 100644 --- a/src/main/java/forge/Gui_DeckEditorBase.java +++ b/src/main/java/forge/Gui_DeckEditorBase.java @@ -8,9 +8,7 @@ import javax.swing.JFrame; import net.slightlymagic.maxmtg.Predicate; -import forge.card.CardCoreType; import forge.card.CardRules; -import forge.card.CardRules.Predicates; import forge.card.CardPoolView; public class Gui_DeckEditorBase extends JFrame { diff --git a/src/main/java/forge/card/CardRules.java b/src/main/java/forge/card/CardRules.java index 009d2e2bf37..a4c8893f469 100644 --- a/src/main/java/forge/card/CardRules.java +++ b/src/main/java/forge/card/CardRules.java @@ -1,7 +1,6 @@ package forge.card; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; diff --git a/src/main/java/forge/card/CardRulesReader.java b/src/main/java/forge/card/CardRulesReader.java index c613fb320b6..ed3b96b0524 100644 --- a/src/main/java/forge/card/CardRulesReader.java +++ b/src/main/java/forge/card/CardRulesReader.java @@ -2,34 +2,20 @@ package forge.card; import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.Charset; -import java.util.Enumeration; +//import java.util.Enumeration; import java.util.Locale; import java.util.Map; -import java.util.StringTokenizer; import java.util.TreeMap; import java.util.regex.Pattern; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; +//import java.util.zip.ZipEntry; +//import java.util.zip.ZipFile; -import net.slightlymagic.braids.util.UtilFunctions; -import net.slightlymagic.braids.util.generator.FindNonDirectoriesSkipDotDirectoriesGenerator; -import net.slightlymagic.braids.util.generator.GeneratorFunctions; -import net.slightlymagic.braids.util.progress_monitor.BaseProgressMonitor; -import net.slightlymagic.braids.util.progress_monitor.StderrProgressMonitor; - -import com.google.code.jyield.Generator; -import com.google.code.jyield.YieldUtils; - -import forge.card.trigger.TriggerHandler; import forge.error.ErrorViewer; import forge.properties.NewConstants; -import forge.view.FView; /** @@ -60,17 +46,19 @@ public class CardRulesReader /** Special value for estimatedFilesRemaining. */ protected static final int UNKNOWN_NUMBER_OF_FILES_REMAINING = -1; // NOPMD by Braids on 8/18/11 10:54 PM - private transient Map mapToFill; - private transient File cardsfolder; + //private transient Map mapToFill; + //private transient File cardsfolder; - private transient ZipFile zip; + //private transient ZipFile zip; private transient Charset charset; - private transient Enumeration zipEnum; + //private transient Enumeration zipEnum; + /* private transient long estimatedFilesRemaining = // NOPMD by Braids on 8/18/11 10:56 PM UNKNOWN_NUMBER_OF_FILES_REMAINING; - + */ + private transient Iterable findNonDirsIterable; // NOPMD by Braids on 8/18/11 10:56 PM diff --git a/src/main/java/forge/card/MtgDataParser.java b/src/main/java/forge/card/MtgDataParser.java index 880ec6fb791..a9b5d172438 100644 --- a/src/main/java/forge/card/MtgDataParser.java +++ b/src/main/java/forge/card/MtgDataParser.java @@ -1,16 +1,12 @@ package forge.card; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tools.ant.taskdefs.compilers.Sj; import forge.FileUtil; import forge.properties.ForgeProps; diff --git a/src/main/java/forge/view/swing/ApplicationView.java b/src/main/java/forge/view/swing/ApplicationView.java index b7c4602b86e..9c104834f3e 100644 --- a/src/main/java/forge/view/swing/ApplicationView.java +++ b/src/main/java/forge/view/swing/ApplicationView.java @@ -1,11 +1,9 @@ package forge.view.swing; -import javax.swing.JFrame; import javax.swing.SwingUtilities; import javax.swing.UIManager; import net.slightlymagic.braids.util.UtilFunctions; -import net.slightlymagic.braids.util.progress_monitor.BaseProgressMonitor; import net.slightlymagic.braids.util.progress_monitor.BraidsProgressMonitor; import com.esotericsoftware.minlog.Log; diff --git a/src/main/java/forge/view/swing/SplashFrame.java b/src/main/java/forge/view/swing/SplashFrame.java index 8fe8cbe9fdc..90229e460e0 100644 --- a/src/main/java/forge/view/swing/SplashFrame.java +++ b/src/main/java/forge/view/swing/SplashFrame.java @@ -35,7 +35,7 @@ public class SplashFrame extends JFrame { private static final int DISCLAIMER_FONT_SIZE = 9; private static final Color DISCLAIMER_COLOR = Color.white; - private static final int CLOSEBTN_PADDING_X = 15; + //private static final int CLOSEBTN_PADDING_X = 15; private static final int CLOSEBTN_PADDING_Y = 15; private static final int CLOSEBTN_SIDELENGTH = 15; private static final Color CLOSEBTN_COLOR = new Color(215,208,188);