Changeset 1088

Timestamp:

02/18/13 18:18:11 (12 years ago)

Author:

pharms

Message:

• added a GUI model test
• performed some bug fixes
• added a possibility to navigate a traverser to a specific GUI element in the model

Location:

trunk

Files:

• autoquest-core-events-test/src/test/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIModelTest.java (added)
• autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIModel.java (modified) (4 diffs)
• autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowGuiModelDialog.java (modified) (3 diffs)

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

@@ -163 +163 @@
 
         for (TreeNode node : allNodes) {
-            for (TreeNode child : node.children) {
-                if (child.guiElement.equals(guiElement)) {
-                    if (parent != null) {
-                        parent = node.guiElement;
-                    }
-                    else {
-                        Console
+            if (node.children != null) {
+                for (TreeNode child : node.children) {
+                    if (child.guiElement.equals(guiElement)) {
+                        if (parent != null) {
+                            parent = node.guiElement;
+                        }
+                        else {
+                            Console
                             .traceln(Level.SEVERE,
                                      "Multiple nodes in the internal GUI model match the same GUI element. "
-                                         + "This should not be the case and the GUI model is probably invalid.");
+                                             + "This should not be the case and the GUI model is probably invalid.");
+                        }
                     }
                 }
@@ -208 +210 @@
     public Traverser getTraverser() {
         return new Traverser();
+    }
+
+    /**
+     * returns a traverser for the GUI model starting at the given GUI element. Returns null, if
+     * the GUI element is not part of the model.
+     * 
+     * @return a traverser
+     */
+    public Traverser getTraverser(IGUIElement startingAt) {
+        TreeNode node = findNode(startingAt);
+        
+        if (node != null) {
+            Traverser traverser = new Traverser();
+            traverser.navigateTo(node);
+            return traverser;
+        }
+        else {
+            return null;
+        }
     }
 
@@ -616 +637 @@
          */
         public boolean hasNextSibling() {
-            StackEntry entry = nodeStack.pop();
-            boolean result = nodeStack.peek().treeNode.children.size() > (entry.index + 1);
-            pushChild(entry.index);
+            boolean result = false;
+            if (nodeStack.size() > 1) {
+                StackEntry entry = nodeStack.pop();
+                result = nodeStack.peek().treeNode.children.size() > (entry.index + 1);
+                pushChild(entry.index);
+            }
+            
             return result;
         }
@@ -662 +687 @@
         }
         
+        /**
+         * <p>
+         * navigates the traverser to the given node in the GUI model
+         * </p>
+         */
+        private boolean navigateTo(TreeNode node) {
+            if (hasFirstChild()) {
+                IGUIElement childElement = firstChild();
+            
+                while (childElement != null) {
+                    if (childElement.equals(node.guiElement)) {
+                        return true;
+                    }
+                    else if (navigateTo(node)) {
+                        return true;
+                    }
+                    else {
+                        childElement = nextSibling();
+                    }
+                }
+            
+                parent();
+            }
+            
+            return false;
+        }
+
         /**
          * <p>

trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowGuiModelDialog.java

@@ -14 +14 @@
 
 package de.ugoe.cs.autoquest.ui.swt;
-
-import java.util.List;
 
 import org.eclipse.swt.SWT;
@@ -148 +146 @@
     }
 
-    private void buildGuiTree(TreeItem currentParent, List<IGUIElement> elements) {
-        for (IGUIElement element : elements) {
-            TreeItem child = new TreeItem(currentParent, SWT.NULL);
-            child.setText(element.toString());
-            child.setData(element);
-            buildGuiTree(child, model.getChildren(element));
-        }
-    }
-
     private void expandAll(Tree tree, boolean expanded) {
         for (TreeItem item : tree.getItems()) {
@@ -203 +192 @@
         // update visualization of the model
         firstParent.removeAll();
-        buildGuiTree(firstParent, model.getChildren((IGUIElement) firstParent.getData()));
+        buildGuiTree(firstParent, model.getTraverser((IGUIElement) firstParent.getData()));
         firstParent.setExpanded(true);
     }