Add search depth for context tree instead of running in thread

Author: mmokko

robocorp-code/src/robocorp_code/inspector/java/java_inspector.py

@@ -65,9 +65,9 @@ def list_windows(self) -> List[JavaWindowInfoTypedDict]:
         return [to_window_info(window) for window in windows]
 
     def collect_tree(
-        self, window: str, locator: Optional[str] = None
+        self, window: str, search_depth: int = 8, locator: Optional[str] = None
     ) -> LocatorTreeInfoTypedDict:
         log.info(f"Collect tree from locator: {locator}")
 
-        tree = self._inspector.collect_tree(window, locator)
+        tree = self._inspector.collect_tree(window, search_depth, locator)
         return [to_locator_info(node) for node in tree]

robocorp-code/src/robocorp_code/inspector/java/robocorp_java/_context_tree.py

@@ -11,9 +11,11 @@ def wrapper(self: "ElementInspector", *args, **kwargs):
 
             event_pump_thread = EventPumpThread()
             event_pump_thread.start()
-            jab_wrapper = event_pump_thread.get_wrapper()
-            ret = func(self, jab_wrapper, *args, **kwargs)
-            event_pump_thread.stop()
+            try:
+                jab_wrapper = event_pump_thread.get_wrapper()
+                ret = func(self, jab_wrapper, *args, **kwargs)
+            finally:
+                event_pump_thread.stop()
             return ret
 
         return wrapper
@@ -27,17 +29,11 @@ def collect_tree(
         self,
         jab_wrapper: JavaAccessBridgeWrapper,
         window: str,
+        search_depth: int,
         locator: Optional[str] = None,
     ) -> Union[ContextNode, List[ContextNode]]:
         jab_wrapper.switch_window_by_title(window)
-
-        from ._context_tree import ContextTreeThread
-
-        context_tree_thread = ContextTreeThread(jab_wrapper)
-        context_tree_thread.start()
-        context_tree = context_tree_thread.get_context_tree()
-        context_tree_thread.join()
-
+        context_tree = ContextTree(jab_wrapper, search_depth)
         if locator:
             from ._locators import find_elements_from_tree