changeset 6552:f1e1491949bb

[Accessibility] Standardise controls files wrt accessibility code layout and positioning.
author jgiles
date Tue, 25 Mar 2014 11:25:15 +1300
parents d21a135c84d5
children fd6893fc1047
files modules/controls/src/main/java/javafx/scene/control/Accordion.java modules/controls/src/main/java/javafx/scene/control/Button.java modules/controls/src/main/java/javafx/scene/control/ButtonBase.java modules/controls/src/main/java/javafx/scene/control/CheckBox.java modules/controls/src/main/java/javafx/scene/control/ComboBoxBase.java modules/controls/src/main/java/javafx/scene/control/Control.java modules/controls/src/main/java/javafx/scene/control/Hyperlink.java modules/controls/src/main/java/javafx/scene/control/Label.java modules/controls/src/main/java/javafx/scene/control/Labeled.java modules/controls/src/main/java/javafx/scene/control/ListCell.java modules/controls/src/main/java/javafx/scene/control/Pagination.java modules/controls/src/main/java/javafx/scene/control/PasswordField.java modules/controls/src/main/java/javafx/scene/control/ProgressBar.java modules/controls/src/main/java/javafx/scene/control/ProgressIndicator.java modules/controls/src/main/java/javafx/scene/control/RadioButton.java modules/controls/src/main/java/javafx/scene/control/ScrollPane.java modules/controls/src/main/java/javafx/scene/control/SkinBase.java modules/controls/src/main/java/javafx/scene/control/Slider.java modules/controls/src/main/java/javafx/scene/control/TabPane.java modules/controls/src/main/java/javafx/scene/control/TableCell.java modules/controls/src/main/java/javafx/scene/control/TableRow.java modules/controls/src/main/java/javafx/scene/control/TextArea.java modules/controls/src/main/java/javafx/scene/control/TextField.java modules/controls/src/main/java/javafx/scene/control/TextInputControl.java modules/controls/src/main/java/javafx/scene/control/TitledPane.java modules/controls/src/main/java/javafx/scene/control/ToggleButton.java modules/controls/src/main/java/javafx/scene/control/ToolBar.java modules/controls/src/main/java/javafx/scene/control/TreeCell.java modules/controls/src/main/java/javafx/scene/control/TreeTableCell.java modules/controls/src/main/java/javafx/scene/control/TreeTableRow.java
diffstat 30 files changed, 302 insertions(+), 105 deletions(-) [+]
line wrap: on
line diff
--- a/modules/controls/src/main/java/javafx/scene/control/Accordion.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/Accordion.java	Tue Mar 25 11:25:15 2014 +1300
@@ -208,9 +208,16 @@
         return Boolean.FALSE;
     }
 
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.ACCORDION;
             default: return super.accGetAttribute(attribute, parameters);
--- a/modules/controls/src/main/java/javafx/scene/control/Button.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/Button.java	Tue Mar 25 11:25:15 2014 +1300
@@ -191,6 +191,7 @@
         return new ButtonSkin(this);
     }
 
+
     /***************************************************************************
      *                                                                         *
      * Stylesheet Handling                                                     *
@@ -210,9 +211,15 @@
     private static final PseudoClass PSEUDO_CLASS_CANCEL
             = PseudoClass.getPseudoClass("cancel");
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.BUTTON;
             default: return super.accGetAttribute(attribute, parameters);
--- a/modules/controls/src/main/java/javafx/scene/control/ButtonBase.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/ButtonBase.java	Tue Mar 25 11:25:15 2014 +1300
@@ -76,7 +76,8 @@
     public ButtonBase(String text, Node graphic) {
         super(text, graphic);
     }
-    
+
+
     /***************************************************************************
      *                                                                         *
      * Properties                                                              *
@@ -135,6 +136,7 @@
         }
     };
 
+
     /***************************************************************************
      *                                                                         *
      * Methods                                                                 *
@@ -176,6 +178,7 @@
      */
     public abstract void fire();
 
