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

Timestamp:

11/28/12 12:05:15 (12 years ago)

Author:

fglaser

Message:

• JFCSimpliefiedLogParser updated to use new GUIElementTree instead of JFCComponentTree
• JFCComponentTree marked as "deprecated"

Location:

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

Files:

• JFCSimplifiedLogParser.java (modified) (7 diffs)
• guimodel/JFCComponentTree.java (modified) (1 diff)

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

@@ -37 +37 @@
 import de.ugoe.cs.autoquest.eventcore.gui.MouseButtonUp;
 import de.ugoe.cs.autoquest.eventcore.gui.MouseClick;
+import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
@@ -127 +128 @@
      * </p>
      */
-    private JFCComponentTree currentComponentTree;
+    private GUIElementTree currentGUIElementTree;
 
     /**
@@ -293 +294 @@
      */
     public GUIModel getGuiModel() {
-        return currentComponentTree.getGUIModel();
+        return currentGUIElementTree.getGUIModel();
     }
 
@@ -306 +307 @@
         if (qName.equals("sessions")) {
             currentSequence = new LinkedList<Event>();
-            if (currentComponentTree == null)
-                currentComponentTree = new JFCComponentTree();
+            if (currentGUIElementTree == null)
+                currentGUIElementTree = new GUIElementTree();
         }
         if (qName.equals("newsession")) {
@@ -333 +334 @@
                 String newName = atts.getValue("newName");
                 int titleSource = Integer.parseInt(atts.getValue("titleSource"));
-                JFCGUIElement sourceElement = (JFCGUIElement) currentComponentTree.find(sourceHash);
+                JFCGUIElement sourceElement = (JFCGUIElement) currentGUIElementTree.find(sourceHash);
                 JFCGUIElementSpec sourceSpec = (JFCGUIElementSpec) sourceElement.getSpecification();
                 sourceSpec.setName(newName);
@@ -390 +391 @@
         }
         else if (qName.equals("component") && currentComponentHash != null) {
-                currentComponentTree.add(currentComponentHash, currentParentHash, currentGuiElementSpec);
+                currentGUIElementTree.add(currentComponentHash, currentParentHash, currentGuiElementSpec);
                 // do something with the ancestor list here
                 
@@ -401 +402 @@
                 
                 IGUIElement currentGUIElement;
-                currentGUIElement = currentComponentTree.find(currentEventSource);
+                currentGUIElement = currentGUIElementTree.find(currentEventSource);
                 
                 Event event = new Event

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

@@ -27 +27 @@
 /**
  * <p>
- * This class provides an the interfaces for component trees.
+ * @deprecated Use GUIElementTree instead, which provides a generalization.
+ * </p>
+ * <p>
+ * This class provides the interfaces for component trees.
  * </p>
  * <p>