Changeset 743 for trunk/quest-plugin-jfc/src/main

Timestamp:

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

Author:

pharms

Message:

• handle element hashes as int again and simply corrected parsing

Location:

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

Files:

• JFCLogParser.java (modified) (6 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
-                            (atts.getValue("value"));
+                            ((int) Long.parseLong(atts.getValue("value"), 16));
                     }
                 }
@@ -566 +566 @@
             else
             {
-                throw new SAXException
-                  ("log file has an error, as it contains a key up event on key " + key +
-                   " for which there is no preceeding key down event");
+                Console.printerrln("log file has an error, as it contains a key up event on key " +
+                                   key + " for which there is no preceeding key down event");
             }
 
@@ -645 +644 @@
             matcher = Pattern.compile(pattern).matcher(matcher.group(2));
             
-            String elementHash = "-1";
+            float elementHash = -1;
             
             pattern = "(([\\d]*)|([\\w$]*)|(([\\w$@\\.]*)=([\\w$@\\.]*)))\\z";
@@ -656 +655 @@
                         // found digit value. Those in combination usually denote the position
                         // of the GUI element. So calculate an element has out of them
-                        elementHash += valueMatcher.group(2);
+                        elementHash += Integer.parseInt(valueMatcher.group(2));
                     }
                     else if ((valueMatcher.group(5) != null) &&
@@ -667 +666 @@
                         
                         if ("alignmentX".equals(key) || "alignmentY".equals(key)) {
-                            elementHash += valueMatcher.group(6);
+                            elementHash += Float.parseFloat(valueMatcher.group(6));
                         }
                     }
@@ -673 +672 @@
             }
 
-            currentGuiElementSpec.setName("unknown(" + elementHash + ")");
+            currentGuiElementSpec.setName("unknown(" + ((int) elementHash) + ")");
             currentGuiElementSpec.setType(type);
             currentGuiElementSpec.setIndex(-1);
-            currentGuiElementSpec.setElementHash(elementHash);
+            currentGuiElementSpec.setElementHash((int) 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
      */
-    String getElementHash() {
+    int getElementHash() {
         return specification.getElementHash();
     }

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);
             }