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

Timestamp:

02/13/15 10:31:00 (9 years ago)

Author:

pharms

Message:

• added support for views in GUIs

Location:

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

Files:

• HTMLDocument.java (modified) (2 diffs)
• HTMLDocumentSpec.java (modified) (6 diffs)
• HTMLPageElement.java (modified) (2 diffs)
• HTMLServer.java (modified) (2 diffs)

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

@@ -17 +17 @@
 import de.ugoe.cs.autoquest.eventcore.guimodel.IDialog;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
+import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIView;
 
 /**
@@ -68 +69 @@
     protected String getElementDescriptor() {
         return "Document";
+    }
+
+    /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement#getView()
+     */
+    @Override
+    public IGUIView getView() {
+        return (HTMLDocumentSpec) this.getSpecification();
     }
 

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

@@ -16 +16 @@
 
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec;
+import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIView;
 
 /**
@@ -27 +28 @@
  * @author Patrick Harms
  */
-public class HTMLDocumentSpec extends HTMLGUIElementSpec implements IGUIElementSpec {
+public class HTMLDocumentSpec extends HTMLGUIElementSpec implements IGUIElementSpec, IGUIView {
 
     /**
@@ -123 +124 @@
 
     /* (non-Javadoc)
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof HTMLDocumentSpec) {
+            return getSimilarity((HTMLDocumentSpec) obj);
+        }
+        else {
+            return false;
+        }
+    }
+
+    /* (non-Javadoc)
      * @see java.lang.Object#toString()
      */
     @Override
     public String toString() {
-        return "Document(" + getPath() + ", \"" + getTitle() + "\")";
+        return "Document(" + getPath() + (getQuery() != null ? getQuery() : "") +
+            ", \"" + getTitle() + "\")";
+    }
+
+    /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.eventcore.guimodel.IGUIView#isModal()
+     */
+    @Override
+    public boolean isModal() {
+        return true;
     }
 
@@ -148 +171 @@
      * @return the path in the URL of the document
      */
-    String getPath() {
+    public String getPath() {
         return path;
     }
@@ -159 +182 @@
      * @return the query in the URL of the document
      */
-    String getQuery() {
+    public String getQuery() {
         return query;
     }
@@ -170 +193 @@
      * @return the title of the document
      */
-    String getTitle() {
+    public String getTitle() {
         return title;
     }

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

@@ -16 +16 @@
 
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
+import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIView;
 
 /**
@@ -78 +79 @@
     public int getIndex() {
         return ((HTMLPageElementSpec) super.getSpecification()).getIndex();
+    }
+
+    /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement#getView()
+     */
+    @Override
+    public IGUIView getView() {
+        return ((HTMLPageElementSpec) super.getSpecification()).getPage();
     }
 

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

@@ -17 +17 @@
 import de.ugoe.cs.autoquest.eventcore.guimodel.IFrame;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
+import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIView;
 
 /**
@@ -88 +89 @@
 
     /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement#getView()
+     */
+    @Override
+    public IGUIView getView() {
+        return null;
+    }
+
+    /* (non-Javadoc)
      * @see de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement#getDistanceTo(IGUIElement)
      */