+
     /***************************************************************************
      *                                                                         *
      * Stylesheet Handling                                                     *
@@ -184,9 +187,15 @@
 
     private static final PseudoClass ARMED_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("armed");
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override 
-    public void accExecuteAction(Action action, Object... parameters) {
+    @Override public void accExecuteAction(Action action, Object... parameters) {
         switch (action) {
             case FIRE: 
                 fire();
--- a/modules/controls/src/main/java/javafx/scene/control/CheckBox.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/CheckBox.java	Tue Mar 25 11:25:15 2014 +1300
@@ -259,9 +259,15 @@
     private static final PseudoClass PSEUDO_CLASS_SELECTED = 
             PseudoClass.getPseudoClass("selected");
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.CHECKBOX;
             case TOGGLE_STATE: return isIndeterminate() ? 2 : (isSelected() ? 1 : 0);
--- a/modules/controls/src/main/java/javafx/scene/control/ComboBoxBase.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/ComboBoxBase.java	Tue Mar 25 11:25:15 2014 +1300
@@ -447,7 +447,8 @@
             setArmed(false);
         }
     }
-    
+
+
     /***************************************************************************
      *                                                                         *
      * Stylesheet Handling                                                     *
@@ -462,10 +463,16 @@
             PseudoClass.getPseudoClass("showing");
     private static final PseudoClass PSEUDO_CLASS_ARMED =
             PseudoClass.getPseudoClass("armed");
-    
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.COMBOBOX;
             case EXPANDED: return isShowing();
@@ -475,8 +482,7 @@
     }
 
     /** @treatAsPrivate */
