changeset 6567:d4f62c49a4ad

[Accessibility] Rename CELL_AT_ROWCOLUMN to CELL_AT_ROW_COLUMN
author Felipe Heidrich <felipe.heidrich@oracle.com>
date Fri, 28 Mar 2014 14:16:41 -0700
parents 7b65e71dd2cf
children 4925e1655837
files modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableRowSkin.java modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableViewSkin.java modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableViewSkinBase.java modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TreeTableRowSkin.java modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TreeTableViewSkin.java modules/controls/src/main/java/javafx/scene/control/TableRow.java modules/controls/src/main/java/javafx/scene/control/TableView.java modules/controls/src/main/java/javafx/scene/control/TreeTableView.java modules/graphics/src/main/java/com/sun/glass/ui/mac/MacAccessible.java modules/graphics/src/main/java/com/sun/glass/ui/win/WinAccessible.java modules/graphics/src/main/java/javafx/scene/accessibility/Attribute.java
diffstat 11 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableRowSkin.java	Fri Mar 28 12:46:39 2014 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableRowSkin.java	Fri Mar 28 14:16:41 2014 -0700
@@ -152,7 +152,7 @@
                     return FXCollections.observableArrayList(selection);
                 }
             }
-            case CELL_AT_ROWCOLUMN: {
+            case CELL_AT_ROW_COLUMN: {
                 int colIndex = (Integer)parameters[1];
                 TableColumn column = tableView.getVisibleLeafColumn(colIndex);
                 return cellsMap.get(column);
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableViewSkin.java	Fri Mar 28 12:46:39 2014 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableViewSkin.java	Fri Mar 28 14:16:41 2014 -0700
@@ -292,7 +292,7 @@
                 return FXCollections.observableArrayList(selection);
             }
             case FOCUS_ITEM: // TableViewSkinBase
-            case CELL_AT_ROWCOLUMN: // TableViewSkinBase
+            case CELL_AT_ROW_COLUMN: // TableViewSkinBase
             case COLUMN_AT_INDEX: // TableViewSkinBase
             case HEADER: // TableViewSkinBase
             default: return super.accGetAttribute(attribute, parameters);
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableViewSkinBase.java	Fri Mar 28 12:46:39 2014 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableViewSkinBase.java	Fri Mar 28 14:16:41 2014 -0700
@@ -939,7 +939,7 @@
                 int focusedIndex = fm.getFocusedIndex();
                 return flow.getCell(focusedIndex);
             }
-            case CELL_AT_ROWCOLUMN: {
+            case CELL_AT_ROW_COLUMN: {
                 int rowIndex = (Integer)parameters[0];
                 return flow.getCell(rowIndex);
             }
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TreeTableRowSkin.java	Fri Mar 28 12:46:39 2014 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TreeTableRowSkin.java	Fri Mar 28 14:16:41 2014 -0700
@@ -425,7 +425,7 @@
                     return FXCollections.observableArrayList(selection);
                 }
             }
-            case CELL_AT_ROWCOLUMN: {
+            case CELL_AT_ROW_COLUMN: {
                 int colIndex = (Integer)parameters[1];
                 TreeTableColumn column = treeTableView.getVisibleLeafColumn(colIndex);
                 return cellsMap.get(column);
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TreeTableViewSkin.java	Fri Mar 28 12:46:39 2014 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TreeTableViewSkin.java	Fri Mar 28 14:16:41 2014 -0700
@@ -426,7 +426,7 @@
 //            }
 
             case FOCUS_ITEM: // TableViewSkinBase
-            case CELL_AT_ROWCOLUMN: // TableViewSkinBase
+            case CELL_AT_ROW_COLUMN: // TableViewSkinBase
             case COLUMN_AT_INDEX: // TableViewSkinBase
             case HEADER: // TableViewSkinBase
             default: return super.accGetAttribute(attribute, parameters);
--- a/modules/controls/src/main/java/javafx/scene/control/TableRow.java	Fri Mar 28 12:46:39 2014 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/TableRow.java	Fri Mar 28 14:16:41 2014 -0700
@@ -369,7 +369,7 @@
             case INDEX: return getIndex();
             case FOCUS_ITEM: //Skin
             case SELECTED_CELLS: //Skin
-            case CELL_AT_ROWCOLUMN: //Skin
+            case CELL_AT_ROW_COLUMN: //Skin
             default: return super.accGetAttribute(attribute, parameters);
         }
     }
