Changeset 1433 for trunk/autoquest-core-events/src/main/java/de

Timestamp:

03/04/14 12:19:00 (11 years ago)

Author:

pharms

Message:

• added support to retrieve the GUI model to which a GUI element belongs from the GUI element itself

Location:

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

Files:

• AbstractDefaultGUIElement.java (modified) (3 diffs)
• GUIElementGroup.java (modified) (1 diff)
• GUIModel.java (modified) (3 diffs)
• IGUIElement.java (modified) (1 diff)

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

@@ -65 +65 @@
     /**
      * <p>
+     * the reference to the GUI model to which this GUI element belongs.
+     * </p>
+     */
+    private GUIModel guiModel;
+
+    /**
+     * <p>
      * Constructor. Creates a new AbstractDefaultGUIElement.
      * </p>
@@ -97 +104 @@
     public IGUIElement getParent() {
         return parent;
+    }
+
+    /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement#getGUIModel()
+     */
+    @Override
+    public GUIModel getGUIModel() {
+       return guiModel;
     }
 
@@ -233 +248 @@
             }
         }
-
+    }
+
+    /**
+     * <p>
+     * used to set the GUI model to which this GUI element belongs. Will be set automatically, if
+     * used in combination with {@link GUIModel};
+     * </p>
+     *
+     * @param guiModel
+     */
+    void setGUIModel(GUIModel guiModel) {
+        this.guiModel = guiModel;
     }
 

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

@@ -50 +50 @@
      * @param groupName the name of the GUI element group
      * @param parent    the optional parent GUI element of the group
+     * @param guiModel  the GUI model to which the group will belong
      */
-    public GUIElementGroup(String groupName, IGUIElement parent) {
+    public GUIElementGroup(String groupName, IGUIElement parent, GUIModel guiModel) {
         super(new GroupSpecification(groupName), parent);
+        super.setGUIModel(guiModel);
     }
 

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

@@ -352 +352 @@
         
         TreeNode replacement = new TreeNode();
-        replacement.guiElement = new GUIElementGroup(groupName, parent.guiElement);
+        replacement.guiElement = new GUIElementGroup(groupName, parent.guiElement, this);
         
         for (TreeNode child : nodesToGroup) {
@@ -487 +487 @@
      *             thrown in cases such as the GUI element object could not be instantiated
      */
-    private IGUIElement integratePath(TreeNode parentNode,
+    private IGUIElement integratePath(TreeNode                        parentNode,
                                       List<? extends IGUIElementSpec> remainingPath,
-                                      IGUIElementFactory guiElementFactory)
+                                      IGUIElementFactory              guiElementFactory)
         throws GUIModelException
     {
@@ -500 +500 @@
                                                         parentNode.guiElement);
 
+            if (newElement instanceof AbstractDefaultGUIElement) {
+                ((AbstractDefaultGUIElement) newElement).setGUIModel(this);
+            }
+            
             child = parentNode.addChild(newElement);
             allNodes.put(child.guiElement, child);

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

@@ -45 +45 @@
     public IGUIElement getParent();
 
+    /**
+     * <p>
+     * returns the GUI model to which this GUI element belongs
+     * </p>
+     */
+    public GUIModel getGUIModel();
+    
     /**
      * <p>