From c451c0be5d7ee1f82a5e4f70f29fd35d3ca704b5 Mon Sep 17 00:00:00 2001 From: melvinzhang Date: Wed, 2 Dec 2015 18:19:01 +0800 Subject: [PATCH] replace long serialVersionUID with @SuppressWarnings("serial") --- src/magic/data/LRUCache.java | 2 +- src/magic/model/MagicBoosterPack.java | 2 +- src/magic/model/MagicCardList.java | 3 +-- src/magic/model/MagicCondensedDeck.java | 3 +-- src/magic/model/MagicCopyMap.java | 3 +-- src/magic/model/MagicPermanentList.java | 3 +-- src/magic/model/MagicPermanentSet.java | 3 +-- src/magic/model/MagicRandom.java | 2 +- src/magic/model/action/MagicActionList.java | 2 +- .../model/choice/MagicCardChoiceResult.java | 3 +-- .../choice/MagicDeclareAttackersResult.java | 3 +-- .../model/choice/MagicDeclareBlockersResult.java | 3 +-- src/magic/model/event/MagicEventQueue.java | 3 +-- src/magic/model/stack/MagicStack.java | 3 +-- .../model/trigger/MagicPermanentTriggerList.java | 3 +-- src/magic/ui/cardtable/CardTable.java | 2 +- src/magic/ui/cardtable/CardTablePanel.java | 2 +- src/magic/ui/cardtable/DeckTablePanel.java | 2 +- src/magic/ui/duel/choice/MayChoicePanel.java | 16 ++++++++++------ .../duel/textmode/BasicLandPermanentButton.java | 3 +-- .../ui/duel/textmode/BattlefieldViewer.java | 3 +-- src/magic/ui/duel/textmode/CardButton.java | 2 +- src/magic/ui/duel/textmode/CardListViewer.java | 2 +- src/magic/ui/duel/textmode/CombatViewer.java | 3 +-- src/magic/ui/duel/textmode/ExileViewer.java | 3 +-- src/magic/ui/duel/textmode/GraveyardViewer.java | 3 +-- .../duel/textmode/HandGraveyardExileViewer.java | 2 +- src/magic/ui/duel/textmode/HandViewer.java | 3 +-- src/magic/ui/duel/textmode/OtherViewer.java | 3 +-- src/magic/ui/duel/textmode/PermanentButton.java | 3 +-- src/magic/ui/duel/textmode/PermanentPanel.java | 3 +-- src/magic/ui/duel/textmode/PermanentsViewer.java | 3 +-- .../ui/duel/textmode/StackCombatViewer.java | 3 +-- src/magic/ui/duel/textmode/ViewerScrollPane.java | 3 +-- .../ui/duel/viewer/ImageBattlefieldViewer.java | 3 +-- src/magic/ui/duel/viewer/ImageCombatViewer.java | 3 +-- .../ui/duel/viewer/ImagePermanentsViewer.java | 3 +-- src/magic/ui/widget/ButtonControlledPopup.java | 11 ++++++----- src/magic/ui/widget/CostPanel.java | 3 +-- src/magic/ui/widget/TexturedPanel.java | 3 +-- src/magic/ui/widget/ZoneBackgroundLabel.java | 3 +-- 41 files changed, 55 insertions(+), 79 deletions(-) diff --git a/src/magic/data/LRUCache.java b/src/magic/data/LRUCache.java index 279de03bc2..3f3fb0daa0 100644 --- a/src/magic/data/LRUCache.java +++ b/src/magic/data/LRUCache.java @@ -3,8 +3,8 @@ package magic.data; import java.util.LinkedHashMap; import java.util.Map; +@SuppressWarnings("serial") public class LRUCache extends LinkedHashMap { - private static final long serialVersionUID = 1L; private final int capacity; public LRUCache(final int capacity) { diff --git a/src/magic/model/MagicBoosterPack.java b/src/magic/model/MagicBoosterPack.java index bf3b923c54..deeb859446 100644 --- a/src/magic/model/MagicBoosterPack.java +++ b/src/magic/model/MagicBoosterPack.java @@ -2,7 +2,7 @@ package magic.model; import java.util.ArrayList; +@SuppressWarnings("serial") public class MagicBoosterPack extends ArrayList { - private static final long serialVersionUID = 1L; } diff --git a/src/magic/model/MagicCardList.java b/src/magic/model/MagicCardList.java index abcf13aaad..eaccd498d5 100644 --- a/src/magic/model/MagicCardList.java +++ b/src/magic/model/MagicCardList.java @@ -4,10 +4,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SuppressWarnings("serial") public class MagicCardList extends ArrayList implements MagicCopyable { - private static final long serialVersionUID = 1L; - public MagicCardList() {} public MagicCardList(final List cardList) { diff --git a/src/magic/model/MagicCondensedDeck.java b/src/magic/model/MagicCondensedDeck.java index 442ee8277f..3a71c29e71 100644 --- a/src/magic/model/MagicCondensedDeck.java +++ b/src/magic/model/MagicCondensedDeck.java @@ -4,10 +4,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +@SuppressWarnings("serial") public class MagicCondensedDeck extends ArrayList { - private static final long serialVersionUID = 143L; - private String name = "Unsaved Deck"; private final HashMap map = new HashMap(); diff --git a/src/magic/model/MagicCopyMap.java b/src/magic/model/MagicCopyMap.java index 654b65b188..0d531b9684 100644 --- a/src/magic/model/MagicCopyMap.java +++ b/src/magic/model/MagicCopyMap.java @@ -4,10 +4,9 @@ import java.lang.reflect.Array; import java.util.Collection; import java.util.HashMap; +@SuppressWarnings("serial") public class MagicCopyMap extends HashMap { - private static final long serialVersionUID = 1L; - @SuppressWarnings("unchecked") public E copy(final E source) { if (source == null) { diff --git a/src/magic/model/MagicPermanentList.java b/src/magic/model/MagicPermanentList.java index f8aead0278..958e9bd5ea 100644 --- a/src/magic/model/MagicPermanentList.java +++ b/src/magic/model/MagicPermanentList.java @@ -4,10 +4,9 @@ import java.util.List; import java.util.ArrayList; import java.util.Arrays; +@SuppressWarnings("serial") public class MagicPermanentList extends ArrayList implements MagicCopyable { - private static final long serialVersionUID = 1L; - public MagicPermanentList() {} public MagicPermanentList(final MagicPermanent... permanents) { diff --git a/src/magic/model/MagicPermanentSet.java b/src/magic/model/MagicPermanentSet.java index c31f667881..1fd53148a1 100644 --- a/src/magic/model/MagicPermanentSet.java +++ b/src/magic/model/MagicPermanentSet.java @@ -2,10 +2,9 @@ package magic.model; import java.util.TreeSet; +@SuppressWarnings("serial") public class MagicPermanentSet extends TreeSet { - private static final long serialVersionUID = 1L; - MagicPermanentSet() {} MagicPermanentSet(final MagicCopyMap copyMap,final MagicPermanentSet source) { diff --git a/src/magic/model/MagicRandom.java b/src/magic/model/MagicRandom.java index a2817457c8..1036210280 100644 --- a/src/magic/model/MagicRandom.java +++ b/src/magic/model/MagicRandom.java @@ -2,11 +2,11 @@ package magic.model; import java.util.Random; +@SuppressWarnings("serial") public class MagicRandom extends Random { private long state; private static MagicRandom RNG = new MagicRandom(); - private static final long serialVersionUID = 1L; static { final String seedStr = System.getProperty("rndSeed"); diff --git a/src/magic/model/action/MagicActionList.java b/src/magic/model/action/MagicActionList.java index d6d3c12caa..eafb8ed6d4 100644 --- a/src/magic/model/action/MagicActionList.java +++ b/src/magic/model/action/MagicActionList.java @@ -2,6 +2,6 @@ package magic.model.action; import java.util.LinkedList; +@SuppressWarnings("serial") public class MagicActionList extends LinkedList { - private static final long serialVersionUID = 1L; } diff --git a/src/magic/model/choice/MagicCardChoiceResult.java b/src/magic/model/choice/MagicCardChoiceResult.java index 34d2712444..d32a70838a 100644 --- a/src/magic/model/choice/MagicCardChoiceResult.java +++ b/src/magic/model/choice/MagicCardChoiceResult.java @@ -10,10 +10,9 @@ import java.util.List; import java.util.ArrayList; import magic.model.MagicMessage; +@SuppressWarnings("serial") public class MagicCardChoiceResult extends ArrayList implements MagicMappable, MagicCopyable { - private static final long serialVersionUID = 1L; - MagicCardChoiceResult(final MagicCard[] cards) { for (final MagicCard card : cards) { if (card != null) { diff --git a/src/magic/model/choice/MagicDeclareAttackersResult.java b/src/magic/model/choice/MagicDeclareAttackersResult.java index 56a4886b1a..919d319c4e 100644 --- a/src/magic/model/choice/MagicDeclareAttackersResult.java +++ b/src/magic/model/choice/MagicDeclareAttackersResult.java @@ -8,10 +8,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +@SuppressWarnings("serial") public class MagicDeclareAttackersResult extends ArrayList implements MagicMappable { - private static final long serialVersionUID = 1L; - MagicDeclareAttackersResult() {} MagicDeclareAttackersResult(final MagicPermanent[] attackers,final int length) { diff --git a/src/magic/model/choice/MagicDeclareBlockersResult.java b/src/magic/model/choice/MagicDeclareBlockersResult.java index 7df15ae6c0..3b1089b3a9 100644 --- a/src/magic/model/choice/MagicDeclareBlockersResult.java +++ b/src/magic/model/choice/MagicDeclareBlockersResult.java @@ -8,10 +8,9 @@ import java.util.Arrays; import java.util.LinkedList; /** First creature in array is the attacker, the other creatures are blockers. */ +@SuppressWarnings("serial") public class MagicDeclareBlockersResult extends LinkedList implements MagicMappable, MagicScoreResult { - private static final long serialVersionUID = 1L; - private final int position; private final int score; diff --git a/src/magic/model/event/MagicEventQueue.java b/src/magic/model/event/MagicEventQueue.java index 68710b3f2e..9b146c59cf 100644 --- a/src/magic/model/event/MagicEventQueue.java +++ b/src/magic/model/event/MagicEventQueue.java @@ -4,10 +4,9 @@ import magic.model.MagicCopyMap; import java.util.LinkedList; +@SuppressWarnings("serial") public class MagicEventQueue extends LinkedList { - private static final long serialVersionUID = 1L; - public MagicEventQueue() {} public MagicEventQueue(final MagicCopyMap copyMap,final MagicEventQueue source) { diff --git a/src/magic/model/stack/MagicStack.java b/src/magic/model/stack/MagicStack.java index 9a86f6ef04..acaeb67488 100644 --- a/src/magic/model/stack/MagicStack.java +++ b/src/magic/model/stack/MagicStack.java @@ -8,10 +8,9 @@ import magic.model.event.MagicActivation; import java.util.Arrays; import java.util.LinkedList; +@SuppressWarnings("serial") public class MagicStack extends LinkedList { - private static final long serialVersionUID = 1L; - private final int[] spells; private final int[] counts; diff --git a/src/magic/model/trigger/MagicPermanentTriggerList.java b/src/magic/model/trigger/MagicPermanentTriggerList.java index 3d595b0c1c..1119f8aed5 100644 --- a/src/magic/model/trigger/MagicPermanentTriggerList.java +++ b/src/magic/model/trigger/MagicPermanentTriggerList.java @@ -3,10 +3,9 @@ package magic.model.trigger; import java.util.ArrayList; import java.util.Collection; +@SuppressWarnings("serial") public class MagicPermanentTriggerList extends ArrayList { - private static final long serialVersionUID = 1L; - public MagicPermanentTriggerList() {} public MagicPermanentTriggerList(final MagicPermanentTriggerList triggerList) { diff --git a/src/magic/ui/cardtable/CardTable.java b/src/magic/ui/cardtable/CardTable.java index bb46685ef7..ffe73eed00 100644 --- a/src/magic/ui/cardtable/CardTable.java +++ b/src/magic/ui/cardtable/CardTable.java @@ -259,8 +259,8 @@ public class CardTable extends TexturedPanel implements ListSelectionListener { } } + @SuppressWarnings("serial") private static class ManaCostCellRenderer extends DefaultTableCellRenderer { - private static final long serialVersionUID = 113245L; @Override public Component getTableCellRendererComponent(final JTable table, final Object value, final boolean isSelected, final boolean hasFocus, final int row, final int col) { diff --git a/src/magic/ui/cardtable/CardTablePanel.java b/src/magic/ui/cardtable/CardTablePanel.java index 8181ae6438..ac0c38d639 100644 --- a/src/magic/ui/cardtable/CardTablePanel.java +++ b/src/magic/ui/cardtable/CardTablePanel.java @@ -291,8 +291,8 @@ public class CardTablePanel extends TexturedPanel { } } + @SuppressWarnings("serial") private static class ManaCostCellRenderer extends DefaultTableCellRenderer { - private static final long serialVersionUID = 113245L; @Override public Component getTableCellRendererComponent(final JTable table, final Object value, final boolean isSelected, final boolean hasFocus, final int row, final int col) { diff --git a/src/magic/ui/cardtable/DeckTablePanel.java b/src/magic/ui/cardtable/DeckTablePanel.java index f80be237f3..733601e32b 100644 --- a/src/magic/ui/cardtable/DeckTablePanel.java +++ b/src/magic/ui/cardtable/DeckTablePanel.java @@ -288,8 +288,8 @@ public class DeckTablePanel extends TexturedPanel { } } + @SuppressWarnings("serial") private static class ManaCostCellRenderer extends DefaultTableCellRenderer { - private static final long serialVersionUID = 113245L; @Override public Component getTableCellRendererComponent(final JTable table, final Object value, final boolean isSelected, final boolean hasFocus, final int row, final int col) { diff --git a/src/magic/ui/duel/choice/MayChoicePanel.java b/src/magic/ui/duel/choice/MayChoicePanel.java index ece0db4dfe..1f15724ade 100644 --- a/src/magic/ui/duel/choice/MayChoicePanel.java +++ b/src/magic/ui/duel/choice/MayChoicePanel.java @@ -54,13 +54,15 @@ public class MayChoicePanel extends JPanel implements ActionListener { buttonPanel.add(yesButton); yesButton.getInputMap(2).put(KeyStroke.getKeyStroke('y'),"yes"); - yesButton.getActionMap().put("yes",new AbstractAction() { - private static final long serialVersionUID = 1L; + + @SuppressWarnings("serial") + final AbstractAction yesAction = new AbstractAction() { public void actionPerformed(final ActionEvent evt) { yes = true; controller.actionClicked(); } - }); + }; + yesButton.getActionMap().put("yes", yesAction); final JButton noButton=new JButton(UiString.get(_S2), MagicImages.getIcon(MagicIcon.CANCEL)); @@ -70,13 +72,15 @@ public class MayChoicePanel extends JPanel implements ActionListener { buttonPanel.add(noButton); noButton.getInputMap(2).put(KeyStroke.getKeyStroke('n'),"no"); - noButton.getActionMap().put("no",new AbstractAction() { - private static final long serialVersionUID = 1L; + + @SuppressWarnings("serial") + final AbstractAction noAction = new AbstractAction() { public void actionPerformed(final ActionEvent evt) { yes = false; controller.actionClicked(); } - }); + }; + noButton.getActionMap().put("no", noAction); } public boolean isYesClicked() { diff --git a/src/magic/ui/duel/textmode/BasicLandPermanentButton.java b/src/magic/ui/duel/textmode/BasicLandPermanentButton.java index 739dbbb087..86629b545e 100644 --- a/src/magic/ui/duel/textmode/BasicLandPermanentButton.java +++ b/src/magic/ui/duel/textmode/BasicLandPermanentButton.java @@ -15,10 +15,9 @@ import magic.ui.theme.ThemeFactory; import magic.ui.widget.FontsAndBorders; import magic.ui.widget.PanelButton; +@SuppressWarnings("serial") class BasicLandPermanentButton extends PanelButton implements IChoiceViewer { - private static final long serialVersionUID = 1L; - private final PermanentViewerInfo permanentInfo; private final SwingGameController controller; private final JPanel landPanel; diff --git a/src/magic/ui/duel/textmode/BattlefieldViewer.java b/src/magic/ui/duel/textmode/BattlefieldViewer.java index e289b0076c..dbf4701443 100644 --- a/src/magic/ui/duel/textmode/BattlefieldViewer.java +++ b/src/magic/ui/duel/textmode/BattlefieldViewer.java @@ -10,10 +10,9 @@ import magic.ui.duel.PermanentFilter; import magic.ui.duel.PermanentViewerInfo; import magic.ui.widget.TitleBar; +@SuppressWarnings("serial") class BattlefieldViewer extends PermanentsViewer { - private static final long serialVersionUID = 1L; - private final boolean opponent; private final PermanentFilter permanentFilter; diff --git a/src/magic/ui/duel/textmode/CardButton.java b/src/magic/ui/duel/textmode/CardButton.java index 5b1de4c129..b3e390d601 100644 --- a/src/magic/ui/duel/textmode/CardButton.java +++ b/src/magic/ui/duel/textmode/CardButton.java @@ -16,8 +16,8 @@ import magic.ui.utility.MagicStyle; import magic.ui.widget.CostPanel; import magic.ui.widget.PanelButton; +@SuppressWarnings("serial") class CardButton extends PanelButton implements IChoiceViewer { - private static final long serialVersionUID = 1L; private final SwingGameController controller; private final MagicCard card; diff --git a/src/magic/ui/duel/textmode/CardListViewer.java b/src/magic/ui/duel/textmode/CardListViewer.java index d542498c34..7c00756961 100644 --- a/src/magic/ui/duel/textmode/CardListViewer.java +++ b/src/magic/ui/duel/textmode/CardListViewer.java @@ -16,8 +16,8 @@ import magic.ui.theme.Theme; import magic.ui.theme.ThemeFactory; import magic.ui.widget.FontsAndBorders; +@SuppressWarnings("serial") abstract class CardListViewer extends JPanel implements IChoiceViewer { - private static final long serialVersionUID = 1L; private static final int LINE_HEIGHT = 26; private final SwingGameController controller; diff --git a/src/magic/ui/duel/textmode/CombatViewer.java b/src/magic/ui/duel/textmode/CombatViewer.java index 77befc82a4..4a7a3c3769 100644 --- a/src/magic/ui/duel/textmode/CombatViewer.java +++ b/src/magic/ui/duel/textmode/CombatViewer.java @@ -10,10 +10,9 @@ import magic.ui.duel.PermanentViewerInfo; import magic.ui.duel.PlayerViewerInfo; import magic.ui.widget.FontsAndBorders; +@SuppressWarnings("serial") class CombatViewer extends PermanentsViewer { - private static final long serialVersionUID = 1L; - CombatViewer(final SwingGameController controller) { super(controller); update(); diff --git a/src/magic/ui/duel/textmode/ExileViewer.java b/src/magic/ui/duel/textmode/ExileViewer.java index 9f8422b6e2..56ff2bc5d9 100644 --- a/src/magic/ui/duel/textmode/ExileViewer.java +++ b/src/magic/ui/duel/textmode/ExileViewer.java @@ -3,9 +3,8 @@ package magic.ui.duel.textmode; import magic.ui.duel.SwingGameController; import magic.ui.theme.Theme; +@SuppressWarnings("serial") class ExileViewer extends CardListViewer { - private static final long serialVersionUID = 1L; - ExileViewer(final SwingGameController controller, final boolean opponent) { super( controller, diff --git a/src/magic/ui/duel/textmode/GraveyardViewer.java b/src/magic/ui/duel/textmode/GraveyardViewer.java index b85d036209..11c926fede 100644 --- a/src/magic/ui/duel/textmode/GraveyardViewer.java +++ b/src/magic/ui/duel/textmode/GraveyardViewer.java @@ -3,9 +3,8 @@ package magic.ui.duel.textmode; import magic.ui.duel.SwingGameController; import magic.ui.theme.Theme; +@SuppressWarnings("serial") class GraveyardViewer extends CardListViewer { - private static final long serialVersionUID = 1L; - GraveyardViewer(final SwingGameController controller, final boolean opponent) { super( controller, diff --git a/src/magic/ui/duel/textmode/HandGraveyardExileViewer.java b/src/magic/ui/duel/textmode/HandGraveyardExileViewer.java index 60d0539c2b..0a75561474 100644 --- a/src/magic/ui/duel/textmode/HandGraveyardExileViewer.java +++ b/src/magic/ui/duel/textmode/HandGraveyardExileViewer.java @@ -11,8 +11,8 @@ import magic.ui.utility.MagicStyle; import magic.ui.widget.TabSelector; import magic.ui.widget.TitleBar; +@SuppressWarnings("serial") class HandGraveyardExileViewer extends JPanel implements ChangeListener { - private static final long serialVersionUID = 1L; private final CardListViewer[] viewers; private final JPanel cardPanel; diff --git a/src/magic/ui/duel/textmode/HandViewer.java b/src/magic/ui/duel/textmode/HandViewer.java index 8b38acbf89..2f3c7024d1 100644 --- a/src/magic/ui/duel/textmode/HandViewer.java +++ b/src/magic/ui/duel/textmode/HandViewer.java @@ -3,9 +3,8 @@ package magic.ui.duel.textmode; import magic.ui.duel.SwingGameController; import magic.ui.theme.Theme; +@SuppressWarnings("serial") class HandViewer extends CardListViewer { - private static final long serialVersionUID = 1L; - HandViewer(final SwingGameController controller) { super( controller, diff --git a/src/magic/ui/duel/textmode/OtherViewer.java b/src/magic/ui/duel/textmode/OtherViewer.java index bfc6892872..0021140c83 100644 --- a/src/magic/ui/duel/textmode/OtherViewer.java +++ b/src/magic/ui/duel/textmode/OtherViewer.java @@ -4,9 +4,8 @@ import magic.model.MagicCardList; import magic.ui.duel.SwingGameController; import magic.ui.theme.Theme; +@SuppressWarnings("serial") class OtherViewer extends CardListViewer { - private static final long serialVersionUID = 1L; - OtherViewer(final MagicCardList cards, final SwingGameController controller) { super( controller, diff --git a/src/magic/ui/duel/textmode/PermanentButton.java b/src/magic/ui/duel/textmode/PermanentButton.java index 3dd4a792cd..af622c824b 100644 --- a/src/magic/ui/duel/textmode/PermanentButton.java +++ b/src/magic/ui/duel/textmode/PermanentButton.java @@ -15,10 +15,9 @@ import magic.ui.theme.ThemeFactory; import magic.ui.utility.MagicStyle; import magic.ui.widget.PanelButton; +@SuppressWarnings("serial") class PermanentButton extends PanelButton implements IChoiceViewer { - private static final long serialVersionUID = 1L; - private final PermanentViewerInfo permanentInfo; private final SwingGameController controller; diff --git a/src/magic/ui/duel/textmode/PermanentPanel.java b/src/magic/ui/duel/textmode/PermanentPanel.java index 2cfc9f653d..2939e72231 100644 --- a/src/magic/ui/duel/textmode/PermanentPanel.java +++ b/src/magic/ui/duel/textmode/PermanentPanel.java @@ -17,10 +17,9 @@ import magic.ui.theme.Theme; import magic.ui.theme.ThemeFactory; import magic.ui.widget.FontsAndBorders; +@SuppressWarnings("serial") class PermanentPanel extends JPanel implements IChoiceViewer { - private static final long serialVersionUID = 1L; - private final PermanentButton button; private final List linkedButtons; diff --git a/src/magic/ui/duel/textmode/PermanentsViewer.java b/src/magic/ui/duel/textmode/PermanentsViewer.java index e7c1104bb5..39be168703 100644 --- a/src/magic/ui/duel/textmode/PermanentsViewer.java +++ b/src/magic/ui/duel/textmode/PermanentsViewer.java @@ -19,10 +19,9 @@ import magic.ui.theme.Theme; import magic.ui.theme.ThemeFactory; import magic.ui.widget.TitleBar; +@SuppressWarnings("serial") abstract class PermanentsViewer extends JPanel implements IChoiceViewer, IUpdatable { - private static final long serialVersionUID = 1L; - private static final Dimension SEPARATOR_DIMENSION=new Dimension(0,10); TitleBar titleBar; diff --git a/src/magic/ui/duel/textmode/StackCombatViewer.java b/src/magic/ui/duel/textmode/StackCombatViewer.java index b215d515e2..78a5e06d65 100644 --- a/src/magic/ui/duel/textmode/StackCombatViewer.java +++ b/src/magic/ui/duel/textmode/StackCombatViewer.java @@ -11,10 +11,9 @@ import magic.ui.utility.MagicStyle; import magic.ui.widget.TabSelector; import magic.ui.widget.TitleBar; +@SuppressWarnings("serial") class StackCombatViewer extends JPanel implements ChangeListener { - private static final long serialVersionUID = 1L; - private final CombatViewer combatViewer; private final JPanel cardPanel; private final CardLayout cardLayout; diff --git a/src/magic/ui/duel/textmode/ViewerScrollPane.java b/src/magic/ui/duel/textmode/ViewerScrollPane.java index a14836d198..1d2565a066 100644 --- a/src/magic/ui/duel/textmode/ViewerScrollPane.java +++ b/src/magic/ui/duel/textmode/ViewerScrollPane.java @@ -9,10 +9,9 @@ import magic.ui.theme.Theme; import magic.ui.theme.ThemeFactory; import magic.ui.widget.FontsAndBorders; +@SuppressWarnings("serial") class ViewerScrollPane extends JScrollPane { - private static final long serialVersionUID = 1L; - private JPanel contentPanel; ViewerScrollPane() { diff --git a/src/magic/ui/duel/viewer/ImageBattlefieldViewer.java b/src/magic/ui/duel/viewer/ImageBattlefieldViewer.java index 65932889c2..db6d4d6e88 100644 --- a/src/magic/ui/duel/viewer/ImageBattlefieldViewer.java +++ b/src/magic/ui/duel/viewer/ImageBattlefieldViewer.java @@ -16,10 +16,9 @@ import java.util.Set; import magic.model.MagicCard; import magic.ui.utility.MagicStyle; +@SuppressWarnings("serial") public class ImageBattlefieldViewer extends JPanel implements IChoiceViewer, IUpdatable { - private static final long serialVersionUID = 1L; - private final SwingGameController controller; private final boolean opponent; private final ImagePermanentsViewer permanentsViewer; diff --git a/src/magic/ui/duel/viewer/ImageCombatViewer.java b/src/magic/ui/duel/viewer/ImageCombatViewer.java index 1cce30e069..67a1e86d19 100644 --- a/src/magic/ui/duel/viewer/ImageCombatViewer.java +++ b/src/magic/ui/duel/viewer/ImageCombatViewer.java @@ -19,10 +19,9 @@ import java.util.TreeSet; import magic.model.MagicCard; import magic.ui.utility.MagicStyle; +@SuppressWarnings("serial") public class ImageCombatViewer extends JPanel implements IChoiceViewer { - private static final long serialVersionUID = 1L; - private final SwingGameController controller; private final ImagePermanentsViewer permanentsViewer; diff --git a/src/magic/ui/duel/viewer/ImagePermanentsViewer.java b/src/magic/ui/duel/viewer/ImagePermanentsViewer.java index c2382ed629..e2b3ddd261 100644 --- a/src/magic/ui/duel/viewer/ImagePermanentsViewer.java +++ b/src/magic/ui/duel/viewer/ImagePermanentsViewer.java @@ -14,10 +14,9 @@ import magic.model.MagicCard; import magic.ui.utility.GraphicsUtils; import magic.ui.duel.SwingGameController; +@SuppressWarnings("serial") public class ImagePermanentsViewer extends JPanel { - private static final long serialVersionUID = 1L; - private static final GeneralConfig CONFIG = GeneralConfig.getInstance(); private static final int POSITION_SPACING = 60; private static final int HORIZONTAL_SPACING = 40; diff --git a/src/magic/ui/widget/ButtonControlledPopup.java b/src/magic/ui/widget/ButtonControlledPopup.java index b50d4a7e22..634908c943 100644 --- a/src/magic/ui/widget/ButtonControlledPopup.java +++ b/src/magic/ui/widget/ButtonControlledPopup.java @@ -17,10 +17,9 @@ import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import magic.ui.ScreenController; +@SuppressWarnings("serial") public class ButtonControlledPopup extends TexturedPanel implements ActionListener, WindowFocusListener { - private static final long serialVersionUID = 54232L; - public static final int STARTING_WIDTH = 260; public static final int STARTING_HEIGHT = 300; @@ -54,13 +53,15 @@ public class ButtonControlledPopup extends TexturedPanel implements ActionListen private void setEscapeKeyAction() { JRootPane root = dialog.getRootPane(); root.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "closeDialog"); - root.getActionMap().put("closeDialog", new AbstractAction() { - private static final long serialVersionUID = 1L; + + @SuppressWarnings("serial") + final AbstractAction closeAction = new AbstractAction() { @Override public void actionPerformed(final ActionEvent e) { hidePopup(); } - }); + }; + root.getActionMap().put("closeDialog", closeAction); } public void setPopupSize(final int width, final int height) { diff --git a/src/magic/ui/widget/CostPanel.java b/src/magic/ui/widget/CostPanel.java index 53e10cee03..c1a736494c 100644 --- a/src/magic/ui/widget/CostPanel.java +++ b/src/magic/ui/widget/CostPanel.java @@ -12,10 +12,9 @@ import java.util.List; import magic.data.MagicIcon; import magic.ui.MagicImages; +@SuppressWarnings("serial") public class CostPanel extends JPanel { - private static final long serialVersionUID = 1L; - private static final Dimension MANA_ICON_SIZE = new Dimension(17,17); public CostPanel(final MagicManaCost cost) { diff --git a/src/magic/ui/widget/TexturedPanel.java b/src/magic/ui/widget/TexturedPanel.java index e0e0705a06..87738fd85f 100644 --- a/src/magic/ui/widget/TexturedPanel.java +++ b/src/magic/ui/widget/TexturedPanel.java @@ -10,10 +10,9 @@ import java.awt.Graphics; import java.awt.Point; import java.awt.image.BufferedImage; +@SuppressWarnings("serial") public class TexturedPanel extends JPanel { - private static final long serialVersionUID = 1L; - private boolean start; private int startX; private int startY; diff --git a/src/magic/ui/widget/ZoneBackgroundLabel.java b/src/magic/ui/widget/ZoneBackgroundLabel.java index ebdd3aeb10..c9743c06cd 100644 --- a/src/magic/ui/widget/ZoneBackgroundLabel.java +++ b/src/magic/ui/widget/ZoneBackgroundLabel.java @@ -15,10 +15,9 @@ import java.awt.Rectangle; import java.awt.image.BufferedImage; import magic.ui.utility.MagicStyle; +@SuppressWarnings("serial") public class ZoneBackgroundLabel extends JLabel { - private static final long serialVersionUID = 1L; - private boolean game; private boolean image=true; private int playerX;