Changeset 1228 for trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest

Timestamp:

06/26/13 15:31:31 (11 years ago)

Author:

pharms

Message:

• improved error messages for invalid data

File:

• trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServlet.java (modified) (3 diffs)

trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServlet.java

@@ -506 +506 @@
         
         if ("onscroll".equals(eventType)) {
-            if ((coordinates == null) && (key == null) &&
-                (scrollPosition != null) && (selectedValue == null))
-            {
-                result = true;
+            result =
+                (coordinates == null) && (key == null) &&
+                (scrollPosition != null) && (selectedValue == null);
+        }
+        else if ("onclick".equals(eventType) || "ondblclick".equals(eventType)) {
+            result =
+                (coordinates != null) && (key == null) &&
+                (scrollPosition == null) && (selectedValue == null);
+        }
+        else if ("onchange".equals(eventType)) {
+            // "input_password" don't have a selectedValue
+            if (domPath.contains("input_password")) {
+                result =
+                    (coordinates == null) && (key == null) &&
+                    (scrollPosition == null) && (selectedValue == null);
             }
             else {
-                Console.printerrln(eventType + " event has invalid parameters");
-            }
-        }
-        else if ("onclick".equals(eventType) || "ondblclick".equals(eventType)) {
-            if ((coordinates != null) && (key == null) &&
-                (scrollPosition == null) && (selectedValue == null))
-            {
-                result = true;
-            }
-            else {
-                Console.printerrln(eventType + " event has invalid parameters");
-            }
-        }
-        else if ("onchange".equals(eventType)) {
-            // "input_password" dont have a selectedValue
-            if (domPath.contains("input_password")) {
-                if ((coordinates == null) && (key == null) && (scrollPosition == null)) {
-                    result = true;
-                }
-                else {
-                    Console.printerrln(eventType + " event has invalid parameters");
-                }
-            }
-            else {
-                if ((coordinates == null) && (key == null) && (scrollPosition == null) &&
-                    (selectedValue != null))
-                {
-                    result = true;
-                }
-                else {
-                    Console.printerrln(eventType + " event has invalid parameters");
-                }
+                result =
+                    (coordinates == null) && (key == null) &&
+                    (scrollPosition == null) && (selectedValue != null);
             }
 
@@ -550 +532 @@
                  "onkeyup".equals(eventType))
         {
-            if ((coordinates == null) && (key != null) &&
-                (scrollPosition == null) && (selectedValue == null))
-            {
-                result = true;
-            }
-            else {
-                Console.printerrln(eventType + " event has invalid parameters");
-            }
+            result =
+                (coordinates == null) && (key != null) &&
+                (scrollPosition == null) && (selectedValue == null);
         }
         else if ("onfocus".equals(eventType) || "onmouseout".equals(eventType) ||
@@ -569 +546 @@
                  "onselect".equals(eventType))
         {
-            if ((coordinates == null) && (key == null) &&
-                (scrollPosition == null) && (selectedValue == null))
-            {
-                result = true;
-            }
-            else {
-                Console.printerrln(eventType + " event has invalid parameters");
-            }
+            result =
+                (coordinates == null) && (key == null) &&
+                (scrollPosition == null) && (selectedValue == null);
         }
         else {
             Console.printerrln("'" + eventType + "' is not a valid event type");
+        }
+        
+        if (!result) {
+            Console.printerrln(eventType + " event has invalid parameters");
+            Console.printerrln("coordinates: " + coordinates);
+            Console.printerrln("key: " + key);
+            Console.printerrln("scrollPosition: " + scrollPosition);
+            Console.printerrln("selectedValue: " + selectedValue);
         }