github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-12 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

Replaced mouseClicked by mousePressed everywhere (works betters). Rebuild everything.

Browse source
This commit is contained in:
magenoxx 2010-12-04 09:02:57 +00:00
parent 4c8344a8fd
commit fe3903d825
8 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Mage.Client/plugins/mage-card-plugin.jar
View file

Binary file not shown.

6
Mage.Client/src/main/java/mage/client/cards/Card.java
View file

@ -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

4
Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
View file

@ -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);
}

1
Mage.Common/src/mage/cards/action/ActionCallback.java
View file

@ -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);

4
Mage.Common/src/mage/cards/action/impl/EmptyCallback.java
View file

@ -28,4 +28,8 @@ public class EmptyCallback implements ActionCallback {
public void mouseClicked(MouseEvent e, TransferData data) {
}
@Override
public void mousePressed(MouseEvent e, TransferData data) {
}
}

12
Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java
View file

@ -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) {}

4
Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateCallback.java
View file

@ -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);
}

2
Mage.Plugins/Mage.Rating.Plugin/src/main/java/org/mage/plugins/rating/RateFrame.java
View file

@ -75,8 +75,6 @@ public class RateFrame extends JFrame {
}
});
add(rate);
System.out.println("test");
}
public void startRating() {