Changeset 1069 for trunk/autoquest-plugin-html/src/main/java/de/ugoe

Timestamp:

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

Author:

pharms

Message:

• support of new HTML logging format

Location:

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

Files:

• AbstractDefaultLogParser.java (added)
• HTMLLogParser.java (modified) (1 diff)
• NewHTMLLogParser.java (deleted)
• OldHTMLLogParser.java (deleted)
• eventcore/HTMLEventTypeFactory.java (modified) (4 diffs)
• guimodel/HTMLDocument.java (moved) (moved from trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPage.java) (7 diffs)
• guimodel/HTMLDocumentSpec.java (moved) (moved from trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPageSpec.java) (8 diffs)
• guimodel/HTMLPageElement.java (modified) (7 diffs)
• guimodel/HTMLPageElementSpec.java (modified) (8 diffs)
• guimodel/HTMLServerSpec.java (modified) (2 diffs)

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

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.plugin.html;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
 
 import de.ugoe.cs.autoquest.eventcore.Event;
 import de.ugoe.cs.autoquest.eventcore.IEventType;
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
 import de.ugoe.cs.autoquest.plugin.html.eventcore.HTMLEventTypeFactory;
+import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLDocumentSpec;
 import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement;
 import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElementSpec;
 import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPageElementSpec;
-import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPageSpec;
 import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLServerSpec;
-import de.ugoe.cs.util.console.Console;
 
 /**
  * <p>
  * This class provides the functionality to parse XML log files generated by the HTMLMonitor of
- * autoquest. The result of parsing a file is a collection of event sequences.
+ * AutoQUEST. The result of parsing a file is a collection of event sequences and a GUI model
  * </p>
  * 
- * @author Fabian Glaser
+ * @author Fabian Glaser, Patrick Harms
  * @version 1.0
  * 
  */
