You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2015/12/28 02:20:51 UTC
[01/10] git commit: [flex-sdk] [refs/heads/release4.15.0] -
FLEX-34979 CAUSE: When the transition was made from the spark Sort and
SortField extending AdvancedStyleClient to implementing its interfaces,
the omission was that only IAdvancedStyleClient was
Repository: flex-sdk
Updated Branches:
refs/heads/release4.15.0 35028cdd1 -> 7738c750e
FLEX-34979
CAUSE:
When the transition was made from the spark Sort and SortField extending AdvancedStyleClient to implementing its interfaces, the omission was that only IAdvancedStyleClient was implemented, as opposed to all three relevant interfaces (IAdvancedStyleClient, IFlexModule, IMXMLObject). More specifically the mustella failures reflected that the function initialized() wasn't present anymore, as that function, called automatically by the framework, is responsible for registering the Sort and SortField instances with the IFlexModuleFactory implementor (FlexModuleFactory or SystemManager, etc.).
SOLUTION:
The spark versions of Sort and SortField now also implement IFlexModule and IMXMLObject via AdvancedStyleClientImplementation.
NOTES:
-also cleaned some imports in AdvancedStyleClient.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/64216e91
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/64216e91
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/64216e91
Branch: refs/heads/release4.15.0
Commit: 64216e91720cd818da9d478410a117619f7f0fa0
Parents: b29975c
Author: Mihai Chira <mi...@apache.org>
Authored: Thu Dec 3 15:19:50 2015 +0100
Committer: Mihai Chira <mi...@apache.org>
Committed: Thu Dec 3 15:19:50 2015 +0100
----------------------------------------------------------------------
.../src/mx/styles/AdvancedStyleClient.as | 22 +++++++++-----------
.../AdvancedStyleClientImplementation.as | 22 ++++++++++++++++++++
.../spark/src/spark/collections/Sort.as | 9 +++++---
.../spark/src/spark/collections/SortField.as | 7 ++++---
4 files changed, 42 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/64216e91/frameworks/projects/framework/src/mx/styles/AdvancedStyleClient.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/styles/AdvancedStyleClient.as b/frameworks/projects/framework/src/mx/styles/AdvancedStyleClient.as
index 8ec8a1d..a8b095c 100644
--- a/frameworks/projects/framework/src/mx/styles/AdvancedStyleClient.as
+++ b/frameworks/projects/framework/src/mx/styles/AdvancedStyleClient.as
@@ -20,18 +20,16 @@
package mx.styles
{
-import flash.events.*;
-
-import mx.core.FlexGlobals;
-import mx.core.IFlexDisplayObject;
-import mx.core.IFlexModule;
-import mx.core.IFlexModuleFactory;
-import mx.core.IMXMLObject;
-import mx.core.UIComponent;
-import mx.styles.*;
-import mx.utils.NameUtil;
-
-/**
+ import flash.events.*;
+
+ import mx.core.FlexGlobals;
+ import mx.core.IFlexModule;
+ import mx.core.IFlexModuleFactory;
+ import mx.core.IMXMLObject;
+ import mx.core.UIComponent;
+ import mx.utils.NameUtil;
+
+ /**
* A base class that can be used
* when implementing an object that uses the
* <code>IAdvancedStyleClient</code> interface. The base class supplies
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/64216e91/frameworks/projects/spark/src/spark/collections/AdvancedStyleClientImplementation.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/collections/AdvancedStyleClientImplementation.as b/frameworks/projects/spark/src/spark/collections/AdvancedStyleClientImplementation.as
index fa2f17f..a1429db 100644
--- a/frameworks/projects/spark/src/spark/collections/AdvancedStyleClientImplementation.as
+++ b/frameworks/projects/spark/src/spark/collections/AdvancedStyleClientImplementation.as
@@ -1,6 +1,8 @@
+import mx.core.IFlexModuleFactory;
import mx.styles.AdvancedStyleClient;
import mx.styles.CSSStyleDeclaration;
import mx.styles.IAdvancedStyleClient;
+import mx.styles.IStyleManager2;
////////////////////////////////////////////////////////////////////////////////
//
@@ -142,3 +144,23 @@ public function styleChanged(styleProp:String):void
{
_styleChanged(styleProp);
}
+
+public function get styleManager():IStyleManager2
+{
+ return _advancedStyleClient.styleManager;
+}
+
+public function get moduleFactory():IFlexModuleFactory
+{
+ return _advancedStyleClient.moduleFactory;
+}
+
+public function set moduleFactory(factory:IFlexModuleFactory):void
+{
+ _advancedStyleClient.moduleFactory = factory;
+}
+
+public function initialized(document:Object, id:String):void
+{
+ _advancedStyleClient.initialized(document, id);
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/64216e91/frameworks/projects/spark/src/spark/collections/Sort.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/collections/Sort.as b/frameworks/projects/spark/src/spark/collections/Sort.as
index 912e2dd..d581c9a 100644
--- a/frameworks/projects/spark/src/spark/collections/Sort.as
+++ b/frameworks/projects/spark/src/spark/collections/Sort.as
@@ -22,6 +22,9 @@ package spark.collections
import flash.events.Event;
+ import mx.core.IFlexModule;
+ import mx.core.IMXMLObject;
+
import mx.core.mx_internal;
import mx.styles.IAdvancedStyleClient;
import mx.collections.ISortField;
@@ -190,7 +193,7 @@ package spark.collections
* @playerversion AIR 2.5
* @productversion Flex 4.5
*/
-public class Sort extends mx.collections.Sort implements IAdvancedStyleClient
+public class Sort extends mx.collections.Sort implements IAdvancedStyleClient, IFlexModule, IMXMLObject
{
include "../core/Version.as";
include "AdvancedStyleClientImplementation.as";
@@ -425,5 +428,5 @@ public class Sort extends mx.collections.Sort implements IAdvancedStyleClient
dispatchEvent(new Event(Event.CHANGE));
}
-}
-}
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/64216e91/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 12568e9..814bf34 100644
--- a/frameworks/projects/spark/src/spark/collections/SortField.as
+++ b/frameworks/projects/spark/src/spark/collections/SortField.as
@@ -24,6 +24,8 @@ package spark.collections
import mx.styles.IAdvancedStyleClient;
import mx.collections.ISortField;
import mx.core.FlexGlobals;
+ import mx.core.IFlexModule;
+ import mx.core.IMXMLObject;
import mx.utils.ObjectUtil;
import spark.globalization.SortingCollator;
@@ -153,9 +155,10 @@ package spark.collections
* @playerversion AIR 2.5
* @productversion Flex 4.5
*/
-public class SortField extends mx.collections.SortField implements IAdvancedStyleClient
+public class SortField extends mx.collections.SortField implements IAdvancedStyleClient, IFlexModule, IMXMLObject
{
include "../core/Version.as";
+ include "AdvancedStyleClientImplementation.as";
//--------------------------------------------------------------------------
//
@@ -192,8 +195,6 @@ public class SortField extends mx.collections.SortField implements IAdvancedStyl
super(name, false, descending, numeric, sortCompareType, customCompareFunction);
}
- include "AdvancedStyleClientImplementation.as";
-
//--------------------------------------------------------------------------
//
// Variables
[08/10] git commit: [flex-sdk] [refs/heads/release4.15.0] -
FLEX-34958 Removed sub-tasks,
added two newly-resolved features and upgraded some issues that were listed as
bugs to the New Features heading.
Posted by jm...@apache.org.
FLEX-34958
Removed sub-tasks, added two newly-resolved features and upgraded some issues that were listed as bugs to the New Features heading.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e11ef417
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e11ef417
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e11ef417
Branch: refs/heads/release4.15.0
Commit: e11ef417cc59e9146ec791c64e3a36b2a004e63a
Parents: 9c7d389
Author: Mihai Chira <mi...@apache.org>
Authored: Fri Dec 18 13:38:18 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Fri Dec 18 13:38:18 2015 +0200
----------------------------------------------------------------------
RELEASE_NOTES | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e11ef417/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index cbd6418..9670131 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -3,7 +3,12 @@ Apache Flex 4.15.0
New Features
------------
-- Sorting on complex DataGrid fields
+- FLEX-34852 Sorting by complex fields in ListCollectionView
+- FLEX-34837 Full support for sorting on complex fields of DataGrid rows
+- FLEX-34927 Allow the setting of an arbitrary property on an object via
+ ObjectUtil
+- FLEX-34941 Allow custom validators to use the triggerEvent
+- FLEX-34945 Validators now able to validate nested properties
AIR and Flash Player Support
----------------------------
@@ -31,6 +36,8 @@ FLEX-34775 Application hangs (in infinite loop) when opening a node inside
FLEX-34807 TLF - EditManager - TextFlowEdit -insertTextScrap
FLEX-34812 Error "Could not find or load main class Flash" when running
`ant frameworks-rsls`
+FLEX-34837 DataGrid sorted with complex dataField doesn't keep track of changes
+ to those fields, leading to RTE when trying to remove selected item
FLEX-34838 getItemIndex returns -1 for item whose property was edited with
GridItemEditor in a sorted DataGrid
FLEX-34850 Applying sort with complex dataField on DataGrid results in
@@ -45,17 +52,11 @@ FLEX-34878 error property of NumberFormatter returns null and not it's
default value
FLEX-34879 FLEX-34853 Deprecate state setters and reverse() for mx and
spark SortField and Sort classes
-FLEX-34883 FLEX-34852 Sort correctly by complex fields with all data types
-FLEX-34884 FLEX-34852 Make sure that finding objects works correctly
FLEX-34891 TLF: pasted text doesn't get the format of the original text
-FLEX-34927 Allow the setting of an arbitrary property on an object via
- ObjectUtil
FLEX-34929 Error #1009 when copy/paste a text with style effect in a
RichEditableText/RichTextEditor
FLEX-34934 Spark Window - Closed Window
-FLEX-34941 Allow custom validators to use the triggerEvent
FLEX-34944 GridItemRenderer overrides error tooltip
-FLEX-34945 Validator should be able to validate nested properties
PR#8 Mxmlc accepts not only *.swc but also *.ane files
PR#12 Fix MenuBar.styleChanged() crash bug
[10/10] git commit: [flex-sdk] [refs/heads/release4.15.0] - Moved the
initStyles from the moduleFactory setter to the class constructor. This
resolved a bug with the styles only being attempted once.
Posted by jm...@apache.org.
Moved the initStyles from the moduleFactory setter to the class constructor. This resolved a bug with the styles only being attempted once.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7738c750
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7738c750
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7738c750
Branch: refs/heads/release4.15.0
Commit: 7738c750e36be693076c191fc61cc8fa5c7ab132
Parents: dc86ad3
Author: Mark Kessler <Ke...@gmail.com>
Authored: Sun Dec 20 21:35:34 2015 -0500
Committer: Mark Kessler <Ke...@gmail.com>
Committed: Sun Dec 20 21:35:34 2015 -0500
----------------------------------------------------------------------
.../projects/charts/src/mx/charts/series/AreaSeries.as | 6 +++---
frameworks/projects/charts/src/mx/charts/series/BarSeries.as | 6 +++---
.../projects/charts/src/mx/charts/series/BubbleSeries.as | 6 +++---
.../charts/src/mx/charts/series/CandlestickSeries.as | 6 +++---
.../projects/charts/src/mx/charts/series/ColumnSeries.as | 6 +++---
.../projects/charts/src/mx/charts/series/HLOCSeries.as | 6 +++---
.../projects/charts/src/mx/charts/series/LineSeries.as | 6 +++---
frameworks/projects/charts/src/mx/charts/series/PieSeries.as | 8 ++++----
.../projects/charts/src/mx/charts/series/PlotSeries.as | 6 +++---
9 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7738c750/frameworks/projects/charts/src/mx/charts/series/AreaSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/AreaSeries.as b/frameworks/projects/charts/src/mx/charts/series/AreaSeries.as
index f36d4ed..5d89c71 100644
--- a/frameworks/projects/charts/src/mx/charts/series/AreaSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/AreaSeries.as
@@ -283,6 +283,9 @@ public class AreaSeries extends Series implements IStackable2
_instanceCache.creationCallback = applyItemRendererProperties;
dataTransform = new CartesianTransform();
+
+ // our style settings
+ initStyles();
}
//--------------------------------------------------------------------------
@@ -912,9 +915,6 @@ public class AreaSeries extends Series implements IStackable2
return;
_moduleFactoryInitialized[factory] = true;
-
- // our style settings
- initStyles();
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7738c750/frameworks/projects/charts/src/mx/charts/series/BarSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/BarSeries.as b/frameworks/projects/charts/src/mx/charts/series/BarSeries.as
index f717f51..9ca363a 100644
--- a/frameworks/projects/charts/src/mx/charts/series/BarSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/BarSeries.as
@@ -273,6 +273,9 @@ public class BarSeries extends Series implements IStackable2, IBar
};
dataTransform = new CartesianTransform();
+
+ // our style settings
+ initStyles();
}
private function getLabelClass():Class
@@ -1099,9 +1102,6 @@ public class BarSeries extends Series implements IStackable2, IBar
return;
_moduleFactoryInitialized[factory] = true;
-
- // our style settings
- initStyles();
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7738c750/frameworks/projects/charts/src/mx/charts/series/BubbleSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/BubbleSeries.as b/frameworks/projects/charts/src/mx/charts/series/BubbleSeries.as
index c061671..428e83a 100644
--- a/frameworks/projects/charts/src/mx/charts/series/BubbleSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/BubbleSeries.as
@@ -200,6 +200,9 @@ public class BubbleSeries extends Series
_instanceCache.creationCallback = applyItemRendererProperties;
dataTransform = new CartesianTransform();
+
+ // our style settings
+ initStyles();
}
//--------------------------------------------------------------------------
@@ -740,9 +743,6 @@ public class BubbleSeries extends Series
return;
_moduleFactoryInitialized[factory] = true;
-
- // our style settings
- initStyles();
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7738c750/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as b/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as
index 1b29f6b..9c0856e 100644
--- a/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as
@@ -166,6 +166,9 @@ public class CandlestickSeries extends HLOCSeriesBase
public function CandlestickSeries()
{
super();
+
+ // our style settings
+ initStyles();
}
//--------------------------------------------------------------------------
//
@@ -329,9 +332,6 @@ public class CandlestickSeries extends HLOCSeriesBase
return;
_moduleFactoryInitialized[factory] = true;
-
- // our style settings
- initStyles();
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7738c750/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as b/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as
index 8e3f462..08ac997 100644
--- a/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as
@@ -272,6 +272,9 @@ public class ColumnSeries extends Series implements IColumn,IStackable2
};
dataTransform = new CartesianTransform();
+
+ // our style settings
+ initStyles();
}
private function getLabelClass():Class
@@ -1087,9 +1090,6 @@ public class ColumnSeries extends Series implements IColumn,IStackable2
return;
_moduleFactoryInitialized[factory] = true;
-
- // our style settings
- initStyles();
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7738c750/frameworks/projects/charts/src/mx/charts/series/HLOCSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/HLOCSeries.as b/frameworks/projects/charts/src/mx/charts/series/HLOCSeries.as
index cfd9eec..59af25f 100644
--- a/frameworks/projects/charts/src/mx/charts/series/HLOCSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/HLOCSeries.as
@@ -166,6 +166,9 @@ public class HLOCSeries extends HLOCSeriesBase
public function HLOCSeries()
{
super();
+
+ //Our style settings
+ initStyles();
}
//--------------------------------------------------------------------------
@@ -229,9 +232,6 @@ public class HLOCSeries extends HLOCSeriesBase
return;
_moduleFactoryInitialized[factory] = true;
-
- // our style settings
- initStyles();
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7738c750/frameworks/projects/charts/src/mx/charts/series/LineSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/LineSeries.as b/frameworks/projects/charts/src/mx/charts/series/LineSeries.as
index 6cc7462..4494fa6 100644
--- a/frameworks/projects/charts/src/mx/charts/series/LineSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/LineSeries.as
@@ -289,6 +289,9 @@ public class LineSeries extends Series
_segmentInstanceCache.properties = { styleName: this };
dataTransform = new CartesianTransform();
+
+ // our style settings
+ initStyles();
}
//--------------------------------------------------------------------------
@@ -924,9 +927,6 @@ public class LineSeries extends Series
return;
_moduleFactoryInitialized[factory] = true;
-
- // our style settings
- initStyles();
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7738c750/frameworks/projects/charts/src/mx/charts/series/PieSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/PieSeries.as b/frameworks/projects/charts/src/mx/charts/series/PieSeries.as
index 02c87c0..4931674 100644
--- a/frameworks/projects/charts/src/mx/charts/series/PieSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/PieSeries.as
@@ -359,7 +359,10 @@ public class PieSeries extends Series
filters = [ new DropShadowFilter(DROP_SHADOW_SIZE, 45, 0, 60,
DROP_SHADOW_SIZE, DROP_SHADOW_SIZE) ];
- dataTransform = new PolarTransform();
+ dataTransform = new PolarTransform();
+
+ // our style settings
+ initStyles();
}
//--------------------------------------------------------------------------
@@ -1219,9 +1222,6 @@ public class PieSeries extends Series
return;
_moduleFactoryInitialized[factory] = true;
-
- // our style settings
- initStyles();
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7738c750/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as b/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as
index da73d3a..4bd74dd 100644
--- a/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as
@@ -204,6 +204,9 @@ public class PlotSeries extends Series
_instanceCache.creationCallback = applyItemRendererProperties;
dataTransform = new CartesianTransform();
+
+ // our style settings
+ initStyles();
}
@@ -671,9 +674,6 @@ public class PlotSeries extends Series
return;
_moduleFactoryInitialized[factory] = true;
-
- // our style settings
- initStyles();
}
/**
[06/10] git commit: [flex-sdk] [refs/heads/release4.15.0] -
FLEX-34979 Adding Apache header.
Posted by jm...@apache.org.
FLEX-34979 Adding Apache header.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/994cbced
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/994cbced
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/994cbced
Branch: refs/heads/release4.15.0
Commit: 994cbceded646ff328ca003c71c25c87766869df
Parents: c047236
Author: Mihai Chira <mi...@apache.org>
Authored: Fri Dec 18 12:05:41 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Fri Dec 18 12:05:41 2015 +0200
----------------------------------------------------------------------
.../spark/collections/AdvancedStyleClient_.as | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/994cbced/frameworks/projects/spark/src/spark/collections/AdvancedStyleClient_.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/collections/AdvancedStyleClient_.as b/frameworks/projects/spark/src/spark/collections/AdvancedStyleClient_.as
index 1dc8959..1e76730 100644
--- a/frameworks/projects/spark/src/spark/collections/AdvancedStyleClient_.as
+++ b/frameworks/projects/spark/src/spark/collections/AdvancedStyleClient_.as
@@ -1,3 +1,22 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
package spark.collections {
import mx.core.FlexGlobals;
import mx.core.UIComponent;
[09/10] git commit: [flex-sdk] [refs/heads/release4.15.0] -
FLEX-34958 Reordered new features by ticket number.
Posted by jm...@apache.org.
FLEX-34958
Reordered new features by ticket number.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/dc86ad39
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/dc86ad39
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/dc86ad39
Branch: refs/heads/release4.15.0
Commit: dc86ad392716ccbaf1a2fdac90479240da04f53c
Parents: e11ef41
Author: Mihai Chira <mi...@apache.org>
Authored: Fri Dec 18 13:40:39 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Fri Dec 18 13:40:39 2015 +0200
----------------------------------------------------------------------
RELEASE_NOTES | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dc86ad39/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 9670131..c78b576 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -3,12 +3,12 @@ Apache Flex 4.15.0
New Features
------------
-- FLEX-34852 Sorting by complex fields in ListCollectionView
-- FLEX-34837 Full support for sorting on complex fields of DataGrid rows
-- FLEX-34927 Allow the setting of an arbitrary property on an object via
- ObjectUtil
-- FLEX-34941 Allow custom validators to use the triggerEvent
-- FLEX-34945 Validators now able to validate nested properties
+- FLEX-34837 Full support for sorting on complex fields of DataGrid rows
+- FLEX-34852 Sorting by complex fields in ListCollectionView
+- FLEX-34927 Allow the setting of an arbitrary property on an object via
+ ObjectUtil
+- FLEX-34941 Allow custom validators to use the triggerEvent
+- FLEX-34945 Validators now able to validate nested properties
AIR and Flash Player Support
----------------------------
[04/10] git commit: [flex-sdk] [refs/heads/release4.15.0] - Merge
branch 'release4.15.0' into develop
Posted by jm...@apache.org.
Merge branch 'release4.15.0' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/881ea2c3
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/881ea2c3
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/881ea2c3
Branch: refs/heads/release4.15.0
Commit: 881ea2c363e8ef5b9415051708348828861ef63a
Parents: 10a910e 5c7e0f8
Author: Alex Harui <ah...@apache.org>
Authored: Mon Dec 14 15:56:23 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Dec 14 15:56:23 2015 -0800
----------------------------------------------------------------------
ApproveSDK.xml | 1041 ++++++++++++++++--
CONTRIBUTORS | 5 +-
RELEASE_NOTES | 61 +-
frameworks/projects/charts/charts.css | 2 +-
.../charts/src/mx/charts/series/BarSeries.as | 11 +-
.../charts/src/mx/charts/series/ColumnSeries.as | 11 +-
modules/downloads.xml | 2 +-
7 files changed, 1009 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/881ea2c3/frameworks/projects/charts/src/mx/charts/series/BarSeries.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/881ea2c3/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as
----------------------------------------------------------------------
[07/10] git commit: [flex-sdk] [refs/heads/release4.15.0] -
FLEX-34625 Reverting unit test to pre-debug version.
Posted by jm...@apache.org.
FLEX-34625
Reverting unit test to pre-debug version.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/9c7d389d
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/9c7d389d
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/9c7d389d
Branch: refs/heads/release4.15.0
Commit: 9c7d389d218b79a9a7d858cdcdd0130625c681c2
Parents: 994cbce
Author: Mihai Chira <mi...@apache.org>
Authored: Fri Dec 18 13:22:52 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Fri Dec 18 13:22:52 2015 +0200
----------------------------------------------------------------------
.../tests/spark/skins/spark/FLEX_34625_Tests.as | 49 ++++----------------
1 file changed, 8 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9c7d389d/frameworks/projects/spark/tests/spark/skins/spark/FLEX_34625_Tests.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/tests/spark/skins/spark/FLEX_34625_Tests.as b/frameworks/projects/spark/tests/spark/skins/spark/FLEX_34625_Tests.as
index 9009224..c040b38 100644
--- a/frameworks/projects/spark/tests/spark/skins/spark/FLEX_34625_Tests.as
+++ b/frameworks/projects/spark/tests/spark/skins/spark/FLEX_34625_Tests.as
@@ -18,67 +18,46 @@
////////////////////////////////////////////////////////////////////////////////
package spark.skins.spark {
- import flash.display.Sprite;
import flash.events.Event;
import flash.events.EventDispatcher;
- import mx.core.Container;
-
import mx.managers.FocusManager;
import mx.managers.IFocusManagerContainer;
- import org.flexunit.asserts.assertNotNull;
-
import org.flexunit.asserts.assertTrue;
import org.flexunit.async.Async;
import org.fluint.uiImpersonation.UIImpersonator;
- import spark.components.Group;
-
import spark.components.TextInput;
public class FLEX_34625_Tests {
private static const NO_ENTER_FRAMES_TO_ALLOW:int = 4;
+ private static const _finishNotifier:EventDispatcher = new EventDispatcher();
+ private static var _textInput:TextInput;
private var noEnterFramesRemaining:int = NaN;
- private var _finishNotifier:EventDispatcher;
- private var _textInput:TextInput;
[Before]
public function setUp():void
{
+ var _focusManager:FocusManager = new FocusManager(UIImpersonator.testDisplay as IFocusManagerContainer);
+ _focusManager.showFocusIndicator = true;
+ _textInput = new TextInput();
+ _textInput.width = 0;
+ _textInput.height = 0;
+ _textInput.focusManager = _focusManager;
}
[After]
public function tearDown():void
{
_textInput = null;
- _finishNotifier = null;
}
[Test(async, timeout=500)]
public function test_focus_skin_with_zero_focus_thickness():void
{
- //from setUp(), for debugging
- trace("UIImpersonator root:" + UIImpersonator.testDisplay);
-
- assertNotNull("UIImpersonator is not available!", UIImpersonator.testDisplay);
- assertTrue("It's not a Sprite!", UIImpersonator.testDisplay is Sprite);
- assertTrue("It's not a Container!", UIImpersonator.testDisplay is Container);
- assertTrue("It's not a Group!", UIImpersonator.testDisplay is Group);
- assertTrue("It's not an IFocusManagerContainer!", UIImpersonator.testDisplay is IFocusManagerContainer);
-
- var focusManager:FocusManager = new FocusManager(UIImpersonator.testDisplay as IFocusManagerContainer);
- focusManager.showFocusIndicator = true;
-
- _textInput = new TextInput();
- _textInput.width = 0;
- _textInput.height = 0;
- _textInput.focusManager = focusManager;
-
- _finishNotifier = new EventDispatcher();
-
//given
UIImpersonator.addChild(_textInput);
@@ -95,17 +74,6 @@ package spark.skins.spark {
[Test(async, timeout=500)]
public function test_focus_skin_with_NaN_focus_thickness():void
{
- //from setUp(), for debugging
- var focusManager:FocusManager = new FocusManager(UIImpersonator.testDisplay as IFocusManagerContainer);
- focusManager.showFocusIndicator = true;
-
- _textInput = new TextInput();
- _textInput.width = 0;
- _textInput.height = 0;
- _textInput.focusManager = focusManager;
-
- _finishNotifier = new EventDispatcher();
-
//given
UIImpersonator.addChild(_textInput);
@@ -124,7 +92,6 @@ package spark.skins.spark {
if(!--noEnterFramesRemaining)
{
UIImpersonator.testDisplay.removeEventListener(Event.ENTER_FRAME, onEnterFrame);
-
_finishNotifier.dispatchEvent(new Event(Event.COMPLETE));
}
}
[02/10] git commit: [flex-sdk] [refs/heads/release4.15.0] -
FLEX-34979 CAUSE: The transformation of the spark Sort and SortField from
extending AdvancedStyleClient to implementing its interfaces and using an
instance of it as a class member had some more
Posted by jm...@apache.org.
FLEX-34979
CAUSE:
The transformation of the spark Sort and SortField from extending AdvancedStyleClient to implementing its interfaces and using an instance of it as a class member had some more bugs:
-the id setter didn't exist
-when AdvancedStyleClient dispatched an event, Sort / SortField didn't pick up on it and dispatch forward
-When AdvancedStyleClient initialized it added itself as a styleClient to the document. This is undesired for Sort and SortField because from then on the style code would used the AdvancedStyleClient member instead of the Sort / SortField instances, as before, which meant that their relevant functions (such as setStyle or styleChanged) were never called.
SOLUTION:
-there is now an id setter in AdvancedStyleClientImplementation
-AdvancedStyleClient_ was introduced to be able to override some functions of AdvancedStyleClient
-Sort and SortField now listen to the events dispatched via their AdvancedStyleClient_ member and pass on the events if there's a listener for them
-on initialization we now add the Sort / SortField instances as styleClients to the document instead of their AdvancedStyleClient members, which should now be hidden from any code interacting with Sort and SortField (this is achieved in AdvancedStyleClient_)
-all the instances where AdvancedStyleClient interacted with the StyleProtoChain using 'this' were changed into using the Sort / SortField instances
NOTES:
-Since some of the public functions in AdvancedStyleClient (getStyle, setStyle, styleChanged) are also called internally from other AdvancedStyleClient functions (or could be, in the future), and we need them to hit the Sort / SortField implementations instead, AdvancedStyleClient_ now overrides those functions and makes sure that the Sort / SortField versions are called.
-AdvancedStyleClient.setDeferredStyles() was made protected so that AdvancedStyleClient_.as can override it to make sure that StyleProtoChain.setStyle is always called referring to Sort or SortField instead of the instance of AdvancedStyleClient_ they use internally.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/d22d6872
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/d22d6872
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/d22d6872
Branch: refs/heads/release4.15.0
Commit: d22d68726e271ac680efe56296270b4a68876d92
Parents: 64216e9
Author: Mihai Chira <mi...@apache.org>
Authored: Tue Dec 8 16:45:49 2015 +0100
Committer: Mihai Chira <mi...@apache.org>
Committed: Tue Dec 8 16:45:49 2015 +0100
----------------------------------------------------------------------
.../src/mx/styles/AdvancedStyleClient.as | 7 +-
.../AdvancedStyleClientImplementation.as | 24 ++++-
.../spark/collections/AdvancedStyleClient_.as | 107 +++++++++++++++++++
.../spark/src/spark/collections/Sort.as | 18 ++--
.../spark/src/spark/collections/SortField.as | 11 +-
5 files changed, 148 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d22d6872/frameworks/projects/framework/src/mx/styles/AdvancedStyleClient.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/styles/AdvancedStyleClient.as b/frameworks/projects/framework/src/mx/styles/AdvancedStyleClient.as
index a8b095c..6b2dc21 100644
--- a/frameworks/projects/framework/src/mx/styles/AdvancedStyleClient.as
+++ b/frameworks/projects/framework/src/mx/styles/AdvancedStyleClient.as
@@ -89,7 +89,7 @@ public class AdvancedStyleClient extends EventDispatcher
* Keeps track of the setStyles() calls that have been deferred
* until a moduleFactory is set.
*/
- private var deferredSetStyles:Object;
+ protected var deferredSetStyles:Object;
//--------------------------------------------------------------------------
//
@@ -235,15 +235,14 @@ public class AdvancedStyleClient extends EventDispatcher
return StyleManager.getStyleManager(moduleFactory);
}
- private function setDeferredStyles():void
+ protected function setDeferredStyles():void
{
if (!deferredSetStyles)
return;
for (var styleProp:String in deferredSetStyles)
{
- StyleProtoChain.setStyle(
- this, styleProp, deferredSetStyles[styleProp]);
+ StyleProtoChain.setStyle(this, styleProp, deferredSetStyles[styleProp]);
}
deferredSetStyles = null;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d22d6872/frameworks/projects/spark/src/spark/collections/AdvancedStyleClientImplementation.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/collections/AdvancedStyleClientImplementation.as b/frameworks/projects/spark/src/spark/collections/AdvancedStyleClientImplementation.as
index a1429db..9e4e087 100644
--- a/frameworks/projects/spark/src/spark/collections/AdvancedStyleClientImplementation.as
+++ b/frameworks/projects/spark/src/spark/collections/AdvancedStyleClientImplementation.as
@@ -1,8 +1,11 @@
import mx.core.IFlexModuleFactory;
+import mx.core.UIComponent;
import mx.styles.AdvancedStyleClient;
import mx.styles.CSSStyleDeclaration;
import mx.styles.IAdvancedStyleClient;
import mx.styles.IStyleManager2;
+import mx.styles.StyleProtoChain;
+import mx.utils.NameUtil;
////////////////////////////////////////////////////////////////////////////////
//
@@ -23,13 +26,30 @@ import mx.styles.IStyleManager2;
//
////////////////////////////////////////////////////////////////////////////////
-private var _advancedStyleClient:AdvancedStyleClient = new AdvancedStyleClient();
+private var _advancedStyleClient:AdvancedStyleClient_;
+
+private function initAdvancedStyleClient():void
+{
+ _advancedStyleClient = new AdvancedStyleClient_(this);
+ _advancedStyleClient.addEventListener("allStylesChanged", dispatchIfListenersExist);
+}
+
+private function dispatchIfListenersExist(event:Event):void
+{
+ if(hasEventListener(event.type))
+ dispatchEvent(event);
+}
public function get id():String
{
return _advancedStyleClient.id;
}
+public function set id(value:String):void
+{
+ _advancedStyleClient.id = value;
+}
+
public function get styleParent():IAdvancedStyleClient
{
return _advancedStyleClient.styleParent;
@@ -142,7 +162,9 @@ public function set styleName(value:Object):void
public function styleChanged(styleProp:String):void
{
+ _advancedStyleClient.addEventListener(styleProp + "Changed", dispatchIfListenersExist);
_styleChanged(styleProp);
+ _advancedStyleClient.removeEventListener(styleProp + "Changed", dispatchIfListenersExist);
}
public function get styleManager():IStyleManager2
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d22d6872/frameworks/projects/spark/src/spark/collections/AdvancedStyleClient_.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/collections/AdvancedStyleClient_.as b/frameworks/projects/spark/src/spark/collections/AdvancedStyleClient_.as
new file mode 100644
index 0000000..1dc8959
--- /dev/null
+++ b/frameworks/projects/spark/src/spark/collections/AdvancedStyleClient_.as
@@ -0,0 +1,107 @@
+package spark.collections {
+ import mx.core.FlexGlobals;
+ import mx.core.UIComponent;
+ import mx.styles.AdvancedStyleClient;
+ import mx.styles.IAdvancedStyleClient;
+ import mx.styles.StyleProtoChain;
+ import mx.utils.NameUtil;
+
+ public class AdvancedStyleClient_ extends AdvancedStyleClient {
+ private var _styleClient:IAdvancedStyleClient;
+
+ public function AdvancedStyleClient_(styleClient:IAdvancedStyleClient)
+ {
+ super();
+ _styleClient = styleClient;
+ }
+
+ override public function initialized(document:Object, id:String):void
+ {
+ var uiComponent:UIComponent = document as UIComponent;
+
+ if (uiComponent == null)
+ uiComponent = FlexGlobals.topLevelApplication as UIComponent;
+
+ this.id = id;
+
+ this.moduleFactory = uiComponent.moduleFactory;
+
+ uiComponent.addStyleClient(_styleClient);
+ }
+
+ override protected function setDeferredStyles():void
+ {
+ if (!deferredSetStyles)
+ return;
+
+ for (var styleProp:String in deferredSetStyles)
+ {
+ StyleProtoChain.setStyle(_styleClient, styleProp, deferredSetStyles[styleProp]);
+ }
+
+ deferredSetStyles = null;
+ }
+
+ override public function setStyle(styleProp:String, newValue:*):void
+ {
+ _styleClient.setStyle(styleProp, newValue);
+ }
+
+ public function setStyleImpl(styleProp:String, newValue:*):void
+ {
+ // If there is no module factory then defer the set
+ // style until a module factory is set.
+ if (moduleFactory)
+ {
+ StyleProtoChain.setStyle(_styleClient, styleProp, newValue);
+ }
+ else
+ {
+ if (!deferredSetStyles)
+ deferredSetStyles = {};
+
+ deferredSetStyles[styleProp] = newValue;
+ }
+ }
+
+ override public function getStyle(styleProp:String):*
+ {
+ return _styleClient.getStyle(styleProp);
+ }
+
+ public function getStyleImpl(styleProp:String):*
+ {
+ return super.getStyle(styleProp);
+ }
+
+ override public function matchesCSSType(cssType:String):Boolean
+ {
+ return StyleProtoChain.matchesCSSType(_styleClient, cssType);
+ }
+
+ override public function get className():String
+ {
+ return NameUtil.getUnqualifiedClassName(_styleClient);
+ }
+
+ override public function getClassStyleDeclarations():Array
+ {
+ return StyleProtoChain.getClassStyleDeclarations(_styleClient);
+ }
+
+ override public function regenerateStyleCache(recursive:Boolean):void
+ {
+ StyleProtoChain.initProtoChain(_styleClient);
+ }
+
+ override public function styleChanged(styleProp:String):void
+ {
+ _styleClient.styleChanged(styleProp);
+ }
+
+ public function styleChangedImpl(styleProp:String):void
+ {
+ super.styleChanged(styleProp);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d22d6872/frameworks/projects/spark/src/spark/collections/Sort.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/collections/Sort.as b/frameworks/projects/spark/src/spark/collections/Sort.as
index d581c9a..0f31834 100644
--- a/frameworks/projects/spark/src/spark/collections/Sort.as
+++ b/frameworks/projects/spark/src/spark/collections/Sort.as
@@ -21,15 +21,11 @@ package spark.collections
{
import flash.events.Event;
-
- import mx.core.IFlexModule;
- import mx.core.IMXMLObject;
-
- import mx.core.mx_internal;
import mx.styles.IAdvancedStyleClient;
import mx.collections.ISortField;
- import mx.collections.errors.SortError;
import mx.core.FlexGlobals;
+ import mx.core.IFlexModule;
+ import mx.core.IMXMLObject;
[DefaultProperty("fields")]
[ResourceBundle("collections")]
@@ -260,6 +256,8 @@ public class Sort extends mx.collections.Sort implements IAdvancedStyleClient, I
{
super(fields, customCompareFunction, unique);
mx_internal::useSortOn = false;
+
+ initAdvancedStyleClient();
}
//--------------------------------------------------------------------------
@@ -297,7 +295,7 @@ public class Sort extends mx.collections.Sort implements IAdvancedStyleClient, I
private function _getStyle(styleProp:String):*
{
if (styleProp != "locale")
- return _advancedStyleClient.getStyle(styleProp);
+ return _advancedStyleClient.getStyleImpl(styleProp);
if ((localeStyle !== undefined) && (localeStyle !== null))
return localeStyle;
@@ -324,7 +322,7 @@ public class Sort extends mx.collections.Sort implements IAdvancedStyleClient, I
*/
private function _setStyle(styleProp:String, newValue:*):void
{
- _advancedStyleClient.setStyle(styleProp, newValue);
+ _advancedStyleClient.setStyleImpl(styleProp, newValue);
if (styleProp != "locale")
return;
@@ -355,7 +353,7 @@ public class Sort extends mx.collections.Sort implements IAdvancedStyleClient, I
private function _styleChanged(styleProp:String):void
{
localeChanged();
- _advancedStyleClient.styleChanged(styleProp);
+ _advancedStyleClient.styleChangedImpl(styleProp);
}
//--------------------------------------------------------------------------
@@ -417,7 +415,7 @@ public class Sort extends mx.collections.Sort implements IAdvancedStyleClient, I
*/
private function localeChanged():void
{
- const newLocaleStyle:* = _advancedStyleClient.getStyle("locale");
+ const newLocaleStyle:* = _advancedStyleClient.getStyleImpl("locale");
if (localeStyle === newLocaleStyle)
return;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d22d6872/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 814bf34..760b725 100644
--- a/frameworks/projects/spark/src/spark/collections/SortField.as
+++ b/frameworks/projects/spark/src/spark/collections/SortField.as
@@ -193,6 +193,8 @@ public class SortField extends mx.collections.SortField implements IAdvancedStyl
customCompareFunction:Function = null)
{
super(name, false, descending, numeric, sortCompareType, customCompareFunction);
+
+ initAdvancedStyleClient();
}
//--------------------------------------------------------------------------
@@ -285,7 +287,7 @@ public class SortField extends mx.collections.SortField implements IAdvancedStyl
private function _getStyle(styleProp:String):*
{
if (styleProp != "locale")
- return _advancedStyleClient.getStyle(styleProp);
+ return _advancedStyleClient.getStyleImpl(styleProp);
if ((localeStyle !== undefined) && (localeStyle !== null))
return localeStyle;
@@ -314,7 +316,7 @@ public class SortField extends mx.collections.SortField implements IAdvancedStyl
*/
private function _setStyle(styleProp:String, newValue:*):void
{
- _advancedStyleClient.setStyle(styleProp, newValue);
+ _advancedStyleClient.setStyleImpl(styleProp, newValue);
if (styleProp != "locale")
return;
@@ -347,7 +349,8 @@ public class SortField extends mx.collections.SortField implements IAdvancedStyl
private function _styleChanged(styleProp:String):void
{
localeChanged();
- _advancedStyleClient.styleChanged(styleProp);
+
+ _advancedStyleClient.styleChangedImpl(styleProp);
}
@@ -482,7 +485,7 @@ public class SortField extends mx.collections.SortField implements IAdvancedStyl
*/
private function localeChanged():void
{
- const newLocaleStyle:* = _advancedStyleClient.getStyle("locale");
+ const newLocaleStyle:* = _advancedStyleClient.getStyleImpl("locale");
if (localeStyle === newLocaleStyle)
return;
[03/10] git commit: [flex-sdk] [refs/heads/release4.15.0] -
FLEX-34982: The styles will now fallback to assigning directly to the chart
directly if the style declaration was not found. This corrects RTE's that
occur later when the styles are referenced
Posted by jm...@apache.org.
FLEX-34982: The styles will now fallback to assigning directly to the chart directly if the style declaration was not found. This corrects RTE's that occur later when the styles are referenced and do not perform null checks.
-Removed initStyles() method return values since they were not being checked and it's only response was true. It's a private method, will not have to worry about being overridden.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/10a910ea
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/10a910ea
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/10a910ea
Branch: refs/heads/release4.15.0
Commit: 10a910ea280b7abec5c8afff4883a94360f701b0
Parents: d22d687
Author: Mark Kessler <Ke...@gmail.com>
Authored: Fri Dec 11 12:34:20 2015 -0500
Committer: Mark Kessler <Ke...@gmail.com>
Committed: Fri Dec 11 12:34:20 2015 -0500
----------------------------------------------------------------------
.../charts/src/mx/charts/series/AreaSeries.as | 20 ++++++++++++----
.../charts/src/mx/charts/series/BarSeries.as | 17 ++++++++++----
.../charts/src/mx/charts/series/BubbleSeries.as | 19 ++++++++++++----
.../src/mx/charts/series/CandlestickSeries.as | 18 +++++++++++----
.../charts/src/mx/charts/series/ColumnSeries.as | 16 ++++++++++---
.../charts/src/mx/charts/series/HLOCSeries.as | 17 ++++++++++----
.../charts/src/mx/charts/series/LineSeries.as | 20 ++++++++++++----
.../charts/src/mx/charts/series/PieSeries.as | 24 ++++++++++++++------
.../charts/src/mx/charts/series/PlotSeries.as | 14 +++++++++---
9 files changed, 125 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/10a910ea/frameworks/projects/charts/src/mx/charts/series/AreaSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/AreaSeries.as b/frameworks/projects/charts/src/mx/charts/series/AreaSeries.as
index 1b26975..f36d4ed 100644
--- a/frameworks/projects/charts/src/mx/charts/series/AreaSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/AreaSeries.as
@@ -869,11 +869,13 @@ public class AreaSeries extends Series implements IStackable2
/**
* @private
*/
- private function initStyles():Boolean
+ private function initStyles():void
{
HaloDefaults.init(styleManager);
-
+
var areaSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.AreaSeries");
+
+
if (areaSeriesStyle)
{
areaSeriesStyle.setStyle("areaRenderer", new ClassFactory(mx.charts.renderers.AreaRenderer));
@@ -882,10 +884,18 @@ public class AreaSeries extends Series implements IStackable2
areaSeriesStyle.setStyle("fills", []);
areaSeriesStyle.setStyle("stroke", HaloDefaults.pointStroke);
}
-
- return true;
+ else
+ {
+ //Fallback to set the style to this chart directly.
+ setStyle("areaRenderer", new ClassFactory(mx.charts.renderers.AreaRenderer));
+ setStyle("legendMarkerRenderer", new ClassFactory(AreaSeriesLegendMarker));
+ setStyle("areaFill", new SolidColor(0x000000));
+ setStyle("fills", []);
+ setStyle("stroke", HaloDefaults.pointStroke);
+ }
}
-
+
+
/**
* @inheritDoc
*
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/10a910ea/frameworks/projects/charts/src/mx/charts/series/BarSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/BarSeries.as b/frameworks/projects/charts/src/mx/charts/series/BarSeries.as
index 7fb224a..42b5d76 100644
--- a/frameworks/projects/charts/src/mx/charts/series/BarSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/BarSeries.as
@@ -1051,11 +1051,13 @@ public class BarSeries extends Series implements IStackable2, IBar
/**
* @private
*/
- private function initStyles():Boolean
+ private function initStyles():void
{
HaloDefaults.init(styleManager);
var barSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.BarSeries");
+
+
if (barSeriesStyle)
{
barSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.BoxItemRenderer));
@@ -1063,10 +1065,17 @@ public class BarSeries extends Series implements IStackable2, IBar
barSeriesStyle.setStyle("fills", []);
barSeriesStyle.setStyle("stroke", HaloDefaults.emptyStroke);
}
-
- return true;
+ else
+ {
+ //Fallback to set the style to this chart directly.
+ setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.BoxItemRenderer));
+ setStyle("fill", new SolidColor(0x000000));
+ setStyle("fills", []);
+ setStyle("stroke", HaloDefaults.emptyStroke);
+ }
}
-
+
+
/**
* @inheritDoc
*
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/10a910ea/frameworks/projects/charts/src/mx/charts/series/BubbleSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/BubbleSeries.as b/frameworks/projects/charts/src/mx/charts/series/BubbleSeries.as
index 57bfcfb..c061671 100644
--- a/frameworks/projects/charts/src/mx/charts/series/BubbleSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/BubbleSeries.as
@@ -699,11 +699,13 @@ public class BubbleSeries extends Series
/**
* @private
*/
- private function initStyles():Boolean
+ private function initStyles():void
{
HaloDefaults.init(styleManager);
-
+
var bubbleSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.BubbleSeries");
+
+
if (bubbleSeriesStyle)
{
bubbleSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.CircleItemRenderer));
@@ -711,10 +713,17 @@ public class BubbleSeries extends Series
bubbleSeriesStyle.setStyle("fills", []);
bubbleSeriesStyle.setStyle("stroke", new SolidColorStroke(0,1,0.2));
}
-
- return true;
+ else
+ {
+ //Fallback to set the style to this chart directly.
+ setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.CircleItemRenderer));
+ setStyle("fill", new SolidColor(0x444444));
+ setStyle("fills", []);
+ setStyle("stroke", new SolidColorStroke(0,1,0.2));
+ }
}
-
+
+
/**
* @inheritDoc
*
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/10a910ea/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as b/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as
index 32959fb..1b29f6b 100644
--- a/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as
@@ -284,11 +284,13 @@ public class CandlestickSeries extends HLOCSeriesBase
/**
* @private
*/
- private function initStyles():Boolean
+ private function initStyles():void
{
HaloDefaults.init(styleManager);
-
+
var csSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.CandlestickSeries");
+
+
if (csSeriesStyle)
{
csSeriesStyle.setStyle("boxStroke", new SolidColorStroke(0,0));
@@ -298,8 +300,16 @@ public class CandlestickSeries extends HLOCSeriesBase
csSeriesStyle.setStyle("fills", []);
csSeriesStyle.setStyle("stroke", new SolidColorStroke(0,0));
}
-
- return true;
+ else
+ {
+ //Fallback to set the style to this chart directly.
+ setStyle("boxStroke", new SolidColorStroke(0,0));
+ setStyle("declineFill", new SolidColor(0));
+ setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.CandlestickItemRenderer));
+ setStyle("fill", new SolidColor(0xFFFFFF));
+ setStyle("fills", []);
+ setStyle("stroke", new SolidColorStroke(0,0));
+ }
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/10a910ea/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as b/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as
index 05e5eee..9a02582 100644
--- a/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as
@@ -1039,21 +1039,31 @@ public class ColumnSeries extends Series implements IColumn,IStackable2
/**
* @private
*/
- private function initStyles():Boolean
+ private function initStyles():void
{
HaloDefaults.init(styleManager);
var columnSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.ColumnSeries");
+
+
if (columnSeriesStyle)
{
columnSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.BoxItemRenderer));
columnSeriesStyle.setStyle("fill", new SolidColor(0x000000));
columnSeriesStyle.setStyle("fills", []);
columnSeriesStyle.setStyle("stroke", HaloDefaults.emptyStroke);
- }
- return true;
+ }
+ else
+ {
+ //Fallback to set the style to this chart directly.
+ setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.BoxItemRenderer));
+ setStyle("fill", new SolidColor(0x000000));
+ setStyle("fills", []);
+ setStyle("stroke", HaloDefaults.emptyStroke);
+ }
}
+
/**
* @inheritDoc
*
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/10a910ea/frameworks/projects/charts/src/mx/charts/series/HLOCSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/HLOCSeries.as b/frameworks/projects/charts/src/mx/charts/series/HLOCSeries.as
index dfcc8af..cfd9eec 100644
--- a/frameworks/projects/charts/src/mx/charts/series/HLOCSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/HLOCSeries.as
@@ -188,11 +188,13 @@ public class HLOCSeries extends HLOCSeriesBase
/**
* @private
*/
- private function initStyles():Boolean
+ private function initStyles():void
{
HaloDefaults.init(styleManager);
-
+
var hlocSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.HLOCSeries");
+
+
if (hlocSeriesStyle)
{
hlocSeriesStyle.setStyle("closeTickStroke", new SolidColorStroke(0, 3, 1, false, "normal", "none"));
@@ -200,10 +202,17 @@ public class HLOCSeries extends HLOCSeriesBase
hlocSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.HLOCItemRenderer));
hlocSeriesStyle.setStyle("stroke", new SolidColorStroke(0,0));
}
-
- return true;
+ else
+ {
+ //Fallback to set the style to this chart directly.
+ setStyle("closeTickStroke", new SolidColorStroke(0, 3, 1, false, "normal", "none"));
+ setStyle("openTickStroke", new SolidColorStroke(0, 3, 1, false, "normal", "none"));
+ setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.HLOCItemRenderer));
+ setStyle("stroke", new SolidColorStroke(0,0));
+ }
}
+
/**
* @inheritDoc
*
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/10a910ea/frameworks/projects/charts/src/mx/charts/series/LineSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/LineSeries.as b/frameworks/projects/charts/src/mx/charts/series/LineSeries.as
index 08c97c4..6cc7462 100644
--- a/frameworks/projects/charts/src/mx/charts/series/LineSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/LineSeries.as
@@ -883,21 +883,31 @@ public class LineSeries extends Series
/**
* @private
*/
- private function initStyles():Boolean
+ private function initStyles():void
{
HaloDefaults.init(styleManager);
-
+
var lineSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.LineSeries");
+
+
if (lineSeriesStyle)
{
lineSeriesStyle.setStyle("lineSegmentRenderer", new ClassFactory(LineRenderer));
lineSeriesStyle.setStyle("fill", new SolidColor(0xFFFFFF));
lineSeriesStyle.setStyle("fills", []);
lineSeriesStyle.setStyle("lineStroke", new SolidColorStroke(0,3));
- }
- return true;
+ }
+ else
+ {
+ //Fallback to set the style to this chart directly.
+ setStyle("lineSegmentRenderer", new ClassFactory(LineRenderer));
+ setStyle("fill", new SolidColor(0xFFFFFF));
+ setStyle("fills", []);
+ setStyle("lineStroke", new SolidColorStroke(0,3));
+ }
}
-
+
+
/**
* @inheritDoc
*
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/10a910ea/frameworks/projects/charts/src/mx/charts/series/PieSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/PieSeries.as b/frameworks/projects/charts/src/mx/charts/series/PieSeries.as
index 97783b1..02c87c0 100644
--- a/frameworks/projects/charts/src/mx/charts/series/PieSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/PieSeries.as
@@ -1170,29 +1170,39 @@ public class PieSeries extends Series
/**
* @private
*/
- private function initStyles():Boolean
+ private function initStyles():void
{
HaloDefaults.init(styleManager);
+ var pieSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.PieSeries");
var pieFills:Array /* of IFill */ = [];
-
var n:int = HaloDefaults.defaultFills.length;
+
+
for (var i:int = 0; i < n; i++)
{
pieFills[i] = HaloDefaults.defaultFills[i];
}
-
- var pieSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.PieSeries");
+
+
if (pieSeriesStyle)
{
pieSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.WedgeItemRenderer));
pieSeriesStyle.setStyle("fills", pieFills);
pieSeriesStyle.setStyle("legendMarkerRenderer", new ClassFactory(PieSeriesLegendMarker));
pieSeriesStyle.setStyle("calloutStroke", new SolidColorStroke(0,0,1));
- }
- return true;
+ }
+ else
+ {
+ //Fallback to set the style to this chart directly.
+ setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.WedgeItemRenderer));
+ setStyle("fills", pieFills);
+ setStyle("legendMarkerRenderer", new ClassFactory(PieSeriesLegendMarker));
+ setStyle("calloutStroke", new SolidColorStroke(0,0,1));
+ }
}
-
+
+
/**
* @inheritDoc
*
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/10a910ea/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as b/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as
index 7d1c7bb..da73d3a 100644
--- a/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as
@@ -632,18 +632,26 @@ public class PlotSeries extends Series
/**
* @private
*/
- private function initStyles():Boolean
+ private function initStyles():void
{
HaloDefaults.init(styleManager);
var plotSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.PlotSeries");
+
+
if (plotSeriesStyle)
{
plotSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.DiamondItemRenderer));
plotSeriesStyle.setStyle("fill", new SolidColor(0x4444AA));
plotSeriesStyle.setStyle("fills", []);
- }
- return true;
+ }
+ else
+ {
+ //Fallback to set the style to this chart directly.
+ setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.DiamondItemRenderer));
+ setStyle("fill", new SolidColor(0x4444AA));
+ setStyle("fills", []);
+ }
}
[05/10] git commit: [flex-sdk] [refs/heads/release4.15.0] - Merge
branch 'release4.15.0' into develop
Posted by jm...@apache.org.
Merge branch 'release4.15.0' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c047236b
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c047236b
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c047236b
Branch: refs/heads/release4.15.0
Commit: c047236b5753f1c5ffc1e5c4d9a6c2e4ad706906
Parents: 881ea2c 35028cd
Author: Alex Harui <ah...@apache.org>
Authored: Tue Dec 15 21:47:10 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Dec 15 21:47:10 2015 -0800
----------------------------------------------------------------------
.../src/java/flex2/compiler/common/MxmlConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------