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/04/16 06:49:22 UTC

[48/50] [abbrv] git commit: [flex-sdk] - Merged with 4.9 branch

Merged with 4.9 branch


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

Branch: refs/heads/develop
Commit: cc7be1f4f650c448c36fc5eb419e115c735b2b03
Parents: 00201ff a5f24c1
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Apr 16 14:13:20 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Apr 16 14:13:20 2013 +1000

----------------------------------------------------------------------
 KEYS                                               |    3 +-
 LICENSE                                            |    2 +-
 README                                             |   11 +-
 RELEASE_NOTES                                      |   24 +
 frameworks/build.xml                               |    3 -
 frameworks/build_framework.xml                     |   10 +-
 .../apache/bundles/ja_JP/apache.properties         |    2 +-
 .../apache/bundles/nl_NL/apache.properties         |    2 +-
 .../apache/bundles/pt_BR/apache.properties         |    2 +-
 .../apache/bundles/pt_PT/apache.properties         |    2 +-
 .../apache/bundles/ru_RU/apache.properties         |    2 +-
 .../bundles/fr_AR/experimental.properties          |   18 +
 .../framework/src/mx/managers/PopUpManagerImpl.as  |    2 +-
 .../spark/src/spark/components/ComboBox.as         |    2 +-
 frameworks/projects/tool/bundles.properties        |    1 +
 .../themes/AeonGraphical/src/AeonGraphical.as      |  327 ++++++++-------
 .../src/DateChooser_nextMonthDisabledSkin.fxg      |   92 ++--
 .../src/DateChooser_nextMonthDownSkin.fxg          |  112 +++---
 .../src/DateChooser_nextMonthOverSkin.fxg          |  112 +++---
 .../src/DateChooser_nextMonthUpSkin.fxg            |  112 +++---
 .../src/DateChooser_nextYearDisabledSkin.fxg       |   60 ++--
 .../src/DateChooser_nextYearDownSkin.fxg           |   37 ++
 .../src/DateChooser_nextYearOverSkin.fxg           |   60 ++--
 .../src/DateChooser_nextYearUpSkin.fxg             |   37 ++
 .../src/DateChooser_prevMonthDisabledSkin.fxg      |   92 ++--
 .../src/DateChooser_prevMonthDownSkin.fxg          |  112 +++---
 .../src/DateChooser_prevMonthOverSkin.fxg          |  112 +++---
 .../src/DateChooser_prevMonthUpSkin.fxg            |  112 +++---
 .../src/DateChooser_prevYearDisabledSkin.fxg       |   37 ++
 .../src/DateChooser_prevYearDownSkin.fxg           |   60 ++--
 .../src/DateChooser_prevYearOverSkin.fxg           |   37 ++
 .../src/DateChooser_prevYearUpSkin.fxg             |   60 ++--
 .../src/DateChooser_rollOverIndicatorSkin.fxg      |   50 +--
 .../src/DateChooser_selectionIndicatorSkin.fxg     |   50 +--
 .../src/DateChooser_todayIndicatorSkin.fxg         |   50 +--
 .../AeonGraphical/src/PanelTitleBackground.fxg     |   39 ++
 .../AeonGraphical/src/PopUpButton_DisabledSkin.fxg |    2 +-
 .../AeonGraphical/src/ScrollBar_thumbIcon.fxg      |   30 ++
 ide/flashbuilder/makeApacheFlexForFlashBuilder.bat |   18 +-
 ide/flashbuilder/makeApacheFlexForFlashBuilder.sh  |   13 +-
 modules/asc/src/java/macromedia/abc/Encoder.java   |    8 -
 .../flex2/compiler/common/MxmlConfiguration.java   |    3 +-
 .../java/flash/graphics/g2d/SpriteGraphics2D.java  |    3 +-
 modules/thirdparty/batik/build.xml                 |   23 +-
 .../svggen/font/resources/Messages.properties      |    2 +-
 .../resources/XMLResourceDescriptor.properties     |    2 +-
 mustella/as3/src/mustella/ErrorArray.as            |   18 +
 .../tests/LangPacks/Japanese/SWFs/LangPackApp.mxml |   45 +-
 .../JA_CreditCardValidator_FieldRequired.png       |  Bin 1362 -> 1273 bytes
 .../JA_CreditCardValidator_InvalidCharError.png    |  Bin 2074 -> 1935 bytes
 .../JA_CreditCardValidator_NumberRequired.png      |  Bin 2094 -> 1962 bytes
 .../JA_CreditCardValidator_TypeRequired.png        |  Bin 2639 -> 2527 bytes
 .../JA_CreditCardValidator_invalidNumberError.png  |  Bin 3243 -> 3061 bytes
 .../JA_CreditCardValidator_wrongLengthError.png    |  Bin 2222 -> 2081 bytes
 .../JA_CreditCardValidator_wrongTypeError.png      |  Bin 1975 -> 1865 bytes
 .../JA_CurrencyValidator_currencySymbolError.png   |  Bin 1660 -> 1562 bytes
 ...JA_CurrencyValidator_decimalPointCountError.png |  Bin 1514 -> 1447 bytes
 .../JA_CurrencyValidator_exceedsMaxError.png       |  Bin 1458 -> 1371 bytes
 .../JA_CurrencyValidator_invalidCharError.png      |  Bin 1706 -> 1599 bytes
 ...A_CurrencyValidator_invalidFormatCharsError.png |  Bin 1645 -> 1556 bytes
 .../JA_CurrencyValidator_lowerThanMinError.png     |  Bin 1386 -> 1323 bytes
 .../JA_CurrencyValidator_negativeError.png         |  Bin 1523 -> 1449 bytes
 .../JA_CurrencyValidator_precisionError.png        |  Bin 1645 -> 1556 bytes
 .../JA_CurrencyValidator_separationError.png       |  Bin 2006 -> 1997 bytes
 .../baselines/JA_DateChooser_Japanese_Layout.png   |  Bin 4047 -> 4136 bytes
 .../JA_DateField_Dropdown_Japanese_Layout.png      |  Bin 3943 -> 4712 bytes
 .../baselines/JA_DateValidator_dateFormat.png      |  Bin 2270 -> 2167 bytes
 .../baselines/JA_DateValidator_formatError.png     |  Bin 2302 -> 2127 bytes
 .../JA_DateValidator_invalidCharError.png          |  Bin 1645 -> 1547 bytes
 .../baselines/JA_DateValidator_wrongDayError.png   |  Bin 1650 -> 1519 bytes
 .../baselines/JA_DateValidator_wrongMonthError.png |  Bin 1660 -> 1497 bytes
 .../baselines/JA_DateValidator_wrongYearError.png  |  Bin 2372 -> 2181 bytes
 .../JA_EmailValidator_invalidCharError2.png        |  Bin 2235 -> 2058 bytes
 .../JA_EmailValidator_invalidDomainError.png       |  Bin 2380 -> 2100 bytes
 .../JA_EmailValidator_invalidDomainError2.png      |  Bin 2330 -> 2073 bytes
 ..._EmailValidator_invalidDomainError_noPeriod.png |  Bin 2220 -> 2012 bytes
 .../JA_EmailValidator_invalidIPDomainError.png     |  Bin 2606 -> 2212 bytes
 ..._EmailValidator_invalidPeriodsInDomainError.png |  Bin 2658 -> 2600 bytes
 .../JA_EmailValidator_missingAtSignError.png       |  Bin 2234 -> 1939 bytes
 ...A_EmailValidator_missingPeriodInDomainError.png |  Bin 2240 -> 2026 bytes
 .../JA_EmailValidator_missingUsernameError.png     |  Bin 2094 -> 1875 bytes
 .../JA_EmailValidator_tooManyAtSignsError.png      |  Bin 2510 -> 2297 bytes
 .../JA_NumberValidator_decimalPointCountError.png  |  Bin 1514 -> 1447 bytes
 .../JA_NumberValidator_exceedsMaxError.png         |  Bin 1463 -> 1369 bytes
 .../baselines/JA_NumberValidator_integerError.png  |  Bin 1618 -> 1542 bytes
 .../JA_NumberValidator_invalidCharError.png        |  Bin 1706 -> 1599 bytes
 ...erValidator_invalidFormatCharsError_Decimal.png |  Bin 2238 -> 2174 bytes
 ...rValidator_invalidFormatCharsError_Thousand.png |  Bin 2249 -> 2168 bytes
 .../JA_NumberValidator_lowerThanMinError.png       |  Bin 1386 -> 1323 bytes
 .../baselines/JA_NumberValidator_negativeError.png |  Bin 1523 -> 1449 bytes
 .../JA_NumberValidator_precisionError.png          |  Bin 1645 -> 1556 bytes
 .../JA_PhoneNumberValidator_invalidCharError.png   |  Bin 1760 -> 1672 bytes
 .../JA_PhoneNumberValidator_wrongLengthError.png   |  Bin 2201 -> 1771 bytes
 ...JA_SocialSecurityValidator_invalidCharError.png |  Bin 1837 -> 1744 bytes
 ...JA_SocialSecurityValidator_wrongFormatError.png |  Bin 2994 -> 2840 bytes
 .../JA_SocialSecurityValidator_zeroStartError.png  |  Bin 2845 -> 2755 bytes
 .../baselines/JA_StringValidator_tooLongError.png  |  Bin 3260 -> 3018 bytes
 .../baselines/JA_StringValidator_tooLongError1.png |  Bin 3242 -> 3021 bytes
 .../baselines/JA_StringValidator_tooShortError.png |  Bin 3241 -> 2988 bytes
 .../JA_StringValidator_tooShortError1.png          |  Bin 3199 -> 2960 bytes
 .../JA_ZipCodeValidator_invalidCharError.png       |  Bin 1717 -> 1636 bytes
 .../JA_ZipCodeValidator_invalidDomainError.png     |  Bin 3664 -> 3383 bytes
 .../JA_ZipCodeValidator_wrongCAFormatError.png     |  Bin 2574 -> 2394 bytes
 .../JA_ZipCodeValidator_wrongLengthError.png       |  Bin 2272 -> 2151 bytes
 .../JA_ZipCodeValidator_wrongUSFormatError.png     |  Bin 2455 -> 2239 bytes
 .../ComboBox/Properties/ComboBox_Properties.mxml   |    4 +-
 .../baselines/dropShadowVisible_css_Alert.png      |  Bin 12180 -> 12182 bytes
 .../baselines/dropShadowVisible_default_Alert.png  |  Bin 16297 -> 16308 bytes
 108 files changed, 1145 insertions(+), 872 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/KEYS
