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/09 13:23:00 UTC
[3/3] git commit: [flex-sdk] [refs/heads/develop] - Revert FLEX-34880
part 3
Revert FLEX-34880 part 3
This reverts commit 2b09e327281211d26d65dd5d061b02d645cbdd39.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/286a0ca9
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/286a0ca9
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/286a0ca9
Branch: refs/heads/develop
Commit: 286a0ca9401b8e2a6e2ccca2fcc1764d4933b523
Parents: 3f5638d
Author: Mihai Chira <mi...@apache.org>
Authored: Wed Nov 9 14:09:58 2016 +0100
Committer: Mihai Chira <mi...@apache.org>
Committed: Wed Nov 9 14:09:58 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, 33 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/286a0ca9/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 e023569..7f1155b 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.mx_internal::compareFunction_ = groupingField.compareFunction;
+ sortField.compareFunction = groupingField.compareFunction;
fields.push(sortField);
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/286a0ca9/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 1b73f86..6ceeac7 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.mx_internal::compareFunction_ = groupingField.compareFunction;
+ sortField.compareFunction = groupingField.compareFunction;
fields.push(sortField);
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/286a0ca9/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 e6ed9bb..041147d 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);
- SortField(field).mx_internal::compareFunction_ = attr.dataCompareFunction;
+ field= new SortField(attr.dataField);
+ field.compareFunction = attr.dataCompareFunction;
fields.push(field);
}
else
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/286a0ca9/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..44b3995 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.mx_internal::compareFunction = cF;
+ sortField.compareFunction = cF;
}
sortField.descending = column.sortDescending;
return sortField;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/286a0ca9/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..766bd69 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,6 +79,12 @@ 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/286a0ca9/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..a465656 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)
{
- mx_internal::compareFunction_ = customCompareFunction;
+ 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.
*/
- mx_internal function set compareFunction_(c:Function):void
+ public function set compareFunction(c:Function):void
{
_compareFunction = c;
_usingCustomCompareFunction = (c != null);
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/286a0ca9/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..a035e70 100644
--- a/frameworks/projects/mx/src/mx/controls/DataGrid.as
+++ b/frameworks/projects/mx/src/mx/controls/DataGrid.as
@@ -3981,10 +3981,14 @@ public class DataGrid extends DataGridBase implements IIMESupport
}
}
else
- s = new Sort();
+ s = new Sort;
if (!f)
- f = new SortField(c.dataField, false, desc, null, c.sortCompareType, c.sortCompareFunction);
+ {
+ f = new SortField(c.dataField, false, desc, null, null, c.sortCompareFunction);
+ f.sortCompareType = c.sortCompareType;
+ }
+
c.sortDescending = desc;
var dir:String = (desc) ? "DESC" : "ASC";
@@ -3996,13 +4000,14 @@ public class DataGrid extends DataGridBase implements IIMESupport
sortColumn = c;
// if you have a labelFunction you must supply a sortCompareFunction
- SortField(f).mx_internal::compareFunction_ = c.sortCompareFunction;
+ f.name = c.dataField;
+ f.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/286a0ca9/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 c58e4a3..760b725 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,8 @@ package spark.collections
import mx.core.IFlexModule;
import mx.core.IMXMLObject;
import mx.utils.ObjectUtil;
- import spark.globalization.SortingCollator;
- use namespace mx_internal;
+ import spark.globalization.SortingCollator;
[ResourceBundle("collections")]
@@ -267,9 +266,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 mx_internal function set compareFunction_(c:Function):void
+ override public function set compareFunction(c:Function):void
{
- super.mx_internal::compareFunction_ = c;
+ super.compareFunction = c;
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/286a0ca9/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..f3812e2 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(sortField).mx_internal::compareFunction_ = compareFunc;
+ sortField.compareFunction = compareFunc;
sortField.descending = column.sortDescending;
return sortField;
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/286a0ca9/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 098923c..b71634b 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,9 +107,10 @@
sfCN.setStyle("locale","zh-CN");
sfScriptName.setStyle("locale","zh-CN");
- sfCFScript= new spark.collections.SortField("name", false, null, null, mySortCompareFunction);
+ sfCFScript= new spark.collections.SortField("name");
this.addStyleClient(sfCFScript);
-
+ sfCFScript.compareFunction=mySortCompareFunction;
+
stCFScript=new Sort();
this.addStyleClient(stCFScript);