From 848528b19ff846d888ba10ce354fb62cbd54fd1b Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 23:08:27 +0000 Subject: [PATCH] fix a bunch of Java warnings. --- src/forge/Gui_DeckEditor_Menu.java | 12 ++++++------ src/forge/Gui_Quest_DeckEditor.java | 4 ++-- src/forge/Gui_Quest_DeckEditor_Menu.java | 16 ++++++++-------- src/forge/Gui_Quest_Deck_Info.java | 3 ++- src/forge/QuestData.java | 1 - src/forge/QuestUtil.java | 1 - src/forge/deck/Deck.java | 10 +++------- src/forge/quest/data/QuestData.java | 2 +- src/forge/quest/data/QuestDataIO.java | 3 +++ src/forge/quest/gui/QuestAbstractPanel.java | 4 +++- src/forge/quest/gui/bazaar/QuestBazaarItem.java | 4 +++- src/forge/quest/gui/main/QuestBattle.java | 4 ++-- src/forge/quest/gui/main/QuestMainPanel.java | 4 +++- src/forge/quest/gui/main/QuestQuest.java | 5 +++-- .../quest/gui/main/QuestSelectablePanel.java | 4 +++- 15 files changed, 42 insertions(+), 35 deletions(-) diff --git a/src/forge/Gui_DeckEditor_Menu.java b/src/forge/Gui_DeckEditor_Menu.java index 9f2c4c0486b..73815935ecd 100644 --- a/src/forge/Gui_DeckEditor_Menu.java +++ b/src/forge/Gui_DeckEditor_Menu.java @@ -361,11 +361,11 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants { for (int i = 0; i < deck.countSideboard(); i++) { String cardName = deck.getMain(i); - String setCode = ""; + //String setCode = ""; if (cardName.contains("|")) { String s[] = cardName.split("\\|", 2); cardName = s[0]; - setCode = s[1]; + //setCode = s[1]; } top.add(AllZone.CardFactory.getCard(cardName, AllZone.HumanPlayer)); @@ -845,11 +845,11 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants { CardList top = new CardList(); for (int i = 0; i < deck.countSideboard(); i++) { String cardName = deck.getMain(i); - String setCode = ""; + //String setCode = ""; if (cardName.contains("|")) { String s[] = cardName.split("\\|", 2); cardName = s[0]; - setCode = s[1]; + //setCode = s[1]; } top.add(AllZone.CardFactory.getCard(cardName, AllZone.HumanPlayer)); @@ -857,11 +857,11 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants { CardList bottom = new CardList(); for (int i = 0; i < deck.countMain(); i++) { String cardName = deck.getMain(i); - String setCode = ""; + //String setCode = ""; if (cardName.contains("|")) { String s[] = cardName.split("\\|", 2); cardName = s[0]; - setCode = s[1]; + //setCode = s[1]; } bottom.add(AllZone.CardFactory.getCard(cardName, AllZone.HumanPlayer)); diff --git a/src/forge/Gui_Quest_DeckEditor.java b/src/forge/Gui_Quest_DeckEditor.java index af6a7d37ff3..2a2f5dfc525 100644 --- a/src/forge/Gui_Quest_DeckEditor.java +++ b/src/forge/Gui_Quest_DeckEditor.java @@ -8,7 +8,7 @@ import forge.gui.game.CardDetailPanel; import forge.gui.game.CardPicturePanel; import forge.properties.ForgeProps; import forge.properties.NewConstants; -import forge.quest.data.QuestBoosterPack; +//import forge.quest.data.QuestBoosterPack; import javax.swing.*; import javax.swing.border.Border; @@ -104,7 +104,7 @@ public class Gui_Quest_DeckEditor extends JFrame implements CardContainer, DeckD Card c; String cardName; - QuestBoosterPack pack = new QuestBoosterPack(); + //QuestBoosterPack pack = new QuestBoosterPack(); java.util.List addedList = AllZone.QuestData.getAddedCards(); diff --git a/src/forge/Gui_Quest_DeckEditor_Menu.java b/src/forge/Gui_Quest_DeckEditor_Menu.java index 6b97ac69141..483cdaa82e3 100644 --- a/src/forge/Gui_Quest_DeckEditor_Menu.java +++ b/src/forge/Gui_Quest_DeckEditor_Menu.java @@ -433,11 +433,11 @@ public class Gui_Quest_DeckEditor_Menu extends JMenuBar { List list = questData.getCardpool(); for (String cardName : list) { - String setCode = ""; + //String setCode = ""; if (cardName.contains("|")) { String s[] = cardName.split("\\|", 2); cardName = s[0]; - setCode = s[1]; + //setCode = s[1]; } cardpool.add(AllZone.CardFactory.getCard(cardName, null)); @@ -451,12 +451,12 @@ public class Gui_Quest_DeckEditor_Menu extends JMenuBar { CardList deckList = new CardList(); for(int i = 0; i < deck.countMain(); i++) { String cardName = deck.getMain(i); - String setCode = ""; + //String setCode = ""; if (cardName.contains("|")) { String s[] = cardName.split("\\|",2); cardName = s[0]; - setCode = s[1]; + //setCode = s[1]; } deckList.add(AllZone.CardFactory.getCard(cardName, null)); @@ -534,12 +534,12 @@ public class Gui_Quest_DeckEditor_Menu extends JMenuBar { for(int i = 0; i < d.countMain(); i++) { String cardName = d.getMain(i); - String setCode = ""; + //String setCode = ""; if (cardName.contains("|")) { String s[] = cardName.split("\\|",2); cardName = s[0]; - setCode = s[1]; + //setCode = s[1]; } deck.add(AllZone.CardFactory.getCard(cardName, null)); @@ -683,12 +683,12 @@ public class Gui_Quest_DeckEditor_Menu extends JMenuBar { for(int i = 0; i < d.countMain(); i++) { { String cardName = d.getMain(i); - String setCode = ""; + //String setCode = ""; if (cardName.contains("|")) { String s[] = cardName.split("\\|",2); cardName = s[0]; - setCode = s[1]; + //setCode = s[1]; } deck.add(AllZone.CardFactory.getCard(cardName, null)); diff --git a/src/forge/Gui_Quest_Deck_Info.java b/src/forge/Gui_Quest_Deck_Info.java index dbb257aa0a5..157f773cfc7 100644 --- a/src/forge/Gui_Quest_Deck_Info.java +++ b/src/forge/Gui_Quest_Deck_Info.java @@ -216,10 +216,11 @@ public class Gui_Quest_Deck_Info implements NewConstants { */ } + /* private static void addToDeckList(String name, String difficulty, String description) { nameDeckMap.put(name, new DeckInfo(name, description, difficulty)); } - + */ public static void showDeckList() { diff --git a/src/forge/QuestData.java b/src/forge/QuestData.java index 191edf30a65..0d8dfa867a3 100644 --- a/src/forge/QuestData.java +++ b/src/forge/QuestData.java @@ -19,7 +19,6 @@ import java.util.*; //static readAIQuestDeckFiles(QuestData data, ArrayList aiDeckNames) //OR non-static readAIQuestDeckFiles() //which reads the files "questDecks-easy", "questDecks-medium","questDecks-hard", -@SuppressWarnings({"deprecation"}) @Deprecated public class QuestData implements NewConstants { QuestData_Prefs qdPrefs = null; diff --git a/src/forge/QuestUtil.java b/src/forge/QuestUtil.java index f414c52e15e..a81a8ef0545 100644 --- a/src/forge/QuestUtil.java +++ b/src/forge/QuestUtil.java @@ -10,7 +10,6 @@ import forge.card.trigger.Trigger; import forge.card.trigger.TriggerHandler; @Deprecated -@SuppressWarnings("deprecation") public class QuestUtil { public static int getLife(QuestData qd) diff --git a/src/forge/deck/Deck.java b/src/forge/deck/Deck.java index 0963b780bcd..1b7fd2215ab 100644 --- a/src/forge/deck/Deck.java +++ b/src/forge/deck/Deck.java @@ -5,7 +5,7 @@ import forge.Constant; import java.util.*; -public class Deck implements Comparable{ +public class Deck implements Comparable{ //gameType is from Constant.GameType, like Constant.GameType.Regular private Map metadata = new HashMap(); @@ -161,12 +161,8 @@ public class Deck implements Comparable{ return metadata.get(DESCRIPTION); } - public int compareTo(Object o) { - if (o instanceof Deck) - { - return getName().compareTo(((Deck)o).getName()); - } - return 0; + public int compareTo(Deck d) { + return getName().compareTo(d.getName()); } public Set> getMetadata() { diff --git a/src/forge/quest/data/QuestData.java b/src/forge/quest/data/QuestData.java index f30cc87581b..7b57c241a42 100644 --- a/src/forge/quest/data/QuestData.java +++ b/src/forge/quest/data/QuestData.java @@ -30,7 +30,7 @@ public class QuestData { int lost; int life; - private int maxLife; + //private int maxLife; int questsPlayed; diff --git a/src/forge/quest/data/QuestDataIO.java b/src/forge/quest/data/QuestDataIO.java index c11e084b849..6c64a78c326 100644 --- a/src/forge/quest/data/QuestDataIO.java +++ b/src/forge/quest/data/QuestDataIO.java @@ -216,8 +216,11 @@ public class QuestDataIO { }; } + //is not used anywhere as far as I can search for + /* public List getIgnoredFields() { return ignoredFields; } + */ } } \ No newline at end of file diff --git a/src/forge/quest/gui/QuestAbstractPanel.java b/src/forge/quest/gui/QuestAbstractPanel.java index 216779c7557..618931ac7f8 100644 --- a/src/forge/quest/gui/QuestAbstractPanel.java +++ b/src/forge/quest/gui/QuestAbstractPanel.java @@ -3,7 +3,9 @@ package forge.quest.gui; import javax.swing.*; public abstract class QuestAbstractPanel extends JPanel { - public QuestFrame mainFrame; + private static final long serialVersionUID = -6378675010346615367L; + + public QuestFrame mainFrame; protected QuestAbstractPanel(QuestFrame mainFrame) { this.mainFrame = mainFrame; diff --git a/src/forge/quest/gui/bazaar/QuestBazaarItem.java b/src/forge/quest/gui/bazaar/QuestBazaarItem.java index e97cb9d8b73..e74e640f587 100644 --- a/src/forge/quest/gui/bazaar/QuestBazaarItem.java +++ b/src/forge/quest/gui/bazaar/QuestBazaarItem.java @@ -68,7 +68,9 @@ public class QuestBazaarItem { } JPanel itemPanel = new JPanel() { - @Override + private static final long serialVersionUID = -5182857296365949682L; + + @Override public Dimension getPreferredSize() { Dimension realSize = super.getPreferredSize(); realSize.width = 100; diff --git a/src/forge/quest/gui/main/QuestBattle.java b/src/forge/quest/gui/main/QuestBattle.java index c3f12c94df4..544a0ac52b6 100644 --- a/src/forge/quest/gui/main/QuestBattle.java +++ b/src/forge/quest/gui/main/QuestBattle.java @@ -366,14 +366,14 @@ public class QuestBattle extends QuestSelectablePanel { } private static class DeckInfo { - String name; + //String name; String difficulty; String description; private DeckInfo(String name, String description, String difficulty) { this.description = description; this.difficulty = difficulty; - this.name = name; + //this.name = name; } } diff --git a/src/forge/quest/gui/main/QuestMainPanel.java b/src/forge/quest/gui/main/QuestMainPanel.java index 4feaa525801..dafb59397f4 100644 --- a/src/forge/quest/gui/main/QuestMainPanel.java +++ b/src/forge/quest/gui/main/QuestMainPanel.java @@ -25,7 +25,9 @@ import java.util.List; public class QuestMainPanel extends QuestAbstractPanel { - private forge.quest.data.QuestData questData; + private static final long serialVersionUID = 6142934729724012402L; + + private forge.quest.data.QuestData questData; JLabel creditsLabel = new JLabel(); JLabel lifeLabel = new JLabel(); diff --git a/src/forge/quest/gui/main/QuestQuest.java b/src/forge/quest/gui/main/QuestQuest.java index 1a5d85f340d..e153b1b86be 100644 --- a/src/forge/quest/gui/main/QuestQuest.java +++ b/src/forge/quest/gui/main/QuestQuest.java @@ -13,8 +13,9 @@ import java.util.Collections; import java.util.List; public class QuestQuest extends QuestSelectablePanel { - - Quest_Assignment assignment; + private static final long serialVersionUID = -162817410327650160L; + + Quest_Assignment assignment; public QuestQuest(Quest_Assignment assignment) { super(assignment.getName(), assignment.getDifficulty(), assignment.getDesc(), GuiUtils.getIconFromFile(assignment.getIconName())); diff --git a/src/forge/quest/gui/main/QuestSelectablePanel.java b/src/forge/quest/gui/main/QuestSelectablePanel.java index b525ba37ee8..c5dc2271d5e 100644 --- a/src/forge/quest/gui/main/QuestSelectablePanel.java +++ b/src/forge/quest/gui/main/QuestSelectablePanel.java @@ -11,7 +11,9 @@ import java.awt.Color; import java.awt.Dimension; public class QuestSelectablePanel extends JPanel { - protected Color backgroundColor; + private static final long serialVersionUID = -1502285997894190742L; + + protected Color backgroundColor; private boolean selected; ImageIcon icon;