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

Timestamp:

07/30/13 09:41:12 (11 years ago)

Author:

pharms

Message:

• removed bug that did not allow merging root nodes in the GUI model

File:

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

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

@@ -428 +428 @@
         // check if both nodes have the same parent
         IGUIElement parentElement = guiElement1.getParent();
-        if (parentElement != null && !parentElement.equals(guiElement2.getParent())) {
+        boolean sameParent = (parentElement != null) ?
+            parentElement.equals(guiElement2.getParent()) : (guiElement2.getParent() == null);
+            
+        if (!sameParent) {
             throw new IllegalArgumentException("can only merge nodes with the same parent");
         }
@@ -434 +437 @@
         // get the TreeNode of the parent of the GUI elements
         TreeNode parent = findNode(parentElement);
+        
+        if ((parent == null) && (parentElement == null)) {
+            // merging root nodes. The parent is the root node of the GUI element tree
+            parent = root;
+        }
 
         // get the TreeNodes for both GUI elements