1 files changed, 21 insertions, 50 deletions

diff --git a/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java b/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java
index 94a88b591ffa..3f7ff474297b 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java
@@ -2,10 +2,6 @@
  *
  *  $RCSfile: TextComponent.java,v $
  *
- *  $Revision: 1.2 $
- *
- *  last change: $Author: obr $ $Date: 2003-01-13 11:00:08 $
- *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
  *
@@ -71,15 +67,10 @@ public class TextComponent extends Component implements javax.accessibility.Acce
     boolean multiLine = false;
     boolean editable = false;
 
-    protected TextComponent(XAccessible accessible, XAccessibleComponent xAccessibleComponent, XAccessibleStateSet xAccessibleStateSet) {
-        super();
-        unoAccessible = accessible;
-        unoAccessibleComponent = xAccessibleComponent;
+    protected TextComponent(XAccessible xAccessible, XAccessibleContext xAccessibleContext, XAccessibleStateSet xAccessibleStateSet) {
+        super(xAccessible, xAccessibleContext);
         editable = xAccessibleStateSet.contains(AccessibleStateType.EDITABLE);
         multiLine = xAccessibleStateSet.contains(AccessibleStateType.MULTILINE);
-        // To reflect focus and other component state changes, the accessibility
-        // event listener must already be added here
-        addAccessibleEventListener(new AccessibleTextComponentListener());
     }
 
     protected class AccessibleTextComponentListener extends AccessibleUNOComponentListener {
@@ -105,25 +96,10 @@ public class TextComponent extends Component implements javax.accessibility.Acce
                     break;
             }
         }
+    }
 
-        /** Called by OpenOffice process to notify property changes */
-        public void notifyEvent(AccessibleEventObject event) {
-            switch (event.EventId) {
-                case AccessibleEventId.ACCESSIBLE_TEXT_EVENT:
-                    firePropertyChange(accessibleContext.ACCESSIBLE_TEXT_PROPERTY,
-                        null, new Integer(0));
-                    break;
-                case AccessibleEventId.ACCESSIBLE_CARET_EVENT:
-                    if (Build.DEBUG) {
-                        System.err.println("Caret event");
-                    }
-                    firePropertyChange(accessibleContext.ACCESSIBLE_CARET_PROPERTY,
-                        toNumber(event.OldValue), toNumber(event.NewValue));
-                    break;
-                default:
-                    super.notifyEvent(event);
-            }
-        }
+    protected XAccessibleEventListener createEventListener() {
+        return new AccessibleTextComponentListener();
     }
 
     /** Returns the AccessibleContext associated with this object */
@@ -143,6 +119,22 @@ public class TextComponent extends Component implements javax.accessibility.Acce
             super();
         }
 
+        /** Returns an AccessibleStateSet that contains corresponding Java states to the UAA state types */
+        protected javax.accessibility.AccessibleStateSet getAccessibleStateSetImpl(XAccessibleStateSet unoAS) {
+            javax.accessibility.AccessibleStateSet states = super.getAccessibleStateSetImpl(unoAS);
+
+            if (editable) {
+                states.add(javax.accessibility.AccessibleState.EDITABLE);
+            }
+            if (multiLine) {
+                states.add(javax.accessibility.AccessibleState.MULTI_LINE);
+            } else {
+                states.add(javax.accessibility.AccessibleState.SINGLE_LINE);
+            }
+
+            return states;
+        }
+
         /*
         * AccessibleContext
         */
@@ -194,27 +186,6 @@ public class TextComponent extends Component implements javax.accessibility.Acce
             }
         }
 
-        /**
-        * Get the state set of this object.
-        *
-        * @return an instance of AccessibleState containing the current state
-        * of the object
-        * @see AccessibleState
-        */
-
-        public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
-            javax.accessibility.AccessibleStateSet states = super.getAccessibleStateSet();
-            if (editable) {
-                states.add(javax.accessibility.AccessibleState.EDITABLE);
-            }
-            if (multiLine) {
-                states.add(javax.accessibility.AccessibleState.MULTI_LINE);
-            } else {
-                states.add(javax.accessibility.AccessibleState.SINGLE_LINE);
-            }
-            return states;
-        }
-
         /** Returns the relation set of this object */
         public javax.accessibility.AccessibleRelationSet getAccessibleRelationSet() {
             try {