Changeset 1056

Timestamp:

02/01/13 12:08:09 (12 years ago)

Author:

pharms

Message:

• extended comparison to also correctly compare mouse double clicks

File:

• trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/nodeequality/GUIEventTaskComparisonRule.java (modified) (3 diffs)

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/nodeequality/GUIEventTaskComparisonRule.java

@@ -3 +3 @@
 import de.ugoe.cs.autoquest.eventcore.gui.IInteraction;
 import de.ugoe.cs.autoquest.eventcore.gui.MouseClick;
+import de.ugoe.cs.autoquest.eventcore.gui.MouseDoubleClick;
 import de.ugoe.cs.autoquest.eventcore.gui.MouseDragAndDrop;
 import de.ugoe.cs.autoquest.eventcore.gui.TextInput;
@@ -91 +92 @@
             return compareMouseClicks((MouseClick) interaction1, (MouseClick) interaction2);
         }
+        else if ((interaction1 instanceof MouseDoubleClick) &&
+                 (interaction2 instanceof MouseDoubleClick))
+        {
+            return compareMouseDoubleClicks
+                ((MouseDoubleClick) interaction1, (MouseDoubleClick) interaction2);
+        }
         else if ((interaction1 instanceof MouseDragAndDrop) &&
                  (interaction2 instanceof MouseDragAndDrop))
@@ -187 +194 @@
     /**
      * <p>
+     * compares two mouse double clicks. If both double clicks have the same coordinates, they are
+     * lexically equal. Otherwise, they are semantically equal.
+     * </p>
+     *
+     * @param interaction1 the first mouse double click to compare
+     * @param interaction2 the second mouse double click to compare
+     * 
+     * @return as described
+     */
+    private NodeEquality compareMouseDoubleClicks(MouseDoubleClick interaction1,
+                                                  MouseDoubleClick interaction2)
+    {
+        int x1 = interaction1.getX();
+        int x2 = interaction2.getX();
+        int y1 = interaction1.getY();
+        int y2 = interaction2.getY();
+        
+        if ((x1 == x2) && (y1 == y2)) {
+            return NodeEquality.LEXICALLY_EQUAL;
+        }
+        else {
+            return NodeEquality.SEMANTICALLY_EQUAL;
+        }
+    }
+
+    /**
+     * <p>
      * compares two mouse drag and drops. If both drag and drops have the same start and end
      * coordinates, they are lexically equal. Otherwise, they are semantically equal.