Changeset 736 for trunk

Timestamp:

08/31/12 15:16:13 (12 years ago)

Author:

sherbold

Message:

• changed JFCGUIElementSpec to store the elementHash as String instead of int. The reason for this is a problem that Integer.parseInt() that can occur with handling of negative hexadecimal values (see also Rev. 588)

Location:

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

Files:

• JFCLogParser.java (modified) (5 diffs)
• guimodel/JFCGUIElement.java (modified) (1 diff)
• guimodel/JFCGUIElementSpec.java (modified) (7 diffs)

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

@@ -340 +340 @@
                     else if ("hash".equals(atts.getValue("name"))) {
                         currentGuiElementSpec.setElementHash
-                            (Integer.parseInt(atts.getValue("value"), 16));
+                            (atts.getValue("value"));
                     }
                 }
@@ -645 +645 @@
             matcher = Pattern.compile(pattern).matcher(matcher.group(2));
             
-            float elementHash = -1;
+            String elementHash = "-1";
             
             pattern = "(([\\d]*)|([\\w$]*)|(([\\w$@\\.]*)=([\\w$@\\.]*)))\\z";
@@ -656 +656 @@
                         // found digit value. Those in combination usually denote the position
                         // of the GUI element. So calculate an element has out of them
-                        elementHash += Integer.parseInt(valueMatcher.group(2));
+                        elementHash += valueMatcher.group(2);
                     }
                     else if ((valueMatcher.group(5) != null) &&
@@ -667 +667 @@
                         
                         if ("alignmentX".equals(key) || "alignmentY".equals(key)) {
-                            elementHash += Float.parseFloat(valueMatcher.group(6));
+                            elementHash += valueMatcher.group(6);
                         }
                     }
@@ -673 +673 @@
             }
 
-            currentGuiElementSpec.setName("unknown(" + ((int) elementHash) + ")");
+            currentGuiElementSpec.setName("unknown(" + elementHash + ")");
             currentGuiElementSpec.setType(type);
             currentGuiElementSpec.setIndex(-1);
-            currentGuiElementSpec.setElementHash((int) elementHash);
+            currentGuiElementSpec.setElementHash(elementHash);
         }
         catch (Exception e)

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

@@ -69 +69 @@
      * @return the hashCode
      */
-    int getElementHash() {
+    String getElementHash() {
         return specification.getElementHash();
     }

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

@@ -43 +43 @@
     /**
      * <p>
-     * hash code of the window elemt. Used as unique identifier during its existence.
-     * </p>
-     */
-    private int elementHash = -1;
+     * hash code of the window element. Used as unique identifier during its existence.
+     * </p>
+     */
+    private String elementHash = "-1";
 
     /**
@@ -53 +53 @@
      * </p>
      */
-    private List<Integer> formerElementHashes = new ArrayList<Integer>();
+    private List<String> formerElementHashes = new ArrayList<String>();
 
     /* (non-Javadoc)
@@ -87 +87 @@
         // the same, then similarity is given. Therefore these are the first two comparisons
         
-        if (elementHash == otherSpec.elementHash) {
+        if (elementHash.equals(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 == otherSpec.elementHash);
+            (index == otherSpec.index) && (elementHash.equals(otherSpec.elementHash));
     }
 
@@ -233 +233 @@
      * @return the elementHash
      */
-    public int getElementHash() {
+    public String getElementHash() {
         return elementHash;
     }
@@ -275 +275 @@
      * @param elementHash the elementHash to set
      */
-    public void setElementHash(int newElementHash) {
-        if ((this.elementHash > -1) &&
+    public void setElementHash(String newElementHash) {
+        if (!this.elementHash.equals("-1") &&
             !this.formerElementHashes.contains(this.elementHash))
         {
@@ -294 +294 @@
     void update(JFCGUIElementSpec other) {
         if (other != this) {
-            for (int formerElementHash : other.formerElementHashes) {
+            for (String formerElementHash : other.formerElementHashes) {
                 setElementHash(formerElementHash);
             }