----------------------------------------------------------------------
diff --cc KEYS
index 299f2ea,75dc18e..244b432
--- a/KEYS
+++ b/KEYS
@@@ -322,61 -322,3 +322,60 @@@ FyUxMyOnYe/HV/0/Dl/5w/4uDZYIsxrqqQlZGw0
  Q96oD9lJJ/uXMjjXLnyp35MHRfAPMfmuBL0s9rRSGW3yxRinY0cLv1+qOx6VTyti
  =Kaki
  -----END PGP PUBLIC KEY BLOCK-----
- 
 +pub   4096R/458BCC72 2013-03-09
 +uid                  Fr�d�ric THOMAS <ft...@apache.org>
 +sig 3        458BCC72 2013-03-09  Fr�d�ric THOMAS <ft...@apache.org>
 +sub   4096R/D43D84D5 2013-03-09
 +sig          458BCC72 2013-03-09  Fr�d�ric THOMAS <ft...@apache.org>
 +-----BEGIN PGP PUBLIC KEY BLOCK-----
 +Version: GnuPG v2.0.17 (MingW32)
 +
 +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
 +tQ7rj6w=
 +=WlFQ
- -----END PGP PUBLIC KEY BLOCK-----
++-----END PGP PUBLIC KEY BLOCK-----

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/README
----------------------------------------------------------------------
diff --cc README
index 86c6494,502dad0..7d652f3
--- a/README
+++ b/README
@@@ -135,14 -142,14 +137,14 @@@ Install Prerequisite
           will get compile errors.
          
      *3) The Adobe AIR integration kit for Windows can be downloaded from:
