Changeset 965 for trunk

Timestamp:

11/07/12 11:59:49 (12 years ago)

Author:

fglaser

Message:

• Corrected bug in JFCSimplifiedLogParser and JFCComponentTree, which were using Long instead of Integers as hashCodes

Location:

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

Files:

• JFCSimplifiedLogParser.java (modified) (8 diffs)
• guimodel/JFCComponentTree.java (modified) (9 diffs)

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCSimplifiedLogParser.java

@@ -78 +78 @@
      * </p>
      */
-    private Long currentComponentHash;
+    private Integer currentComponentHash;
     
     /**
@@ -86 +86 @@
      * </p>
      */
-    private Long currentParentHash;
+    private Integer currentParentHash;
     
     /**
@@ -93 +93 @@
      * </p>
      */
-    private Long currentEventSource;
+    private Integer currentEventSource;
      
     /**
@@ -312 +312 @@
         }
         else if (qName.equals("component")) {
-                currentComponentHash = Long.parseLong(atts.getValue("hash"), 16);
+                currentComponentHash = (int) Long.parseLong(atts.getValue("hash"), 16);
                 currentGuiElementSpec = new JFCGUIElementSpec();
                 currentGuiElementSpec.setElementHash((int) currentComponentHash.longValue());
@@ -324 +324 @@
         }
         else if (qName.equals("componentNameChange")) {
-                Long sourceHash = Long.parseLong(atts.getValue("hash"), 16);
+                int sourceHash = (int) Long.parseLong(atts.getValue("hash"), 16);
                 String newName = atts.getValue("newName");
                 int titleSource = Integer.parseInt(atts.getValue("titleSource"));
@@ -334 +334 @@
                 if (currentEventId != null){
                         if ("source".equals(atts.getValue("name"))){
-                                currentEventSource = Long.parseLong(atts.getValue("value"), 16);
+                                currentEventSource = (int) Long.parseLong(atts.getValue("value"), 16);
                         }
                 currentEventParameters.put(atts.getValue("name"), atts.getValue("value"));
@@ -351 +351 @@
                         }
                         else if ("parent".equals(atts.getValue("name"))) {
-                                currentParentHash = Long.parseLong(atts.getValue("value"), 16);
+                                currentParentHash = (int) Long.parseLong(atts.getValue("value"), 16);
                         }
             }
@@ -378 +378 @@
         }
         else if (qName.equals("component") && currentComponentHash != null) {
-                currentComponentTree.add(currentParentHash, currentComponentHash, currentGuiElementSpec);
+                currentComponentTree.add(currentComponentHash, currentParentHash, currentGuiElementSpec);
                 // do something with the ancestor list here
                 

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/guimodel/JFCComponentTree.java

@@ -17 +17 @@
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementFactory;
@@ -48 +46 @@
      * </p>
      */
-    private Map<Long, JFCGUIElementSpec> guiElementSpecs;
+    private Map<Integer, JFCGUIElementSpec> guiElementSpecs;
 
     /**
@@ -56 +54 @@
      * </p>
      */
-    private Map<Long, List<JFCGUIElementSpec>> childRelations;
+    private Map<Integer, List<JFCGUIElementSpec>> childRelations;
 
     /**
@@ -64 +62 @@
      * </p>
      */
-    private Map<Long, JFCGUIElementSpec> parentRelations;
+    private Map<Integer, JFCGUIElementSpec> parentRelations;
 
     /**
@@ -86 +84 @@
      * </p>
      */
-    private Map<Long, JFCGUIElement> guiElements;
+    private Map<Integer, JFCGUIElement> guiElements;
 
     /**
@@ -94 +92 @@
      */
     public JFCComponentTree() {
-        guiElementSpecs = new HashMap<Long, JFCGUIElementSpec>();
-        childRelations = new HashMap<Long, List<JFCGUIElementSpec>>();
-        parentRelations = new HashMap<Long, JFCGUIElementSpec>();
-        guiElements = new HashMap<Long, JFCGUIElement>();
+        guiElementSpecs = new HashMap<Integer, JFCGUIElementSpec>();
+        childRelations = new HashMap<Integer, List<JFCGUIElementSpec>>();
+        parentRelations = new HashMap<Integer, JFCGUIElementSpec>();
+        guiElements = new HashMap<Integer, JFCGUIElement>();
     }
 
@@ -105 +103 @@
      * </p>
      * 
+     * @param componentHash
+     *            hash of the window to be created
      * @param parentHash
      *            hash of the parent window
-     * @param componentHash
-     *            hash of the window to be created
      * @param componentSpec
      *                    the component specification
      */
-    public void add(Long parentHash,
-                    Long componentHash,
+    public void add(Integer componentHash,
+                                Integer parentHash,
                     JFCGUIElementSpec componentSpec)
     {
@@ -162 +160 @@
      * @return {@link JFCGUIElementSpec} of the window with the given hash if found, null otherwise
      */
-    public JFCGUIElement find(long hash) {
+    public JFCGUIElement find(int hash) {
         JFCGUIElement guiElement = guiElements.get(hash);
         if (guiElement == null) {
@@ -200 +198 @@
      *            new name of the GUI element
      */
-    public void setName(long hash, String windowName) {
+    public void setName(int hash, String windowName) {
         JFCGUIElementSpec child = guiElementSpecs.get(hash);
         if (child != null) {