Updated Branches: refs/heads/develop 6f68d01b1 -> 5d451afe5
FLEX-33682 Used _columns rattan than rawColumns where possible and used mx_internal namespace to show it's an instal call to be used with caution Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/5d451afe Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/5d451afe Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/5d451afe Branch: refs/heads/develop Commit: 5d451afe584d489d9ba92bca06ecc3526d5667be Parents: 6f68d01 Author: Justin Mclean <jmcl...@apache.org> Authored: Wed Aug 28 10:55:33 2013 +1000 Committer: Justin Mclean <jmcl...@apache.org> Committed: Wed Aug 28 10:55:33 2013 +1000 ---------------------------------------------------------------------- .../advancedgrids/src/mx/controls/AdvancedDataGrid.as | 12 ++++++------ .../AdvancedDataGridGroupItemRenderer.as | 2 +- .../AdvancedDataGridHeaderRenderer.as | 2 +- .../AdvancedDataGridSortItemRenderer.as | 2 +- .../src/mx/printing/PrintAdvancedDataGrid.as | 8 ++++---- .../FTEAdvancedDataGridItemRenderer.as | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5d451afe/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGrid.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGrid.as b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGrid.as index 861363a..4e87409 100644 --- a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGrid.as +++ b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGrid.as @@ -5611,7 +5611,7 @@ public class AdvancedDataGrid extends AdvancedDataGridBaseEx // Number of rows to display. const numberOfRows:int = 10; - if (!rawColumns || rawColumns.length == 0) + if (!_columns || _columns.length == 0) return; var i:int; @@ -5626,10 +5626,10 @@ public class AdvancedDataGrid extends AdvancedDataGridBaseEx { sampleDataRow = {}; - m = rawColumns.length; + m = _columns.length; for (j = 0; j < m; j++) { - col = rawColumns[j]; + col = _columns[j]; if (col.dataField != null) { sampleDataRow[col.dataField] = counter; @@ -5644,7 +5644,7 @@ public class AdvancedDataGrid extends AdvancedDataGridBaseEx } else if (designViewDataType == designViewDataTreeType) { - var branchName:String = rawColumns[0].dataField || ""; + var branchName:String = _columns[0].dataField || ""; var branchCounter:int = 1; for (i = 0; i < numberOfRows; i++) @@ -5654,10 +5654,10 @@ public class AdvancedDataGrid extends AdvancedDataGridBaseEx sampleDataRow[childrenString] = [{}]; sampleDataRow[branchName] = resourceManager.getString("datamanagement", "Branch", [branchCounter]); - m = rawColumns.length; + m = _columns.length; for (j = 0; j < m; j++) { - col = rawColumns[j]; + col = _columns[j]; if (col.dataField != null) { sampleDataRow[childrenString][0][col.dataField] = counter; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5d451afe/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridGroupItemRenderer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridGroupItemRenderer.as b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridGroupItemRenderer.as index 10a5e8c..cd05ac8 100644 --- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridGroupItemRenderer.as +++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridGroupItemRenderer.as @@ -357,7 +357,7 @@ public class AdvancedDataGridGroupItemRenderer extends UIComponent listOwner = AdvancedDataGrid(_listData.owner); var column:AdvancedDataGridColumn = - listOwner.rawColumns[_listData.columnIndex]; + listOwner..mx_internal::rawColumns[_listData.columnIndex]; if (_listData.disclosureIcon) { http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5d451afe/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridHeaderRenderer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridHeaderRenderer.as b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridHeaderRenderer.as index 741fc05..25b12e2 100644 --- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridHeaderRenderer.as +++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridHeaderRenderer.as @@ -819,7 +819,7 @@ public class AdvancedDataGridHeaderRenderer */ protected function getFieldSortInfo():SortInfo { - return grid.getFieldSortInfo(grid.rawColumns[listData.columnIndex]); + return grid.getFieldSortInfo(grid..mx_internal::rawColumns[listData.columnIndex]); } //-------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5d451afe/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridSortItemRenderer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridSortItemRenderer.as b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridSortItemRenderer.as index 45e82ba..372a789 100644 --- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridSortItemRenderer.as +++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridSortItemRenderer.as @@ -484,7 +484,7 @@ public class AdvancedDataGridSortItemRenderer extends UIComponent var listData:AdvancedDataGridListData = (parent as IDropInListItemRenderer).listData as AdvancedDataGridListData; if (listData && listData.columnIndex != -1) - return grid.getFieldSortInfo(grid.rawColumns[listData.columnIndex]); + return grid.getFieldSortInfo(grid..mx_internal::rawColumns[listData.columnIndex]); } return null; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5d451afe/frameworks/projects/advancedgrids/src/mx/printing/PrintAdvancedDataGrid.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/printing/PrintAdvancedDataGrid.as b/frameworks/projects/advancedgrids/src/mx/printing/PrintAdvancedDataGrid.as index 5b59c35..76b6ea5 100644 --- a/frameworks/projects/advancedgrids/src/mx/printing/PrintAdvancedDataGrid.as +++ b/frameworks/projects/advancedgrids/src/mx/printing/PrintAdvancedDataGrid.as @@ -616,10 +616,10 @@ public class PrintAdvancedDataGrid extends AdvancedDataGrid { // assign the columns var columnArray:Array = []; - n = value.rawColumns != null ? value.rawColumns.length : 0; + n = value.mx_internal::rawColumns != null ? value.mx_internal::rawColumns.length : 0; for (i = 0; i < n; i++) { - var sourceColumn:AdvancedDataGridColumn = value.rawColumns[i]; + var sourceColumn:AdvancedDataGridColumn = value.mx_internal::rawColumns[i]; var col:AdvancedDataGridColumn = sourceColumn.clone(); // check for treeColumn @@ -725,10 +725,10 @@ public class PrintAdvancedDataGrid extends AdvancedDataGrid // set treeColumn in case of a column grouped AdvacnedDataGrid if (source && source.groupedColumns && source.treeColumn) { - var n:int = source.rawColumns.length; + var n:int = source.mx_internal::rawColumns.length; for (var i:int = 0; i < n; i++) { - var sourceColumn:AdvancedDataGridColumn = source.rawColumns[i]; + var sourceColumn:AdvancedDataGridColumn = source..mx_internal::rawColumns[i]; if (sourceColumn == source.treeColumn) { http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5d451afe/frameworks/projects/spark_dmv/src/mx/controls/advancedDataGridClasses/FTEAdvancedDataGridItemRenderer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark_dmv/src/mx/controls/advancedDataGridClasses/FTEAdvancedDataGridItemRenderer.as b/frameworks/projects/spark_dmv/src/mx/controls/advancedDataGridClasses/FTEAdvancedDataGridItemRenderer.as index ea2c84b..13e7fc1 100644 --- a/frameworks/projects/spark_dmv/src/mx/controls/advancedDataGridClasses/FTEAdvancedDataGridItemRenderer.as +++ b/frameworks/projects/spark_dmv/src/mx/controls/advancedDataGridClasses/FTEAdvancedDataGridItemRenderer.as @@ -456,7 +456,7 @@ public class FTEAdvancedDataGridItemRenderer extends UIFTETextField var dg:AdvancedDataGrid = AdvancedDataGrid(_listData.owner); var column:AdvancedDataGridColumn = - dg.rawColumns[_listData.columnIndex]; + dg.mx_internal::rawColumns[_listData.columnIndex]; text = _listData.label;
