INTEGRATION: CWS vcl07 (1.9.66); FILE MERGED

2003/04/08 14:28:23 obr 1.9.66.1: re-added accessibility workbench

toolkit/test/accessibility/AccTreeNode.java

@@ -174,6 +174,29 @@ class AccTreeNode
         return null;
     }
 
+    public AccessibleTreeNode getChildNoCreate (int nIndex)
+        throws IndexOutOfBoundsException
+    {
+        if( nIndex >= 0 )
+        {
+            for(int i = 0; i < maHandlers.size(); i++)
+            {
+                // check if this handler has the child, and if not
+                // search with next handler
+                HandlerDescriptor aDescriptor = getHandlerDescriptor (i);
+                if (nIndex < aDescriptor.mnChildCount)
+                    return aDescriptor.maHandler.getChildNoCreate (this, nIndex);
+                else
+                    nIndex -= aDescriptor.mnChildCount;
+            }
+        }
+        else
+            throw new IndexOutOfBoundsException();
+
+        // nothing found?
+        return null;
+    }
+
     public boolean removeChild (int nIndex)
         throws IndexOutOfBoundsException
     {
@@ -230,7 +253,7 @@ class AccTreeNode
 
     public boolean equals (Object aOther)
     {
-        return (this == aOther) || aOther.equals(mxContext);
+        return (this == aOther) || (aOther!=null && aOther.equals(mxContext));
     }
 
 
@@ -297,9 +320,12 @@ class AccTreeNode
             The returned array containes the indices of the updated children
             and can be used to create a TreeModelEvent.
     */
-    public Vector update (java.lang.Class class1)
-    {return update (class1, null); }
-    public Vector update (java.lang.Class class1, java.lang.Class class2)
+    public Vector updateChildren (java.lang.Class class1)
+    {
+        return updateChildren (class1, null);
+    }
+
+    public Vector updateChildren (java.lang.Class class1, java.lang.Class class2)
     {
         Vector aChildIndices = new Vector();
         int nOffset = 0;