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

Timestamp:

03/06/14 10:30:03 (11 years ago)

Author:

pharms

Message:

• corrected a bug in creating hashcodes for GUI elements (they changed after storing a GUI model to a file and then reloading it)

Location:

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

Files:

• HTMLDocumentSpec.java (modified) (1 diff)
• HTMLGUIElementSpec.java (modified) (4 diffs)
• HTMLPageElementSpec.java (modified) (1 diff)
• HTMLServerSpec.java (modified) (1 diff)

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

@@ -77 +77 @@
      */
     public HTMLDocumentSpec(HTMLServerSpec server, String path, String query, String title) {
-        super("document");
+        super("document", (server != null ? server.hashCode() : 0) +
+              (path != null ? path.hashCode() : 0) + (query != null ? query.hashCode() : 0) +
+              (title != null ? title.hashCode() : 0));
         
         if (server == null) {

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

@@ -40 +40 @@
      */
     private String type;
+
+    /**
+     * <p>
+     * the hashCode of this GUI element specification
+     * </p>
+     */
+    private int hashCode;
     
     /**
@@ -50 +57 @@
      * @throws IllegalArgumentException if the provided type is null
      */
-    public HTMLGUIElementSpec(String type) {
+    public HTMLGUIElementSpec(String type, int hashCode) {
         if (type == null) {
             throw new IllegalArgumentException("type must not be null");
@@ -56 +63 @@
 
         this.type = type;
+        this.hashCode = hashCode;
     }
 
@@ -87 +95 @@
     }
 
+    /* (non-Javadoc)
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return hashCode;
+    }
+
 }

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

@@ -83 +83 @@
      */
     public HTMLPageElementSpec(HTMLDocumentSpec page, String tagName, String htmlId, int index) {
-        super(tagName);
+        super(tagName, (page != null ? page.hashCode() : 0) +
+              (tagName != null ? tagName.hashCode() : 0) + 
+              (htmlId != null ? htmlId.hashCode() : 0) + (index >= 0 ? index : 0));
         
         if (page == null) {

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

@@ -59 +59 @@
      */
     public HTMLServerSpec(String host, int port) {
-        super("server");
+        super("server", (host != null ? host.hashCode() : 0) + port);
         
         if (host == null) {