flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mih...@apache.org
Subject [1/4] git commit: [flex-sdk] [refs/heads/release4.16.0] - Revert FLEX-34880 part 1 This reverts commit 0b5a634dabb00c04a492a08375e29c6885c1486f.
Date Wed, 09 Nov 2016 13:25:15 GMT
Repository: flex-sdk
Updated Branches:
  refs/heads/release4.16.0 b7ea70499 -> 13183954e


Revert FLEX-34880 part 1
This reverts commit 0b5a634dabb00c04a492a08375e29c6885c1486f.


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/332e075c
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/332e075c
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/332e075c

Branch: refs/heads/release4.16.0
Commit: 332e075cb3c290400b924a03bfe8d5cb8195009b
Parents: 0b5a634
Author: Mihai Chira <mihaic@apache.org>
Authored: Wed Nov 9 14:01:44 2016 +0100
Committer: Mihai Chira <mihaic@apache.org>
Committed: Wed Nov 9 14:01:44 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, 49 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/332e075c/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 85d68fa..d58f885 100644
--- a/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as
+++ b/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as
@@ -22,7 +22,6 @@ 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;
@@ -281,8 +280,8 @@ public class MobileGrid extends List
         lastSortIndex = sortIndex;
         sortIndex = index;
         sortColumn = c;
-        SortField(f).mx_internal::name_ = c.dataField;
-        SortField(f).mx_internal::descending_ = desc;
+        f.name = c.dataField;
+        f.descending = desc;
         s.fields = [f];
         collection.sort = s;
         collection.refresh();

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/332e075c/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 668594c..ca8ab27 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.mx_internal::descending_ = column.sortDescending;
+        sortField.descending = column.sortDescending;
         return sortField;
     }
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/332e075c/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 be3cc35..4186d0b 100644
--- a/frameworks/projects/framework/src/mx/collections/ISortField.as
+++ b/frameworks/projects/framework/src/mx/collections/ISortField.as
@@ -91,6 +91,11 @@ 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.
@@ -103,6 +108,12 @@ 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.
@@ -136,6 +147,12 @@ 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
@@ -150,6 +167,12 @@ 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/332e075c/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 a7ee7b5..554d7c3 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 set caseInsensitive_(value:Boolean):void
+    mx_internal function setCaseInsensitive(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.
      */
-    mx_internal function set descending_(value:Boolean):void
+    public 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.
      */
-    mx_internal function set name_(n:String):void
+    public 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.
      */
-    mx_internal function set numeric_(value:Object):void
+    public 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.
      */
-    mx_internal function set sortCompareType_(value:String):void
+    public function set sortCompareType(value:String):void
     {
         if (_sortCompareType != value)
         {
@@ -598,7 +598,7 @@ public class SortField extends EventDispatcher implements ISortField
      */
     public function reverse():void
     {
-        mx_internal::descending_ = !descending;
+        descending = !descending;
     }
 
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/332e075c/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 a40f4fb..654cb92 100644
--- a/frameworks/projects/framework/tests/FLEX_34852_Tests.as
+++ b/frameworks/projects/framework/tests/FLEX_34852_Tests.as
@@ -24,7 +24,6 @@ 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;
@@ -147,7 +146,7 @@ package {
 
             const sortByDateMovedInAscending:Sort = new Sort();
             var complexSortField:ComplexSortField = new ComplexSortField("address.dateMovedIn",
false, false, false);
-            complexSortField.mx_internal::sortCompareType_ = SortFieldCompareTypes.DATE;
+            complexSortField.sortCompareType = SortFieldCompareTypes.DATE;
             sortByDateMovedInAscending.fields = [complexSortField];
             _sut.sort = sortByDateMovedInAscending;
 
@@ -167,7 +166,7 @@ package {
 
             const sortByDateMovedInDescending:Sort = new Sort();
             var complexSortField:ComplexSortField = new ComplexSortField("address.dateMovedIn",
false, true, false);
-            complexSortField.mx_internal::sortCompareType_ = SortFieldCompareTypes.DATE;
+            complexSortField.sortCompareType = SortFieldCompareTypes.DATE;
             sortByDateMovedInDescending.fields = [complexSortField];
             _sut.sort = sortByDateMovedInDescending;
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/332e075c/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 3b0372f..b4a8825 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;
-            SortField(f).mx_internal::descending_ = desc;
+            f.descending = desc;
             s.fields = [f];
         }
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/332e075c/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 a55c07f..2c44d22 100644
--- a/frameworks/projects/spark/src/spark/components/DataGrid.as
+++ b/frameworks/projects/spark/src/spark/components/DataGrid.as
@@ -36,7 +36,6 @@ 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;
@@ -5053,7 +5052,7 @@ public class DataGrid extends SkinnableContainerBase
             }
             else
             {
-                SortField(sortField).mx_internal::descending_ = col.sortDescending;
+                sortField.descending = col.sortDescending;
             }
 
             fields.push(sortField);

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/332e075c/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 aeda085..c82c1cb 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(sortField).mx_internal::sortCompareType_ = column._sortCompareType;
+        sortField.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(sortField).mx_internal::descending_ = column.sortDescending;
+        sortField.descending = column.sortDescending;
         return sortField;
     }
     

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/332e075c/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 149ff34..09eb142 100644
--- a/mustella/tests/gumbo/components/DataGrid/SWFs/GridSortPreserveSelection.mxml
+++ b/mustella/tests/gumbo/components/DataGrid/SWFs/GridSortPreserveSelection.mxml
@@ -33,7 +33,6 @@
         <![CDATA[
             import mx.collections.*;
             import flash.utils.getTimer;
-            import mx.core.mx_internal;
             
             private var startTime:uint = 0;
             private var endTime:uint = 0;
@@ -58,8 +57,8 @@
             private function sort():void
             {
                 var dataSortField:SortField = new SortField();
-                dataSortField.mx_internal::name_ = "A";
-                dataSortField.mx_internal::numeric_ = true;
+                dataSortField.name = "A";
+                dataSortField.numeric = true;
                 
                 var numericDataSort:Sort = new Sort();
                 numericDataSort.fields = [dataSortField];

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/332e075c/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 96e9681..89bcb27 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.mx_internal::descending_ = !dgc.sortDescending;
+				sf.descending = !dgc.sortDescending;
 				
 				if(dgc.headerText == "numeric")
-					sf.mx_internal::numeric_ = true;
+					sf.numeric = true;
 				else if(dgc.headerText == "alpha")
-					sf.mx_internal::numeric_ = false;
+					sf.numeric = false;
 				else
-					sf.mx_internal::numeric_ = null;
+					sf.numeric = null;
 				
 				dgc.sortDescending = sf.descending;
 				s.fields = [ sf ];

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/332e075c/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 a97c381..d2c1fff 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.mx_internal::descending_ = !dgc.sortDescending;
+				sf.descending = !dgc.sortDescending;
 				
 				if(dgc.headerText == "numeric")
-					sf.mx_internal::numeric_ = true;
+					sf.numeric = true;
 				else if(dgc.headerText == "alpha")
-					sf.mx_internal::numeric_ = false;
+					sf.numeric = false;
 				else
-					sf.mx_internal::numeric_ = null;
+					sf.numeric = null;
 				
 				dgc.sortDescending = sf.descending;
 				s.fields = [ sf ];


Mime
View raw message