diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index d27f510ea8a..a3fdfb00f62 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -988,6 +988,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { btnDebug.setFocusable(false); btnDebug.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); btnDebug.addMouseListener(new java.awt.event.MouseAdapter() { + @Override public void mouseClicked(java.awt.event.MouseEvent evt) { btnDebugMouseClicked(evt); } diff --git a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java index 2733c0861f3..254bffac0e1 100644 --- a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java @@ -952,13 +952,16 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg searchByTextField = new JTextField(); searchByTextField.setToolTipText("Searches for card names, types, rarity, casting cost and rules text. NB: Mana symbols are written like {W},{U},{C} etc"); searchByTextField.addKeyListener(new KeyAdapter() { + @Override public void keyReleased(KeyEvent e) { reselectBy(); } + @Override public void keyTyped(KeyEvent e) { } + @Override public void keyPressed(KeyEvent e) { } }); diff --git a/Mage.Client/src/main/java/mage/client/cards/ManaBarChart.java b/Mage.Client/src/main/java/mage/client/cards/ManaBarChart.java index 15ae7abb539..53c4191fdec 100644 --- a/Mage.Client/src/main/java/mage/client/cards/ManaBarChart.java +++ b/Mage.Client/src/main/java/mage/client/cards/ManaBarChart.java @@ -9,6 +9,7 @@ import java.awt.Rectangle; import java.awt.Stroke; import java.awt.geom.Rectangle2D; import java.util.HashMap; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -16,12 +17,12 @@ import javax.swing.JComponent; public class ManaBarChart extends JComponent { - HashMap pips_at_cmcs = new HashMap(); + Map pips_at_cmcs = new HashMap(); ManaBarChart() { } - ManaBarChart(HashMap pips_at_cmcs) { + ManaBarChart(Map pips_at_cmcs) { this.pips_at_cmcs = pips_at_cmcs; } @@ -35,6 +36,7 @@ public class ManaBarChart extends JComponent { return preferred; } + @Override public void paint(Graphics g) { drawBar((Graphics2D) g, getBounds()); } diff --git a/Mage.Client/src/main/java/mage/client/cards/ManaPieChart.java b/Mage.Client/src/main/java/mage/client/cards/ManaPieChart.java index ce438c8fa95..84be3531b42 100644 --- a/Mage.Client/src/main/java/mage/client/cards/ManaPieChart.java +++ b/Mage.Client/src/main/java/mage/client/cards/ManaPieChart.java @@ -60,6 +60,7 @@ public class ManaPieChart extends JComponent { return preferred; } + @Override public void paint(Graphics g) { drawPie((Graphics2D) g, getBounds(), slices.toArray(new Slice[slices.size()])); } diff --git a/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.java b/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.java index 2b351fa28cb..d62b0938145 100644 --- a/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.java +++ b/Mage.Client/src/main/java/mage/client/chat/ChatPanelBasic.java @@ -374,6 +374,7 @@ public class ChatPanelBasic extends javax.swing.JPanel { txtMessage.setName(""); // NOI18N txtMessage.setPreferredSize(new java.awt.Dimension(6, 70)); txtMessage.addKeyListener(new java.awt.event.KeyAdapter() { + @Override public void keyTyped(java.awt.event.KeyEvent evt) { txtMessageKeyTyped(evt); } diff --git a/Mage.Client/src/main/java/mage/client/components/TranslucentSynthSytle.java b/Mage.Client/src/main/java/mage/client/components/TranslucentSynthSytle.java index 9f1f43b0988..ca0fb9611c1 100644 --- a/Mage.Client/src/main/java/mage/client/components/TranslucentSynthSytle.java +++ b/Mage.Client/src/main/java/mage/client/components/TranslucentSynthSytle.java @@ -20,39 +20,48 @@ class TranslucentSynthSytle extends SynthStyle { style = s; } + @Override public Object get(SynthContext context, Object key) { return style.get(context, key); } + @Override public boolean getBoolean(SynthContext context, Object key, boolean defaultValue) { return style.getBoolean(context, key, defaultValue); } + @Override public Color getColor(SynthContext context, ColorType type) { return style.getColor(context, type); } + @Override public Font getFont(SynthContext context) { return style.getFont(context); } + @Override public SynthGraphicsUtils getGraphicsUtils(SynthContext context) { return style.getGraphicsUtils(context); } + @Override public Icon getIcon(SynthContext context, Object key) { return style.getIcon(context, key); } + @Override public Insets getInsets(SynthContext context, Insets insets) { return style.getInsets(context, insets); } + @Override public int getInt(SynthContext context, Object key, int defaultValue) { return style.getInt(context, key, defaultValue); } + @Override public SynthPainter getPainter(final SynthContext context) { return new SynthPainter() { public void paintInternalFrameBackground(SynthContext context, @@ -63,19 +72,23 @@ class TranslucentSynthSytle extends SynthStyle { }; } + @Override public String getString(SynthContext context, Object key, String defaultValue) { return style.getString(context, key, defaultValue); } + @Override public void installDefaults(SynthContext context) { style.installDefaults(context); } + @Override public void uninstallDefaults(SynthContext context) { style.uninstallDefaults(context); } + @Override public boolean isOpaque(SynthContext context) { if (context.getRegion() == Region.INTERNAL_FRAME) { return false; diff --git a/Mage.Client/src/main/java/mage/client/components/ext/ShadowLabel.java b/Mage.Client/src/main/java/mage/client/components/ext/ShadowLabel.java index d1094d08fba..d60cc6784ef 100644 --- a/Mage.Client/src/main/java/mage/client/components/ext/ShadowLabel.java +++ b/Mage.Client/src/main/java/mage/client/components/ext/ShadowLabel.java @@ -60,6 +60,8 @@ public class ShadowLabel extends JLabel { this.invertColors = invertColors; } + + @Override public void setText(String text) { this.text = text; repaint(); diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java index 77125fcc67f..9846764b5a4 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java @@ -338,6 +338,8 @@ public class ConnectDialog extends MageDialog { ); txtPort.addKeyListener(new java.awt.event.KeyAdapter() { + + @Override public void keyTyped(java.awt.event.KeyEvent evt) { ConnectDialog.this.keyTyped(evt); } diff --git a/Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java b/Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java index f3f8e826a46..bb3dbf739d6 100644 --- a/Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java +++ b/Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java @@ -38,6 +38,8 @@ public class CombatDialog extends MageDialog { JPanel contentPane = new JPanel() { private static final long serialVersionUID = -8283955788355547309L; + + @Override public void paintComponent(Graphics g) { g.setColor(new Color(50, 50, 50, 100)); g.fillRect(0, 0, getWidth(), getHeight()); diff --git a/Mage.Client/src/main/java/mage/client/util/audio/MusicPlayer.java b/Mage.Client/src/main/java/mage/client/util/audio/MusicPlayer.java index e7331c4e1a6..cd1613bbcaf 100644 --- a/Mage.Client/src/main/java/mage/client/util/audio/MusicPlayer.java +++ b/Mage.Client/src/main/java/mage/client/util/audio/MusicPlayer.java @@ -119,6 +119,8 @@ public class MusicPlayer { } + + @Override public void run() { try { TimeUnit.MILLISECONDS.sleep(100); @@ -146,6 +148,8 @@ public class MusicPlayer { final byte[] tempBuffer = new byte[320]; + + @Override public void run() { try { sourceDataLine.flush(); diff --git a/Mage.Client/src/main/java/mage/client/util/gui/Arrow.java b/Mage.Client/src/main/java/mage/client/util/gui/Arrow.java index f44cb98cdd9..6dfcc49c23f 100644 --- a/Mage.Client/src/main/java/mage/client/util/gui/Arrow.java +++ b/Mage.Client/src/main/java/mage/client/util/gui/Arrow.java @@ -32,6 +32,8 @@ public class Arrow extends JPanel { setOpacity(0.6f); } + + @Override protected void paintComponent(Graphics g) { super.paintComponent(g); float ex = endX - startX; diff --git a/Mage.Common/src/main/java/mage/components/ImagePanel.java b/Mage.Common/src/main/java/mage/components/ImagePanel.java index c71e0dd6544..8d6be1e2031 100644 --- a/Mage.Common/src/main/java/mage/components/ImagePanel.java +++ b/Mage.Common/src/main/java/mage/components/ImagePanel.java @@ -56,6 +56,8 @@ public class ImagePanel extends JPanel { super.add(component, constraints); } + + @Override protected void paintComponent(Graphics g) { super.paintComponent(g); diff --git a/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java b/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java index c6c2631c2fe..d22df10203b 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java @@ -39,8 +39,6 @@ import java.util.UUID; */ public class HideawayAbility extends StaticAbility { - private final String name; - public HideawayAbility() { this("land"); } @@ -126,7 +124,7 @@ class HideawayLookAtFaceDownCardEffect extends AsThoughEffectImpl { staticText = "You may look at cards exiled with {this}"; } - public HideawayLookAtFaceDownCardEffect(final HideawayLookAtFaceDownCardEffect effect) { + private HideawayLookAtFaceDownCardEffect(final HideawayLookAtFaceDownCardEffect effect) { super(effect); } diff --git a/Mage/src/main/java/mage/cards/decks/importer/PlainTextDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/PlainTextDeckImporter.java index c9d99d3aaee..14683d66ab8 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/PlainTextDeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/PlainTextDeckImporter.java @@ -59,6 +59,8 @@ public abstract class PlainTextDeckImporter extends DeckImporter { return deckList; } + + @Override public DeckCardLists importDeck(String file) { return importDeck(file, null); } diff --git a/Mage/src/main/java/mage/filter/common/FilterCreaturePlayerOrPlaneswalker.java b/Mage/src/main/java/mage/filter/common/FilterCreaturePlayerOrPlaneswalker.java index c9b8990f344..195bc29124c 100644 --- a/Mage/src/main/java/mage/filter/common/FilterCreaturePlayerOrPlaneswalker.java +++ b/Mage/src/main/java/mage/filter/common/FilterCreaturePlayerOrPlaneswalker.java @@ -58,10 +58,6 @@ public class FilterCreaturePlayerOrPlaneswalker extends FilterPermanentOrPlayer return this.creatureFilter; } - public FilterPlayer getPlayerFilter() { - return this.playerFilter; - } - public FilterPlaneswalkerPermanent getPlaneswalkerFilter() { return this.planeswalkerFilter; }