Changeset 995

Timestamp:

11/15/12 19:55:45 (12 years ago)

Author:

pharms

Message:

• added detection of drag and drop

Location:

trunk

Files:

• autoquest-core-events-test/src/test/java/de/ugoe/cs/autoquest/eventcore/gui/MouseClickCondenserTest.java (modified) (2 diffs)
• autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/MouseClickCondenser.java (modified) (5 diffs)
• autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/MouseDragAndDrop.java (added)

trunk/autoquest-core-events-test/src/test/java/de/ugoe/cs/autoquest/eventcore/gui/MouseClickCondenserTest.java

@@ -146 +146 @@
         simulateEvent(new MouseClick(leftBtn, 1, 1), element1);
         assertCondensedMouseClicks("", "", "click left elem1", "", "", "click middle elem1",
-                                   "", "", "click left elem1");
+                                   "drag left elem1", "click left elem1");
+    }
+
+    /**
+     *
+     */
+    @Test
+    public void testDragAndDrop() {
+        MouseButtonInteraction.Button leftBtn = MouseButtonInteraction.Button.LEFT;
+        MouseButtonInteraction.Button middleBtn = MouseButtonInteraction.Button.MIDDLE;
+        MouseButtonInteraction.Button rightBtn = MouseButtonInteraction.Button.RIGHT;
+
+        IGUIElement element1 = new DummyGUIElement("elem1");
+
+        simulateEvent(new MouseButtonDown(leftBtn, 0, 0), element1);
+        simulateEvent(new MouseButtonUp(leftBtn, 1, 0), element1);
+        assertCondensedMouseClicks("drag left elem1");
+
+        simulateEvent(new MouseButtonDown(leftBtn, 0, 0), element1);
+        simulateEvent(new MouseButtonUp(leftBtn, 1, 1), element1);
+        assertCondensedMouseClicks("drag left elem1", "drag left elem1");
+
+        simulateEvent(new MouseButtonDown(leftBtn, 0, 0), element1);
+        simulateEvent(new MouseButtonUp(leftBtn, 0, 1), element1);
+        simulateEvent(new MouseClick(leftBtn, 0, 0), element1);
+        assertCondensedMouseClicks("drag left elem1", "drag left elem1", "drag left elem1",
+                                   "click left elem1");
+
+        simulateEvent(new MouseButtonDown(middleBtn, 1, 0), element1);
+        simulateEvent(new MouseButtonUp(middleBtn, 0, 0), element1);
+        simulateEvent(new MouseClick(middleBtn, 0, 0), element1);
+        assertCondensedMouseClicks("drag left elem1", "drag left elem1", "drag left elem1",
+                                   "click left elem1", "", "", "click middle elem1");
+
+        simulateEvent(new MouseButtonDown(rightBtn, 0, 1), element1);
+        simulateEvent(new MouseButtonUp(rightBtn, 0, 0), element1);
+        simulateEvent(new MouseClick(rightBtn, 0, 0), element1);
+        assertCondensedMouseClicks("drag left elem1", "drag left elem1", "drag left elem1",
+                                   "click left elem1", "", "", "click middle elem1",
+                                   "", "", "click right elem1");
     }
 
@@ -175 +214 @@
                     assertTrue(result.get(i).getType() instanceof MouseClick);
                 }
+                else if ("drag".equals(parts[0])) {
+                    assertTrue(result.get(i).getType() instanceof MouseDragAndDrop);
+                }
                 else {
                     fail("invalid assertion in test case");

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

@@ -30 +30 @@
  * condensed to the mouse click event.
  * </p>
- * TODO correctly identify drag and drop
  * 
  * @version 1.0
@@ -78 +77 @@
                     mouseClickHandled = true;
                 }
+                else if (mouseDragAndDropSequenceFound(mbDown, mbUp)) {
+                    // skip the mouse button down and mouse button up event and add a mouse click
+                    index += 2;
+                    resultingSequence.add(createDragAndDrop(mbDown, mbUp));
+                    mouseClickHandled = true;
+                }
             }
 
@@ -105 +110 @@
         }
 
-        IEventTarget eventTarget = mouseButtonDown.getTarget();
-
-        if (!eventTarget.equals(mouseClick.getTarget())) {
-            return false;
-        }
-
-        MouseButtonInteraction.Button button =
-            ((MouseButtonDown) mouseButtonDown.getType()).getButton();
-
-        if (!button.equals(((MouseClick) mouseClick.getType()).getButton())) {
-            return false;
-        }
-
-        int x = ((MouseButtonDown) mouseButtonDown.getType()).getX();
-
-        if (x != ((MouseClick) mouseClick.getType()).getX()) {
-            return false;
-        }
-        
-        int y = ((MouseButtonDown) mouseButtonDown.getType()).getY();
-
-        if (y != ((MouseClick) mouseClick.getType()).getY()) {
+        if (!targetsEqual(mouseButtonDown, mouseClick)) {
+            return false;
+        }
+        
+        if (!buttonsEqual(mouseButtonDown, mouseClick)) {
+            return false;
+        }
+
+        if (!coordinatesEqual(mouseButtonDown, mouseClick)) {
             return false;
         }
@@ -149 +141 @@
         }
 
