Merge commit '0b5a634dabb00c04a492a08375e29c6885c1486f' into release4.16.0
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/f86902af Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/f86902af Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/f86902af Branch: refs/heads/release4.16.0 Commit: f86902afa4dd31d94f06232bbc9af7fc6d81c3fd Parents: 4c8fe16 0b5a634 Author: Justin Mclean <jmcl...@apache.org> Authored: Mon Nov 7 16:15:08 2016 +1100 Committer: Justin Mclean <jmcl...@apache.org> Committed: Mon Nov 7 16:15:08 2016 +1100 ---------------------------------------------------------------------- .../src/mx/collections/GroupingCollection.as | 2 +- .../src/mx/collections/GroupingCollection2.as | 2 +- .../src/mx/olap/DefaultCubeImpl.as | 6 ++-- .../src/spark/components/MobileGrid.as | 5 ++-- .../supportClasses/MobileGridColumn.as | 6 ++-- .../framework/src/mx/collections/ISortField.as | 31 +------------------- .../framework/src/mx/collections/SortField.as | 16 +++++----- .../framework/tests/FLEX_34852_Tests.as | 5 ++-- .../ListCollectionView_FLEX_34837_Tests.as | 4 +-- .../projects/mx/src/mx/controls/DataGrid.as | 15 ++++------ .../spark/src/spark/collections/SortField.as | 9 +++--- .../spark/src/spark/components/DataGrid.as | 3 +- .../spark/components/gridClasses/GridColumn.as | 6 ++-- .../SWFs/GridSortPreserveSelection.mxml | 5 ++-- .../Sort/SWFs/SF_ORIG_DataGridApp.mxml | 10 +++---- .../Sort/SWFs/SF_ORIG_DataGridApp_halo.mxml | 8 ++--- .../CustComp_sortField_compareFunction.mxml | 5 ++-- 17 files changed, 54 insertions(+), 84 deletions(-) ----------------------------------------------------------------------