You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2013/06/11 08:20:38 UTC

[1/2] git commit: [flex-sdk] [refs/heads/develop] - update version to 4.10

Updated Branches:
  refs/heads/develop 499267ce6 -> 55486e0c0


update version to 4.10


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

Branch: refs/heads/develop
Commit: 7af3b46000252ee0adf53e92a1d3a991eccf871b
Parents: 499267ce
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jun 10 23:18:44 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jun 10 23:18:44 2013 -0700

----------------------------------------------------------------------
 .../src/java/flex2/compiler/common/MxmlConfiguration.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7af3b460/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java b/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
index 55b3eea..d442921 100644
--- a/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
+++ b/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
@@ -48,6 +48,7 @@ public class MxmlConfiguration
     //
     // 'compiler.mxml.compatibility-version' option
     //
+	public static final int VERSION_4_10 = 0x040a0000;
 	public static final int VERSION_4_9_1 = 0x04090001;
 	public static final int VERSION_4_9 = 0x04090000;
 	public static final int VERSION_4_8 = 0x04080000;
@@ -57,10 +58,10 @@ public class MxmlConfiguration
     public static final int VERSION_3_0 = 0x03000000;
     public static final int VERSION_2_0_1 = 0x02000001;
     public static final int VERSION_2_0 = 0x02000000;
-    public static final int CURRENT_VERSION = VERSION_4_9_1;
+    public static final int CURRENT_VERSION = VERSION_4_10;
     public static final int EARLIEST_MAJOR_VERSION = 3;
     public static final int LATEST_MAJOR_VERSION = 4;
-    public static final int LATEST_MINOR_VERSION = 9;
+    public static final int LATEST_MINOR_VERSION = 10;
 
 	private int major = LATEST_MAJOR_VERSION;
 	private int minor = LATEST_MINOR_VERSION;


[2/2] git commit: [flex-sdk] [refs/heads/develop] - fix japanese tests

Posted by ah...@apache.org.
fix japanese tests


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

Branch: refs/heads/develop
Commit: 55486e0c09c77aa6c3d0a0b3ddd8a3fc1fce0ecb
Parents: 7af3b46
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jun 10 23:19:06 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jun 10 23:19:06 2013 -0700

----------------------------------------------------------------------
 .../JA_DateField_Dropdown_Japanese_Layout.png    | Bin 4712 -> 4021 bytes
 .../Japanese/tests/dateValidatorTests.mxml       |   1 +
 .../Japanese/tests/runtimeErrorTests.mxml        |   2 +-
 3 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/55486e0c/mustella/tests/LangPacks/Japanese/tests/baselines/JA_DateField_Dropdown_Japanese_Layout.png
----------------------------------------------------------------------
diff --git a/mustella/tests/LangPacks/Japanese/tests/baselines/JA_DateField_Dropdown_Japanese_Layout.png b/mustella/tests/LangPacks/Japanese/tests/baselines/JA_DateField_Dropdown_Japanese_Layout.png
index 2a391c5..cfda080 100644
Binary files a/mustella/tests/LangPacks/Japanese/tests/baselines/JA_DateField_Dropdown_Japanese_Layout.png and b/mustella/tests/LangPacks/Japanese/tests/baselines/JA_DateField_Dropdown_Japanese_Layout.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/55486e0c/mustella/tests/LangPacks/Japanese/tests/dateValidatorTests.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/LangPacks/Japanese/tests/dateValidatorTests.mxml b/mustella/tests/LangPacks/Japanese/tests/dateValidatorTests.mxml
index ef89185..c7f3d7f 100644
--- a/mustella/tests/LangPacks/Japanese/tests/dateValidatorTests.mxml
+++ b/mustella/tests/LangPacks/Japanese/tests/dateValidatorTests.mxml
@@ -59,6 +59,7 @@
 				<ResetComponent target="ct" className="components.CustomTester" waitEvent="updateComplete" waitTarget="ct" />
 				<SetProperty target="ct.myDateV.myDV" propertyName="property" value="text"/>
 				<SetProperty target="ct.myDateV.myDV" propertyName="allowedFormatChars" value="語" />
+                <SetProperty target="ct.myDateV.myDV" propertyName="inputFormat" value="YYYY語MM語DD" />
 				<SetProperty target="ct.myDateV.ti1" propertyName="text" value="2006語12語31" waitEvent="updateComplete" waitTarget="ct.myDateV.ti1"/>
 			</setup>
 			<body>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/55486e0c/mustella/tests/LangPacks/Japanese/tests/runtimeErrorTests.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/LangPacks/Japanese/tests/runtimeErrorTests.mxml b/mustella/tests/LangPacks/Japanese/tests/runtimeErrorTests.mxml
index 1467f5a..a168bf8 100644
--- a/mustella/tests/LangPacks/Japanese/tests/runtimeErrorTests.mxml
+++ b/mustella/tests/LangPacks/Japanese/tests/runtimeErrorTests.mxml
@@ -546,7 +546,7 @@
         <!-- CanvasLayout -->
         <TestCase testID="JA_RTE_CanvasLayout_ColumnNotFound" description="RTE Tests" keywords="[Runtime Localization,CanvasLayout,ColumnNotFound]" >
             <body>
-                <AssertMethodValue method="try { triggerColumnNotFoundRTE(); } catch (e:Error) { value = StringUtil.trim(e.message) }" value="ConstraintColumn 'col1' が見つかりませんでした。" />
+                <AssertMethodValue method="try { triggerColumnNotFoundRTE(); } catch (e:Error) { value = StringUtil.trim(e.message) }" value="ConstraintColumns が見つかりませんでした。" />
             </body>
         </TestCase>
         <TestCase testID="JA_RTE_CanvasLayout_NoRowsFound" description="RTE Tests" keywords="[Runtime Localization,CanvasLayout,NoRowsFound]" >