Index: trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/HierarchicalEventTargetTree.java
===================================================================
--- trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/HierarchicalEventTargetTree.java	(revision 2156)
+++ trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/HierarchicalEventTargetTree.java	(revision 2156)
@@ -0,0 +1,269 @@
+//   Copyright 2012 Georg-August-Universität Göttingen, Germany
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
+package de.ugoe.cs.autoquest.eventcore;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import de.ugoe.cs.autoquest.eventcore.EventTargetModelException;
+import de.ugoe.cs.autoquest.eventcore.IEventTargetFactory;
+
+/**
+ * <p>
+ * This class provides the interfaces for GUI element trees.
+ * </p>
+ * <p>
+ * The GUIElementTree represents the hierarchical structure of the GUI elements "as it is"
+ * currently during a session. It may change during the session due to creation and destruction
+ * of GUI elements. The parameter T represents the id type of the GUI elements that are handled
+ * internally.
+ * </p>
+ * 
+ * @author Fabian Glaser
+ * @author Steffen Herbold
+ * @version 1.0
+ */
+public class HierarchicalEventTargetTree<ID,
+                                         TARGET_TYPE extends IHierarchicalEventTarget,
+                                         TARGET_SPEC_TYPE extends IEventTargetSpec>
+{
+    /**
+     * <p>
+     * Map of all GUI elements that are part of the tree for efficient searching. The keys of the
+     * map are the ids of the GUI elements.
+     * </p>
+     */
+    private Map<ID, TARGET_TYPE> eventTargets;
+
+    /**
+     * <p>
+     * Map of all GUI element specifications that are part of the tree for efficient searching. The
+     * keys of the map are the ids of the GUI elements.
+     * </p>
+     */
+    private Map<ID, TARGET_SPEC_TYPE> eventTargetSpecs;
+
+    /**
+     * <p>
+     * Map of all children of GUI elements that are part of the tree. The keys of the map are the
+     * ids of the parent GUI elements.
+     * </p>
+     */
+    private Map<ID, List<ID>> childRelations;
+
+    /**
+     * <p>
+     * Map of all parents of GUI elements that are part of the tree. The keys of the map are the
+     * ids of the child GUI elements.
+     * </p>
+     */
+    private Map<ID, ID> parentRelations;
+
+    /**
+     * <p>
+     * the internally created GUI model
+     * </p>
+     */
+    private HierarchicalEventTargetModel<TARGET_TYPE> eventTargetModel;
+
+    /**
+     * <p>
+     * the GUI element factory used in the model
+     * </p>
+     */
+    private IEventTargetFactory eventTargetFactory;
+
+    /**
+     * <p>
+     * Creates a new GUIElementTree.
+     * </p>
+     */
+    public HierarchicalEventTargetTree(HierarchicalEventTargetModel<TARGET_TYPE> eventTargetModel,
+                                       IEventTargetFactory                       eventTargetFactory)
+    {
+        this.eventTargetSpecs = new HashMap<ID, TARGET_SPEC_TYPE>();
+        this.childRelations = new HashMap<ID, List<ID>>();
+        this.parentRelations = new HashMap<ID, ID>();
+        this.eventTargets = new HashMap<ID, TARGET_TYPE>();
+        this.eventTargetModel = eventTargetModel;
+        this.eventTargetFactory = eventTargetFactory;
+    }
+
+    /**
+     * <p>
+     * Adds a new GUI element to the tree.
+     * </p>
+     * 
+     * @param eventTargetID
+     *            id of the GUI element to be created
+     * @param parentID
+     *            id of the parent GUI element 
+     * @param eventTargetSpec
+     *            the GUI element specification
+     *            
+     * @throws EventTargetModelException if the GUI element can not be added to the underlying GUI model
+     */
+    public void add(ID               eventTargetID,
+                    ID               parentID,
+                    TARGET_SPEC_TYPE eventTargetSpec)
+        throws EventTargetModelException
+    {
+        TARGET_TYPE eventTarget = eventTargets.get(eventTargetID);
+        
+        if (eventTarget == null) {
+            TARGET_SPEC_TYPE parent = eventTargetSpecs.get(parentID);
+            if (parent != null) {
+                List<ID> otherChildren = childRelations.get(parentID);
+
+                if (otherChildren == null) {
+                    otherChildren = new ArrayList<ID>();
+                    childRelations.put(parentID, otherChildren);
+                }
+
+                otherChildren.add(eventTargetID);
+
+                parentRelations.put(eventTargetID, parentID);
+            }
+            eventTargetSpecs.put(eventTargetID, eventTargetSpec);
+            
+            List<TARGET_SPEC_TYPE> eventTargetPath = new ArrayList<TARGET_SPEC_TYPE>();
+
+            ID currentElementID = eventTargetID;
+            while (eventTargetSpec != null) {
+                eventTargetPath.add(0, eventTargetSpec);
+                currentElementID = parentRelations.get(currentElementID);
+                eventTargetSpec = eventTargetSpecs.get(currentElementID);
+            }
+
+            eventTarget = (TARGET_TYPE)
+                  eventTargetModel.integratePath(eventTargetPath, eventTargetFactory);
+            
+            eventTargets.put(eventTargetID, eventTarget);
+        }
+    }
+
+    /**
+     * <p>
+     * Searches the tree for a GUI element with the specified id and returns its
+     * {@link IGUIElement} .
+     * </p>
+     * 
+     * @param id
+     *            id that is looked for
+     * @return {@link IGUIElementSpec} of the GUI element with the given id if found, null otherwise
+     */
+    public TARGET_TYPE find(ID id) {
+        return eventTargets.get(id);
+    }
+
+    /**
+     * <p>
+     * Returns the id of the provided {@link IGUIElement}. The comparison is performed using the
+     * equals method of the GUI element.
+     * </p>
+     * 
+     * @param eventTarget
+     *            guiElement that is looked for
+     * @return the id of the GUI element, null if the GUI element can not be found
+     */
+    public ID find(TARGET_TYPE eventTarget) {
+        for (Map.Entry<ID, TARGET_TYPE> entry : eventTargets.entrySet()) {
+            if (eventTarget.equals(entry.getValue())) {
+                return entry.getKey();
+            }
+        }
+        
+        return null;
+    }
+
+    /**
+     * <p>
+     * Removes a GUI element (defined by its id) from the tree. All children of the GUI element will be
+     * removed recursively.
+     * </p>
+     * 
+     * @param id
+     *            id of the GUI element to be removed
+     * @return number of GUI elements that were removed
+     */
+    public int remove(ID id) {
+        int removedCounter = 0;
+        TARGET_SPEC_TYPE node = eventTargetSpecs.remove(id);
+
+        if (node != null) {
+            removedCounter++;
+            List<ID> nodesToBeRemoved = childRelations.remove(id);
+
+            // remove all children and sub-children, if any
+            if (nodesToBeRemoved != null) {
+                for (int i = 0; i < nodesToBeRemoved.size(); i++) {
+                    ID nodeToBeRemoved = nodesToBeRemoved.get(i);
+                    List<ID> children =
+                        childRelations.remove(nodeToBeRemoved);
+
+                    if (children != null) {
+                        nodesToBeRemoved.addAll(children);
+                    }
+
+                    eventTargetSpecs.remove(nodeToBeRemoved);
+                    parentRelations.remove(nodeToBeRemoved);
+                    removedCounter++;
+                }
+            }
+
+            /* the node may be a child node of a parent. So search for it in the child relations
+            of the parent and remove it */
+            ID parent = parentRelations.remove(id);
+            if (parent != null) {
+                List<ID> children = childRelations.get(parent);
+
+                if (children != null) {
+                    for (int i = 0; i < children.size(); i++) {
+                        if (children.get(i) == id) {
+                            children.remove(i);
+                            break;
+                        }
+                    }
+
+                    if (children.size() <= 0) {
+                        childRelations.remove(parent);
+                    }
+                }
+            }
+        }
+        return removedCounter;
+    }
+
+    /**
+     * @return the guiModel
+     */
+    public HierarchicalEventTargetModel<TARGET_TYPE> getHierarchicalEventTargetModel() {
+        return eventTargetModel;
+    }
+
+    /**
+     * <p>
+     * Returns the number of nodes contained in the JFCComponentTree.
+     * </p>
+     * 
+     * @return number of nodes
+     */
+    public int size() {
+        return eventTargetSpecs.size();
+    }
+
+}
Index: trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIElementTree.java
===================================================================
--- trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIElementTree.java	(revision 2146)
+++ trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIElementTree.java	(revision 2156)
@@ -15,11 +15,5 @@
 package de.ugoe.cs.autoquest.eventcore.guimodel;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import de.ugoe.cs.autoquest.eventcore.EventTargetModelException;
