#97772# Moved shortcuts to different interfaces of one XAccessible into AccTreeNode.

1 files changed, 20 insertions, 10 deletions

diff --git a/toolkit/test/accessibility/AccessibleComponentHandler.java b/toolkit/test/accessibility/AccessibleComponentHandler.java
index 51031533170c..d0ec5367d1aa 100644
--- a/toolkit/test/accessibility/AccessibleComponentHandler.java
+++ b/toolkit/test/accessibility/AccessibleComponentHandler.java
@@ -10,7 +10,9 @@ class AccessibleComponentHandler
 
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
-        XAccessibleComponent xComponent = getComponent (xContext);
+        XAccessibleComponent xComponent =
+            (XAccessibleComponent) UnoRuntime.queryInterface (
+                XAccessibleComponent.class, xContext);
         if (xComponent != null)
             return new AccessibleComponentHandler (xComponent);
         else
@@ -25,13 +27,7 @@ class AccessibleComponentHandler
     public AccessibleComponentHandler (XAccessibleComponent xComponent)
     {
         if (xComponent != null)
-            maChildList.setSize (3);
-    }
-
-    private static XAccessibleComponent getComponent(Object aObject)
-    {
-        return (XAccessibleComponent) UnoRuntime.queryInterface (
-            XAccessibleComponent.class, aObject);
+            maChildList.setSize (4);
     }
 
     public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex)
@@ -39,8 +35,8 @@ class AccessibleComponentHandler
         AccessibleTreeNode aChild = null;
         if (aParent instanceof AccTreeNode)
         {
-            XAccessibleComponent xComponent = getComponent (
-                ((AccTreeNode)aParent).getContext());
+            XAccessibleComponent xComponent =
+                ((AccTreeNode)aParent).getComponent();
 
             if (xComponent != null)
             {
@@ -61,6 +57,20 @@ class AccessibleComponentHandler
                             + xComponent.getSize().Height,
                             aParent);
                         break;
+                    case 3:
+                        boolean bVisible = xComponent.isVisible();
+                        boolean bShowing = xComponent.isShowing();
+                        String sText;
+                        if (bVisible && bShowing)
+                            sText = new String ("visible and showing");
+                        else if (bVisible)
+                            sText = new String ("visible but not showing");
+                        else if (bShowing)
+                            sText = new String ("showing but not visible");
+                        else
+                            sText = new String ("neither visible nor showing");
+                        aChild = new StringNode (sText, aParent);
+                        break;
                 }
             }
         }