FLEX-34880 Placed the other ISortField setters behind mx_internal and removed them from the interface.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/0b5a634d Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/0b5a634d Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/0b5a634d Branch: refs/heads/release4.16.0 Commit: 0b5a634dabb00c04a492a08375e29c6885c1486f Parents: ff4067f Author: Mihai Chira <[email protected]> Authored: Sun Nov 6 19:08:38 2016 +0100 Committer: Mihai Chira <[email protected]> Committed: Sun Nov 6 19:08:38 2016 +0100 ---------------------------------------------------------------------- .../src/spark/components/MobileGrid.as | 5 +++-- .../supportClasses/MobileGridColumn.as | 2 +- .../framework/src/mx/collections/ISortField.as | 23 -------------------- .../framework/src/mx/collections/SortField.as | 12 +++++----- .../framework/tests/FLEX_34852_Tests.as | 5 +++-- .../projects/mx/src/mx/controls/DataGrid.as | 2 +- .../spark/src/spark/components/DataGrid.as | 3 ++- .../spark/components/gridClasses/GridColumn.as | 4 ++-- .../SWFs/GridSortPreserveSelection.mxml | 5 +++-- .../Sort/SWFs/SF_ORIG_DataGridApp.mxml | 10 ++++----- .../Sort/SWFs/SF_ORIG_DataGridApp_halo.mxml | 8 +++---- 11 files changed, 30 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0b5a634d/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as b/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as index d58f885..85d68fa 100644 --- a/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as +++ b/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as @@ -22,6 +22,7 @@ package spark.components import mx.collections.ICollectionView; import mx.collections.ISort; import mx.collections.ISortField; +import mx.collections.SortField; import mx.core.ClassFactory; import mx.core.ScrollPolicy; import mx.core.mx_internal; @@ -280,8 +281,8 @@ public class MobileGrid extends List lastSortIndex = sortIndex; sortIndex = index; sortColumn = c; - f.name = c.dataField; - f.descending = desc; + SortField(f).mx_internal::name_ = c.dataField; + SortField(f).mx_internal::descending_ = desc; s.fields = [f]; collection.sort = s; collection.refresh(); http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0b5a634d/frameworks/projects/experimental_mobile/src/spark/components/supportClasses/MobileGridColumn.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/experimental_mobile/src/spark/components/supportClasses/MobileGridColumn.as b/frameworks/projects/experimental_mobile/src/spark/components/supportClasses/MobileGridColumn.as index ca8ab27..668594c 100644 --- a/frameworks/projects/experimental_mobile/src/spark/components/supportClasses/MobileGridColumn.as +++ b/frameworks/projects/experimental_mobile/src/spark/components/supportClasses/MobileGridColumn.as @@ -324,7 +324,7 @@ public class MobileGridColumn extends EventDispatcher }; sortField.mx_internal::compareFunction = cF; } - sortField.descending = column.sortDescending; + sortField.mx_internal::descending_ = column.sortDescending; return sortField; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0b5a634d/frameworks/projects/framework/src/mx/collections/ISortField.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/src/mx/collections/ISortField.as b/frameworks/projects/framework/src/mx/collections/ISortField.as index 4186d0b..be3cc35 100644 --- a/frameworks/projects/framework/src/mx/collections/ISortField.as +++ b/frameworks/projects/framework/src/mx/collections/ISortField.as @@ -91,11 +91,6 @@ public interface ISortField */ function get descending():Boolean; - /** - * @deprecated A future release of Apache Flex SDK will remove this function. Please use the constructor - * argument instead. - */ - function set descending(value:Boolean):void; /** * The name of the field to be sorted. @@ -108,12 +103,6 @@ public interface ISortField function get name():String; /** - * @deprecated A future release of Apache Flex SDK will remove this function. Please use the constructor - * argument instead. - */ - function set name(n:String):void; - - /** * Specifies that if the field being sorted contains numeric * (<code>number/int/uint</code>) values, or string representations of numeric values, * the comparator use a numeric comparison. @@ -147,12 +136,6 @@ public interface ISortField */ function get numeric():Object; - /** - * @deprecated A future release of Apache Flex SDK will remove this function. Please use the constructor - * argument instead. - */ - function set numeric(value:Object):void; - /** * Specifies what compare type will be used for the sortField. This overrides the default @@ -167,12 +150,6 @@ public interface ISortField */ function get sortCompareType():String; - /** - * @deprecated A future release of Apache Flex SDK will remove this function. Please use the constructor - * argument instead. - */ - function set sortCompareType(value:String):void; - /** * True if this <code>ISortField</code> uses a custom comparator function. http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0b5a634d/frameworks/projects/framework/src/mx/collections/SortField.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/src/mx/collections/SortField.as b/frameworks/projects/framework/src/mx/collections/SortField.as index 554d7c3..a7ee7b5 100644 --- a/frameworks/projects/framework/src/mx/collections/SortField.as +++ b/frameworks/projects/framework/src/mx/collections/SortField.as @@ -233,7 +233,7 @@ public class SortField extends EventDispatcher implements ISortField * @deprecated A future release of Apache Flex SDK will remove this function. Please use the constructor * argument instead. */ - mx_internal function setCaseInsensitive(value:Boolean):void + mx_internal function set caseInsensitive_(value:Boolean):void { if (value != _caseInsensitive) { @@ -338,7 +338,7 @@ public class SortField extends EventDispatcher implements ISortField * @deprecated A future release of Apache Flex SDK will remove this function. Please use the constructor * argument instead. */ - public function set descending(value:Boolean):void + mx_internal function set descending_(value:Boolean):void { if (_descending != value) { @@ -379,7 +379,7 @@ public class SortField extends EventDispatcher implements ISortField * @deprecated A future release of Apache Flex SDK will remove this function. Please use the constructor * argument instead. */ - public function set name(n:String):void + mx_internal function set name_(n:String):void { _name = n; dispatchEvent(new Event("nameChanged")); @@ -417,7 +417,7 @@ public class SortField extends EventDispatcher implements ISortField * @deprecated A future release of Apache Flex SDK will remove this function. Please use the constructor * argument instead. */ - public function set numeric(value:Object):void + mx_internal function set numeric_(value:Object):void { if (_numeric != value) { @@ -454,7 +454,7 @@ public class SortField extends EventDispatcher implements ISortField * @deprecated A future release of Apache Flex SDK will remove this function. Please use the constructor * argument instead. */ - public function set sortCompareType(value:String):void + mx_internal function set sortCompareType_(value:String):void { if (_sortCompareType != value) { @@ -598,7 +598,7 @@ public class SortField extends EventDispatcher implements ISortField */ public function reverse():void { - descending = !descending; + mx_internal::descending_ = !descending; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0b5a634d/frameworks/projects/framework/tests/FLEX_34852_Tests.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/tests/FLEX_34852_Tests.as b/frameworks/projects/framework/tests/FLEX_34852_Tests.as index 654cb92..a40f4fb 100644 --- a/frameworks/projects/framework/tests/FLEX_34852_Tests.as +++ b/frameworks/projects/framework/tests/FLEX_34852_Tests.as @@ -24,6 +24,7 @@ package { import mx.collections.ListCollectionView; import mx.collections.Sort; import mx.collections.SortFieldCompareTypes; + import mx.core.mx_internal; import org.flexunit.asserts.assertEquals; import org.flexunit.asserts.assertTrue; @@ -146,7 +147,7 @@ package { const sortByDateMovedInAscending:Sort = new Sort(); var complexSortField:ComplexSortField = new ComplexSortField("address.dateMovedIn", false, false, false); - complexSortField.sortCompareType = SortFieldCompareTypes.DATE; + complexSortField.mx_internal::sortCompareType_ = SortFieldCompareTypes.DATE; sortByDateMovedInAscending.fields = [complexSortField]; _sut.sort = sortByDateMovedInAscending; @@ -166,7 +167,7 @@ package { const sortByDateMovedInDescending:Sort = new Sort(); var complexSortField:ComplexSortField = new ComplexSortField("address.dateMovedIn", false, true, false); - complexSortField.sortCompareType = SortFieldCompareTypes.DATE; + complexSortField.mx_internal::sortCompareType_ = SortFieldCompareTypes.DATE; sortByDateMovedInDescending.fields = [complexSortField]; _sut.sort = sortByDateMovedInDescending; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0b5a634d/frameworks/projects/mx/src/mx/controls/DataGrid.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/mx/src/mx/controls/DataGrid.as b/frameworks/projects/mx/src/mx/controls/DataGrid.as index b4a8825..3b0372f 100644 --- a/frameworks/projects/mx/src/mx/controls/DataGrid.as +++ b/frameworks/projects/mx/src/mx/controls/DataGrid.as @@ -3997,7 +3997,7 @@ public class DataGrid extends DataGridBase implements IIMESupport // if you have a labelFunction you must supply a sortCompareFunction SortField(f).mx_internal::compareFunction_ = c.sortCompareFunction; - f.descending = desc; + SortField(f).mx_internal::descending_ = desc; s.fields = [f]; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0b5a634d/frameworks/projects/spark/src/spark/components/DataGrid.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/components/DataGrid.as b/frameworks/projects/spark/src/spark/components/DataGrid.as index 2c44d22..a55c07f 100644 --- a/frameworks/projects/spark/src/spark/components/DataGrid.as +++ b/frameworks/projects/spark/src/spark/components/DataGrid.as @@ -36,6 +36,7 @@ package spark.components import mx.collections.IList; import mx.collections.ISort; import mx.collections.ISortField; + import mx.collections.SortField; import mx.collections.ListCollectionView; import mx.core.DragSource; import mx.core.EventPriority; @@ -5052,7 +5053,7 @@ public class DataGrid extends SkinnableContainerBase } else { - sortField.descending = col.sortDescending; + SortField(sortField).mx_internal::descending_ = col.sortDescending; } fields.push(sortField); http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0b5a634d/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as b/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as index c82c1cb..aeda085 100644 --- a/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as +++ b/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as @@ -1586,7 +1586,7 @@ public class GridColumn extends EventDispatcher // data object even though a sortCompareFunction is defined. var sortField:ISortField = isComplexDataField ? new GridSortFieldComplex(this, dataField) : new GridSortFieldSimple(this, dataField); - sortField.sortCompareType = column._sortCompareType; + SortField(sortField).mx_internal::sortCompareType_ = column._sortCompareType; var compareFunc:Function = null; if (_sortCompareFunction != null) @@ -1610,7 +1610,7 @@ public class GridColumn extends EventDispatcher } SortField(sortField).mx_internal::compareFunction_ = compareFunc; - sortField.descending = column.sortDescending; + SortField(sortField).mx_internal::descending_ = column.sortDescending; return sortField; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0b5a634d/mustella/tests/gumbo/components/DataGrid/SWFs/GridSortPreserveSelection.mxml ---------------------------------------------------------------------- diff --git a/mustella/tests/gumbo/components/DataGrid/SWFs/GridSortPreserveSelection.mxml b/mustella/tests/gumbo/components/DataGrid/SWFs/GridSortPreserveSelection.mxml index 09eb142..149ff34 100644 --- a/mustella/tests/gumbo/components/DataGrid/SWFs/GridSortPreserveSelection.mxml +++ b/mustella/tests/gumbo/components/DataGrid/SWFs/GridSortPreserveSelection.mxml @@ -33,6 +33,7 @@ <![CDATA[ import mx.collections.*; import flash.utils.getTimer; + import mx.core.mx_internal; private var startTime:uint = 0; private var endTime:uint = 0; @@ -57,8 +58,8 @@ private function sort():void { var dataSortField:SortField = new SortField(); - dataSortField.name = "A"; - dataSortField.numeric = true; + dataSortField.mx_internal::name_ = "A"; + dataSortField.mx_internal::numeric_ = true; var numericDataSort:Sort = new Sort(); numericDataSort.fields = [dataSortField]; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0b5a634d/mustella/tests/spark/collections/Sort/SWFs/SF_ORIG_DataGridApp.mxml ---------------------------------------------------------------------- diff --git a/mustella/tests/spark/collections/Sort/SWFs/SF_ORIG_DataGridApp.mxml b/mustella/tests/spark/collections/Sort/SWFs/SF_ORIG_DataGridApp.mxml index 89bcb27..96e9681 100644 --- a/mustella/tests/spark/collections/Sort/SWFs/SF_ORIG_DataGridApp.mxml +++ b/mustella/tests/spark/collections/Sort/SWFs/SF_ORIG_DataGridApp.mxml @@ -33,7 +33,7 @@ import mx.events.DragEvent; import mx.managers.DragManager; import mx.utils.ObjectUtil; - + import mx.core.mx_internal; import spark.collections.*; // These skins are copied from DataGridMain.mxml. @@ -766,14 +766,14 @@ event.preventDefault(); - sf.descending = !dgc.sortDescending; + sf.mx_internal::descending_ = !dgc.sortDescending; if(dgc.headerText == "numeric") - sf.numeric = true; + sf.mx_internal::numeric_ = true; else if(dgc.headerText == "alpha") - sf.numeric = false; + sf.mx_internal::numeric_ = false; else - sf.numeric = null; + sf.mx_internal::numeric_ = null; dgc.sortDescending = sf.descending; s.fields = [ sf ]; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/0b5a634d/mustella/tests/spark/collections/Sort/SWFs/SF_ORIG_DataGridApp_halo.mxml ---------------------------------------------------------------------- diff --git a/mustella/tests/spark/collections/Sort/SWFs/SF_ORIG_DataGridApp_halo.mxml b/mustella/tests/spark/collections/Sort/SWFs/SF_ORIG_DataGridApp_halo.mxml index d2c1fff..a97c381 100644 --- a/mustella/tests/spark/collections/Sort/SWFs/SF_ORIG_DataGridApp_halo.mxml +++ b/mustella/tests/spark/collections/Sort/SWFs/SF_ORIG_DataGridApp_halo.mxml @@ -751,14 +751,14 @@ event.preventDefault(); - sf.descending = !dgc.sortDescending; + sf.mx_internal::descending_ = !dgc.sortDescending; if(dgc.headerText == "numeric") - sf.numeric = true; + sf.mx_internal::numeric_ = true; else if(dgc.headerText == "alpha") - sf.numeric = false; + sf.mx_internal::numeric_ = false; else - sf.numeric = null; + sf.mx_internal::numeric_ = null; dgc.sortDescending = sf.descending; s.fields = [ sf ];