-            http://airdownload.adobe.com/air/win/download/3.5/AdobeAIRSDK.zip
 -                http://airdownload.adobe.com/air/win/download/3.4/AdobeAIRSDK.zip
++           http://airdownload.adobe.com/air/win/download/3.7/AdobeAIRSDK.zip
          
           The Adobe AIR integration kit for Mac can be downloaded from:
-             http://airdownload.adobe.com/air/mac/download/3.5/AdobeAIRSDK.tbz2
 -            http://airdownload.adobe.com/air/mac/download/3.4/AdobeAIRSDK.tbz2
++            http://airdownload.adobe.com/air/mac/download/3.7/AdobeAIRSDK.tbz2
  
 -        This version of Apache Flex was certified for use with AIR 3.4, and should
 +        This version of Apache Flex was certified for use with AIR 3.5, and should
          be compatible with other versions of AIR newer than 3.1. However it hasn't
 -        been tested on AIR 3.2, 3.3 or 3.5.
 +        been tested on AIR 3.2, 3.3, 3.6 or 3.7.
  
          Download the AIR SDK for your platform and unzip it.  Set AIR_HOME to the absolute 
          path of the AIR SDK directory.
@@@ -182,11 -189,10 +184,12 @@@
          PLAYERGLOBAL_HOME subdirectory is used.
  
          Other more recent versions of Adode Flash Player playergloal.swc can be downloaded from:
 -            http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_2.swc
 -            http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_3.swc
 -            http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_4.swc
 -            http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_5.swc
 +            http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_2.swc
 +            http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_3.swc
 +            http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_4.swc
 +            http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_5.swc
 +            http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_6.swc