-import de.ugoe.cs.autoquest.eventcore.IEventTargetFactory;
+import de.ugoe.cs.autoquest.eventcore.HierarchicalEventTargetTree;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementFactory;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel;
@@ -40,50 +34,6 @@
  * @version 1.0
  */
-public class GUIElementTree<T> {
-    /**
-     * <p>
-     * Map of all GUI elements that are part of the tree for efficient searching. The keys of the
-     * map are the ids of the GUI elements.
-     * </p>
-     */
-    private Map<T, IGUIElement> guiElements;
-
-    /**
-     * <p>
-     * Map of all GUI element specifications that are part of the tree for efficient searching. The
-     * keys of the map are the ids of the GUI elements.
-     * </p>
-     */
-    private Map<T, IGUIElementSpec> guiElementSpecs;
-
-    /**
-     * <p>
-     * Map of all children of GUI elements that are part of the tree. The keys of the map are the
-     * ids of the parent GUI elements.
-     * </p>
-     */
-    private Map<T, List<T>> childRelations;
-
-    /**
-     * <p>
-     * Map of all parents of GUI elements that are part of the tree. The keys of the map are the
-     * ids of the child GUI elements.
-     * </p>
-     */
-    private Map<T, T> parentRelations;
-
-    /**
-     * <p>
-     * the internally created GUI model
-     * </p>
-     */
-    private GUIModel guiModel;
-
-    /**
-     * <p>
-     * the GUI element factory used in the model
-     * </p>
-     */
-    private IEventTargetFactory guiElementFactory = GUIElementFactory.getInstance();
+public class GUIElementTree<T> extends HierarchicalEventTargetTree<T, IGUIElement, IGUIElementSpec>
+{
 
     /**
@@ -93,9 +43,5 @@
      */
     public GUIElementTree() {
-        guiElementSpecs = new HashMap<T, IGUIElementSpec>();
-        childRelations = new HashMap<T, List<T>>();
-        parentRelations = new HashMap<T, T>();
-        guiElements = new HashMap<T, IGUIElement>();
-        guiModel = new GUIModel();
+        this(new GUIModel());
     }
     
@@ -107,152 +53,5 @@
      */
     public GUIElementTree(GUIModel guiModel){
-        guiElementSpecs = new HashMap<T, IGUIElementSpec>();
-        childRelations = new HashMap<T, List<T>>();
-        parentRelations = new HashMap<T, T>();
-        guiElements = new HashMap<T, IGUIElement>();
-        this.guiModel = guiModel;
-    }
-
-    /**
-     * <p>
-     * Adds a new GUI element to the tree.
-     * </p>
-     * 
-     * @param guiElementID
-     *            id of the GUI element to be created
-     * @param parentID
-     *            id of the parent GUI element 
-     * @param guiElementSpec
-     *            the GUI element specification
-     *            
-     * @throws EventTargetModelException if the GUI element can not be added to the underlying GUI model
-     */
-    public void add(T guiElementID,
-                    T parentID,
-                    IGUIElementSpec guiElementSpec)
-        throws EventTargetModelException
-    {
-        IGUIElement guiElement = guiElements.get(guiElementID);
-        
-        if (guiElement == null) {
-            IGUIElementSpec parent = guiElementSpecs.get(parentID);
-            if (parent != null) {
-                List<T> otherChildren = childRelations.get(parentID);
-
-                if (otherChildren == null) {
-                    otherChildren = new ArrayList<T>();
-                    childRelations.put(parentID, otherChildren);
-                }
-
-                otherChildren.add(guiElementID);
-
-                parentRelations.put(guiElementID, parentID);
-            }
-            guiElementSpecs.put(guiElementID, guiElementSpec);
-            
-            List<IGUIElementSpec> guiElementPath = new ArrayList<IGUIElementSpec>();
-
-            T currentElementID = guiElementID;
-            while (guiElementSpec != null) {
-                guiElementPath.add(0, guiElementSpec);
-                currentElementID = parentRelations.get(currentElementID);
-                guiElementSpec = guiElementSpecs.get(currentElementID);
-            }
-
-            guiElement = (IGUIElement) guiModel.integratePath(guiElementPath, guiElementFactory);
-            guiElements.put(guiElementID, guiElement);
-        }
-    }
-
-    /**
-     * <p>
-     * Searches the tree for a GUI element with the specified id and returns its
-     * {@link IGUIElement} .
-     * </p>
-     * 
-     * @param id
-     *            id that is looked for
-     * @return {@link IGUIElementSpec} of the GUI element with the given id if found, null otherwise
-     */
-    public IGUIElement find(T id) {
-        return guiElements.get(id);
-    }
-
-    /**
-     * <p>
-     * Returns the id of the provided {@link IGUIElement}. The comparison is performed using the
-     * equals method of the GUI element.
-     * </p>
-     * 
-     * @param guiElement
-     *            guiElement that is looked for
-     * @return the id of the GUI element, null if the GUI element can not be found
-     */
-    public T find(IGUIElement guiElement) {
-        for (Map.Entry<T, IGUIElement> entry : guiElements.entrySet()) {
-            if (guiElement.equals(entry.getValue())) {
-                return entry.getKey();
-            }
-        }
-        
-        return null;
-    }
-
-    /**
-     * <p>
-     * Removes a GUI element (defined by its id) from the tree. All children of the GUI element will be
-     * removed recursively.
-     * </p>
-     * 
-     * @param id
-     *            id of the GUI element to be removed
-     * @return number of GUI elements that were removed
-     */
-    public int remove(T id) {
-        int removedCounter = 0;
-        IGUIElementSpec node = guiElementSpecs.remove(id);
-
-        if (node != null) {
-            removedCounter++;
-            List<T> nodesToBeRemoved = childRelations.remove(id);
-
-            // remove all children and sub-children, if any
-            if (nodesToBeRemoved != null) {
-                for (int i = 0; i < nodesToBeRemoved.size(); i++) {
-                    T nodeToBeRemoved = nodesToBeRemoved.get(i);
-                    List<T> children =
-                        childRelations.remove(nodeToBeRemoved);
-
-                    if (children != null) {
-                        nodesToBeRemoved.addAll(children);
-                    }
-
-                    guiElementSpecs.remove(nodeToBeRemoved);
-                    parentRelations.remove(nodeToBeRemoved);
-                    removedCounter++;
-                }
-            }
-
-            /* the node may be a child node of a parent. So search for it in the child relations
-            of the parent and remove it */
-            T parent = parentRelations.remove(id);
-            if (parent != null) {
-                List<T> children = childRelations.get(parent);
-
-                if (children != null) {
-                    for (int i = 0; i < children.size(); i++) {
-                        if (children.get(i) == id) {
-                            children.remove(i);
-                            break;
-                        }
-                    }
-
-                    if (children.size() <= 0) {
-                        childRelations.remove(parent);
-                    }
-                }
-            }
-        }
-        return removedCounter;
+        super(guiModel, GUIElementFactory.getInstance());
     }
 
@@ -261,16 +60,5 @@
      */
     public GUIModel getGUIModel() {
-        return guiModel;
-    }
-
-    /**
-     * <p>
-     * Returns the number of nodes contained in the JFCComponentTree.
-     * </p>
-     * 
-     * @return number of nodes
-     */
-    public int size() {
-        return guiElementSpecs.size();
+        return (GUIModel) super.getHierarchicalEventTargetModel();
     }