--- a/modules/controls/src/main/java/javafx/scene/control/TableView.java	Fri Mar 28 12:46:39 2014 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/TableView.java	Fri Mar 28 14:16:41 2014 -0700
@@ -1607,7 +1607,7 @@
                 return FXCollections.observableArrayList(selection);
             }
             case FOCUS_ITEM:
-            case CELL_AT_ROWCOLUMN: {
+            case CELL_AT_ROW_COLUMN: {
                 TableRow<S> row = (TableRow<S>)super.accGetAttribute(attribute, parameters);
                 return row != null ? row.accGetAttribute(attribute, parameters) : null;
             }
--- a/modules/controls/src/main/java/javafx/scene/control/TreeTableView.java	Fri Mar 28 12:46:39 2014 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/TreeTableView.java	Fri Mar 28 14:16:41 2014 -0700
@@ -1874,7 +1874,7 @@
                 return FXCollections.observableArrayList(selection);
             }
             case FOCUS_ITEM:
-            case CELL_AT_ROWCOLUMN: {
+            case CELL_AT_ROW_COLUMN: {
                 TreeTableRow<S> row = (TreeTableRow<S>)super.accGetAttribute(attribute, parameters);
                 return row != null ? row.accGetAttribute(attribute, parameters) : null;
             }
--- a/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacAccessible.java	Fri Mar 28 12:46:39 2014 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacAccessible.java	Fri Mar 28 14:16:41 2014 -0700
@@ -146,7 +146,7 @@
         NSAccessibilityStringForRangeParameterizedAttribute(TITLE, MacVariant::createNSString, MacVariant.NSValue_range),
         NSAccessibilityRangeForLineParameterizedAttribute(TITLE, MacVariant::createNSValueForRange, MacVariant.NSNumber_Int),
         NSAccessibilityAttributedStringForRangeParameterizedAttribute(TITLE, MacVariant::createNSAttributedString, MacVariant.NSValue_range),
-        NSAccessibilityCellForColumnAndRowParameterizedAttribute(CELL_AT_ROWCOLUMN, MacVariant::createNSObject, MacVariant.NSArray_int),
+        NSAccessibilityCellForColumnAndRowParameterizedAttribute(CELL_AT_ROW_COLUMN, MacVariant::createNSObject, MacVariant.NSArray_int),
         ;
 
         long ptr; /* Initialized natively - treat as final */
--- a/modules/graphics/src/main/java/com/sun/glass/ui/win/WinAccessible.java	Fri Mar 28 12:46:39 2014 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/win/WinAccessible.java	Fri Mar 28 14:16:41 2014 -0700
@@ -1171,7 +1171,7 @@
 
     long GetItem(int row, int column) {
         if (isDisposed()) return 0;
-        Node node = (Node)getAttribute(CELL_AT_ROWCOLUMN, row, column);
+        Node node = (Node)getAttribute(CELL_AT_ROW_COLUMN, row, column);
         return getAccessible(node);
     }
 
--- a/modules/graphics/src/main/java/javafx/scene/accessibility/Attribute.java	Fri Mar 28 12:46:39 2014 -0700
+++ b/modules/graphics/src/main/java/javafx/scene/accessibility/Attribute.java	Fri Mar 28 14:16:41 2014 -0700
@@ -63,7 +63,7 @@
      * Parameter: Integer, Integer
      * Type: Node
      */
-    CELL_AT_ROWCOLUMN("CellAtRowColumn", Node.class),
+    CELL_AT_ROW_COLUMN("CellAtRowColumn", Node.class),
 
     /**
      * Returns the column count