INTEGRATION: CWS uaa02 (1.3.6); FILE MERGED

2003/04/22 11:47:06 obr 1.3.6.2: #109004# remove debug output to prevent NullPointerExceptions
2003/04/11 11:01:10 obr 1.3.6.1: #108656# accessibility API moved from drafts to final

accessibility/bridge/org/openoffice/java/accessibility/Window.java

@@ -58,7 +58,7 @@
 package org.openoffice.java.accessibility;
 
 import com.sun.star.uno.*;
-import drafts.com.sun.star.accessibility.*;
+import com.sun.star.accessibility.*;
 
 public class Window extends java.awt.Window implements javax.accessibility.Accessible, NativeFrame {
     protected XAccessibleComponent unoAccessibleComponent;
@@ -267,29 +267,29 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
         /** Called by OpenOffice process to notify property changes */
         public void notifyEvent(AccessibleEventObject event) {
             switch (event.EventId) {
-                case AccessibleEventId.ACCESSIBLE_NAME_EVENT:
+                case AccessibleEventId.NAME_CHANGED:
                     // Set the accessible name for the corresponding context, which will fire a property
                     // change event itself
                     handleNameChangedEvent(event.NewValue);
                     break;
-                case AccessibleEventId.ACCESSIBLE_DESCRIPTION_EVENT:
+                case AccessibleEventId.DESCRIPTION_CHANGED:
                     // Set the accessible description for the corresponding context, which will fire a property
                     // change event itself - so do not set propertyName !
                     handleDescriptionChangedEvent(event.NewValue);
                     break;
-                case AccessibleEventId.ACCESSIBLE_STATE_EVENT:
+                case AccessibleEventId.STATE_CHANGED:
                     // Update the internal state set and fire the appropriate PropertyChangedEvent
                     handleStateChangedEvent(event.OldValue, event.NewValue);
                     break;
-                case AccessibleEventId.ACCESSIBLE_CHILD_EVENT:
+                case AccessibleEventId.CHILD:
                     if (AnyConverter.isObject(event.OldValue)) {
                         AccessibleObjectFactory.removeChild(Window.this, event.OldValue);
                     } else if (AnyConverter.isObject(event.NewValue)) {
                         AccessibleObjectFactory.addChild(Window.this, event.NewValue);
                     }
                     break;
-                case AccessibleEventId.ACCESSIBLE_VISIBLE_DATA_EVENT:
-                case AccessibleEventId.ACCESSIBLE_BOUNDRECT_EVENT:
+                case AccessibleEventId.VISIBLE_DATA_CHANGED:
+                case AccessibleEventId.BOUNDRECT_CHANGED:
                     handleVisibleDataEvent();
                     break;
                 default:
@@ -484,7 +484,7 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
 
         public boolean contains(java.awt.Point p) {
             try {
-                return unoAccessibleComponent.contains(new com.sun.star.awt.Point(p.x, p.y));
+                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y));
             } catch (com.sun.star.uno.RuntimeException e) {
                 return false;
             }
@@ -549,7 +549,7 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
         public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
             try {
                 java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(
-                    unoAccessibleComponent.getAccessibleAt(new com.sun.star.awt.Point(p.x, p.y)));
+                    unoAccessibleComponent.getAccessibleAtPoint(new com.sun.star.awt.Point(p.x, p.y)));
 
                 return (javax.accessibility.Accessible) c;
             } catch (com.sun.star.uno.RuntimeException e) {