- Timestamp:
- 03/06/14 10:28:28 (11 years ago)
- Location:
- trunk/autoquest-plugin-html
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/autoquest-plugin-html/data/guimappings/guimapping-html.txt
r1263 r1435 127 127 summary = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText 128 128 sup = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText 129 svg = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLCanvas 129 130 130 131 table = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel -
trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/HTMLLogParser.java
r1416 r1435 155 155 156 156 if (parent != null) { 157 if (!childrenMustBeConsidered(parent)) { 158 return true; 159 } 160 157 161 IGUIElement document = parent; 158 162 … … 196 200 197 201 specification = new HTMLPageElementSpec 198 ((HTMLDocumentSpec) document.getSpecification(), tagName, htmlId, index); 202 ((HTMLDocumentSpec) document.getSpecification(), 203 tagName.intern(), htmlId == null ? null : htmlId.intern(), index); 199 204 200 205 } … … 624 629 } 625 630 631 /** 632 * <p> 633 * checks if the children of a specified parent must be added to the GUI model or not. 634 * </p> 635 * 636 * @param parent the parent tag to check 637 * 638 * @return true, if the child of the tag must be considered, false else 639 */ 640 private boolean childrenMustBeConsidered(HTMLGUIElement parent) { 641 if (parent instanceof HTMLPageElement) { 642 return !"svg".equals(((HTMLPageElement) parent).getTagName()); 643 } 644 else { 645 return true; 646 } 647 } 648 626 649 } -
trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseDirHTML.java
r1354 r1435 69 69 } 70 70 else { 71 Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w=\\[\\]\\(\\)/\\. ]*)");71 Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w=\\[\\]\\(\\)/\\.-]*)"); 72 72 Matcher matcher = parseParamPattern.matcher(param); 73 73 -
trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseHTML.java
r1354 r1435 64 64 } 65 65 else { 66 Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w=\\[\\]\\(\\)/\\. ]*)");66 Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w=\\[\\]\\(\\)/\\.-]*)"); 67 67 Matcher matcher = parseParamPattern.matcher(param); 68 68 -
trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/eventcore/HTMLEventTypeFactory.java
r1354 r1435 138 138 result = new KeyboardFocusChange(); 139 139 } 140 else if ("onunload".equals(eventName) || "onbeforeunload".equals(eventName) || 140 else if ("onload".equals(eventName) || 141 "onunload".equals(eventName) || "onbeforeunload".equals(eventName) || 141 142 "onpagehide".equals(eventName) || "onpageshow".equals(eventName) || 142 143 "onsubmit".equals(eventName) || "onselect".equals(eventName) || 143 "onreset".equals(eventName) )144 "onreset".equals(eventName) || "onabort".equals(eventName)) 144 145 { 145 146 Console.traceln(Level.FINE, "Ignored event name \"" + eventName + "\"");
Note: See TracChangeset
for help on using the changeset viewer.