-    @Override 
-    public void accExecuteAction(Action action, Object... parameters) {
+    @Override public void accExecuteAction(Action action, Object... parameters) {
         switch (action) {
             case EXPAND: show(); break;
             case COLLAPSE: hide(); break;
--- a/modules/controls/src/main/java/javafx/scene/control/Control.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/Control.java	Tue Mar 25 11:25:15 2014 +1300
@@ -903,9 +903,15 @@
         return Boolean.TRUE;
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case TOOLTIP:
                 Tooltip tooltip = getTooltip();
--- a/modules/controls/src/main/java/javafx/scene/control/Hyperlink.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/Hyperlink.java	Tue Mar 25 11:25:15 2014 +1300
@@ -176,9 +176,15 @@
         return Cursor.HAND;
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.HYPERLINK;
             case VISITED: return isVisited();
--- a/modules/controls/src/main/java/javafx/scene/control/Label.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/Label.java	Tue Mar 25 11:25:15 2014 +1300
@@ -177,11 +177,17 @@
     @Deprecated @Override
     protected /*do not make final*/ Boolean impl_cssGetFocusTraversableInitialValue() {
         return Boolean.FALSE;
-    }    
+    }
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
        
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.TEXT;
             case TITLE: return getText();
--- a/modules/controls/src/main/java/javafx/scene/control/Labeled.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/Labeled.java	Tue Mar 25 11:25:15 2014 +1300
@@ -1065,9 +1065,15 @@
         return getClassCssMetaData();
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override 
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case TITLE: return getText();
             default: return super.accGetAttribute(attribute, parameters);
--- a/modules/controls/src/main/java/javafx/scene/control/ListCell.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/ListCell.java	Tue Mar 25 11:25:15 2014 +1300
@@ -544,9 +544,16 @@
 
     private static final String DEFAULT_STYLE_CLASS = "list-cell";
 
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.LIST_ITEM;
             case TITLE: {
@@ -570,8 +577,7 @@
     }
 
     /** @treatAsPrivate */
-    @Override
-    public void accExecuteAction(Action action, Object... parameters) {
+    @Override public void accExecuteAction(Action action, Object... parameters) {
         final ListView<T> listView = getListView();
         final MultipleSelectionModel<T> sm = listView == null ? null : listView.getSelectionModel();
         switch (action) {
--- a/modules/controls/src/main/java/javafx/scene/control/Pagination.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/Pagination.java	Tue Mar 25 11:25:15 2014 +1300
@@ -377,9 +377,15 @@
         return getClassCssMetaData();
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.PAGINATION;
             case PAGES: // Skin
--- a/modules/controls/src/main/java/javafx/scene/control/PasswordField.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/PasswordField.java	Tue Mar 25 11:25:15 2014 +1300
@@ -61,9 +61,15 @@
         // No-op
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.PASSWORD_FIELD;
             case TITLE: return null;
--- a/modules/controls/src/main/java/javafx/scene/control/ProgressBar.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/ProgressBar.java	Tue Mar 25 11:25:15 2014 +1300
@@ -121,9 +121,15 @@
         return Boolean.FALSE;
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ORIENTATION: return Orientation.HORIZONTAL;
             default: return super.accGetAttribute(attribute, parameters);
--- a/modules/controls/src/main/java/javafx/scene/control/ProgressIndicator.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/ProgressIndicator.java	Tue Mar 25 11:25:15 2014 +1300
@@ -235,9 +235,15 @@
         return Boolean.FALSE;
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override 
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.PROGRESS_INDICATOR;
             case VALUE: return getProgress();
--- a/modules/controls/src/main/java/javafx/scene/control/RadioButton.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/RadioButton.java	Tue Mar 25 11:25:15 2014 +1300
@@ -135,9 +135,15 @@
         return Pos.CENTER_LEFT;
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.RADIO_BUTTON;
             case SELECTED: return isSelected();
--- a/modules/controls/src/main/java/javafx/scene/control/ScrollPane.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/ScrollPane.java	Tue Mar 25 11:25:15 2014 +1300
@@ -725,7 +725,32 @@
     protected /*do not make final*/ Boolean impl_cssGetFocusTraversableInitialValue() {
         return Boolean.FALSE;
     }
-    
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    /** @treatAsPrivate */
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
+        switch (attribute) {
+            case ROLE: return Role.SCROLL_PANE;
+            case CONTENTS: return getContent();
+            case VERTICAL_SCROLLBAR: //Skin
+            case HORIZONTAL_SCROLLBAR: //Skin
+            default: return super.accGetAttribute(attribute, parameters);
+        }
+    }
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
     /**
      * An enumeration denoting the policy to be used by a scrollable
      * Control in deciding whether to show a scroll bar.
@@ -746,15 +771,6 @@
         AS_NEEDED
     }
 
-    /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
-        switch (attribute) {
-            case ROLE: return Role.SCROLL_PANE;
-            case CONTENTS: return getContent();
-            case VERTICAL_SCROLLBAR: //Skin
-            case HORIZONTAL_SCROLLBAR: //Skin
-            default: return super.accGetAttribute(attribute, parameters);
-        }
-    }
+
+
 }
--- a/modules/controls/src/main/java/javafx/scene/control/SkinBase.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/SkinBase.java	Tue Mar 25 11:25:15 2014 +1300
@@ -755,6 +755,13 @@
         }
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
     protected Object accGetAttribute(Attribute attribute, Object... parameters) {
         return null;
--- a/modules/controls/src/main/java/javafx/scene/control/Slider.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/Slider.java	Tue Mar 25 11:25:15 2014 +1300
@@ -803,9 +803,16 @@
     private static final PseudoClass HORIZONTAL_PSEUDOCLASS_STATE =
             PseudoClass.getPseudoClass("horizontal");
 
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.SLIDER;
             case VALUE: return getValue();
@@ -817,8 +824,7 @@
     }
 
     /** @treatAsPrivate */
-    @Override
-    public void accExecuteAction(Action action, Object... parameters) {
+    @Override public void accExecuteAction(Action action, Object... parameters) {
         switch (action) {
             case INCREMENT: increment(); break;
             case DECREMENT: decrement(); break;
@@ -830,5 +836,4 @@
             default: super.accExecuteAction(action, parameters);
         }
     }
-
 }
--- a/modules/controls/src/main/java/javafx/scene/control/TabPane.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/TabPane.java	Tue Mar 25 11:25:15 2014 +1300
@@ -602,7 +602,32 @@
     private static final PseudoClass LEFT_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("left");
     private static final PseudoClass RIGHT_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("right");
 
-    
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    /** @treatAsPrivate */
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
+        switch (attribute) {
+            case ROLE: return Role.TAB_PANE;
+            case TABS: //Skin
+            case SELECTED_TAB: //Skin
+            default: return super.accGetAttribute(attribute, parameters);
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
     static class TabPaneSelectionModel extends SingleSelectionModel<Tab> {
         private final TabPane tabPane;
 
@@ -744,15 +769,4 @@
          */
         UNAVAILABLE
     }
-
-    /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
-        switch (attribute) {
-            case ROLE: return Role.TAB_PANE;
-            case TABS: //Skin 
-            case SELECTED_TAB: //Skin
-            default: return super.accGetAttribute(attribute, parameters);
-        }
-    }
 }
--- a/modules/controls/src/main/java/javafx/scene/control/TableCell.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/TableCell.java	Tue Mar 25 11:25:15 2014 +1300
@@ -711,9 +711,16 @@
     private static final PseudoClass PSEUDO_CLASS_LAST_VISIBLE = 
             PseudoClass.getPseudoClass("last-visible");
 
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.TABLE_CELL;
             case TITLE: return getText();
@@ -725,8 +732,7 @@
     }
 
     /** @treatAsPrivate */
-    @Override
-    public void accExecuteAction(Action action, Object... parameters) {
+    @Override public void accExecuteAction(Action action, Object... parameters) {
         final TableView<S> tableView = getTableView();
         final TableSelectionModel<S> sm = tableView == null ? null : tableView.getSelectionModel();
 
--- a/modules/controls/src/main/java/javafx/scene/control/TableRow.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/TableRow.java	Tue Mar 25 11:25:15 2014 +1300
@@ -369,9 +369,15 @@
 
     private static final String DEFAULT_STYLE_CLASS = "table-row-cell";
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.TABLE_ROW;
             case INDEX: return getIndex();
@@ -383,8 +389,7 @@
     }
 
     /** @treatAsPrivate */
-    @Override
-    public void accExecuteAction(Action action, Object... parameters) {
+    @Override public void accExecuteAction(Action action, Object... parameters) {
         final TableView<T> tableView = getTableView();
         final MultipleSelectionModel<T> sm = tableView == null ? null : tableView.getSelectionModel();
 
--- a/modules/controls/src/main/java/javafx/scene/control/TextArea.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/TextArea.java	Tue Mar 25 11:25:15 2014 +1300
@@ -596,6 +596,7 @@
     public final double getScrollLeft() { return scrollLeft.getValue(); }
     public final void setScrollLeft(double value) { scrollLeft.setValue(value); }
 
+
     /***************************************************************************
      *                                                                         *
      * Methods                                                                 *
@@ -607,6 +608,7 @@
         return new TextAreaSkin(this);
     }
 
+
     /***************************************************************************
      *                                                                         *
      * Stylesheet Handling                                                     *
@@ -691,10 +693,15 @@
         return getClassCssMetaData();
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute,
-                                     Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.TEXT_AREA;
             case SELECTION_START: return getSelection().getStart();
--- a/modules/controls/src/main/java/javafx/scene/control/TextField.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/TextField.java	Tue Mar 25 11:25:15 2014 +1300
@@ -333,10 +333,15 @@
         return getClassCssMetaData();
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute,
-                                     Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.TEXT_FIELD;
             case SELECTION_START: return getSelection().getStart();
--- a/modules/controls/src/main/java/javafx/scene/control/TextInputControl.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/TextInputControl.java	Tue Mar 25 11:25:15 2014 +1300
@@ -1208,9 +1208,15 @@
         return getClassCssMetaData();
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case TITLE: {
                 String text = getText();
@@ -1224,8 +1230,7 @@
     }
 
     /** @treatAsPrivate */
-    @Override 
-    public void accExecuteAction(Action action, Object... parameters) {
+    @Override public void accExecuteAction(Action action, Object... parameters) {
         switch (action) {
             case SET_TITLE: {
                 String value = (String) parameters[0];
--- a/modules/controls/src/main/java/javafx/scene/control/TitledPane.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/TitledPane.java	Tue Mar 25 11:25:15 2014 +1300
@@ -345,9 +345,15 @@
         return c == null ? super.getContentBias() : c.getContentBias();
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.TITLED_PANE;
             case TITLE: return getText();
@@ -357,8 +363,7 @@
     }
 
     /** @treatAsPrivate */
-    @Override
-    public void accExecuteAction(Action action, Object... parameters) {
+    @Override public void accExecuteAction(Action action, Object... parameters) {
         switch (action) {
             case EXPAND: setExpanded(true); break;
             case COLLAPSE: setExpanded(false); break;
--- a/modules/controls/src/main/java/javafx/scene/control/ToggleButton.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/ToggleButton.java	Tue Mar 25 11:25:15 2014 +1300
@@ -261,9 +261,15 @@
         return Pos.CENTER;
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.TOGGLE_BUTTON;
             case TOGGLE_STATE: return isSelected() ? 1 : 0;
--- a/modules/controls/src/main/java/javafx/scene/control/ToolBar.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/ToolBar.java	Tue Mar 25 11:25:15 2014 +1300
@@ -263,9 +263,15 @@
         return Boolean.FALSE;
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.TOOLBAR;
             case OVERFLOW_BUTTON: //Skin
--- a/modules/controls/src/main/java/javafx/scene/control/TreeCell.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/TreeCell.java	Tue Mar 25 11:25:15 2014 +1300
@@ -640,9 +640,15 @@
     private static final PseudoClass EXPANDED_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("expanded");
     private static final PseudoClass COLLAPSED_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("collapsed");
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         TreeItem<T> treeItem = getTreeItem();
         TreeView<T> treeView = getTreeView();
         switch (attribute) {
@@ -682,8 +688,7 @@
     }
 
     /** @treatAsPrivate */
-    @Override
-    public void accExecuteAction(Action action, Object... parameters) {
+    @Override public void accExecuteAction(Action action, Object... parameters) {
         final TreeView<T> treeView = getTreeView();
         final TreeItem<T> treeItem = getTreeItem();
         final MultipleSelectionModel<TreeItem<T>> sm = treeView == null ? null : treeView.getSelectionModel();
--- a/modules/controls/src/main/java/javafx/scene/control/TreeTableCell.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/TreeTableCell.java	Tue Mar 25 11:25:15 2014 +1300
@@ -718,9 +718,15 @@
         return new TreeTableCellSkin<S,T>(this);
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         switch (attribute) {
             case ROLE: return Role.TREE_TABLE_CELL;
             case TITLE: return getText();
@@ -732,8 +738,7 @@
     }
 
     /** @treatAsPrivate */
-    @Override
-    public void accExecuteAction(Action action, Object... parameters) {
+    @Override public void accExecuteAction(Action action, Object... parameters) {
         final TreeTableView<S> treeTableView = getTreeTableView();
         final TreeTableView.TreeTableViewSelectionModel<S> sm = treeTableView == null ? null : treeTableView.getSelectionModel();
 
--- a/modules/controls/src/main/java/javafx/scene/control/TreeTableRow.java	Tue Mar 25 10:56:35 2014 +1300
+++ b/modules/controls/src/main/java/javafx/scene/control/TreeTableRow.java	Tue Mar 25 11:25:15 2014 +1300
@@ -527,9 +527,15 @@
         return new TreeTableRowSkin<T>(this);
     }
 
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
     /** @treatAsPrivate */
-    @Override
-    public Object accGetAttribute(Attribute attribute, Object... parameters) {
+    @Override public Object accGetAttribute(Attribute attribute, Object... parameters) {
         TreeItem<T> treeItem = getTreeItem();
         TreeTableView<T> treeTableView = getTreeTableView();
 
@@ -572,8 +578,7 @@
     }
 
     /** @treatAsPrivate */
-    @Override
-    public void accExecuteAction(Action action, Object... parameters) {
+    @Override public void accExecuteAction(Action action, Object... parameters) {
         final TreeTableView<T> treeTableView = getTreeTableView();
         final TreeTableView.TreeTableViewSelectionModel<T> sm = treeTableView == null ? null : treeTableView.getSelectionModel();