Changeset 1435

Timestamp:

03/06/14 10:28:28 (10 years ago)

Author:

pharms

Message:

• extended parsing of HTML log files to support further case study

Location:

trunk/autoquest-plugin-html

Files:

• data/guimappings/guimapping-html.txt (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/plugin/html/HTMLLogParser.java (modified) (3 diffs)
• src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseDirHTML.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseHTML.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/plugin/html/eventcore/HTMLEventTypeFactory.java (modified) (1 diff)

trunk/autoquest-plugin-html/data/guimappings/guimapping-html.txt

@@ -127 +127 @@
 summary = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
 sup = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+svg = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLCanvas
 
 table = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel

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

@@ -155 +155 @@
 
             if (parent != null) {
+                if (!childrenMustBeConsidered(parent)) {
+                    return true;
+                }
+                
                 IGUIElement document = parent;
                 
@@ -196 +200 @@
 
                 specification = new HTMLPageElementSpec
-                    ((HTMLDocumentSpec) document.getSpecification(), tagName, htmlId, index);
+                    ((HTMLDocumentSpec) document.getSpecification(),
+                     tagName.intern(), htmlId == null ? null : htmlId.intern(), index);
                 
             }
@@ -624 +629 @@
     }
 
+    /**
+     * <p>
+     * checks if the children of a specified parent must be added to the GUI model or not.
+     * </p>
+     *
+     * @param parent the parent tag to check
+     * 
+     * @return true, if the child of the tag must be considered, false else
+     */
+    private boolean childrenMustBeConsidered(HTMLGUIElement parent) {
+        if (parent instanceof HTMLPageElement) {
+            return !"svg".equals(((HTMLPageElement) parent).getTagName());
+        }
+        else {
+            return true;
+        }
+    }
+
 }

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseDirHTML.java

@@ -69 +69 @@
                 }
                 else {
-                    Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w=\\[\\]\\(\\)/\\.]*)");
+                    Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w=\\[\\]\\(\\)/\\.-]*)");
                     Matcher matcher = parseParamPattern.matcher(param);
                     

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseHTML.java

@@ -64 +64 @@
                 }
                 else {
-                    Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w=\\[\\]\\(\\)/\\.]*)");
+                    Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w=\\[\\]\\(\\)/\\.-]*)");
                     Matcher matcher = parseParamPattern.matcher(param);
                     

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

@@ -138 +138 @@
             result = new KeyboardFocusChange();
         }
-        else if ("onunload".equals(eventName) || "onbeforeunload".equals(eventName) ||
+        else if ("onload".equals(eventName) ||
+                 "onunload".equals(eventName) || "onbeforeunload".equals(eventName) ||
                  "onpagehide".equals(eventName) || "onpageshow".equals(eventName) ||
                  "onsubmit".equals(eventName) || "onselect".equals(eventName) ||
-                 "onreset".equals(eventName))
+                 "onreset".equals(eventName) || "onabort".equals(eventName))
         {
             Console.traceln(Level.FINE, "Ignored event name \"" + eventName + "\"");