++            http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_7.swc
              
          These can be used with Apache Flex but have not been fully tested.
          
@@@ -305,12 -308,8 +308,12 @@@ Adobe Flash Player Version Suppor
                      /11.4
                           /playerglobal.swc
                      /11.5
 -                         /playerglobal.swc     
 -                                                                                                                                
 +                         /playerglobal.swc 
 +                    /11.6
 +                         /playerglobal.swc  
 +                    /11.7
-                          /playerglobal.swc                                                     
-                                                                                                                                 
++                         /playerglobal.swc  
++    
      Apache Flex has been tested with Adobe Flash Player 11.1 and 11.5 on Windows and Mac.
      
      It compiles against other Adobe Flash Player versions and is expected to work but they 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/RELEASE_NOTES
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/frameworks/build.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/frameworks/build_framework.xml
----------------------------------------------------------------------
diff --cc frameworks/build_framework.xml
index 6189557,bb154cb..1cecfda
--- a/frameworks/build_framework.xml
+++ b/frameworks/build_framework.xml
@@@ -883,7 -883,7 +883,11 @@@
  
      <target name="textLayout_rb" description="Builds default locale textLayout_rb.swc">
          <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}" 
++<<<<<<< HEAD
 +            output="${basedir}/locale/${locale}/textLayout_rb.swc">
++=======
+             output="${basedir}/locale/${locale}/mx_rb.swc">
++>>>>>>> origin/release4.9
              <include-resource-bundles bundle="textLayout"/>
              <source-path path-element="${textLayout.dir}/bundles/${locale}"/>
              <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/frameworks/projects/apache/bundles/ja_JP/apache.properties
----------------------------------------------------------------------
diff --cc frameworks/projects/apache/bundles/ja_JP/apache.properties
index b4f471e,29940f7..1af5664
--- a/frameworks/projects/apache/bundles/ja_JP/apache.properties
+++ b/frameworks/projects/apache/bundles/ja_JP/apache.properties
@@@ -16,9 -16,3 +16,9 @@@
  ##  limitations under the License.
  ##
  ################################################################################
 +
 +#PostCodeValidator
 +invalidCharPostcodeError=郵便番号に無効な文字が含まれています
 +wrongLengthPostcodeError=郵便番号の長さが正しくありません
 +wrongFormatPostcodeError=郵便番号の書式が正しくありません
- incorrectFormatPostcodeError=郵便番号の書式指定文字列が正しくありません
++incorrectFormatPostcodeError=郵便番号の書式指定文字列が正しくありません

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/frameworks/projects/apache/bundles/nl_NL/apache.properties
----------------------------------------------------------------------
diff --cc frameworks/projects/apache/bundles/nl_NL/apache.properties
index 6551e26,29940f7..f89c74f
--- a/frameworks/projects/apache/bundles/nl_NL/apache.properties
+++ b/frameworks/projects/apache/bundles/nl_NL/apache.properties
@@@ -16,9 -16,3 +16,9 @@@
  ##  limitations under the License.
  ##
  ################################################################################
 +
 +#PostCodeValidator
 +invalidCharPostcodeError=De postcode bevat ongeldige tekens.
 +wrongLengthPostcodeError=De postcode bevat niet het correct aantal tekens. 
 +wrongFormatPostcodeError=De postcode heeft niet het correcte formaat. 
- incorrectFormatPostcodeError=De ingave voor postcode is niet in het correcte formaat.
++incorrectFormatPostcodeError=De ingave voor postcode is niet in het correcte formaat.

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/frameworks/projects/apache/bundles/pt_BR/apache.properties
----------------------------------------------------------------------
diff --cc frameworks/projects/apache/bundles/pt_BR/apache.properties
index e73d1f3,29940f7..97123fe
--- a/frameworks/projects/apache/bundles/pt_BR/apache.properties
+++ b/frameworks/projects/apache/bundles/pt_BR/apache.properties
@@@ -16,9 -16,3 +16,9 @@@
  ##  limitations under the License.
  ##
  ################################################################################
 +
 +#PostCodeValidator
 +invalidCharPostcodeError=O CEP contém caracteres inválidos.
 +wrongLengthPostcodeError=O CEP está com um tamanho inválido.
 +wrongFormatPostcodeError=O CEP está com um formato inválido.
