Changeset 2146 for trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIElementTree.java

Timestamp:

05/19/17 11:31:29 (7 years ago)

Author:

pharms

Message:

• refactored GUI model so that hierarchical event target structures can also be used and created by plugins not being strictly for GUIs

File:

• trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIElementTree.java (modified) (5 diffs)

trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIElementTree.java

@@ -20 +20 @@
 import java.util.Map;
 
+import de.ugoe.cs.autoquest.eventcore.EventTargetModelException;
+import de.ugoe.cs.autoquest.eventcore.IEventTargetFactory;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementFactory;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel;
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModelException;
-import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementFactory;
 
 /**
@@ -30 +30 @@
  * </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.
+ * 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>
  * 
@@ -84 +85 @@
      * </p>
      */
-    private IGUIElementFactory guiElementFactory = GUIElementFactory.getInstance();
-
- 
+    private IEventTargetFactory guiElementFactory = GUIElementFactory.getInstance();
 
     /**
@@ -127 +126 @@
      *            the GUI element specification
      *            
-     * @throws GUIModelException if the GUI element can not be added to the underlying GUI model
+     * @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 GUIModelException
+        throws EventTargetModelException
     {
         IGUIElement guiElement = guiElements.get(guiElementID);
@@ -161 +160 @@
             }
 
-            guiElement = guiModel.integratePath(guiElementPath, guiElementFactory);
+            guiElement = (IGUIElement) guiModel.integratePath(guiElementPath, guiElementFactory);
             guiElements.put(guiElementID, guiElement);
         }