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

Timestamp:

09/03/12 09:14:35 (12 years ago)

Author:

pharms

Message:

• handle element hashes as int again and simply corrected parsing

File:

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

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

@@ -46 +46 @@
      * </p>
      */
-    private String elementHash = "-1";
+    private int elementHash = -1;
 
     /**
@@ -53 +53 @@
      * </p>
      */
-    private List<String> formerElementHashes = new ArrayList<String>();
+    private List<Integer> formerElementHashes = new ArrayList<Integer>();
 
     /* (non-Javadoc)
@@ -87 +87 @@
         // the same, then similarity is given. Therefore these are the first two comparisons
         
-        if (elementHash.equals(otherSpec.elementHash)) {
+        if (elementHash == otherSpec.elementHash) {
             return true;
         }
@@ -163 +163 @@
             ((type == otherSpec.type) || ((type != null) && (type.equals(otherSpec.type)))) &&
             ((icon == otherSpec.icon) || ((icon != null) && (icon.equals(otherSpec.icon)))) &&
-            (index == otherSpec.index) && (elementHash.equals(otherSpec.elementHash));
+            (index == otherSpec.index) && (elementHash == otherSpec.elementHash);
     }
 
@@ -233 +233 @@
      * @return the elementHash
      */
-    public String getElementHash() {
+    public int getElementHash() {
         return elementHash;
     }
@@ -275 +275 @@
      * @param elementHash the elementHash to set
      */
-    public void setElementHash(String newElementHash) {
-        if (!this.elementHash.equals("-1") &&
+    public void setElementHash(int newElementHash) {
+        if ((this.elementHash > -1) &&
             !this.formerElementHashes.contains(this.elementHash))
         {
@@ -294 +294 @@
     void update(JFCGUIElementSpec other) {
         if (other != this) {
-            for (String formerElementHash : other.formerElementHashes) {
+            for (int formerElementHash : other.formerElementHashes) {
                 setElementHash(formerElementHash);
             }