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/06/08 10:10:57 UTC

[1/3] git commit: [flex-sdk] [refs/heads/develop] - Fixed RTE in tests. It may be that the code in Divider box is incorrect and it confusing no dividers (= no of children-1) and number of children.

Updated Branches:
  refs/heads/develop 3777b5ff0 -> 051867db4


Fixed RTE in tests. It may be that the code in Divider box is incorrect and it confusing no dividers (= no of children-1) and number of children.


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/f5ba8748
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/f5ba8748
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/f5ba8748

Branch: refs/heads/develop
Commit: f5ba8748dd9625453d30cd1eda861fbbafabfdc5
Parents: 3777b5f
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Jun 8 18:08:18 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Jun 8 18:08:18 2013 +1000

----------------------------------------------------------------------
 .../projects/mx/src/mx/containers/DividedBox.as    |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f5ba8748/frameworks/projects/mx/src/mx/containers/DividedBox.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/containers/DividedBox.as b/frameworks/projects/mx/src/mx/containers/DividedBox.as
index a426c8a..223e539 100644
--- a/frameworks/projects/mx/src/mx/containers/DividedBox.as
+++ b/frameworks/projects/mx/src/mx/containers/DividedBox.as
@@ -538,7 +538,7 @@ public class DividedBox extends Box
            	if (!liveDragging && activeDivider)
            		return dividerLayer.numChildren-1;
            	else
-			return dividerLayer.numChildren;
+				return dividerLayer.numChildren;
 		else 
 			return 0;
 	}
@@ -793,10 +793,10 @@ public class DividedBox extends Box
 	{
 		if (dividerLayer) {
 			// Check whether this is a valid divider index.
-			if (i < 0 || i >= numDividers)
+			if (i < 0 || i >= dividerLayer.numChildren)
 				return null;
-			
-			return BoxDivider(dividerLayer.getChildAt(i));
+			else
+				return BoxDivider(dividerLayer.getChildAt(i));
 		}
 		else {
 			return null;


[3/3] git commit: [flex-sdk] [refs/heads/develop] - Fix file case issue.

Posted by jm...@apache.org.
Fix file case issue.


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/051867db
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/051867db
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/051867db

Branch: refs/heads/develop
Commit: 051867db4ea16ecf58354705befd3f1ab49fbe13
Parents: fb72226
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Jun 8 18:10:43 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Jun 8 18:10:43 2013 +1000

----------------------------------------------------------------------
 .../CurrentSyntax/IncludeIn/states_includeIn.mxml  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/051867db/mustella/tests/States/CurrentSyntax/IncludeIn/states_includeIn.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/States/CurrentSyntax/IncludeIn/states_includeIn.mxml b/mustella/tests/States/CurrentSyntax/IncludeIn/states_includeIn.mxml
index a23355d..114c97d 100644
--- a/mustella/tests/States/CurrentSyntax/IncludeIn/states_includeIn.mxml
+++ b/mustella/tests/States/CurrentSyntax/IncludeIn/states_includeIn.mxml
@@ -75,7 +75,7 @@ absence of a parent for the asserts.
         <AssertPropertyValue target="btnCalibrate1" propertyName="parent" value="statesApp_includeIn0.bxCalibrate" />
         <AssertPropertyValue target="btnCalibrate2" propertyName="parent" value="null" />
         <AssertPropertyValue target="bxCalibrate" propertyName="parent" value="statesApp_includeIn0" />
-        <CompareBitmap target="bxCalibrate" url="../includeIn/baselines/statesApp_pngCalibration.png" />
+        <CompareBitmap target="bxCalibrate" url="../includein/baselines/statesApp_pngCalibration.png" />
     </body>
 </TestCase>
 


[2/3] git commit: [flex-sdk] [refs/heads/develop] - Corrected spacing.

Posted by jm...@apache.org.
Corrected spacing.


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/fb72226f
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/fb72226f
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/fb72226f

Branch: refs/heads/develop
Commit: fb72226fe1588432d384fc41bc96dddc01a61bb3
Parents: f5ba874
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Jun 8 18:08:55 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Jun 8 18:08:55 2013 +1000

----------------------------------------------------------------------
 frameworks/projects/spark/build.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fb72226f/frameworks/projects/spark/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/build.xml b/frameworks/projects/spark/build.xml
index f5420c1..771f0c4 100644
--- a/frameworks/projects/spark/build.xml
+++ b/frameworks/projects/spark/build.xml
@@ -193,10 +193,10 @@
     <target name="compile" depends="pixelbender-compile, pixelbender-unzip, swc-compile" description="Compiles spark.swc"/>
 
     <target name="pixelbender-unzip" if="isLinux">
-	<echo message="Unziping pixel bender files" />
-	<gunzip src="${env.PIXELBENDER_HOME}/pb.tar.gz" dest="${FLEX_HOME}" />
-	<untar src="${FLEX_HOME}/pb.tar" dest="${FLEX_HOME}" />
-	<delete file="${FLEX_HOME}/pb.tar" />
+		<echo message="Unziping pixel bender files" />
+		<gunzip src="${env.PIXELBENDER_HOME}/pb.tar.gz" dest="${FLEX_HOME}" />
+		<untar src="${FLEX_HOME}/pb.tar" dest="${FLEX_HOME}" />
+		<delete file="${FLEX_HOME}/pb.tar" />
     </target>
     
     <target name="pixelbender-compile" unless="isLinux">