Changeset 945 for trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/MouseButtonDown.java

Timestamp:

10/26/12 10:13:40 (12 years ago)

Author:

pharms

Message:

• added support for mouse click coordinates

File:

• trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/MouseButtonDown.java (modified) (4 diffs)

trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/MouseButtonDown.java

@@ -37 +37 @@
      * </p>
      * 
-     * @see MouseButtonInteraction#MouseButtonInteraction(Button)
+     * @see MouseButtonInteraction#MouseButtonInteraction(Button,int,int)
      */
-    public MouseButtonDown(Button button) {
-        super(button);
+    public MouseButtonDown(Button button, int x, int y) {
+        super(button, x, y);
     }
 
@@ -71 +71 @@
     public String toString() {
         if (super.getButton() == Button.LEFT) {
-            return "left mouse button down";
+            return "left mouse button down (" + getX() + "," + getY() + ")";
         }
         else if (super.getButton() == Button.MIDDLE) {
-            return "middle mouse button down";
+            return "middle mouse button down (" + getX() + "," + getY() + ")";
         }
         else if (super.getButton() == Button.RIGHT) {
-            return "right mouse button down";
+            return "right mouse button down (" + getX() + "," + getY() + ")";
         }
         else {
-            return "unknown mouse button down";
+            return "unknown mouse button down (" + getX() + "," + getY() + ")";
         }
     }
@@ -110 +110 @@
     public boolean equals(Object obj) {
         if (obj instanceof MouseButtonDown) {
-            return getButton().equals(((MouseButtonDown) obj).getButton());
+            return
+                getButton().equals(((MouseButtonDown) obj).getButton()) &&
+                (getX() == ((MouseButtonDown) obj).getX()) &&
+                (getY() == ((MouseButtonDown) obj).getY());
         }
         return false;
@@ -122 +125 @@
     @Override
     public int hashCode() {
-        return getButton().hashCode();
+        return getButton().hashCode() + getX() + getY();
     }