Changeset 1025

Timestamp:

12/31/12 17:06:37 (12 years ago)

Author:

fglaser

Message:

• Removed an inconsistency in GUIElementTree: find(...) does not throw exceptions if element was not found, but instead returns null.

Location:

trunk

Files:

• autoquest-core-events-test/src/test/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIElementTreeTest.java (modified) (1 diff)
• autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIElementTree.java (modified) (2 diffs)

trunk/autoquest-core-events-test/src/test/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIElementTreeTest.java

@@ -48 +48 @@
         public void testFindNonExisting(){
                 GUIElementTree tree = new GUIElementTree();
-                try{
-                        tree.find(10l);
-                        fail("Exception was not thrown.");
-                }
-                catch(Exception e){             
-                }
+                assertEquals(tree.find(10l), null);
         }
 

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

@@ -173 +173 @@
      * <p>
      * Searches the tree for a GUI element with the specified id and returns its
-     * {@link IGUIElementSpec} .
+     * {@link IGUIElement} .
      * </p>
      * 
@@ -181 +181 @@
      */
     public IGUIElement find(long id) {
-        IGUIElement guiElement = guiElements.get(id);
-        if (guiElement == null) {
-            List<IGUIElementSpec> guiElementPath = new ArrayList<IGUIElementSpec>();
-
-            IGUIElementSpec elementSpec = guiElementSpecs.get(id);
-
-            if (elementSpec == null) {
-                throw new RuntimeException("no GUI element found with hash " + id);
-            }
-
-            Long currentElementID = id;
-            while (elementSpec != null) {
-                guiElementPath.add(0, elementSpec);
-                currentElementID = parentRelations.get(currentElementID);
-                elementSpec = guiElementSpecs.get(currentElementID);
-            }
-
-            try {
-                guiElement = guiModel.integratePath(guiElementPath, guiElementFactory);
-            }
-            catch (GUIModelException e) {
-                throw new RuntimeException("could not instantiate GUI element with id " + id, e);
-            }
-            guiElements.put(id, guiElement);
-        }
-        return guiElement;
+        return guiElements.get(id);
     }