-public class HTMLLogParser extends DefaultHandler {
+public class HTMLLogParser extends AbstractDefaultLogParser {
+    
+    /**
+     *
+     */
+    private Pattern htmlElementPattern =
+        Pattern.compile("(\\w+)(\\[(\\d+)\\]|\\(htmlId=([\\w-]+)\\))");
+
+    /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.plugin.html.AbstractDefaultLogParser#handleGUIElement(java.lang.String, java.util.Map)
+     */
+    @Override
+    protected boolean handleGUIElement(String id, Map<String, String> parameters)
+        throws SAXException
+    {
+        HTMLGUIElementSpec specification = null;
+        
+        String parentId = parameters.get("parent");
+        IGUIElement parent = super.getGUIElementTree().find(parentId);
+
+        if (parameters.containsKey("host")) {
+            // this is a server specification
+            int port = 80;
+            String portStr = parameters.get(port);
+            
+            if (portStr != null) {
+                port = Integer.parseInt(portStr);
+            }
+            
+            specification = new HTMLServerSpec(parameters.get("host"), port);
+        }
+        else if (parameters.containsKey("path")) {
+            // this is a document specification
+            
+            if (parent != null) {
+                if (!(parent.getSpecification() instanceof HTMLServerSpec)) {
+                    throw new SAXException
+                        ("invalid log: parent GUI element of a document is not of type server");
+                }
+                
+                specification = new HTMLDocumentSpec
+                    ((HTMLServerSpec) parent.getSpecification(), parameters.get("path"),
+                     parameters.get("query"), parameters.get("title"));
+            }
+            else if (parentId == null) {
+                throw new SAXException("invalid log: a document has no parent id");
+            }
+        }
+        else if (parameters.containsKey("tagname")) {
+            String tagName = parameters.get("tagname");
+            
+            if (!tagNameMustBeConsidered(tagName)) {
+                return true;
+            }
+
+            if (parent != null) {
+                IGUIElement document = parent;
+                
+                while ((document != null) &&
+                       (!(document.getSpecification() instanceof HTMLDocumentSpec)))
+                {
+                    document = document.getParent();
+                }
+                
+                if (document == null) {
+                    throw new SAXException
+                        ("invalid log: parent hierarchy of a page element does not contain a " +
+                         "document");
+                }
+                
+                int index = -1;
+                String indexStr = parameters.get("index");
+
+                if ((indexStr != null) && (!"".equals(indexStr))) {
+                    index = Integer.parseInt(indexStr);
+                }
+
+                specification = new HTMLPageElementSpec
+                    ((HTMLDocumentSpec) document.getSpecification(), tagName,
+                     parameters.get("htmlid"), index);
+            }
+            else if (parentId == null) {
+                throw new SAXException("invalid log: a page element has no parent id");
+            }
+        }
+        else {
+            throw new SAXException("invalid log: unknown GUI element");
+        }
+
+        if (specification != null) {
+            super.getGUIElementTree().add(id, parentId, specification);
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.plugin.html.AbstractDefaultLogParser#handleEvent(java.lang.String, java.util.Map)
+     */
+    @Override
+    protected boolean handleEvent(String type, Map<String, String> parameters) throws SAXException {
+        String targetId = parameters.get("target");
+        
+        if (targetId == null) {
+            String targetDocument = parameters.get("targetDocument");
+            String targetDOMPath = parameters.get("targetDOMPath");
+            
+            if ((targetDocument == null) || (targetDOMPath == null)) {
+                throw new SAXException("event has no target defined");
+            }
+            
+            targetId = determineTargetId(targetDocument, targetDOMPath);
+            
+            if (targetId == null) {
+                // the target id can not be determined yet
+                return false;
+            }
+        }
+        
+        IGUIElement target = super.getGUIElementTree().find(targetId);
+        
+        if (target == null) {
+            // event not processable yet
+            return false;
+        }
+
+        IEventType eventType =
+            HTMLEventTypeFactory.getInstance().getEventType(type, parameters, target);
+        
+        Event event = new Event(eventType, target);
+
+        String timestampStr = parameters.get("timestamp");
+        
+        if (timestampStr != null) {
+            event.setTimestamp(Long.parseLong(timestampStr));
+        }
+
+        ((HTMLGUIElement) event.getTarget()).markUsed();
+        
+        super.addToSequence(event);
+
+        return true;
+    }
+
     /**
      * <p>
-     * Constructor. Creates a new HTMLLogParser.
+     * TODO: comment
      * </p>
-     */
-    public HTMLLogParser() {
-        sequences = new LinkedList<List<Event>>();
+     *
+     * @param targetDocument
+     * @param targetDOMPath
+     * @return
+     */
+    private String determineTargetId(String targetDocument, String targetDOMPath)
+        throws SAXException
+    {
+        IGUIElement document = super.getGUIElementTree().find(targetDocument);
+        
+        if (document == null) {
+            return null;
+        }
+        
+        if (!(document.getSpecification() instanceof HTMLDocumentSpec)) {
+            throw new SAXException("an id that should refer to an HTML document refers to" +
+                                   "something else");
+        }
+        
+        GUIModel model = super.getGUIElementTree().getGUIModel();
+        IGUIElement child = document;
+        String[] pathElements = targetDOMPath.split("/");
+        int pathIndex = 0;
+        
+        HTMLPageElementSpec compareSpec;
+        String tagName;
+        int index;
+        String htmlId;
+        
+        while ((pathIndex < pathElements.length) && (child != null)) {
+            if ((pathElements[pathIndex] != null) && (!"".equals(pathElements[pathIndex]))) {           
+                Matcher matcher = htmlElementPattern.matcher(pathElements[pathIndex]);
+                if (!matcher.matches()) {
+                    throw new SAXException
+                        ("could not parse target DOM path element " + pathElements[pathIndex]);
+                }
+
+                tagName = matcher.group(1);
+                String indexStr = matcher.group(3);
+                htmlId = matcher.group(4);
+
+                index = -1;
+                if ((indexStr != null) && (!"".equals(indexStr))) {
+                    index = Integer.parseInt(indexStr);
+                }
+
+                compareSpec = new HTMLPageElementSpec
+                    ((HTMLDocumentSpec) document.getSpecification(), tagName, htmlId, index);
+
+                List<IGUIElement> children = model.getChildren(child);
+                child = null;
+
+                for (IGUIElement candidate : children) {
+                    if (compareSpec.getSimilarity(candidate.getSpecification())) {
+                        child = candidate;
+                        break;
+                    }
+                }
+            }
+            
+            pathIndex++;
+        }
+        
+        if (child != null) {
+            return super.getGUIElementTree().find(child);
+        }
+        else {
+            return null;
+        }
     }
 
     /**
      * <p>
-     * Collection of event sequences that is contained in the parsed log file.
+     * checks if tags with the provided name must be handled in the GUI model. As an example,
+     * it is not necessary to handle "head" tags and anything included in them. 
      * </p>
-     */
-    private Collection<List<Event>> sequences;
-
-    /**
-     * <p>
-     * Internal handle to the parsed GUI structure, stored in a GUIElementTree
-     * </p>
-     */
-    private GUIElementTree<String> currentGUIElementTree;
-
-    /**
-     * <p>
-     * Path of the GUI element currently being parsed.
-     * </p>
-     */
-    private String currentGUIElementPath;
-
-    /**
-     * <p>
-     * Path of the parent of the GUI element currently being parsed.
-     * </p>
-     */
-    private String currentParentPath;
-
-    /**
-     * <p>
-     * Source of the GUI element currently being parsed.
-     * </p>
-     */
-    private String currentEventSource;
-
-    /**
-     * <p>
-     * Timestamp of the event currently being parsed.
-     * </p>
-     */
-    private Long currentEventTimestamp;
-
-    /**
-     * <p>
-     * Internal handle to the parameters of the event currently being parsed.
-     * </p>
-     */
-    private Map<String, String> currentEventParameters;
-
-    /**
-     * <p>
-     * Internal handle to the parameters of the GUI element currently being parsed.
-     * </p>
-     */
-    private Map<String, String> currentGUIElementParameters;
-    /**
-     * <p>
-     * Internal handle to the sequence currently being parsed.
-     * </p>
-     */
-    private List<Event> currentSequence;
-
-    /**
-     * <p>
-     * Internal handle to type of the event currently being parsed.
-     * </p>
-     */
-    private String currentEventType;
-
-    /**
-     * <p>
-     * Class of the GUI element currently being parsed.
-     * </p>
-     */
-    private String currentGUIElementClass;
-
-    /**
-     * <p>
-     * Index of the GUI element currently being parsed.
-     * </p>
-     */
-    private String currentGUIElementIndex;
-
-    /**
-     * <p>
-     * internal handle to the GUI element of the previous event to be potentially reused for the
-     * current
-     * </p>
-     */
-    private IGUIElement lastGUIElement;
-
-    /**
-     * <p>
-     * internal handle to the server specification currently being used.
-     * </p>
-     */
-    private HTMLServerSpec currentServerSpec;
-
-    /**
-     * <p>
-     * Parses a log file written by the HTMLMonitor and creates a collection of event sequences.
-     * </p>
-     * 
-     * @param filename
-     *            name and path of the log file
-     */
-    public void parseFile(String filename) {
-        if (filename == null) {
-            throw new IllegalArgumentException("filename must not be null");
-        }
-
-        parseFile(new File(filename));
-    }
-
-    /**
-     * <p>
-     * Parses a log file written by the HTMLMonitor and creates a collection of event sequences.
-     * </p>
-     * 
-     * @param file
-     *            file to be parsed
-     */
-    public void parseFile(File file) {
-        if (file == null) {
-            throw new IllegalArgumentException("file must not be null");
-        }
-        SAXParserFactory spf = SAXParserFactory.newInstance();
-        spf.setValidating(true);
-        SAXParser saxParser = null;
-        InputSource inputSource = null;
-        try {
-            saxParser = spf.newSAXParser();
-            inputSource =
-                new InputSource(new InputStreamReader(new FileInputStream(file), "UTF-8"));
-        }
-        catch (UnsupportedEncodingException e) {
-            Console.printerr("Error parsing file " + file.getName());
-            Console.logException(e);
-            return;
-        }
-        catch (ParserConfigurationException e) {
-            Console.printerr("Error parsing file " + file.getName());
-            Console.logException(e);
-            return;
-        }
-        catch (SAXException e) {
-            Console.printerr("Error parsing file " + file.getName());
-            Console.logException(e);
-        }
-        catch (FileNotFoundException e) {
-            Console.printerr("Error parsing file " + file.getName());
-            Console.logException(e);
-        }
-        if (inputSource != null) {
-            inputSource.setSystemId("file://" + file.getAbsolutePath());
-            try {
-                if (saxParser == null) {
-                    throw new RuntimeException("SaxParser creation failed");
-                }
-                saxParser.parse(inputSource, this);
-            }
-            catch (SAXParseException e) {
-                Console.printerrln("Failure parsing file in line " + e.getLineNumber() +
-                    ", column " + e.getColumnNumber() + ".");
-                Console.logException(e);
-            }
-            catch (SAXException e) {
-                Console.printerr("Error parsing file " + file.getName());
-                Console.logException(e);
-                return;
-            }
-            catch (IOException e) {
-                Console.printerr("Error parsing file " + file.getName());
-                Console.logException(e);
-                return;
-            }
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, java.lang.String,
-     * java.lang.String, org.xml.sax.Attributes)
-     */
-    @Override
-    public void startElement(String uri, String localName, String qName, Attributes atts)
-        throws SAXException
-    {
-        if (qName.equals("session")) {
-            currentSequence = new LinkedList<Event>();
-            if (currentGUIElementTree == null)
-                currentGUIElementTree = new GUIElementTree<String>();
-        }
-        else if (qName.equals("component")) {
-            currentGUIElementPath = atts.getValue("path");
-            currentGUIElementParameters = new HashMap<String, String>();
-        }
-        else if (qName.equals("event")) {
-            currentEventType = atts.getValue("type");
-            currentEventParameters = new HashMap<String, String>();
-        }
-        else if (qName.equals("param")) {
-            String paramName = atts.getValue("name");
-            if (currentGUIElementPath != null) {
-                if ("parent".equals(paramName)) {
-                    currentParentPath = atts.getValue("value");
-                }
-                if ("class".equals(paramName)) {
-                    currentGUIElementClass = atts.getValue("value");
-                }
-                if ("index".equals(paramName)) {
-                    currentGUIElementIndex = atts.getValue("value");
-                }
-                currentGUIElementParameters.put(paramName, atts.getValue("value"));
-            }
-            else if (currentEventType != null) {
-                if ("target".equals(paramName)) {
-                    currentEventSource = atts.getValue("value");
-                }
-                if ("timestamp".equals(paramName)) {
-                    currentEventTimestamp = Long.parseLong(atts.getValue("value"));
-                }
-                currentEventParameters.put(paramName, atts.getValue("value"));
-            }
-            else {
-                throw new SAXException("param tag found where it should not be.");
-            }
-        }
-        else {
-            throw new SAXException("unknown tag found: " + qName);
-        }
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String, java.lang.String,
-     * java.lang.String)
-     */
-    @Override
-    public void endElement(String uri, String localName, String qName) throws SAXException {
-        if (qName.equals("session")) {
-            if (currentSequence != null && !currentSequence.isEmpty()) {
-                sequences.add(currentSequence);
-            }
-            currentSequence = null;
-        }
-        else if (qName.equals("component") && currentGUIElementPath != null) {
-            HTMLGUIElementSpec guiElementSpec =
-                getGUIElementSpec(currentGUIElementClass, currentGUIElementParameters);
-            currentGUIElementTree.add(currentGUIElementPath, currentParentPath, guiElementSpec);
-
-            currentParentPath = null;
-            currentGUIElementPath = null;
-            currentGUIElementParameters = null;
-        }
-        else if (qName.equals("event")) {
-            IGUIElement currentGUIElement;
-            currentGUIElement = currentGUIElementTree.find(currentEventSource);
-
-            IEventType eventType =
-                HTMLEventTypeFactory.getInstance().getEventType(currentEventType,
-                                                                currentEventParameters,
-                                                                currentGUIElement);
-            Event event =
-                new Event(eventType, (currentGUIElement == null ? lastGUIElement
-                    : currentGUIElement));
-
-            event.setTimestamp(currentEventTimestamp);
-            HTMLGUIElement currentEventTarget = (HTMLGUIElement) event.getTarget();
-            currentEventTarget.markUsed();
-            currentSequence.add(event);
-
-            currentEventSource = null;
-            currentEventTimestamp = -1l;
-            currentEventParameters = null;
-            currentEventType = null;
-
-            if (currentGUIElement != null) {
-                lastGUIElement = currentGUIElement;
-            }
-
-            currentGUIElement = null;
-        }
-    }
-
-    /**
-     * <p>
-     * Returns a collection of event sequences that was obtained from parsing log files.
-     * </p>
-     * 
+     *
+     * @param tagName
      * @return
      */
-    public Collection<List<Event>> getSequences() {
-        return sequences;
-    }
-
-    /**
-     * <p>
-     * Returns the GUI model that is obtained from parsing log files.
-     * </p>
-     * 
-     * @return GUIModel
-     */
-    public GUIModel getGuiModel() {
-        return currentGUIElementTree.getGUIModel();
-    }
-
-    /**
-     * Returns the HTMLGUIElementSpecification for a GUI Element described
-     * by its class name and its parameters.
-     * @param guiElementClass
-     * @param guiElementParameters
-     * @return
-     */
-    private HTMLGUIElementSpec getGUIElementSpec(String guiElementClass,
-                                                 Map<String, String> guiElementParameters)
-    {
-        HTMLGUIElementSpec specification = null;
-        if ("server".equals(guiElementClass)) {
-            // TODO: add correct port handling
-            specification = new HTMLServerSpec(guiElementParameters.get("htmlId"), 0);
-            currentServerSpec = (HTMLServerSpec) specification;
-        }
-
-        else {
-            String id = guiElementParameters.get("htmlId");
-            if (id == null) {
-                HTMLPageElementSpec parentSpec =
-                    (HTMLPageElementSpec) currentGUIElementTree.find(currentParentPath)
-                        .getSpecification();
-                id = parentSpec.getPage().getPagePath();
-            }
-
-            int index = -1;
-            String indexStr = guiElementParameters.get("index");
-
-            if ((indexStr != null) && (!"".equals(indexStr))) {
-                index = Integer.parseInt(indexStr);
-            }
-            String title = guiElementParameters.get("title");
-            HTMLPageSpec page = new HTMLPageSpec(currentServerSpec, id, title);
-            specification = new HTMLPageElementSpec(page, guiElementClass, id, index);
-        }
-
-        return specification;
-    }
+    private boolean tagNameMustBeConsidered(String tagName) {
+        return
+            !"head".equals(tagName) && !"title".equals(tagName) && !"script".equals(tagName) &&
+            !"style".equals(tagName) && !"link".equals(tagName) && !"meta".equals(tagName) &&
+            !"iframe".equals(tagName) && !"input_hidden".equals(tagName) &&
+            !"option".equals(tagName) && !"tt".equals(tagName) && !"br".equals(tagName) &&
+            !"colgroup".equals(tagName) && !"col".equals(tagName);
+
+    }
+
 }

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");
         }

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

@@ -24 +24 @@
  * @author Patrick Harms
  */
-public class HTMLPage extends HTMLGUIElement implements IDialog {
+public class HTMLDocument extends HTMLGUIElement implements IDialog {
 
     /**  */
@@ -37 +37 @@
      * @param parent
      */
-    public HTMLPage(HTMLPageSpec specification, HTMLServer parent) {
+    public HTMLDocument(HTMLDocumentSpec specification, HTMLServer parent) {
         super(specification, parent);
     }
@@ -48 +48 @@
     @Override
     public String toString() {
-        return "Page(" + getPagePath() + ", \"" + getPageTitle() + "\")";
+        return "Document(" + getPath() + ", \"" + getTitle() + "\")";
     }
 
@@ -58 +58 @@
     @Override
     protected String getElementDescriptor() {
-        return "Page";
+        return "Document";
     }
 
@@ -69 +69 @@
      */
     HTMLServerSpec getServer() {
-        return ((HTMLPageSpec) super.getSpecification()).getServer();
+        return ((HTMLDocumentSpec) super.getSpecification()).getServer();
     }
 
@@ -79 +79 @@
      * @return
      */
-    String getPagePath() {
-        return ((HTMLPageSpec) super.getSpecification()).getPagePath();
+    String getPath() {
+        return ((HTMLDocumentSpec) super.getSpecification()).getPath();
     }
 
@@ -90 +90 @@
      * @return
      */
-    String getPageTitle() {
-        return ((HTMLPageSpec) super.getSpecification()).getPageTitle();
+    String getTitle() {
+        return ((HTMLDocumentSpec) super.getSpecification()).getTitle();
     }
 

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

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.plugin.html.guimodel;
 
-import java.net.URL;
-
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec;
 
@@ -26 +24 @@
  * @author Patrick Harms
  */
-public class HTMLPageSpec extends HTMLGUIElementSpec implements IGUIElementSpec {
+public class HTMLDocumentSpec extends HTMLGUIElementSpec implements IGUIElementSpec {
 
     /**  */
@@ -35 +33 @@
     
     /** */
-    private String pagePath;
+    private String path;
     
     /** */
-    private String pageTitle;
+    private String query;
+    
+    /** */
+    private String title;
     
     /**
@@ -49 +50 @@
      * @param pageTitle
      */
-    public HTMLPageSpec(HTMLServerSpec server, String pagePath, String pageTitle) {
-        super("page");
+    public HTMLDocumentSpec(HTMLServerSpec server, String path, String query, String title) {
+        super("document");
         
         if (server == null) {
             throw new IllegalArgumentException("server must not be null");
         }
-        else if (pagePath == null) {
+        else if (path == null) {
             throw new IllegalArgumentException("pagePath must not be null");
-        }
-        else if (pageTitle == null) {
-            throw new IllegalArgumentException("pageTitle must not be null");
         }
         
         this.server = server;
-        this.pagePath = pagePath;
-        this.pageTitle = pageTitle;
-    }
-
-    /**
-     * <p>
-     * TODO: comment
-     * </p>
-     *
-     * @param server
-     * @param pagePath
-     * @param pageTitle
-     */
-    public HTMLPageSpec(URL pageURL, String pageTitle) {
-        super("page");
-        
-        if (pageURL == null) {
-            throw new IllegalArgumentException("pageURL must not be null");
-        }
-        else if (pageTitle == null) {
-            throw new IllegalArgumentException("pageTitle must not be null");
-        }
-        
-        this.server = new HTMLServerSpec(pageURL);
-        this.pagePath = pageURL.getPath();
-        this.pageTitle = pageTitle;
+        this.path = path;
+        this.query = query;
+        this.title = title;
     }
 
@@ -96 +71 @@
     @Override
     public boolean getSimilarity(IGUIElementSpec other) {
-        if (other instanceof HTMLPageSpec) {
-            HTMLPageSpec otherSpec = (HTMLPageSpec) other;
+        if (other instanceof HTMLDocumentSpec) {
+            HTMLDocumentSpec otherSpec = (HTMLDocumentSpec) other;
             
             if (!super.getSimilarity(otherSpec)) {
@@ -105 +80 @@
                 return false;
             }
-            else if (!pagePath.equals(otherSpec.pagePath)) {
+            else if (!path.equals(otherSpec.path)) {
+                return false;
+            }
+            else if (query != null ? !query.equals(otherSpec.query) : otherSpec.query != null) {
                 return false;
             }
             else {
-                return pageTitle.equals(otherSpec.pageTitle);
+                return (title != null ? title.equals(otherSpec.title) : otherSpec.title == null);
             }
         }
@@ -134 +112 @@
      * @return
      */
-    String getPagePath() {
-        return pagePath;
+    String getPath() {
+        return path;
     }
 
@@ -145 +123 @@
      * @return
      */
-    String getPageTitle() {
-        return pageTitle;
+    String getQuery() {
+        return query;
+    }
+
+    /**
+     * <p>
+     * TODO: comment
+     * </p>
+     *
+     * @return
+     */
+    String getTitle() {
+        return title;
     }
 

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

@@ -47 +47 @@
      * @param parent
      */
-    public HTMLPageElement(HTMLPageElementSpec specification, HTMLPage parent) {
+    public HTMLPageElement(HTMLPageElementSpec specification, HTMLDocument parent) {
         super(specification, parent);
     }
@@ -58 +58 @@
     @Override
     public String toString() {
-        String str = getTag();
+        String str = getTagName();
         
-        if ((getTagId() != null) && (!"".equals(getTagId()))) {
-            str += "(id=\"" + getTagId() + "\")";
+        if ((getHtmlId() != null) && (!"".equals(getHtmlId()))) {
+            str += "(id=\"" + getHtmlId() + "\")";
         }
         else {
-            str += "[" + getTagIndex() + "]";
+            str += "[" + getIndex() + "]";
         }
         
@@ -77 +77 @@
     @Override
     protected String getElementDescriptor() {
-        return getTag();
+        return getTagName();
     }
 
@@ -87 +87 @@
      * @return
      */
-    HTMLPageSpec getPage() {
+    HTMLDocumentSpec getPage() {
         return ((HTMLPageElementSpec) super.getSpecification()).getPage();
     }
@@ -98 +98 @@
      * @return
      */
-    String getTag() {
-        return ((HTMLPageElementSpec) super.getSpecification()).getTag();
+    String getTagName() {
+        return ((HTMLPageElementSpec) super.getSpecification()).getTagName();
     }
 
@@ -109 +109 @@
      * @return
      */
-    String getTagId() {
-        return ((HTMLPageElementSpec) super.getSpecification()).getTagId();
+    String getHtmlId() {
+        return ((HTMLPageElementSpec) super.getSpecification()).getHtmlId();
     }
 
@@ -120 +120 @@
      * @return
      */
-    int getTagIndex() {
-        return ((HTMLPageElementSpec) super.getSpecification()).getTagIndex();
+    int getIndex() {
+        return ((HTMLPageElementSpec) super.getSpecification()).getIndex();
     }
 

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

@@ -30 +30 @@
     
     /** */
-    private HTMLPageSpec page;
+    private HTMLDocumentSpec page;
     
     /** */
-    private String tag;
+    private String tagName;
     
     /** */
-    private String id;
+    private String htmlId;
     
     /** */
@@ -50 +50 @@
      * @param id
      */
-    public HTMLPageElementSpec(HTMLPageSpec page, String tag, String id, int index) {
-        super(tag);
+    public HTMLPageElementSpec(HTMLDocumentSpec page, String tagName, String htmlId, int index) {
+        super(tagName);
         
         if (page == null) {
             throw new IllegalArgumentException("page must not be null");
         }
-        else if (tag == null) {
+        else if (tagName == null) {
             throw new IllegalArgumentException("tag must not be null");
         }
-        else if ((id == null) && (index < 0)) {
+        else if ((htmlId == null) && (index < 0)) {
             throw new IllegalArgumentException
                 ("either id must not be null or the index must be greater or equal to 0");
@@ -65 +65 @@
         
         this.page = page;
-        this.tag = tag;
-        this.id = id;
+        this.tagName = tagName;
+        this.htmlId = htmlId;
         this.index = index;
     }
@@ -84 +84 @@
                 return false;
             }
-            else if (!tag.equals(otherSpec.tag)) {
+            else if (!tagName.equals(otherSpec.tagName)) {
                 return false;
             }
             
-            if (id != null) {
-                return id.equals(otherSpec.id);
+            if (htmlId != null) {
+                return htmlId.equals(otherSpec.htmlId);
             }
             else if (index >= 0) {
@@ -106 +106 @@
      * @return
      */
-    public HTMLPageSpec getPage() {
+    HTMLDocumentSpec getPage() {
         return page;
     }
@@ -117 +117 @@
      * @return
      */
-    String getTag() {
-        return tag;
+    String getTagName() {
+        return tagName;
     }
 
@@ -128 +128 @@
      * @return
      */
-    String getTagId() {
-        return id;
+    String getHtmlId() {
+        return htmlId;
     }
 
@@ -139 +139 @@
      * @return
      */
-    int getTagIndex() {
+    int getIndex() {
         return index;
     }

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

@@ -14 +14 @@
 
 package de.ugoe.cs.autoquest.plugin.html.guimodel;
-
-import java.net.URL;
 
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec;
@@ -58 +56 @@
         this.host = host;
         this.port = port;
-    }
-
-    /**
-     * <p>
-     * TODO: comment
-     * </p>
-     *
-     * @param pageURL
-     */
-    public HTMLServerSpec(URL pageURL) {
-        super("server");
-
-        if (pageURL == null) {
-            throw new IllegalArgumentException("page URL must not be null");
-        }
-
-        this.host = pageURL.getHost();
-        this.port = pageURL.getPort();
     }