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 2015/07/25 15:50:09 UTC
[1/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34837 Minor
changes: asdocs, making some private functions static where applicable,
removing unused namespaces.
Repository: flex-sdk
Updated Branches:
refs/heads/develop 0cb12ee3f -> 07e7bcf74
FLEX-34837
Minor changes: asdocs, making some private functions static where applicable, removing unused namespaces.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/462a85b9
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/462a85b9
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/462a85b9
Branch: refs/heads/develop
Commit: 462a85b9bc675ebf88175c63c948bf9e752f36e8
Parents: 0cb12ee
Author: Mihai Chira <mi...@apache.org>
Authored: Sat Jul 25 15:32:22 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Sat Jul 25 15:34:25 2015 +0200
----------------------------------------------------------------------
.../gridClasses/DefaultGridItemEditor.mxml | 5 +--
.../components/gridClasses/GridItemEditor.as | 43 +++++++++-----------
2 files changed, 21 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/462a85b9/frameworks/projects/spark/src/spark/components/gridClasses/DefaultGridItemEditor.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/DefaultGridItemEditor.mxml b/frameworks/projects/spark/src/spark/components/gridClasses/DefaultGridItemEditor.mxml
index 5b7dea0..d8cfd33 100644
--- a/frameworks/projects/spark/src/spark/components/gridClasses/DefaultGridItemEditor.mxml
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/DefaultGridItemEditor.mxml
@@ -42,8 +42,7 @@
-->
<s:GridItemEditor xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:s="library://ns.adobe.com/flex/spark"
- xmlns:mx="library://ns.adobe.com/flex/mx"
- xmlns:gridEditorClasses="spark.components.gridEditorClasses.*">
+ xmlns:mx="library://ns.adobe.com/flex/mx">
<fx:Script>
<![CDATA[
@@ -65,7 +64,7 @@
*/
override public function get value():Object
{
- return textArea.text;
+ return textArea.text;
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/462a85b9/frameworks/projects/spark/src/spark/components/gridClasses/GridItemEditor.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/GridItemEditor.as b/frameworks/projects/spark/src/spark/components/gridClasses/GridItemEditor.as
index bc851ea..32bd73f 100644
--- a/frameworks/projects/spark/src/spark/components/gridClasses/GridItemEditor.as
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/GridItemEditor.as
@@ -19,26 +19,21 @@
package spark.components.gridClasses
{
-import flash.events.Event;
-import flash.events.MouseEvent;
-import flash.geom.Point;
-import flash.utils.describeType;
+ import flash.events.Event;
+ import flash.events.MouseEvent;
+ import flash.geom.Point;
+ import flash.utils.describeType;
-import mx.collections.ICollectionView;
-import mx.collections.ISort;
-import mx.core.IIMESupport;
-import mx.core.IInvalidating;
-import mx.core.IVisualElement;
-import mx.core.IVisualElementContainer;
-import mx.core.mx_internal;
-import mx.validators.IValidatorListener;
+ import mx.core.IIMESupport;
+ import mx.core.IInvalidating;
+ import mx.core.IVisualElement;
+ import mx.core.IVisualElementContainer;
+ import mx.validators.IValidatorListener;
+ import mx.core.mx_internal;
+ import spark.components.DataGrid;
+ import spark.components.Group;
-import spark.components.DataGrid;
-import spark.components.Group;
-import spark.components.gridClasses.GridColumn;
-
-
-use namespace mx_internal;
+ use namespace mx_internal;
/**
* The GridItemEditor class defines the base class for custom item editors
@@ -149,7 +144,7 @@ public class GridItemEditor extends Group implements IGridItemEditor
*/
public function get columnIndex():int
{
- return column.columnIndex;;
+ return column.columnIndex;
}
//----------------------------------
@@ -562,7 +557,7 @@ public class GridItemEditor extends Group implements IGridItemEditor
* @param container container to verify, may not be null.
* @return true if the container and its children are valid, false otherwise.
*/
- private function validateContainer(container:IVisualElementContainer):Boolean
+ private static function validateContainer(container:IVisualElementContainer):Boolean
{
if (container is IValidatorListener && IValidatorListener(container).errorString)
return false;
@@ -596,14 +591,14 @@ public class GridItemEditor extends Group implements IGridItemEditor
*
* @param container container to verify, may not be null.
*/
- private function clearErrorStringFromContainer(container:IVisualElementContainer):void
+ private static function clearErrorStringFromContainer(container:IVisualElementContainer):void
{
if (container is IValidatorListener && IValidatorListener(container).errorString)
{
clearErrorString(IValidatorListener(container));
}
- // loop thru the children, looking for errors to clear.
+ // loop through the children, looking for errors to clear.
var n:int = container.numElements;
for (var i:int = 0; i < n; i++)
{
@@ -635,7 +630,7 @@ public class GridItemEditor extends Group implements IGridItemEditor
*
* @param validatorListener listener to clear error message in.
*/
- private function clearErrorString(validatorListener:IValidatorListener):void
+ private static function clearErrorString(validatorListener:IValidatorListener):void
{
validatorListener.errorString = "";
if (validatorListener is IInvalidating)
@@ -648,7 +643,7 @@ public class GridItemEditor extends Group implements IGridItemEditor
* @private
* Stop the item renderer from getting the click.
*/
- private function mouseUpDownMoveHandler(event:MouseEvent):void
+ private static function mouseUpDownMoveHandler(event:MouseEvent):void
{
if (event.cancelable)
event.preventDefault();
[2/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34879
Replacing SortField setters with constructor arguments.
Posted by mi...@apache.org.
FLEX-34879
Replacing SortField setters with constructor arguments.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/cd5f9efa
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/cd5f9efa
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/cd5f9efa
Branch: refs/heads/develop
Commit: cd5f9efa5b4d427803db606580caf80f00472fb9
Parents: 462a85b
Author: Mihai Chira <mi...@apache.org>
Authored: Sat Jul 25 15:41:33 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Sat Jul 25 15:41:33 2015 +0200
----------------------------------------------------------------------
.../src/mx/controls/AdvancedDataGridBaseEx.as | 11 +++--------
.../projects/mx/src/mx/controls/DataGrid.as | 12 ++----------
.../SWFs/DataGridApp_halo.mxml | 20 +++++++++-----------
.../DataGrid_SparkSkin/SWFs/DataGridApp.mxml | 18 ++++++++----------
4 files changed, 22 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cd5f9efa/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as
index 3bdf4bd..b0a1f67 100644
--- a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as
+++ b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as
@@ -6133,13 +6133,8 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME
}
column.sortDescending = desc;
- var field:ISortField = new SortField(columnName);
- field.sortCompareType = column.sortCompareType;
- field.descending = desc;
-
- if (column.sortCompareFunction != null)
- field.compareFunction = column.sortCompareFunction;
-
+ var field:ISortField = new SortField(columnName, false, desc, null, column.sortCompareType, column.sortCompareFunction);
+
fields = collection.sort.fields;
if (fields == null)
fields = [];
@@ -6892,7 +6887,7 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME
* @private
* Catches any events from the model. Optimized for editing one item.
* Creates columns when there are none. Inherited from list.
- * @param eventObj
+ * @param event
*/
override protected function collectionChangeHandler(event:Event):void
{
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cd5f9efa/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 341d629..92dca9b 100644
--- a/frameworks/projects/mx/src/mx/controls/DataGrid.as
+++ b/frameworks/projects/mx/src/mx/controls/DataGrid.as
@@ -3969,7 +3969,6 @@ public class DataGrid extends DataGridBase implements IIMESupport
{
for (var i:int = 0; i < sf.length; i++)
{
-
if (sf[i].name == c.dataField)
{
// we're part of the current sort
@@ -3986,7 +3985,7 @@ public class DataGrid extends DataGridBase implements IIMESupport
if (!f)
{
- f = new SortField(c.dataField);
+ f = new SortField(c.dataField, false, desc, null, null, c.sortCompareFunction);
f.sortCompareType = c.sortCompareType;
}
@@ -4002,14 +4001,7 @@ public class DataGrid extends DataGridBase implements IIMESupport
// if you have a labelFunction you must supply a sortCompareFunction
f.name = c.dataField;
- if (c.sortCompareFunction != null)
- {
- f.compareFunction = c.sortCompareFunction;
- }
- else
- {
- f.compareFunction = null;
- }
+ f.compareFunction = c.sortCompareFunction;
f.descending = desc;
s.fields = [f];
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cd5f9efa/mustella/tests/components/DataGrid/DataGrid_HaloSkin/SWFs/DataGridApp_halo.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/DataGrid/DataGrid_HaloSkin/SWFs/DataGridApp_halo.mxml b/mustella/tests/components/DataGrid/DataGrid_HaloSkin/SWFs/DataGridApp_halo.mxml
index fd56d26..a93ad2f 100644
--- a/mustella/tests/components/DataGrid/DataGrid_HaloSkin/SWFs/DataGridApp_halo.mxml
+++ b/mustella/tests/components/DataGrid/DataGrid_HaloSkin/SWFs/DataGridApp_halo.mxml
@@ -749,20 +749,18 @@
var dg:DataGrid = DataGrid(event.target);
var dgc:DataGridColumn = dg.columns[event.columnIndex] as DataGridColumn;
var s:Sort = new Sort();
- var sf:SortField = new SortField(dgc.dataField);
+
+ var numeric:Object = null;
+ if(dgc.headerText == "numeric")
+ numeric = true;
+ else if(dgc.headerText == "alpha")
+ numeric = false;
+
+ var sf:SortField = new SortField(dgc.dataField, false, !dgc.sortDescending, numeric);
var dp:ICollectionView = dg.dataProvider as ICollectionView;
event.preventDefault();
-
- sf.descending = !dgc.sortDescending;
-
- if(dgc.headerText == "numeric")
- sf.numeric = true;
- else if(dgc.headerText == "alpha")
- sf.numeric = false;
- else
- sf.numeric = null;
-
+
dgc.sortDescending = sf.descending;
s.fields = [ sf ];
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cd5f9efa/mustella/tests/components/DataGrid/DataGrid_SparkSkin/SWFs/DataGridApp.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/DataGrid/DataGrid_SparkSkin/SWFs/DataGridApp.mxml b/mustella/tests/components/DataGrid/DataGrid_SparkSkin/SWFs/DataGridApp.mxml
index 007b3df..15ac9e9 100644
--- a/mustella/tests/components/DataGrid/DataGrid_SparkSkin/SWFs/DataGridApp.mxml
+++ b/mustella/tests/components/DataGrid/DataGrid_SparkSkin/SWFs/DataGridApp.mxml
@@ -763,20 +763,18 @@
var dg:DataGrid = DataGrid(event.target);
var dgc:DataGridColumn = dg.columns[event.columnIndex] as DataGridColumn;
var s:Sort = new Sort();
- var sf:SortField = new SortField(dgc.dataField);
+
+ var numeric:Object = null;
+ if(dgc.headerText == "numeric")
+ numeric = true;
+ else if(dgc.headerText == "alpha")
+ numeric = false;
+
+ var sf:SortField = new SortField(dgc.dataField, false, !dgc.sortDescending, numeric);
var dp:ICollectionView = dg.dataProvider as ICollectionView;
event.preventDefault();
- sf.descending = !dgc.sortDescending;
-
- if(dgc.headerText == "numeric")
- sf.numeric = true;
- else if(dgc.headerText == "alpha")
- sf.numeric = false;
- else
- sf.numeric = null;
-
dgc.sortDescending = sf.descending;
s.fields = [ sf ];
[3/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34837 Asdoc
corrections, plus making one function static.
Posted by mi...@apache.org.
FLEX-34837
Asdoc corrections, plus making one function static.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/07e7bcf7
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/07e7bcf7
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/07e7bcf7
Branch: refs/heads/develop
Commit: 07e7bcf740ae15330874bf3747fef8cb72b322bf
Parents: cd5f9ef
Author: Mihai Chira <mi...@apache.org>
Authored: Sat Jul 25 15:47:06 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Sat Jul 25 15:47:06 2015 +0200
----------------------------------------------------------------------
.../apache/src/org/apache/flex/collections/VectorList.as | 4 ++--
frameworks/projects/framework/src/mx/binding/Binding.as | 4 ++--
.../projects/framework/src/mx/collections/XMLListAdapter.as | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07e7bcf7/frameworks/projects/apache/src/org/apache/flex/collections/VectorList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/apache/src/org/apache/flex/collections/VectorList.as b/frameworks/projects/apache/src/org/apache/flex/collections/VectorList.as
index 5892935..52b34a0 100644
--- a/frameworks/projects/apache/src/org/apache/flex/collections/VectorList.as
+++ b/frameworks/projects/apache/src/org/apache/flex/collections/VectorList.as
@@ -597,8 +597,8 @@ public class VectorList extends EventDispatcher
}
/**
- * Called whenever any of the contained items in the list fire an
- * ObjectChange event.
+ * Called whenever any of the contained items in the list fires a
+ * <code>PropertyChangeEvent</code>.
* Wraps it in a CollectionEventKind.UPDATE.
*/
protected function itemUpdateHandler(event:PropertyChangeEvent):void
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07e7bcf7/frameworks/projects/framework/src/mx/binding/Binding.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/binding/Binding.as b/frameworks/projects/framework/src/mx/binding/Binding.as
index 6122921..15bef54 100644
--- a/frameworks/projects/framework/src/mx/binding/Binding.as
+++ b/frameworks/projects/framework/src/mx/binding/Binding.as
@@ -468,9 +468,9 @@ public class Binding
/**
* @private
- * true iff XMLLists x and y contain the same node sequence.
+ * true if XMLLists x and y contain the same node sequence.
*/
- private function nodeSeqEqual(x:XMLList, y:XMLList):Boolean
+ private static function nodeSeqEqual(x:XMLList, y:XMLList):Boolean
{
var n:uint = x.length();
if (n == y.length())
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07e7bcf7/frameworks/projects/framework/src/mx/collections/XMLListAdapter.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/collections/XMLListAdapter.as b/frameworks/projects/framework/src/mx/collections/XMLListAdapter.as
index 0a8b5e6..f1646a7 100644
--- a/frameworks/projects/framework/src/mx/collections/XMLListAdapter.as
+++ b/frameworks/projects/framework/src/mx/collections/XMLListAdapter.as
@@ -633,8 +633,8 @@ public class XMLListAdapter extends EventDispatcher implements IList, IXMLNotifi
}
/**
- * Called whenever any of the contained items in the list fire an
- * ObjectChange event.
+ * Called whenever any of the contained items in the list fires a
+ * <code>PropertyChangeEvent</code>.
* Wraps it in a CollectionEventKind.UPDATE.
*
* @langversion 3.0