- incorrectFormatPostcodeError=String da formatação do CEP está incorreta.
++incorrectFormatPostcodeError=String da formatação do CEP está incorreta.

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/frameworks/projects/apache/bundles/pt_PT/apache.properties
----------------------------------------------------------------------
diff --cc frameworks/projects/apache/bundles/pt_PT/apache.properties
index 9a7e91a,29940f7..743479d
--- a/frameworks/projects/apache/bundles/pt_PT/apache.properties
+++ b/frameworks/projects/apache/bundles/pt_PT/apache.properties
@@@ -16,9 -16,3 +16,9 @@@
  ##  limitations under the License.
  ##
  ################################################################################
 +
 +#PostCodeValidator
 +invalidCharPostcodeError=O código postal contém caracteres inválidos.
 +wrongLengthPostcodeError=O código postal tem um tamanho inválido.
 +wrongFormatPostcodeError=O código postal tem um formato inválido.
- incorrectFormatPostcodeError=A formatação do código postal é inválido.
++incorrectFormatPostcodeError=A formatação do código postal é inválido.

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/frameworks/projects/apache/bundles/ru_RU/apache.properties
----------------------------------------------------------------------
diff --cc frameworks/projects/apache/bundles/ru_RU/apache.properties
index 7ad415e,29940f7..9b38526
--- a/frameworks/projects/apache/bundles/ru_RU/apache.properties
+++ b/frameworks/projects/apache/bundles/ru_RU/apache.properties
@@@ -16,9 -16,3 +16,9 @@@
  ##  limitations under the License.
  ##
  ################################################################################
 +
 +#PostCodeValidator
 +invalidCharPostcodeError=Почтовый индекс содержит недопустимые символы.
 +wrongLengthPostcodeError=Неверное количество символов в почтовом индексе.
 +wrongFormatPostcodeError=Неверный формат почтового индекса.
- incorrectFormatPostcodeError=Ошибка в строке формата почтового индекса.
++incorrectFormatPostcodeError=Ошибка в строке формата почтового индекса.

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/frameworks/projects/spark/src/spark/components/ComboBox.as
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat
----------------------------------------------------------------------
diff --cc ide/flashbuilder/makeApacheFlexForFlashBuilder.bat
index a11effd,472685f..9e7c3ce
--- a/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat
+++ b/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat
@@@ -42,10 -42,10 +42,10 @@@ RE
  set APACHE_FLEX_BIN_DISTRO_DIR=..\..
  
  REM
- REM     Adobe AIR SDK Version 3.6
 -REM     Adobe AIR SDK Version 3.1
++REM     Adobe AIR SDK Version 3.7
  REM
  set ADOBE_AIR_SDK_WIN_FILE=AdobeAIRSDK.zip
- set ADOBE_AIR_SDK_WIN_URL=http://airdownload.adobe.com/air/win/download/3.6/%ADOBE_AIR_SDK_WIN_FILE%
 -set ADOBE_AIR_SDK_WIN_URL=http://airdownload.adobe.com/air/win/download/3.4/%ADOBE_AIR_SDK_WIN_FILE%
++set ADOBE_AIR_SDK_WIN_URL=http://airdownload.adobe.com/air/win/download/3.7/%ADOBE_AIR_SDK_WIN_FILE%
  
  REM
  REM     Adobe Flash Player Version 11.1

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/modules/thirdparty/batik/build.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/mustella/tests/LangPacks/Japanese/tests/baselines/JA_EmailValidator_invalidDomainError2.png
----------------------------------------------------------------------
diff --cc mustella/tests/LangPacks/Japanese/tests/baselines/JA_EmailValidator_invalidDomainError2.png
index b3f6ad5,62d7ba2..62d7ba2
mode 100644,100755..100644
Binary files differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/mustella/tests/LangPacks/Japanese/tests/baselines/JA_EmailValidator_invalidDomainError_noPeriod.png
----------------------------------------------------------------------
diff --cc mustella/tests/LangPacks/Japanese/tests/baselines/JA_EmailValidator_invalidDomainError_noPeriod.png
index 91a6641,b46ee59..b46ee59
mode 100644,100755..100644
Binary files differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc7be1f4/mustella/tests/LangPacks/Japanese/tests/baselines/JA_EmailValidator_invalidIPDomainError.png
----------------------------------------------------------------------
diff --cc mustella/tests/LangPacks/Japanese/tests/baselines/JA_EmailValidator_invalidIPDomainError.png
index 99d6bee,c832b8c..c832b8c
mode 100644,100755..100644
Binary files differ