Changeset 1069 for trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/eventcore/HTMLEventTypeFactory.java

Timestamp:

02/14/13 15:20:07 (11 years ago)

Author:

pharms

Message:

• support of new HTML logging format

File:

• trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/eventcore/HTMLEventTypeFactory.java (modified) (4 diffs)

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/eventcore/HTMLEventTypeFactory.java

@@ -23 +23 @@
 import de.ugoe.cs.autoquest.eventcore.gui.MouseButtonInteraction;
 import de.ugoe.cs.autoquest.eventcore.gui.MouseClick;
+import de.ugoe.cs.autoquest.eventcore.gui.MouseDoubleClick;
 import de.ugoe.cs.autoquest.eventcore.gui.Scroll;
 import de.ugoe.cs.autoquest.eventcore.gui.TextInput;
@@ -76 +77 @@
 
         if ("onscroll".equals(eventName)) {
-            int[] coordinates = getCoordinateParameter(eventName, eventParameters);
+            int[] coordinates =
+                getCoordinateParameter("scrollX", "scrollY", eventName, eventParameters);
+            
             result = new Scroll(coordinates[0], coordinates[1]);
         }
         else if ("onclick".equals(eventName)) {
-            int[] coordinates = getCoordinateParameter(eventName, eventParameters);
+            int[] coordinates = getCoordinateParameter("X", "Y", eventName, eventParameters);
             result =
                 new MouseClick(MouseButtonInteraction.Button.LEFT, coordinates[0], coordinates[1]);
+        }
+        else if ("ondblclick".equals(eventName)) {
+            int[] coordinates = getCoordinateParameter("X", "Y", eventName, eventParameters);
+            result = new MouseDoubleClick
+                (MouseButtonInteraction.Button.LEFT, coordinates[0], coordinates[1]);
         }
         else if ("onchange".equals(eventName)) {
@@ -118 +126 @@
      * @return
      */
-    private int[] getCoordinateParameter(String eventName, Map<String, String> eventParameters) {
-        String xCoord = eventParameters.get("X");
+    private int[] getCoordinateParameter(String              xParamName,
+                                         String              yParamName,
+                                         String              eventName,
+                                         Map<String, String> eventParameters)
+    {
+        String xCoord = eventParameters.get(xParamName);
         if (xCoord == null) {
-            throw new IllegalArgumentException("eventParameters do not contain X coordinate.");
+            throw new IllegalArgumentException
+                ("eventParameters do not contain " + xParamName + " coordinate.");
         }
 
-        String yCoord = eventParameters.get("Y");
+        String yCoord = eventParameters.get(yParamName);
         if (yCoord == null) {
-            throw new IllegalArgumentException("eventParameters do not contain Y coordinate.");
+            throw new IllegalArgumentException
+                ("eventParameters do not contain " + yParamName + " coordinate.");
         }
 
@@ -134 +148 @@
         }
         catch (NumberFormatException e) {
-            throw new IllegalArgumentException("the coordinates provided" + " of an " + eventName +
+            throw new IllegalArgumentException("the coordinates provided by an " + eventName +
                 " event are no numbers");
         }