8284544: [Win] Name-Property of Spinner cannot be changed

Reviewed-by: kcr, aghaisas

Author: arapte

modules/javafx.controls/src/main/java/javafx/scene/control/Spinner.java

@@ -769,7 +769,7 @@ private void setText(T value) {
             }
         }
 
-        notifyAccessibleAttributeChanged(AccessibleAttribute.TEXT);
+        notifyAccessibleAttributeChanged(AccessibleAttribute.VALUE_STRING);
         if (text == null) {
             if (value == null) {
                 getEditor().clear();
@@ -834,7 +834,7 @@ static BigDecimal wrapValue(BigDecimal value, BigDecimal min, BigDecimal max) {
     @Override
     public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
         switch (attribute) {
-            case TEXT: {
+            case VALUE_STRING: {
                 T value = getValue();
                 SpinnerValueFactory<T> factory = getValueFactory();
                 if (factory != null) {
@@ -845,6 +845,15 @@ public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object...
                 }
                 return value != null ? value.toString() : "";
             }
+
+            case TEXT: {
+                String accText = getAccessibleText();
+                return (accText != null) ? accText : "";
+            }
+
+            case EDITABLE:
+                return isEditable();
+
             default: return super.queryAccessibleAttribute(attribute, parameters);
         }
     }

modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacAccessible.java

@@ -801,6 +801,11 @@ public void sendNotification(AccessibleAttribute notification) {
                     macNotification = MacNotification.NSAccessibilityValueChangedNotification;
                 }
                 break;
+            case VALUE_STRING:
+                if (getAttribute(ROLE) == AccessibleRole.SPINNER) {
+                    macNotification = MacNotification.NSAccessibilityValueChangedNotification;
+                }
+                break;
             case PARENT:
                 if (peer != 0L) {
                     _invalidateParent(peer);
@@ -1210,6 +1215,10 @@ private MacVariant accessibilityAttributeValue(long attribute) {
                             jfxAttr = TEXT;
                             map = MacVariant::createNSString;
                             break;
+                        case SPINNER:
+                            jfxAttr = VALUE_STRING;
+                            map = MacVariant::createNSString;
+                            break;
                         case CHECK_BOX:
                         case TOGGLE_BUTTON:
                             jfxAttr = SELECTED;

modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinAccessible.java

@@ -363,18 +363,26 @@ public void sendNotification(AccessibleAttribute notification) {
                     WinVariant vn = new WinVariant();
                     vn.vt = WinVariant.VT_BSTR;
                     vn.bstrVal = value;
-                    if (getAttribute(ROLE) == AccessibleRole.SPINNER) {
-                        UiaRaiseAutomationPropertyChangedEvent(peer, UIA_NamePropertyId, vo, vn);
-                    } else {
-                        /* Combo and Text both implement IValueProvider */
-                        UiaRaiseAutomationPropertyChangedEvent(peer, UIA_ValueValuePropertyId, vo, vn);
-                    }
+                    /* Combo and Text both implement IValueProvider */
+                    UiaRaiseAutomationPropertyChangedEvent(peer, UIA_ValueValuePropertyId, vo, vn);
                 }
 
                 if (selectionRange != null || documentRange != null) {
                     UiaRaiseAutomationEvent(peer, UIA_Text_TextChangedEventId);
                 }
                 break;
+            case VALUE_STRING:
+                String val = (String)getAttribute(VALUE_STRING);
+                if (val != null) {
+                    WinVariant vo = new WinVariant();
+                    vo.vt = WinVariant.VT_BSTR;
+                    vo.bstrVal = "";
+                    WinVariant vn = new WinVariant();
+                    vn.vt = WinVariant.VT_BSTR;
+                    vn.bstrVal = val;
+                    UiaRaiseAutomationPropertyChangedEvent(peer, UIA_ValueValuePropertyId, vo, vn);
+                }
+                break;
             case EXPANDED: {
                 Boolean expanded = (Boolean)getAttribute(EXPANDED);
                 if (expanded != null) {
@@ -686,6 +694,9 @@ private long GetPatternProvider(int patternId) {
                 impl = patternId == UIA_ExpandCollapsePatternId ||
                        patternId == UIA_ValuePatternId;
                 break;
+            case SPINNER:
+                impl = patternId == UIA_ValuePatternId;
+                break;
             case SCROLL_BAR:
             case SLIDER:
             case PROGRESS_INDICATOR:
@@ -1319,6 +1330,7 @@ private boolean get_IsReadOnly() {
                 case SCROLL_BAR: return true;
                 case TEXT_FIELD:
                 case TEXT_AREA:
+                case SPINNER:
                 case COMBO_BOX: return Boolean.FALSE.equals(getAttribute(EDITABLE));
                 default:
             }
@@ -1367,6 +1379,14 @@ private void SetValueString(String val) {
 
     private String get_ValueString() {
         if (isDisposed()) return null;
+        AccessibleRole role = (AccessibleRole)getAttribute(ROLE);
+        if (role != null) {
+            switch (role) {
+                case SPINNER:
+                    return (String)getAttribute(VALUE_STRING);
+                default:
+            }
+        }
         return (String)getAttribute(TEXT);
     }
 

modules/javafx.graphics/src/main/java/javafx/scene/AccessibleAttribute.java

@@ -774,6 +774,19 @@ public enum AccessibleAttribute {
      */
     VALUE(Double.class),
 
+    /**
+     * Returns the value as string for the node.
+     * <ul>
+     * <li>Used by: Spinner </li>
+     * <li>Needs notify: yes </li>
+     * <li>Return Type: {@link String} </li>
+     * <li>Parameters: </li>
+     * </ul>
+     *
+     * @since 22
+     */
+    VALUE_STRING(String.class),
+
     /**
      * Returns the vertical scroll bar for the node.
      * <ul>