Index: /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCSimplifiedLogParser.java
===================================================================
--- /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCSimplifiedLogParser.java	(revision 1002)
+++ /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCSimplifiedLogParser.java	(revision 1003)
@@ -37,4 +37,5 @@
 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,5 +128,5 @@
      * </p>
      */
-    private JFCComponentTree currentComponentTree;
+    private GUIElementTree currentGUIElementTree;
 
     /**
@@ -293,5 +294,5 @@
      */
     public GUIModel getGuiModel() {
-        return currentComponentTree.getGUIModel();
+        return currentGUIElementTree.getGUIModel();
     }
 
@@ -306,6 +307,6 @@
         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,5 +334,5 @@
         	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,5 +391,5 @@
         }
         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,5 +402,5 @@
                 
                 IGUIElement currentGUIElement;
-                currentGUIElement = currentComponentTree.find(currentEventSource);
+                currentGUIElement = currentGUIElementTree.find(currentEventSource);
                 
                 Event event = new Event
Index: /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/guimodel/JFCComponentTree.java
===================================================================
--- /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/guimodel/JFCComponentTree.java	(revision 1002)
+++ /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/guimodel/JFCComponentTree.java	(revision 1003)
@@ -27,5 +27,8 @@
 /**
  * <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>