From 9aa620c68efd410a8d00e91e2bcf75dd67bcb526 Mon Sep 17 00:00:00 2001 From: slapshot5 Date: Sat, 3 Sep 2011 07:56:52 +0000 Subject: [PATCH] fix a bunch of Java warnings --- src/main/java/forge/Card.java | 2 +- src/main/java/forge/GUI_DeckAnalysis.java | 1 - src/main/java/forge/ReadBoosterPack.java | 4 ++-- .../card/cardFactory/CardFactory_Creatures.java | 1 - .../java/forge/gui/deckeditor/CardPanelHeavy.java | 1 - src/main/java/forge/gui/deckeditor/DeckEditor.java | 3 --- .../java/forge/gui/deckeditor/DeckEditorBase.java | 14 -------------- .../java/forge/gui/deckeditor/DeckEditorDraft.java | 3 --- .../java/forge/gui/deckeditor/DeckEditorMenu.java | 4 ++-- .../java/forge/gui/deckeditor/DeckEditorQuest.java | 1 - .../java/forge/gui/deckeditor/DeckEditorShop.java | 1 - .../java/forge/gui/deckeditor/TableWithCards.java | 2 +- 12 files changed, 6 insertions(+), 31 deletions(-) diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 79d933dd5e8..f365f187237 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -144,7 +144,7 @@ public class Card extends GameEntity implements Comparable { private Player owner = null; private ArrayList controllerObjects = new ArrayList(); private String imageName = ""; - private String rarity = ""; + //private String rarity = ""; private String text = ""; private String manaCost = ""; private String echoCost = ""; diff --git a/src/main/java/forge/GUI_DeckAnalysis.java b/src/main/java/forge/GUI_DeckAnalysis.java index 0658e20709d..b3b4e4c8a9d 100644 --- a/src/main/java/forge/GUI_DeckAnalysis.java +++ b/src/main/java/forge/GUI_DeckAnalysis.java @@ -32,7 +32,6 @@ import forge.card.CardRules; import forge.card.CardPoolView; import forge.card.CardPrinted; import forge.card.CardType; -import forge.gui.deckeditor.TableModel; import net.miginfocom.swing.MigLayout; diff --git a/src/main/java/forge/ReadBoosterPack.java b/src/main/java/forge/ReadBoosterPack.java index eb2279145db..809aa387b02 100644 --- a/src/main/java/forge/ReadBoosterPack.java +++ b/src/main/java/forge/ReadBoosterPack.java @@ -28,7 +28,7 @@ import net.slightlymagic.maxmtg.Predicate; public class ReadBoosterPack implements NewConstants { - private List mythics; + //private List mythics; private List rares; private List uncommons; private List commons; @@ -39,7 +39,7 @@ public class ReadBoosterPack implements NewConstants { *

Constructor for ReadBoosterPack.

*/ public ReadBoosterPack() { - mythics = CardPrinted.Predicates.Presets.isMythicRare.select(CardDb.instance().getAllUniqueCards()); + //mythics = CardPrinted.Predicates.Presets.isMythicRare.select(CardDb.instance().getAllUniqueCards()); rares = CardPrinted.Predicates.Presets.isRare.select(CardDb.instance().getAllUniqueCards()); commons = CardPrinted.Predicates.Presets.isCommon.select(CardDb.instance().getAllUniqueCards()); uncommons = CardPrinted.Predicates.Presets.isUncommon.select(CardDb.instance().getAllUniqueCards()); diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java index c890bdba80a..214f129cb22 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java @@ -19,7 +19,6 @@ import javax.swing.*; import net.slightlymagic.maxmtg.Predicate; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Stack; diff --git a/src/main/java/forge/gui/deckeditor/CardPanelHeavy.java b/src/main/java/forge/gui/deckeditor/CardPanelHeavy.java index 9d3ec3d0dbf..2d2736c95a7 100644 --- a/src/main/java/forge/gui/deckeditor/CardPanelHeavy.java +++ b/src/main/java/forge/gui/deckeditor/CardPanelHeavy.java @@ -7,7 +7,6 @@ import java.io.IOException; import javax.swing.JButton; import javax.swing.JFileChooser; import javax.swing.JOptionPane; -import javax.swing.JPanel; import javax.swing.filechooser.FileFilter; import net.miginfocom.swing.MigLayout; diff --git a/src/main/java/forge/gui/deckeditor/DeckEditor.java b/src/main/java/forge/gui/deckeditor/DeckEditor.java index d4d3817e04c..48d396b8059 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditor.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditor.java @@ -3,7 +3,6 @@ package forge.gui.deckeditor; import java.awt.Container; import java.awt.Font; import java.awt.Frame; -import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -16,8 +15,6 @@ import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JScrollPane; import javax.swing.JTextField; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorBase.java b/src/main/java/forge/gui/deckeditor/DeckEditorBase.java index 41bc7d29a1a..ee3d64fb958 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorBase.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorBase.java @@ -1,29 +1,15 @@ package forge.gui.deckeditor; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import java.util.List; -import javax.swing.BorderFactory; import javax.swing.JFrame; -import javax.swing.JLabel; import javax.swing.JOptionPane; -import javax.swing.JScrollPane; -import javax.swing.JTable; -import javax.swing.border.TitledBorder; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; import net.slightlymagic.maxmtg.Predicate; -import forge.Constant; import forge.GUI_DeckAnalysis; -import forge.card.CardPool; -import forge.card.CardPrinted; import forge.card.CardRules; import forge.card.CardPoolView; diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java b/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java index 7a5cce4ec61..1e04b44086b 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java @@ -17,9 +17,6 @@ import forge.properties.NewConstants; import forge.view.swing.OldGuiNewGame; import javax.swing.*; -import javax.swing.border.TitledBorder; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; import java.awt.*; import java.awt.event.*; import java.util.ArrayList; diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorMenu.java b/src/main/java/forge/gui/deckeditor/DeckEditorMenu.java index 7e4b2adbffc..47494d40767 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorMenu.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorMenu.java @@ -61,7 +61,7 @@ public class DeckEditorMenu extends JMenuBar implements NewConstants { private String currentDeckName; private String currentGameType; - private String currentDeckPlayerType; + //private String currentDeckPlayerType; /** *

Setter for the field currentGameType.

@@ -741,7 +741,7 @@ public class DeckEditorMenu extends JMenuBar implements NewConstants { */ public final void showSealedDeck(final Deck deck) { setDeckData(deck.getName(), true); - currentDeckPlayerType = deck.getMetadata("PlayerType"); + //currentDeckPlayerType = deck.getMetadata("PlayerType"); deckDisplay.setDecks(deck.getSideboard(), deck.getMain()); }//showSealedDeck() diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java b/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java index 8d7e0f4dd6f..a1133611cac 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java @@ -3,7 +3,6 @@ package forge.gui.deckeditor; import forge.AllZone; import forge.Command; import forge.Constant; -import forge.card.CardDb; import forge.card.CardPool; import forge.card.CardPoolView; import forge.card.CardPrinted; diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorShop.java b/src/main/java/forge/gui/deckeditor/DeckEditorShop.java index 934fde3d3c6..65c1e7a8c57 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorShop.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorShop.java @@ -11,7 +11,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.TreeMap; import javax.swing.JButton; import javax.swing.JLabel; diff --git a/src/main/java/forge/gui/deckeditor/TableWithCards.java b/src/main/java/forge/gui/deckeditor/TableWithCards.java index d3856e48b80..0fb19848be2 100644 --- a/src/main/java/forge/gui/deckeditor/TableWithCards.java +++ b/src/main/java/forge/gui/deckeditor/TableWithCards.java @@ -135,7 +135,7 @@ public final class TableWithCards { } public void addCard(final CardPrinted card) { - int n = table.getSelectedRow(); + //int n = table.getSelectedRow(); pool.add(card); if (isUnfiltered()) { model.addCard(card); } updateView();