Changeset 1174 for trunk

Timestamp:

04/24/13 11:45:41 (12 years ago)

Author:

ftrautsch

Message:

Modified Method "checkEventParameterCombinations" - onchange Event because of the input_password bug

File:

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

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

@@ -314 +314 @@
                     }
                     else if (checkEventParameterCombinations
-                                (eventType, coordinates, key, scrollPosition, selectedValue))
+                                (eventType, coordinates, key, scrollPosition, selectedValue, domPath))
                     {
                         HtmlPageElement target =
@@ -481 +481 @@
      * @param scrollPosition the scroll position of the event
      * @param selectedValue  the value selected through a specific event
+     * @param domPath            the path through the DOM of the document of the HTML element on which
+     *                       the event was executed
      * 
      * @return true, if the combination of the parameters is valid, false else
@@ -488 +490 @@
                                                     Integer   key,
                                                     Integer[] scrollPosition,
-                                                    String    selectedValue)
+                                                    String    selectedValue,
+                                                    String    domPath)
     {
         boolean result = false;
@@ -513 +516 @@
         }
         else if ("onchange".equals(eventType)) {
-            if ((coordinates == null) && (key == null) &&
-                (scrollPosition == null) && (selectedValue != null))
-            {
-                result = true;
+            // "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 {
-                Console.printerrln(eventType + " event has invalid parameters");
-            }
+                if ((coordinates == null) && (key == null) && (scrollPosition == null) &&
+                    (selectedValue != null))
+                {
+                    result = true;
+                }
+                else {
+                    Console.printerrln(eventType + " event has invalid parameters");
+                }
+            }
+
         }
         else if ("onkeypress".equals(eventType) || "onkeydown".equals(eventType) ||