-        IEventTarget eventTarget = mouseButtonDown.getTarget();
-
-        if (!eventTarget.equals(mouseButtonUp.getTarget())) {
-            return false;
-        }
-
+        if (!targetsEqual(mouseButtonDown, mouseButtonUp)) {
+            return false;
+        }
+        
+        if (!buttonsEqual(mouseButtonDown, mouseButtonUp)) {
+            return false;
+        }
+
+        if (!coordinatesEqual(mouseButtonDown, mouseButtonUp)) {
+            return false;
+        }
+        
+        return true;
+    }
+
+    /**
+     * 
+     */
+    private boolean mouseDragAndDropSequenceFound(Event mouseButtonDown,
+                                                  Event mouseButtonUp)
+    {
+        // check the first in a row of three for validity
+        if (!(mouseButtonDown.getType() instanceof MouseButtonDown)) {
+            return false;
+        }
+
+        // check the second node for validity
+        if (!(mouseButtonUp.getType() instanceof MouseButtonUp)) {
+            return false;
+        }
+
+        if (!targetsEqual(mouseButtonDown, mouseButtonUp)) {
+            return false;
+        }
+        
         MouseButtonInteraction.Button button =
             ((MouseButtonDown) mouseButtonDown.getType()).getButton();
-
-        if (!button.equals(((MouseButtonUp) mouseButtonUp.getType()).getButton())) {
-            return false;
-        }
-
-        int x = ((MouseButtonDown) mouseButtonDown.getType()).getX();
-
-        if (x != ((MouseButtonUp) mouseButtonUp.getType()).getX()) {
-            return false;
-        }
-        
-        int y = ((MouseButtonDown) mouseButtonDown.getType()).getY();
-
-        if (y != ((MouseButtonUp) mouseButtonUp.getType()).getY()) {
+        
+        if (MouseButtonInteraction.Button.LEFT != button) {
+            return false;
+        }
+        
+        if (!buttonsEqual(mouseButtonDown, mouseButtonUp)) {
+            return false;
+        }
+
+        if (coordinatesEqual(mouseButtonDown, mouseButtonUp)) {
             return false;
         }
@@ -190 +207 @@
     }
 
+    /**
+     *
+     */
+    private Event createDragAndDrop(Event mouseButtonDown, Event mouseButtonUp) {
+        int xStart = ((MouseButtonDown) mouseButtonDown.getType()).getX();
+        int yStart = ((MouseButtonDown) mouseButtonDown.getType()).getY();
+        int xEnd = ((MouseButtonUp) mouseButtonUp.getType()).getX();
+        int yEnd = ((MouseButtonUp) mouseButtonUp.getType()).getY();
+
+        return new Event
+            (new MouseDragAndDrop(xStart, yStart, xEnd, yEnd), mouseButtonDown.getTarget());
+    }
+
+    /**
+     *
+     */
+    private boolean targetsEqual(Event event1, Event event2) {
+        IEventTarget target1 = event1.getTarget();
+        IEventTarget target2 = event2.getTarget();
+
+        return target1 == null ? target2 == null : target1.equals(target2);
+    }
+
+    /**
+     *
+     */
+    private boolean buttonsEqual(Event event1, Event event2) {
+        MouseButtonInteraction.Button button1 =
+            (event1.getType() instanceof MouseButtonInteraction) ?
+                ((MouseButtonInteraction) event1.getType()).getButton() : null;
+                
+        MouseButtonInteraction.Button button2 =
+            (event2.getType() instanceof MouseButtonInteraction) ?
+                ((MouseButtonInteraction) event2.getType()).getButton() : null;
+
+        return button1 == null ? button2 == null : button1.equals(button2);
+    }
+
+    /**
+     *
+     */
+    private boolean coordinatesEqual(Event event1, Event event2) {
+        int x1 =
+            (event1.getType() instanceof MouseButtonInteraction) ?
+                ((MouseButtonInteraction) event1.getType()).getX() : -1;
+               
+        int x2 =
+            (event2.getType() instanceof MouseButtonInteraction) ?
+                ((MouseButtonInteraction) event2.getType()).getX() : -1;
+                
+        if ((x1 == -1) || (x1 != x2)) {
+            return false;
+        }
+
+        int y1 =
+            (event1.getType() instanceof MouseButtonInteraction) ?
+                ((MouseButtonInteraction) event1.getType()).getY() : -1;
+                           
+        int y2 =
+            (event2.getType() instanceof MouseButtonInteraction) ?
+                ((MouseButtonInteraction) event2.getType()).getY() : -1;
+
+        return (y1 != -1) && (y1 == y2);
+   }
+
 }