Performance improvements: Handler have become non-static members of tree nodes and cache data to prevent UNO queries. Increased type safety by introduction of tree node hierarchy.

1 files changed, 25 insertions, 8 deletions

diff --git a/toolkit/test/accessibility/AccessibleHypertextHandler.java b/toolkit/test/accessibility/AccessibleHypertextHandler.java
index 0e1f4ece6823..1742ed3a8d9d 100644
--- a/toolkit/test/accessibility/AccessibleHypertextHandler.java
+++ b/toolkit/test/accessibility/AccessibleHypertextHandler.java
@@ -1,25 +1,42 @@
 
 import com.sun.star.uno.UnoRuntime;
+import drafts.com.sun.star.accessibility.XAccessibleContext;
 import drafts.com.sun.star.accessibility.XAccessibleHypertext;
 
 
 class AccessibleHypertextHandler extends AccessibleTreeHandler
 {
-    protected XAccessibleHypertext getHypertext(Object aObject)
+    public NodeHandler createHandler (XAccessibleContext xContext)
     {
-        XAccessibleHypertext xHypertext =
+        XAccessibleHypertext xText =
             (XAccessibleHypertext) UnoRuntime.queryInterface (
-                 XAccessibleHypertext.class, aObject);
-        return xHypertext;
+                XAccessibleHypertext.class, xContext);
+        if (xText != null)
+            return new AccessibleHypertextHandler (xText);
+        else
+            return null;
+    }
+
+    public AccessibleHypertextHandler ()
+    {
     }
 
-    public int getChildCount(Object aObject)
+    public AccessibleHypertextHandler (XAccessibleHypertext xText)
     {
-        return (getHypertext(aObject) == null) ? 0 : 1;
+        if (xText != null)
+            maChildList.setSize (1);
+    }
+
+    protected static XAccessibleHypertext getHypertext (AccTreeNode aNode)
+    {
+        XAccessibleHypertext xHypertext =
+            (XAccessibleHypertext) UnoRuntime.queryInterface (
+                 XAccessibleHypertext.class, aNode.getContext());
+        return xHypertext;
     }
 
-    public Object getChild(Object aObject, int nIndex)
+    public AccessibleTreeNode getChild (AccessibleTreeNode aParent, int nIndex)
     {
-        return "interface XAccessibleHypertext is supported";
+        return new StringNode ("interface XAccessibleHypertext is supported", aParent);
     }
 }