You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by mi...@apache.org on 2016/11/06 18:10:58 UTC
[1/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34880 Placed
only one state setter (SortField.compareFunction) behind mx_internal (thus
also renaming it to SortField.compareFunction_) to provide the template for
the others. Also removed it from
Repository: flex-sdk
Updated Branches:
refs/heads/develop 522a06d61 -> 0b5a634da
FLEX-34880
Placed only one state setter (SortField.compareFunction) behind mx_internal (thus also renaming it to SortField.compareFunction_) to provide the template for the others. Also removed it from the interface (ISortField).
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/2b09e327
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/2b09e327
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/2b09e327
Branch: refs/heads/develop
Commit: 2b09e327281211d26d65dd5d061b02d645cbdd39
Parents: 522a06d
Author: Mihai Chira <mi...@apache.org>
Authored: Sun Nov 6 16:58:13 2016 +0100
Committer: Mihai Chira <mi...@apache.org>
Committed: Sun Nov 6 16:58:13 2016 +0100
----------------------------------------------------------------------
.../src/mx/collections/GroupingCollection.as | 2 +-
.../src/mx/collections/GroupingCollection2.as | 2 +-
.../advancedgrids/src/mx/olap/DefaultCubeImpl.as | 6 +++---
.../components/supportClasses/MobileGridColumn.as | 4 ++--
.../framework/src/mx/collections/ISortField.as | 8 +-------
.../projects/framework/src/mx/collections/SortField.as | 4 ++--
frameworks/projects/mx/src/mx/controls/DataGrid.as | 13 ++++---------
.../projects/spark/src/spark/collections/SortField.as | 9 +++++----
.../src/spark/components/gridClasses/GridColumn.as | 2 +-
.../newComps/CustComp_sortField_compareFunction.mxml | 5 ++---
10 files changed, 22 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2b09e327/frameworks/projects/advancedgrids/src/mx/collections/GroupingCollection.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/src/mx/collections/GroupingCollection.as b/frameworks/projects/advancedgrids/src/mx/collections/GroupingCollection.as
index 7f1155b..e023569 100644
--- a/frameworks/projects/advancedgrids/src/mx/collections/GroupingCollection.as
+++ b/frameworks/projects/advancedgrids/src/mx/collections/GroupingCollection.as
@@ -1113,7 +1113,7 @@ public class GroupingCollection extends HierarchicalData implements IGroupingCol
var sortField:SortField = new SortField(groupingField.name,
groupingField.caseInsensitive,
groupingField.descending, groupingField.numeric);
- sortField.compareFunction = groupingField.compareFunction;
+ sortField.mx_internal::compareFunction_ = groupingField.compareFunction;
fields.push(sortField);
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2b09e327/frameworks/projects/advancedgrids/src/mx/collections/GroupingCollection2.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/src/mx/collections/GroupingCollection2.as b/frameworks/projects/advancedgrids/src/mx/collections/GroupingCollection2.as
index 6ceeac7..1b73f86 100644
--- a/frameworks/projects/advancedgrids/src/mx/collections/GroupingCollection2.as
+++ b/frameworks/projects/advancedgrids/src/mx/collections/GroupingCollection2.as
@@ -1154,7 +1154,7 @@ public class GroupingCollection2 extends HierarchicalData implements IGroupingCo
var sortField:SortField = new SortField(groupingField.name,
groupingField.caseInsensitive,
groupingField.descending, groupingField.numeric);
- sortField.compareFunction = groupingField.compareFunction;
+ sortField.mx_internal::compareFunction_ = groupingField.compareFunction;
fields.push(sortField);
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2b09e327/frameworks/projects/advancedgrids/src/mx/olap/DefaultCubeImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/src/mx/olap/DefaultCubeImpl.as b/frameworks/projects/advancedgrids/src/mx/olap/DefaultCubeImpl.as
index 041147d..e6ed9bb 100644
--- a/frameworks/projects/advancedgrids/src/mx/olap/DefaultCubeImpl.as
+++ b/frameworks/projects/advancedgrids/src/mx/olap/DefaultCubeImpl.as
@@ -382,14 +382,14 @@ public class DefaultCubeImpl implements IOLAPCubeImpl
newSort = new Sort;
var fields:Array = [];
- var field:ISortField ;
+ var field:ISortField;
for each (level in levels)
{
if (level.attribute && level.attribute.userDataFunction)
{
attr = level.attribute;
- field= new SortField(attr.dataField);
- field.compareFunction = attr.dataCompareFunction;
+ field = new SortField(attr.dataField);
+ SortField(field).mx_internal::compareFunction_ = attr.dataCompareFunction;
fields.push(field);
}
else
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2b09e327/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 44b3995..ca8ab27 100644
--- a/frameworks/projects/experimental_mobile/src/spark/components/supportClasses/MobileGridColumn.as
+++ b/frameworks/projects/experimental_mobile/src/spark/components/supportClasses/MobileGridColumn.as
@@ -21,7 +21,7 @@ package spark.components.supportClasses
import flash.events.EventDispatcher;
import flash.events.IEventDispatcher;
-
+import mx.core.mx_internal;
import mx.core.ClassFactory;
import mx.core.IFactory;
import mx.core.mx_internal;
@@ -322,7 +322,7 @@ public class MobileGridColumn extends EventDispatcher
{
return ObjectUtil.stringCompare(labelFunction(a), labelFunction(b));
};
- sortField.compareFunction = cF;
+ sortField.mx_internal::compareFunction = cF;
}
sortField.descending = column.sortDescending;
return sortField;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2b09e327/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 766bd69..4186d0b 100644
--- a/frameworks/projects/framework/src/mx/collections/ISortField.as
+++ b/frameworks/projects/framework/src/mx/collections/ISortField.as
@@ -19,7 +19,7 @@
package mx.collections
{
-/**
+ /**
* The <code>ISortField</code> interface defines the interface for classes that
* are used with <code>ISort</code> classes, to provide the sorting information
* required to sort the specific fields or property in a collection view.
@@ -79,12 +79,6 @@ public interface ISortField
function get compareFunction():Function;
/**
- * @deprecated A future release of Apache Flex SDK will remove this function. Please use the constructor
- * argument instead.
- */
- function set compareFunction(c:Function):void;
-
- /**
* Specifies whether this field should be sorted in descending
* order.
*
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2b09e327/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 a465656..554d7c3 100644
--- a/frameworks/projects/framework/src/mx/collections/SortField.as
+++ b/frameworks/projects/framework/src/mx/collections/SortField.as
@@ -146,7 +146,7 @@ public class SortField extends EventDispatcher implements ISortField
if(customCompareFunction != null)
{
- compareFunction = customCompareFunction;
+ mx_internal::compareFunction_ = customCompareFunction;
}
else if (updateSortCompareType() == false)
{
@@ -302,7 +302,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 compareFunction(c:Function):void
+ mx_internal function set compareFunction_(c:Function):void
{
_compareFunction = c;
_usingCustomCompareFunction = (c != null);
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2b09e327/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 a035e70..b4a8825 100644
--- a/frameworks/projects/mx/src/mx/controls/DataGrid.as
+++ b/frameworks/projects/mx/src/mx/controls/DataGrid.as
@@ -3981,14 +3981,10 @@ public class DataGrid extends DataGridBase implements IIMESupport
}
}
else
- s = new Sort;
+ s = new Sort();
if (!f)
- {
- f = new SortField(c.dataField, false, desc, null, null, c.sortCompareFunction);
- f.sortCompareType = c.sortCompareType;
- }
-
+ f = new SortField(c.dataField, false, desc, null, c.sortCompareType, c.sortCompareFunction);
c.sortDescending = desc;
var dir:String = (desc) ? "DESC" : "ASC";
@@ -4000,14 +3996,13 @@ public class DataGrid extends DataGridBase implements IIMESupport
sortColumn = c;
// if you have a labelFunction you must supply a sortCompareFunction
- f.name = c.dataField;
- f.compareFunction = c.sortCompareFunction;
+ SortField(f).mx_internal::compareFunction_ = c.sortCompareFunction;
f.descending = desc;
s.fields = [f];
}
+
collection.sort = s;
collection.refresh();
-
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2b09e327/frameworks/projects/spark/src/spark/collections/SortField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/collections/SortField.as b/frameworks/projects/spark/src/spark/collections/SortField.as
index 760b725..c58e4a3 100644
--- a/frameworks/projects/spark/src/spark/collections/SortField.as
+++ b/frameworks/projects/spark/src/spark/collections/SortField.as
@@ -19,7 +19,7 @@
package spark.collections
{
-
+ import mx.core.mx_internal;
import flash.events.Event;
import mx.styles.IAdvancedStyleClient;
import mx.collections.ISortField;
@@ -27,9 +27,10 @@ package spark.collections
import mx.core.IFlexModule;
import mx.core.IMXMLObject;
import mx.utils.ObjectUtil;
-
import spark.globalization.SortingCollator;
+ use namespace mx_internal;
+
[ResourceBundle("collections")]
//--------------------------------------
@@ -266,9 +267,9 @@ public class SortField extends mx.collections.SortField implements IAdvancedStyl
* @deprecated A future release of Apache Flex SDK will remove this function. Please use the constructor
* argument instead.
*/
- override public function set compareFunction(c:Function):void
+ override mx_internal function set compareFunction_(c:Function):void
{
- super.compareFunction = c;
+ super.mx_internal::compareFunction_ = c;
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2b09e327/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 f3812e2..c82c1cb 100644
--- a/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as
@@ -1609,7 +1609,7 @@ public class GridColumn extends EventDispatcher
}
}
- sortField.compareFunction = compareFunc;
+ SortField(sortField).mx_internal::compareFunction_ = compareFunc;
sortField.descending = column.sortDescending;
return sortField;
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2b09e327/mustella/tests/spark/collections/Sort/SWFs/newComps/CustComp_sortField_compareFunction.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/collections/Sort/SWFs/newComps/CustComp_sortField_compareFunction.mxml b/mustella/tests/spark/collections/Sort/SWFs/newComps/CustComp_sortField_compareFunction.mxml
index b71634b..098923c 100644
--- a/mustella/tests/spark/collections/Sort/SWFs/newComps/CustComp_sortField_compareFunction.mxml
+++ b/mustella/tests/spark/collections/Sort/SWFs/newComps/CustComp_sortField_compareFunction.mxml
@@ -107,10 +107,9 @@
sfCN.setStyle("locale","zh-CN");
sfScriptName.setStyle("locale","zh-CN");
- sfCFScript= new spark.collections.SortField("name");
+ sfCFScript= new spark.collections.SortField("name", false, null, null, mySortCompareFunction);
this.addStyleClient(sfCFScript);
- sfCFScript.compareFunction=mySortCompareFunction;
-
+
stCFScript=new Sort();
this.addStyleClient(stCFScript);
[3/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34880 Placed
the other ISortField setters behind mx_internal and removed them from the
interface.
Posted by mi...@apache.org.
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/develop
Commit: 0b5a634dabb00c04a492a08375e29c6885c1486f
Parents: ff4067f
Author: Mihai Chira <mi...@apache.org>
Authored: Sun Nov 6 19:08:38 2016 +0100
Committer: Mihai Chira <mi...@apache.org>
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 ];
[2/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34880
Omitted to change a unit test.
Posted by mi...@apache.org.
FLEX-34880
Omitted to change a unit test.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ff4067f5
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ff4067f5
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ff4067f5
Branch: refs/heads/develop
Commit: ff4067f56651082cecbe062f9cfd2aedbe44bf60
Parents: 2b09e32
Author: Mihai Chira <mi...@apache.org>
Authored: Sun Nov 6 17:42:40 2016 +0100
Committer: Mihai Chira <mi...@apache.org>
Committed: Sun Nov 6 17:42:40 2016 +0100
----------------------------------------------------------------------
.../framework/tests/ListCollectionView_FLEX_34837_Tests.as | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ff4067f5/frameworks/projects/framework/tests/ListCollectionView_FLEX_34837_Tests.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/tests/ListCollectionView_FLEX_34837_Tests.as b/frameworks/projects/framework/tests/ListCollectionView_FLEX_34837_Tests.as
index f762358..f199481 100644
--- a/frameworks/projects/framework/tests/ListCollectionView_FLEX_34837_Tests.as
+++ b/frameworks/projects/framework/tests/ListCollectionView_FLEX_34837_Tests.as
@@ -25,7 +25,7 @@ package {
import mx.collections.Sort;
import mx.collections.SortField;
import mx.utils.ObjectUtil;
-
+ import mx.core.mx_internal;
import org.flexunit.asserts.assertEquals;
public class ListCollectionView_FLEX_34837_Tests {
@@ -87,7 +87,7 @@ package {
const sortByStreetAscending:Sort = new Sort();
var sortField:SortField = new ComplexSortField("address.street", false, false, false);
- sortField.compareFunction = compareByStreet;
+ sortField.mx_internal::compareFunction_ = compareByStreet;
sortByStreetAscending.fields = [sortField];
_sut.sort = sortByStreetAscending;