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 2013/10/08 16:04:12 UTC
[57/62] [abbrv] Merge Apache Flex 4.10 into trunk
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/frameworks/projects/spark/src/spark/components/gridClasses/GridSelection.as
----------------------------------------------------------------------
diff --cc frameworks/projects/spark/src/spark/components/gridClasses/GridSelection.as
index db2682c,bc28723..88d01c6
--- a/frameworks/projects/spark/src/spark/components/gridClasses/GridSelection.as
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/GridSelection.as
@@@ -1373,12 -1384,14 +1384,14 @@@ public class GridSelectio
* @private
* The item has been moved from the oldLocation to location.
*/
- private function dataProviderCollectionMove(event:CollectionEvent):void
+ private function dataProviderCollectionMove(event:CollectionEvent):Boolean
{
+ var selectionChanged:Boolean = false;
+
const oldRowIndex:int = event.oldLocation;
- const newRowIndex:int = event.location;
+ var newRowIndex:int = event.location;
- handleRowRemove(oldRowIndex);
+ selectionChanged = handleRowRemove(oldRowIndex);
// If the row is removed before the newly added item
// then change index to account for this.
@@@ -1633,12 -1661,12 +1661,12 @@@
{
// If no selectionMode or a row-based selectionMode, nothing to do.
if (!isCellSelectionMode())
- return;
+ return false;
const oldColumnIndex:int = event.oldLocation;
- const newColumnIndex:int = event.location;
+ var newColumnIndex:int = event.location;
- handleColumnRemove(oldColumnIndex);
+ var selectionChanged:Boolean = handleColumnRemove(oldColumnIndex);
// If the column is removed before the newly added column
// then change index to account for this.
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/frameworks/projects/textLayout/build.xml
----------------------------------------------------------------------
diff --cc frameworks/projects/textLayout/build.xml
index 9927296,5dacbc9..7a2fb90
--- a/frameworks/projects/textLayout/build.xml
+++ b/frameworks/projects/textLayout/build.xml
@@@ -22,9 -22,9 +22,10 @@@
<property file="${FLEX_HOME}/env.properties"/>
<property environment="env"/>
+ <property file="${FLEX_HOME}/local.properties"/>
<property file="${FLEX_HOME}/build.properties"/>
+ <property name="source.dir" value="${basedir}/${tlf.version}"/>
<property name="output.file" value="${FLEX_HOME}/frameworks/libs/textLayout.swc"/>
<property name="output.docs" value="${FLEX_HOME}/tempDoc"/>
<property name="flexTasks.location" value="${FLEX_HOME}/lib/flexTasks.jar"/>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties.mxml
----------------------------------------------------------------------
diff --cc mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties.mxml
index b7e9ec2,9dcff76..4db95ab
--- a/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties.mxml
+++ b/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties.mxml
@@@ -94,9 -94,9 +94,17 @@@
<SetProperty target="" propertyName="height" value="-800" waitEvent="updateComplete" waitTarget=""/>
</setup>
<body>
+ <AssertPropertyValue target="" propertyName="height" value="34" />
+ </body>
+ </TestCase>
++ <TestCase testID="Window_Property_height_negative_win" keywords="[Window,property, height]">
++ <setup>
++ <SetProperty target="" propertyName="height" value="-800" waitEvent="updateComplete" waitTarget=""/>
++ </setup>
++ <body>
+ <AssertPropertyValue target="" propertyName="height" value="38" />
+ </body>
+ </TestCase>
<TestCase testID="Window_Property_maxHeight_positive" keywords="[Window,property, maximumHeight]">
<setup>
@@@ -118,19 -118,19 +126,30 @@@
<body>
<AssertPropertyValue target="" propertyName="maxHeight" value="34" />
<AssertPropertyValue target="" propertyName="height" value="34" />
+ </body>
+ </TestCase>
+ <TestCase testID="Window_Property_maxHeight_negative_win" keywords="[Window,property, maximumHeight]">
+ <setup>
+ <SetProperty target="" propertyName="maxHeight" value="-300"/>
+ <SetProperty target="" propertyName="height" value="375" waitTarget="" waitEvent="updateComplete"/>
+ <WaitForEffectsToEnd/>
+ </setup>
+ <body>
+ <AssertPropertyValue target="" propertyName="maxHeight" value="34" />
+ <AssertPropertyValue target="" propertyName="height" value="34" />
</body>
</TestCase>
+ <TestCase testID="Window_Property_maxHeight_negative_win" keywords="[Window,property, maximumHeight]">
+ <setup>
+ <SetProperty target="" propertyName="maxHeight" value="-300"/>
+ <SetProperty target="" propertyName="height" value="375" waitTarget="" waitEvent="updateComplete"/>
+ <WaitForEffectsToEnd/>
+ </setup>
+ <body>
+ <AssertPropertyValue target="" propertyName="maxHeight" value="38" />
+ <AssertPropertyValue target="" propertyName="height" value="38" />
+ </body>
+ </TestCase>
<TestCase testID="Window_Property_width_positive" keywords="[Window,width, Property]">
<setup>
<SetProperty target="" propertyName="width" value="800" waitEvent="updateComplete" waitTarget=""/>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties_Spark.mxml
----------------------------------------------------------------------
diff --cc mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties_Spark.mxml
index 2b1aeac,3b87f4c..20e0800
--- a/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties_Spark.mxml
+++ b/mustella/tests/apollo/WindowedApplication/Properties/AIR_WindowedApplication_Properties_Spark.mxml
@@@ -94,9 -94,9 +94,17 @@@
<SetProperty target="" propertyName="height" value="-800" waitEvent="updateComplete" waitTarget=""/>
</setup>
<body>
+ <AssertPropertyValue target="" propertyName="height" value="34" />
+ </body>
+ </TestCase>
++ <TestCase testID="Window_Property_height_negative_win" keywords="[Window,property, height]">
++ <setup>
++ <SetProperty target="" propertyName="height" value="-800" waitEvent="updateComplete" waitTarget=""/>
++ </setup>
++ <body>
+ <AssertPropertyValue target="" propertyName="height" value="38" />
+ </body>
+ </TestCase>
<TestCase testID="Window_Property_maxHeight_positive" keywords="[Window,property, maximumHeight]">
<setup>
@@@ -118,19 -118,19 +126,30 @@@
<body>
<AssertPropertyValue target="" propertyName="maxHeight" value="34" />
<AssertPropertyValue target="" propertyName="height" value="34" />
+ </body>
+ </TestCase>
+ <TestCase testID="Window_Property_maxHeight_negative_win" keywords="[Window,property, maximumHeight]">
+ <setup>
+ <SetProperty target="" propertyName="maxHeight" value="-300"/>
+ <SetProperty target="" propertyName="height" value="375" waitTarget="" waitEvent="updateComplete"/>
+ <WaitForEffectsToEnd/>
+ </setup>
+ <body>
+ <AssertPropertyValue target="" propertyName="maxHeight" value="34" />
+ <AssertPropertyValue target="" propertyName="height" value="34" />
</body>
</TestCase>
+ <TestCase testID="Window_Property_maxHeight_negative_win" keywords="[Window,property, maximumHeight]">
+ <setup>
+ <SetProperty target="" propertyName="maxHeight" value="-300"/>
+ <SetProperty target="" propertyName="height" value="375" waitTarget="" waitEvent="updateComplete"/>
+ <WaitForEffectsToEnd/>
+ </setup>
+ <body>
+ <AssertPropertyValue target="" propertyName="maxHeight" value="38" />
+ <AssertPropertyValue target="" propertyName="height" value="38" />
+ </body>
+ </TestCase>
<TestCase testID="Window_Property_width_positive" keywords="[Window,width, Property]">
<setup>
<SetProperty target="" propertyName="width" value="800" waitEvent="updateComplete" waitTarget=""/>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests.mxml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/components/Charts/Bubble/Properties/Baselines/BubbleSeries_sameAxis_diffRenderers.png
----------------------------------------------------------------------
diff --cc mustella/tests/components/Charts/Bubble/Properties/Baselines/BubbleSeries_sameAxis_diffRenderers.png
index d9c6d48,eb993dc..eb993dc
mode 100644,100755..100644
Binary files differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/components/Charts/Candle/Properties/Baselines/CandlestickSeries_sameAxis_diffRenderers.png
----------------------------------------------------------------------
diff --cc mustella/tests/components/Charts/Candle/Properties/Baselines/CandlestickSeries_sameAxis_diffRenderers.png
index 0ba54a8,68eff6a..68eff6a
mode 100644,100755..100644
Binary files differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/components/Charts/Column/Properties/Baselines/ColumnSeries_sameAxis_diffRenderers.png
----------------------------------------------------------------------
diff --cc mustella/tests/components/Charts/Column/Properties/Baselines/ColumnSeries_sameAxis_diffRenderers.png
index af1c779,1a48bd7..1a48bd7
mode 100644,100755..100644
Binary files differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/components/Charts/HLOC/Properties/Baselines/HLOCSeries_sameAxis_diffRenderers.png
----------------------------------------------------------------------
diff --cc mustella/tests/components/Charts/HLOC/Properties/Baselines/HLOCSeries_sameAxis_diffRenderers.png
index cd2e5d5,c588979..c588979
mode 100644,100755..100644
Binary files differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/components/Charts/Line/Properties/Baselines/LineSeries_sameAxis_diffRenderers.png
----------------------------------------------------------------------
diff --cc mustella/tests/components/Charts/Line/Properties/Baselines/LineSeries_sameAxis_diffRenderers.png
index c0f0e56,6865b52..6865b52
mode 100644,100755..100644
Binary files differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/components/Charts/Line/Properties/Baselines/LineSeries_selectionMode_Multiple.png
----------------------------------------------------------------------
diff --cc mustella/tests/components/Charts/Line/Properties/Baselines/LineSeries_selectionMode_Multiple.png
index c2ce388,4ed6529..4ed6529
mode 100644,100755..100644
Binary files differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/components/Charts/Line/Properties/Baselines/LineSeries_selectionMode_Single.png
----------------------------------------------------------------------
diff --cc mustella/tests/components/Charts/Line/Properties/Baselines/LineSeries_selectionMode_Single.png
index 8d05270,45411f7..45411f7
mode 100644,100755..100644
Binary files differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/components/Charts/Pie/Properties/Baselines/PieSeries_selectionMode_Multiple.png
----------------------------------------------------------------------
diff --cc mustella/tests/components/Charts/Pie/Properties/Baselines/PieSeries_selectionMode_Multiple.png
index b636b2d,4006292..4006292
mode 100644,100755..100644
Binary files differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/components/Charts/Pie/Properties/Baselines/PieSeries_selectionMode_None.png
----------------------------------------------------------------------
diff --cc mustella/tests/components/Charts/Pie/Properties/Baselines/PieSeries_selectionMode_None.png
index 63f43b5,8c70e2e..8c70e2e
mode 100644,100755..100644
Binary files differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/components/Charts/Pie/Properties/Baselines/PieSeries_selectionMode_Single.png
----------------------------------------------------------------------
diff --cc mustella/tests/components/Charts/Pie/Properties/Baselines/PieSeries_selectionMode_Single.png
index 0f851de,d17df07..d17df07
mode 100644,100755..100644
Binary files differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/components/Charts/Plot/Properties/Baselines/PlotSeries_axisAtSeriesLevel.png
----------------------------------------------------------------------
diff --cc mustella/tests/components/Charts/Plot/Properties/Baselines/PlotSeries_axisAtSeriesLevel.png
index 7f494d9,2a29e9f..2a29e9f
mode 100644,100755..100644
Binary files differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/components/Charts/Plot/Properties/Baselines/PlotSeries_sameAxis_diffRenderers.png
----------------------------------------------------------------------
diff --cc mustella/tests/components/Charts/Plot/Properties/Baselines/PlotSeries_sameAxis_diffRenderers.png
index 79b85b7,067142a..067142a
mode 100644,100755..100644
Binary files differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/gumbo/components/Border/Properties/Border_Properties.mxml
----------------------------------------------------------------------
diff --cc mustella/tests/gumbo/components/Border/Properties/Border_Properties.mxml
index 810486e,c7d9b29..61c5527
--- a/mustella/tests/gumbo/components/Border/Properties/Border_Properties.mxml
+++ b/mustella/tests/gumbo/components/Border/Properties/Border_Properties.mxml
@@@ -322,14 -322,10 +322,12 @@@
</setup>
<body>
<SetProperty target="myBorderGrpRGS.myBorder.borderStroke" propertyName="weight" value="80" waitEvent="updateComplete" waitTarget="myBorderGrpRGS.myBorder"/>
- <CompareBitmap url="../Properties/Baselines/$testID_1.png" numColorVariances="5" ignoreMaxColorVariance="true" target="myBorderGrpRGS" />
+ <CompareBitmap url="../Properties/Baselines/$testID_1.png" numColorVariances="5" ignoreMaxColorVariance="true" target="myBorderGrpRGS">
+ <ConditionalValue os="win" url="../Properties/Baselines/$testID_1@win.png"/>
+ </CompareBitmap>
<SetProperty target="myBorderGrpRGS.myBorder" propertyName="height" value="300" waitEvent="updateComplete" />
<SetProperty target="myBorderGrpRGS.myBorder" propertyName="width" value="300" waitEvent="updateComplete" />
- <CompareBitmap url="../Properties/Baselines/$testID_2.png" numColorVariances="5" ignoreMaxColorVariance="true" target="myBorderGrpRGS">
- <ConditionalValue os="win" url="../Properties/Baselines/$testID_2@win.png"/>
- </CompareBitmap>
+ <CompareBitmap url="../Properties/Baselines/$testID_2.png" numColorVariances="5" ignoreMaxColorVariance="true" target="myBorderGrpRGS" />
<ResetComponent target="myBorderGrpRGS" className="comps.customBorderRGS" waitEvent="updateComplete"/>
</body>
</TestCase>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/mobile/components/ActionBar/properties/ActionBar_ViewNavigator_Properties.mxml
----------------------------------------------------------------------
diff --cc mustella/tests/mobile/components/ActionBar/properties/ActionBar_ViewNavigator_Properties.mxml
index 5388da3,0084843..282834d
--- a/mustella/tests/mobile/components/ActionBar/properties/ActionBar_ViewNavigator_Properties.mxml
+++ b/mustella/tests/mobile/components/ActionBar/properties/ActionBar_ViewNavigator_Properties.mxml
@@@ -1156,10 -1168,10 +1168,10 @@@
<setup>
<RunCode code="FlexGlobals.topLevelApplication.doPopAll()" waitTarget="navigator" waitEvent="updateComplete"/>
<RunCode code="FlexGlobals.topLevelApplication.navigator.pushView(components.ActionBarView1)" waitTarget="navigator" waitEvent="updateComplete" />
- <ResetComponent target="navigator.actionBar" className="spark.components.actionBar"/>
- <Pause timeout="300" />
+ <ResetComponent target="navigator.actionBar" className="spark.components.actionBar"/>
+ <WaitForLayoutManager />
<SetProperty target="navigator.actionBar" propertyName="navigationContent" valueExpression="value=twoEArray" waitTarget="navigator.actionBar" waitEvent="updateComplete"/>
- <Pause timeout="300" />
+ <WaitForLayoutManager />
</setup>
<body>
<CompareBitmap url="../properties/baselines" target="navigator.actionBar">
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/mobile/components/Label/properties/Label_Properties_tester1.mxml
----------------------------------------------------------------------
diff --cc mustella/tests/mobile/components/Label/properties/Label_Properties_tester1.mxml
index f289304,08ac128..a980edc
mode 100755,100644..100644
--- a/mustella/tests/mobile/components/Label/properties/Label_Properties_tester1.mxml
+++ b/mustella/tests/mobile/components/Label/properties/Label_Properties_tester1.mxml
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/mobile/components/Label/properties/Label_Properties_tester2.mxml
----------------------------------------------------------------------
diff --cc mustella/tests/mobile/components/Label/properties/Label_Properties_tester2.mxml
index 4bdbb2f,806f470..8c9246d
mode 100755,100644..100644
--- a/mustella/tests/mobile/components/Label/properties/Label_Properties_tester2.mxml
+++ b/mustella/tests/mobile/components/Label/properties/Label_Properties_tester2.mxml
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1a4946a9/mustella/tests/spark/core/fxg/properties/fxgtemplate_tester.mxml
----------------------------------------------------------------------