diff --git a/Mage.Client/plugins/mage-card-plugin.jar b/Mage.Client/plugins/mage-card-plugin.jar index fe84c771b32..4e2d0e415b6 100644 Binary files a/Mage.Client/plugins/mage-card-plugin.jar and b/Mage.Client/plugins/mage-card-plugin.jar differ diff --git a/Mage.Client/src/main/java/mage/client/cards/Card.java b/Mage.Client/src/main/java/mage/client/cards/Card.java index 3ef775dec75..4b87aeb9d5d 100644 --- a/Mage.Client/src/main/java/mage/client/cards/Card.java +++ b/Mage.Client/src/main/java/mage/client/cards/Card.java @@ -352,12 +352,12 @@ public class Card extends MagePermanent implements MouseMotionListener, MouseLis @Override public void mouseClicked(MouseEvent e) { - requestFocusInWindow(); - callback.mouseClicked(e, gameId, session, card); } @Override - public void mousePressed(MouseEvent arg0) { + public void mousePressed(MouseEvent e) { + requestFocusInWindow(); + callback.mouseClicked(e, gameId, session, card); } @Override diff --git a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java index a066a511437..1ff47e10a24 100644 --- a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java +++ b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java @@ -54,6 +54,10 @@ public class MageActionCallback implements ActionCallback { @Override public void mouseClicked(MouseEvent e, TransferData data) { + } + + @Override + public void mousePressed(MouseEvent e, TransferData data) { data.component.requestFocusInWindow(); defaultCallback.mouseClicked(e, data.gameId, session, data.card); } diff --git a/Mage.Common/src/mage/cards/action/ActionCallback.java b/Mage.Common/src/mage/cards/action/ActionCallback.java index 405f84e3412..4de450a7c9c 100644 --- a/Mage.Common/src/mage/cards/action/ActionCallback.java +++ b/Mage.Common/src/mage/cards/action/ActionCallback.java @@ -4,6 +4,7 @@ import java.awt.event.MouseEvent; public interface ActionCallback { void mouseClicked(MouseEvent e, TransferData data); + void mousePressed(MouseEvent e, TransferData data); void mouseMoved(MouseEvent e, TransferData data); void mouseEntered(MouseEvent e, TransferData data); void mouseExited(MouseEvent e, TransferData dat); diff --git a/Mage.Common/src/mage/cards/action/impl/EmptyCallback.java b/Mage.Common/src/mage/cards/action/impl/EmptyCallback.java index 5aa18de2fa8..5aeac436586 100644 --- a/Mage.Common/src/mage/cards/action/impl/EmptyCallback.java +++ b/Mage.Common/src/mage/cards/action/impl/EmptyCallback.java @@ -28,4 +28,8 @@ public class EmptyCallback implements ActionCallback { public void mouseClicked(MouseEvent e, TransferData data) { } + @Override + public void mousePressed(MouseEvent e, TransferData data) { + } + } diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java index 43d70268dca..95162b555b8 100644 --- a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java +++ b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java @@ -37,7 +37,6 @@ import org.apache.log4j.Logger; import org.mage.card.arcane.ScaledImagePanel.MultipassType; import org.mage.card.arcane.ScaledImagePanel.ScalingType; import org.mage.plugins.card.images.ImageCache; -import org.mage.plugins.card.utils.BufferedImageBuilder; import org.mage.plugins.card.utils.ImagePanel; import org.mage.plugins.card.utils.impl.ImageManagerImpl; @@ -558,10 +557,6 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti @Override public void mouseClicked(MouseEvent e) { - data.component = this; - data.card = this.gameCard; - data.gameId = this.gameId; - callback.mouseClicked(e, data); } @Override @@ -602,7 +597,12 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti } @Override - public void mousePressed(MouseEvent e) {} + public void mousePressed(MouseEvent e) { + data.component = this; + data.card = this.gameCard; + data.gameId = this.gameId; + callback.mousePressed(e, data); + } @Override public void mouseReleased(MouseEvent e) {} diff --git a/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateCallback.java b/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateCallback.java index 2f22f93abab..984806d74e4 100644 --- a/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateCallback.java +++ b/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateCallback.java @@ -30,6 +30,10 @@ public class RateCallback implements ActionCallback { @Override public void mouseClicked(MouseEvent arg0, TransferData arg1) { + } + + @Override + public void mousePressed(MouseEvent arg0, TransferData arg1) { this.callback.reportResult(card1, card2); } diff --git a/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateFrame.java b/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateFrame.java index 01ab5691595..846a784937b 100644 --- a/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateFrame.java +++ b/Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateFrame.java @@ -75,8 +75,6 @@ public class RateFrame extends JFrame { } }); add(rate); - - System.out.println("test"); } public void startRating() {