From e4b91416dd1ab03646fe6ee4372ef095c8373d1e Mon Sep 17 00:00:00 2001 From: drdev Date: Wed, 30 Oct 2013 14:00:37 +0000 Subject: [PATCH] Update DeckLister to use FMouseAdapter --- .../java/forge/gui/toolbox/FMouseAdapter.java | 6 ++++ .../forge/gui/toolbox/special/DeckLister.java | 34 ++++++++++--------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/main/java/forge/gui/toolbox/FMouseAdapter.java b/src/main/java/forge/gui/toolbox/FMouseAdapter.java index 9825814d9ae..c9c47df3958 100644 --- a/src/main/java/forge/gui/toolbox/FMouseAdapter.java +++ b/src/main/java/forge/gui/toolbox/FMouseAdapter.java @@ -205,4 +205,10 @@ public abstract class FMouseAdapter extends MouseAdapter { } } } + + @Override + public final void mouseClicked(MouseEvent e) { + //override mouseClicked as final to prevent it being used since it doesn't fire + //if the user moves the mouse at all between mouse down and mouse up + } } diff --git a/src/main/java/forge/gui/toolbox/special/DeckLister.java b/src/main/java/forge/gui/toolbox/special/DeckLister.java index 73c9c9aac98..83b6d2f9ea8 100644 --- a/src/main/java/forge/gui/toolbox/special/DeckLister.java +++ b/src/main/java/forge/gui/toolbox/special/DeckLister.java @@ -22,7 +22,6 @@ package forge.gui.toolbox.special; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics; -import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.List; @@ -48,6 +47,7 @@ import forge.gui.deckeditor.controllers.CEditorQuest; import forge.gui.framework.FScreen; import forge.gui.framework.ILocalRepaint; import forge.gui.toolbox.FLabel; +import forge.gui.toolbox.FMouseAdapter; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.JLabelSkin; import forge.item.InventoryItem; @@ -196,9 +196,9 @@ public class DeckLister extends JPanel implements ILocalRepaint { this.setBorderPainted(false); this.setToolTipText("Delete this deck"); - this.addMouseListener(new MouseAdapter() { + this.addMouseListener(new FMouseAdapter() { @Override - public void mouseEntered(final MouseEvent e) { + public void onMouseEnter(final MouseEvent e) { if (!r0.selected) { FSkin.get(r0).setBackground(DeckLister.this.clrHover); r0.setOpaque(true); @@ -206,7 +206,7 @@ public class DeckLister extends JPanel implements ILocalRepaint { } @Override - public void mouseExited(final MouseEvent e) { + public void onMouseExit(final MouseEvent e) { if (!r0.selected) { FSkin.get(r0).setBackground(DeckLister.this.clrDefault); r0.setOpaque(false); @@ -214,7 +214,7 @@ public class DeckLister extends JPanel implements ILocalRepaint { } @Override - public void mouseClicked(final MouseEvent e) { + public void onLeftClick(final MouseEvent e) { DeckLister.this.deleteDeck(r0); } }); @@ -235,9 +235,9 @@ public class DeckLister extends JPanel implements ILocalRepaint { this.setBorderPainted(false); this.setToolTipText("Edit this deck"); - this.addMouseListener(new MouseAdapter() { + this.addMouseListener(new FMouseAdapter() { @Override - public void mouseEntered(final MouseEvent e) { + public void onMouseEnter(final MouseEvent e) { if (!r0.selected) { FSkin.get(r0).setBackground(DeckLister.this.clrHover); r0.setOpaque(true); @@ -245,7 +245,7 @@ public class DeckLister extends JPanel implements ILocalRepaint { } @Override - public void mouseExited(final MouseEvent e) { + public void onMouseExit(final MouseEvent e) { if (!r0.selected) { FSkin.get(r0).setBackground(DeckLister.this.clrDefault); r0.setOpaque(false); @@ -253,7 +253,7 @@ public class DeckLister extends JPanel implements ILocalRepaint { } @Override - public void mouseClicked(final MouseEvent e) { + public void onLeftClick(final MouseEvent e) { DeckLister.this.editDeck(r0.getDeck()); } }); @@ -285,9 +285,9 @@ public class DeckLister extends JPanel implements ILocalRepaint { FSkin.get(this).setMatteBorder(0, 0, 1, 0, DeckLister.this.clrBorders); this.deck = d0; - this.addMouseListener(new MouseAdapter() { + this.addMouseListener(new FMouseAdapter() { @Override - public void mouseEntered(final MouseEvent e) { + public void onMouseEnter(final MouseEvent e) { RowPanel.this.hovered = true; if (!RowPanel.this.selected) { FSkin.get(((RowPanel) e.getSource())).setBackground(DeckLister.this.clrHover); @@ -296,7 +296,7 @@ public class DeckLister extends JPanel implements ILocalRepaint { } @Override - public void mouseExited(final MouseEvent e) { + public void onMouseExit(final MouseEvent e) { RowPanel.this.hovered = false; if (!RowPanel.this.selected) { FSkin.get(((RowPanel) e.getSource())).setBackground(DeckLister.this.clrDefault); @@ -305,13 +305,15 @@ public class DeckLister extends JPanel implements ILocalRepaint { } @Override - public void mousePressed(final MouseEvent e) { + public void onLeftMouseDown(final MouseEvent e) { if (e.getClickCount() == 1) { DeckLister.this.selectHandler((RowPanel) e.getSource()); } - else { //edit deck on double click - DeckLister.this.editDeck(RowPanel.this.deck); - } + } + + @Override + public void onLeftDblClick(final MouseEvent e) { + DeckLister.this.editDeck(RowPanel.this.deck); } }); }