Changeset 600 for trunk

Timestamp:

08/23/12 13:42:35 (12 years ago)

Author:

pharms

Message:

• added hashCode, but will perhaps be reverted later

File:

• trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/guimodel/JFCGUIElementSpec.java (modified) (2 diffs)

trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/guimodel/JFCGUIElementSpec.java

@@ -60 +60 @@
         boolean hashEqual = CollectionUtils.containsAny(elementHash, otherSpec.elementHash);
         
-        if( type.equals("Class") ) {
+        if (type.equals("Class") ) {
             retVal = type.equals(otherSpec.type) && (titleEqual || hashEqual);
-        } else {
-            retVal = type.equals(otherSpec.type) && index==otherSpec.index && (titleEqual || hashEqual);
+        }
+        else {
+            retVal = type.equals(otherSpec.type) && index==otherSpec.index &&
+                (titleEqual || hashEqual);
         }
         
@@ -91 +93 @@
             ((icon == otherSpec.icon) || ((icon != null) && (icon.equals(otherSpec.icon)))) &&
             (index == otherSpec.index) && (elementHash == otherSpec.elementHash);
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return (name + type + icon + index + elementHash).hashCode();
     }