Changeset 984 for trunk/autoquest-plugin-jfc/src/main

Timestamp:

11/14/12 10:48:37 (12 years ago)

Author:

fglaser

Message:

• Automatic class hierarchy scanning for to select correct mapping added
• JFCComponentTree can now be inititialized with an existing GUIModel
• JFCSimplifiedLogParser now writes the class itself as the first entry in ancestors children
• newtrace updated to reflect changes in test case

Location:

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

Files:

• JFCSimplifiedLogParser.java (modified) (4 diffs)
• guimodel/JFCComponentTree.java (modified) (2 diffs)
• guimodel/JFCGUIElementSpec.java (modified) (3 diffs)

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

@@ -136 +136 @@
      * </p> 
      */
-    private List<String> currentAncestorList;
+    private List<String> currentClassHierarchy;
 
     /**
@@ -356 +356 @@
         }
         else if (qName.equals("ancestor")){
-                        currentAncestorList.add(atts.getValue("name"));
+                        currentClassHierarchy.add(atts.getValue("name"));
         }
         else if (qName.equals("ancestors")){
-                        currentAncestorList = new LinkedList<String>();
+                        currentClassHierarchy = new LinkedList<String>();
         }
     }
@@ -376 +376 @@
             }
             currentSequence = null;
+        }
+        else if (qName.equals("ancestors")){
+                currentGuiElementSpec.setClassHierarchy(currentClassHierarchy);
         }
         else if (qName.equals("component") && currentComponentHash != null) {
@@ -383 +386 @@
                 currentComponentHash = null;
                 currentParentHash = null;
-                currentAncestorList = null;
+                currentClassHierarchy = null;
         }
         else if (currentEventId != null) {

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

@@ -69 +69 @@
      * </p>
      */
-    private GUIModel guiModel = new GUIModel();
+    private GUIModel guiModel;
 
     /**
@@ -96 +96 @@
         parentRelations = new HashMap<Integer, JFCGUIElementSpec>();
         guiElements = new HashMap<Integer, JFCGUIElement>();
+        guiModel = new GUIModel();
+    }
+    
+    /**
+     * <p>
+     * Creates a JFCComponentTree with an already existing guiModel
+     * @param guiModel
+     * </p>
+     */
+    public JFCComponentTree(GUIModel guiModel){
+        guiElementSpecs = new HashMap<Integer, JFCGUIElementSpec>();
+        childRelations = new HashMap<Integer, List<JFCGUIElementSpec>>();
+        parentRelations = new HashMap<Integer, JFCGUIElementSpec>();
+        guiElements = new HashMap<Integer, JFCGUIElement>();
+        this.guiModel = guiModel;
     }
 

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

@@ -88 +88 @@
      */
     private List<Integer> formerElementHashes = new ArrayList<Integer>();
+    
+    /**
+     * <p>
+     * Class hierarchy of the class itself
+     * </p>
+     */
+    private List<String> classHierarchy = null;
 
     /*
@@ -364 +371 @@
         this.elementHash = newElementHash;
     }
+    
+    /**
+     * <p>
+     * Sets the class hierarchy of the specified GUI element.
+     * @param classHierarchy
+     * </p>
+     */
+    public void setClassHierarchy(List<String> classHierarchy){
+        this.classHierarchy = classHierarchy;
+    }
 
     /**
@@ -405 +422 @@
     @Override
     public String[] getClassHierarchy() {
-        // TODO Auto-generated method stub
-        System.out.println("TODO: implement IGUIElementSpec.getClassHierarchy ");
-        return null;
+        if (classHierarchy == null){
+                return new String[]{(getType())};
+        }
+        else
+                return classHierarchy.toArray(new String[classHierarchy.size()]);
     }