#97772# Added first support for event notifications.

1 files changed, 15 insertions, 6 deletions

diff --git a/toolkit/test/accessibility/Canvas.java b/toolkit/test/accessibility/Canvas.java
index cd4ac0e072e5..27667fe725cb 100755
--- a/toolkit/test/accessibility/Canvas.java
+++ b/toolkit/test/accessibility/Canvas.java
@@ -39,6 +39,11 @@ class Canvas
         maBoundingBox = maBoundingBox.union (aObject.getBBox());
     }
 
+    public void removeAccessible (AccessibleObject aObject)
+    {
+        maObjects.remove (aObject);
+    }
+
     public void clear ()
     {
         maObjects.clear();
@@ -143,10 +148,11 @@ class Canvas
             if (aObject != null)
             {
                 aObject.deselect ();
-                if (aObject.contains (e.getX(),e.getY()))
-                {
-                    maActiveObject = aObject;
-                }
+                if (aObject != null)
+                    if (aObject.contains (e.getX(),e.getY()))
+                    {
+                        maActiveObject = aObject;
+                    }
             }
         }
         if (maActiveObject != null)
@@ -156,8 +162,11 @@ class Canvas
                 +maActiveObject.toString());
             System.out.println (maActiveObject.getPath());
 
-            maTree.scrollPathToVisible (maActiveObject.getPath());
-            maTree.repaint ();
+            if (maTree != null)
+            {
+                maTree.scrollPathToVisible (maActiveObject.getPath());
+                maTree.repaint ();
+            }
         }
         repaint ();
     }