INTEGRATION: CWS uaa03 (1.4.8); FILE MERGED

2003/05/21 15:42:19 mt 1.4.8.2: #i14623# UAA finalization
2003/05/20 08:46:20 obr 1.4.8.1: #i14623# ComboBox.java Tree.java
COLLAPSED state has been removed from UAA

#109167#,#108096# AccessBridge.java WindowsAccessBridgeAdapter.java AccessibleObjectFactory.java
Replaced the XAccessibleTopWindowMap interface with a jni component that registers at VCL on Windows to retrieve the necessary events for registering popup windows and to extract the HWND for every window opened.

The pure java bridge now uses XTopWindowListener and XExtendedToolkit to retrieve WINDOW_OPENED and WINDOW_CLOSED events.

accessibility/bridge/org/openoffice/java/accessibility/Tree.java

@@ -189,12 +189,11 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
                 if (unoAS != null) {
                     if (unoAS.contains(AccessibleStateType.EXPANDABLE)) {
                         states.add(javax.accessibility.AccessibleState.EXPANDABLE);
-                    }
-                    if (unoAS.contains(AccessibleStateType.EXPANDED)) {
-                        states.add(javax.accessibility.AccessibleState.EXPANDED);
-                    }
-                    if (unoAS.contains(AccessibleStateType.COLLAPSED)) {
-                        states.add(javax.accessibility.AccessibleState.COLLAPSED);
+                        if (unoAS.contains(AccessibleStateType.EXPANDED)) {
+                            states.add(javax.accessibility.AccessibleState.EXPANDED);
+                        } else {
+                            states.add(javax.accessibility.AccessibleState.COLLAPSED);
+                        }
                     }
                 }
             } catch (com.sun.star.uno.RuntimeException e) {
@@ -435,12 +434,12 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
                     }
                     if (unoAccessibleStateSet.contains(AccessibleStateType.EXPANDABLE)) {
                         stateSet.add(javax.accessibility.AccessibleState.EXPANDABLE);
-                    }
-                    if (unoAccessibleStateSet.contains(AccessibleStateType.EXPANDED)) {
-                        stateSet.add(javax.accessibility.AccessibleState.EXPANDED);
-                    }
-                    if (unoAccessibleStateSet.contains(AccessibleStateType.COLLAPSED)) {
-                        stateSet.add(javax.accessibility.AccessibleState.COLLAPSED);
+
+                        if (unoAccessibleStateSet.contains(AccessibleStateType.EXPANDED)) {
+                            stateSet.add(javax.accessibility.AccessibleState.EXPANDED);
+                        } else {
+                            stateSet.add(javax.accessibility.AccessibleState.COLLAPSED);
+                        }
                     }
                     return stateSet;
                 } catch (com.sun.star.uno.RuntimeException e) {
@@ -582,7 +581,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
             /** Causes every child of the object to be selected if the object supports multiple selection */
             public void selectAllAccessibleSelection() {
                 try {
-                    unoAccessibleSelection.selectAllAccessible();
+                    unoAccessibleSelection.selectAllAccessibleChildren();
                 } catch (com.sun.star.uno.RuntimeException e) {
                 }
             }