You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by go...@apache.org on 2013/05/08 00:19:16 UTC
[1/7] git commit: [flex-sdk] [refs/heads/develop] - Revised 'compile'
target for frameworks/projects/wireframe.
Updated Branches:
refs/heads/develop 6462a0f03 -> 11734d892
Revised 'compile' target for frameworks/projects/wireframe.
It is now similar to the majority of other projects
in that it doesn't load flex-config.xml but only compile-config.xml.
This gets Falcon's wireframeSWC() functional test closer to passing
by eliminating many errors about <s:SolidColor> etc. not resolving.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/13ac9e65
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/13ac9e65
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/13ac9e65
Branch: refs/heads/develop
Commit: 13ac9e65950305cc10f33f8826dc3f798e8d83f8
Parents: 00201ff
Author: Gordon Smith <go...@apache.org>
Authored: Mon Apr 29 21:01:18 2013 -0700
Committer: Gordon Smith <go...@apache.org>
Committed: Mon Apr 29 21:01:18 2013 -0700
----------------------------------------------------------------------
frameworks/projects/wireframe/build.xml | 1 -
frameworks/projects/wireframe/compile-config.xml | 11 +++++++++++
2 files changed, 11 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/13ac9e65/frameworks/projects/wireframe/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/wireframe/build.xml b/frameworks/projects/wireframe/build.xml
index 490f6b2..462f0e6 100644
--- a/frameworks/projects/wireframe/build.xml
+++ b/frameworks/projects/wireframe/build.xml
@@ -61,7 +61,6 @@
<compc fork="true"
output="${FLEX_HOME}/frameworks/themes/Wireframe/wireframe.swc">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${FLEX_HOME}/frameworks/flex-config.xml"/>
<load-config filename="compile-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/13ac9e65/frameworks/projects/wireframe/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/wireframe/compile-config.xml b/frameworks/projects/wireframe/compile-config.xml
index 36f1536..4f137ca 100644
--- a/frameworks/projects/wireframe/compile-config.xml
+++ b/frameworks/projects/wireframe/compile-config.xml
@@ -19,12 +19,14 @@
<flex-config>
<compiler>
+
<accessible>true</accessible>
<external-library-path>
<path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
<path-element>../../libs/framework.swc</path-element>
<path-element>../../libs/mx/mx.swc</path-element>
+ <path-element>../../libs/osmf.swc</path-element>
<path-element>../../libs/spark.swc</path-element>
<path-element>../../libs/air/airspark.swc</path-element>
<path-element>../../libs/textLayout.swc</path-element>
@@ -34,11 +36,19 @@
<library-path/>
+ <namespaces>
+ <namespace>
+ <uri>library://ns.adobe.com/flex/spark</uri>
+ <manifest>../../spark-manifest.xml</manifest>
+ </namespace>
+ </namespaces>
+
<source-path>
<path-element>src</path-element>
</source-path>
<warn-no-constructor>false</warn-no-constructor>
+
</compiler>
<include-classes>
@@ -61,4 +71,5 @@
<resource-bundle-list>bundles.properties</resource-bundle-list>
<target-player>${playerglobal.version}</target-player>
+
</flex-config>
[6/7] git commit: [flex-sdk] [refs/heads/develop] - Revised 'compile'
target for frameworks/projects/mobiletheme.
Posted by go...@apache.org.
Revised 'compile' target for frameworks/projects/mobiletheme.
It is now similar to the majority of other projects
in that it doesn't load flex-config.xml but only compile-config.xml
This gets Falcon's mobilethemeSWC() functional test closer to passing
by eliminating many errors about <s:SolidColor> etc. not resolving.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/73bcbc56
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/73bcbc56
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/73bcbc56
Branch: refs/heads/develop
Commit: 73bcbc56ae06130aaa669721b7924025d58b86cf
Parents: 1cfee79
Author: Gordon Smith <go...@apache.org>
Authored: Tue May 7 15:06:16 2013 -0700
Committer: Gordon Smith <go...@apache.org>
Committed: Tue May 7 15:06:16 2013 -0700
----------------------------------------------------------------------
frameworks/projects/mobiletheme/build.xml | 1 -
frameworks/projects/mobiletheme/compile-config.xml | 12 ++++++++++++
2 files changed, 12 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/73bcbc56/frameworks/projects/mobiletheme/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/build.xml b/frameworks/projects/mobiletheme/build.xml
index bdec240..7139da9 100644
--- a/frameworks/projects/mobiletheme/build.xml
+++ b/frameworks/projects/mobiletheme/build.xml
@@ -61,7 +61,6 @@
<compc fork="true"
output="${FLEX_HOME}/frameworks/themes/Mobile/mobile.swc">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${FLEX_HOME}/frameworks/flex-config.xml"/>
<load-config filename="compile-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/73bcbc56/frameworks/projects/mobiletheme/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/compile-config.xml b/frameworks/projects/mobiletheme/compile-config.xml
index 44a3367..ec37add 100644
--- a/frameworks/projects/mobiletheme/compile-config.xml
+++ b/frameworks/projects/mobiletheme/compile-config.xml
@@ -19,6 +19,7 @@
<flex-config>
<compiler>
+
<accessible>true</accessible>
<external-library-path>
@@ -28,12 +29,22 @@
<path-element>../../libs/textLayout.swc</path-element>
<path-element>../../libs/mobile/mobilecomponents.swc</path-element>
</external-library-path>
+
+ <library-path/>
+
+ <namespaces>
+ <namespace>
+ <uri>library://ns.adobe.com/flex/spark</uri>
+ <manifest>../../spark-manifest.xml</manifest>
+ </namespace>
+ </namespaces>
<source-path>
<path-element>src</path-element>
</source-path>
<warn-no-constructor>false</warn-no-constructor>
+
</compiler>
<include-classes>
@@ -48,4 +59,5 @@
<resource-bundle-list>bundles.properties</resource-bundle-list>
<target-player>${playerglobal.version}</target-player>
+
</flex-config>
RE: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge
branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into
develop
Posted by Gordon Smith <go...@adobe.com>.
I think we're back to arguing about how to use Git "properly". If merge commits are forbidden in flex-sdk, then I'll try to avoid causing them in the future.
- Gordon
-----Original Message-----
From: Justin Mclean [mailto:justin@classsoftware.com]
Sent: Tuesday, May 07, 2013 5:33 PM
To: dev@flex.apache.org
Subject: Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
HI,
> This is expected with pull+merge. Justin, why do you think something
> went badly wrong?
Because a commit was made that has 100's of lines changed that should not of occurred.
Justin
Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge
branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into
develop
Posted by Alex Harui <ah...@adobe.com>.
I'm hoping to spend more time in flex-sdk later this week. We have to get
mustella to not disturb your git status so I will figure out how to ignore
enough stuff to make that possible, or add an ant target that cleans out
mustella if there isn't already one.
Regarding merge vs rebase, it is my current understanding that you shouldn't
set policy to always use one or the other. It really depends on what you
want to see in the log history. If you look at a visual representation of
the log you will see a single line of history for a while, then a split and
then a return to a single line.
My personal preference is that we get to know Git well enough to understand
how we are affecting that tree when we choose merge vs rebase. So far, I
generally use rebase since the kinds of work I am doing don't feel like a
separate effort to me. I see them as a single incremental change to what is
already there. But I can imagine that some day I will want to record
history as a separate line. I would argue that the way the log looks right
now doesn't really need the most of those changes that are in a separate
line to be in that separate line, but I am willing to learn from the experts
as to why certain changes should be in a separate line.
On 5/7/13 7:01 PM, "Justin Mclean" <ju...@classsoftware.com> wrote:
> Hi,
>
>> It is okay to have exceptions. We can't have a solve for every scenario.
> Well in a normal check in for the Flex SDK you should of at least run the
> mustella check in tests, so I think the exception is going to be for every
> check in.
>
> Normal development process for fixing bugs etc should involve running mustella
> tests.
>
> I currently don't have a "clean" tree so can't confirm that the check in test
> break git rebase. Can anyone try that out for me?
>
>> I am saying that there is a way to not deal with this I'd we don't want to.
> Move back to SVN? :-) (I'm kidding)
>
> Justin
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> It is okay to have exceptions. We can't have a solve for every scenario.
Well in a normal check in for the Flex SDK you should of at least run the mustella check in tests, so I think the exception is going to be for every check in.
Normal development process for fixing bugs etc should involve running mustella tests.
I currently don't have a "clean" tree so can't confirm that the check in test break git rebase. Can anyone try that out for me?
> I am saying that there is a way to not deal with this I'd we don't want to.
Move back to SVN? :-) (I'm kidding)
Justin
Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by OmPrakash Muppirala <bi...@gmail.com>.
On May 7, 2013 6:31 PM, "Justin Mclean" <ju...@classsoftware.com> wrote:
>
> Hi,
>
> > However, I suggest that if no one has objections, we all use the rebase
> > option for a while and see if we can live with that.
>
> It's currently impossible to use rebase if you make a release or run a
single mustella test (as you'll have unstaged changes).
>
It is okay to have exceptions. We can't have a solve for every scenario.
But this is the second time in the past few days where we are discussing
this 'problem'. I am saying that there is a way to not deal with this I'd
we don't want to.
> Justin
Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> However, I suggest that if no one has objections, we all use the rebase
> option for a while and see if we can live with that.
It's currently impossible to use rebase if you make a release or run a single mustella test (as you'll have unstaged changes).
Justin
RE: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by OmPrakash Muppirala <bi...@gmail.com>.
On May 7, 2013 6:03 PM, "Gordon Smith" <go...@adobe.com> wrote:
>
> However, I see some merge commits that Justin has done. So maybe they're
not forbidden?
>
> - Gordon
I don't think we came to a consensus about this. There has been a lot of
discussion about this in the past and I have no interest in starting it
again.
However, I suggest that if no one has objections, we all use the rebase
option for a while and see if we can live with that.
Thanks,
Om
>
> -----Original Message-----
> From: Gordon Smith
> Sent: Tuesday, May 07, 2013 5:59 PM
> To: dev@flex.apache.org
> Subject: RE: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge
branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into
develop
>
> I think we're back to arguing about how to use Git "properly". If merge
commits are forbidden in flex-sdk, then I'll try to avoid causing them in
the future.
>
> - Gordon
>
> -----Original Message-----
> From: Justin Mclean [mailto:justin@classsoftware.com]
> Sent: Tuesday, May 07, 2013 5:33 PM
> To: dev@flex.apache.org
> Subject: Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge
branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into
develop
>
> HI,
>
> > This is expected with pull+merge. Justin, why do you think something
> > went badly wrong?
> Because a commit was made that has 100's of lines changed that should not
of occurred.
>
> Justin
Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> However, I see some merge commits that Justin has done.
Yep guilty as charged - just noticed this one as it merged a lot of changes. Although some of them don't seen to be reapplying the changes like your which is odd.
Justin
RE: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge
branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into
develop
Posted by Gordon Smith <go...@adobe.com>.
However, I see some merge commits that Justin has done. So maybe they're not forbidden?
- Gordon
-----Original Message-----
From: Gordon Smith
Sent: Tuesday, May 07, 2013 5:59 PM
To: dev@flex.apache.org
Subject: RE: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
I think we're back to arguing about how to use Git "properly". If merge commits are forbidden in flex-sdk, then I'll try to avoid causing them in the future.
- Gordon
-----Original Message-----
From: Justin Mclean [mailto:justin@classsoftware.com]
Sent: Tuesday, May 07, 2013 5:33 PM
To: dev@flex.apache.org
Subject: Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
HI,
> This is expected with pull+merge. Justin, why do you think something
> went badly wrong?
Because a commit was made that has 100's of lines changed that should not of occurred.
Justin
Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by Justin Mclean <ju...@classsoftware.com>.
HI,
> This is expected with pull+merge. Justin, why do you think something went
> badly wrong?
Because a commit was made that has 100's of lines changed that should not of occurred.
Justin
Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by OmPrakash Muppirala <bi...@gmail.com>.
On Tue, May 7, 2013 at 5:23 PM, Justin Mclean <ju...@classsoftware.com>wrote:
> Hi,
>
> > I get the impression he pulled the updates from origin then merged his
> > changes which kept his timeline when he last pulled.
> Which wouldn't produce this result I believe.
>
> > So it's showing everybody's commits merged into his develop since then?
> Makes it very hard to see what has actually changed.
>
> Justin
>
This is expected with pull+merge. Justin, why do you think something went
badly wrong?
In my log view, I see two set of diffs - 'Diff with parent 1' and 'Diff
with parent 2'. Diff with parent 2 shows the relevant changes by Gordon.
Thanks,
Om
Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> I get the impression he pulled the updates from origin then merged his
> changes which kept his timeline when he last pulled.
Which wouldn't produce this result I believe.
> So it's showing everybody's commits merged into his develop since then?
Makes it very hard to see what has actually changed.
Justin
Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by Mark Kessler <ke...@gmail.com>.
I get the impression he pulled the updates from origin then merged his
changes which kept his timeline when he last pulled. So it's showing
everybody's commits merged into his develop since then?
-Mark
On Tue, May 7, 2013 at 7:50 PM, Justin Mclean <ju...@classsoftware.com>wrote:
> HI,
>
> Something has gone badly wrong here, not 100% sure but think you may of
> merged the wrong way and undid a lot of changes?
>
> Justin
>
>
Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> Merge commits are a normal feature of Git and should not cause any confusion. They can simply be ignored.
There there any case where they would show other changes? ie In the case of a conflict?
If they can be safely ignored can we not have them mailed to the SVN/Git change list?
Thanks,
Justin
RE: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge
branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into
develop
Posted by Gordon Smith <go...@adobe.com>.
> I agree. We seem to be getting tripped up with this kind of merge commits.
I don't agree. Merge commits are a normal feature of Git and should not cause any confusion. They can simply be ignored. There's even an option for ignoring them: git log --no-merges.
- Gordon
-----Original Message-----
From: omuppi1@gmail.com [mailto:omuppi1@gmail.com] On Behalf Of OmPrakash Muppirala
Sent: Tuesday, May 07, 2013 5:31 PM
To: dev@flex.apache.org
Subject: Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
>
>
> This confusion could be avoided by doing a git pull --rebase on the
> develop branch before pushing new commits to develop.
>
> --Dasa
>
>
I agree. We seem to be getting tripped up with this kind of merge commits.
git pull --rebase seems like a very attractive option at this point.
Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by OmPrakash Muppirala <bi...@gmail.com>.
>
>
> This confusion could be avoided by doing a git pull --rebase on the
> develop branch before pushing new commits to develop.
>
> --Dasa
>
>
I agree. We seem to be getting tripped up with this kind of merge commits.
git pull --rebase seems like a very attractive option at this point.
Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge
branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into
develop
Posted by Dasa Paddock <dp...@esri.com>.
I think it's OK.
Try: git diff 6462a0f 0a6b468
This shows the diff with the last of three of Gordon's "Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop" commits with the previous commit made by Erik with the message "Added missing license headers". It's easier to see in the SourceTree Log view.
The diff above is the same as this commit which is really the change that is being made:
http://mail-archives.apache.org/mod_mbox/flex-commits/201305.mbox/%3c6cd4ad219d6b40968ea579a30bac44e8@git.apache.org%3e
This confusion could be avoided by doing a git pull --rebase on the develop branch before pushing new commits to develop.
--Dasa
On May 7, 2013, at 4:50 PM, Justin Mclean <ju...@classsoftware.com> wrote:
> HI,
>
> Something has gone badly wrong here, not 100% sure but think you may of merged the wrong way and undid a lot of changes?
>
> Justin
>
>
> On 08/05/2013, at 8:19 AM, gordonsmith@apache.org wrote:
>
>> Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk 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/94f0c62e
>> Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/94f0c62e
>> Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/94f0c62e
>>
>> Branch: refs/heads/develop
>> Commit: 94f0c62e965c9c8f05125436e72f92837b329e40
>> Parents: 13ac9e6 d923193
>> Author: Gordon Smith <go...@apache.org>
>> Authored: Mon Apr 29 21:07:34 2013 -0700
>> Committer: Gordon Smith <go...@apache.org>
>> Committed: Mon Apr 29 21:07:34 2013 -0700
>>
>> ----------------------------------------------------------------------
>> .gitignore | 2 +-
>> KEYS | 3 +-
>> LICENSE | 2 +-
>> NOTICE | 2 +-
>> README | 33 +-
>> RELEASE_NOTES | 24 +
>> build.properties | 65 ++
>> build.properties.template | 62 --
>> build.xml | 50 +-
>> frameworks/build.xml | 3 -
>> frameworks/build_framework.xml | 2 +-
>> .../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 +-
>> .../projects/experimental/.actionScriptProperties | 19 -
>> .../projects/experimental/.flexLibProperties | 10 -
>> frameworks/projects/experimental/.gitignore | 1 -
>> frameworks/projects/experimental/build.xml | 1 +
>> .../framework/src/mx/collections/ArrayList.as | 2 +-
>> .../framework/src/mx/collections/AsyncListView.as | 6 +-
>> .../framework/src/mx/controls/SWFLoader.as | 9 +-
>> .../projects/framework/src/mx/core/DesignLayer.as | 2 +-
>> .../projects/framework/src/mx/core/UIComponent.as | 6 +-
>> .../projects/framework/src/mx/effects/Pause.as | 2 +-
>> .../src/mx/formatters/CurrencyFormatter.as | 9 +-
>> .../framework/src/mx/formatters/DateBase.as | 39 +-
>> .../framework/src/mx/formatters/DateFormatter.as | 143 +++-
>> .../framework/src/mx/managers/PopUpManagerImpl.as | 2 +-
>> .../projects/framework/src/mx/states/AddItems.as | 4 +-
>> .../framework/src/mx/styles/AdvancedStyleClient.as | 2 +-
>> .../projects/framework/src/mx/utils/ArrayUtil.as | 13 +-
>> .../projects/framework/src/mx/utils/ObjectUtil.as | 30 +-
>> .../projects/framework/src/mx/utils/StringUtil.as | 9 +
>> .../framework/src/mx/validators/DateValidator.as | 271 ++++---
>> .../src/spark/components/SplitViewNavigator.as | 2 +-
>> .../src/spark/components/TabbedViewNavigator.as | 2 +-
>> .../supportClasses/StyleableStageText.as | 2 +-
>> .../src/spark/transitions/FlipViewTransition.as | 2 +-
>> .../src/spark/transitions/SlideViewTransition.as | 6 +-
>> .../src/spark/transitions/ViewTransitionBase.as | 6 +-
>> .../projects/mx/src/mx/controls/DateChooser.as | 3 +
>> .../projects/mx/src/mx/controls/DateField.as | 253 ++++---
>> frameworks/projects/mx/src/mx/controls/TextArea.as | 2 -
>> .../mx/src/mx/controls/listClasses/ListBase.as | 4 +
>> .../projects/rpc/src/mx/messaging/Channel.as | 2 +-
>> .../rpc/src/mx/rpc/http/HTTPMultiService.as | 4 +-
>> .../rpc/src/mx/rpc/http/SerializationFilter.as | 2 +-
>> .../projects/rpc/src/mx/rpc/xml/XMLDecoder.as | 2 +-
>> .../projects/rpc/src/mx/rpc/xml/XMLEncoder.as | 2 +-
>> .../projects/rpc/src/mx/utils/RPCStringUtil.as | 9 +
>> .../spark/src/spark/collections/SubListView.as | 4 +-
>> .../spark/src/spark/components/ComboBox.as | 2 +-
>> .../spark/src/spark/components/DataGrid.as | 202 +++++-
>> .../projects/spark/src/spark/components/Form.as | 2 +-
>> .../projects/spark/src/spark/components/Grid.as | 286 +++++++-
>> .../spark/src/spark/components/RadioButtonGroup.as | 56 ++
>> .../spark/components/gridClasses/GridDimensions.as | 2 +-
>> .../components/gridClasses/GridHeaderViewLayout.as | 2 +-
>> .../supportClasses/IDataProviderEnhance.as | 161 ++++
>> .../spark/components/supportClasses/ListBase.as | 305 +++++++-
>> .../components/supportClasses/RegExPatterns.as | 221 ++++++
>> .../supportClasses/SkinnableComponent.as | 4 +-
>> .../spark/components/supportClasses/SliderBase.as | 21 +-
>> .../projects/spark/src/spark/effects/Animate.as | 2 +-
>> .../src/spark/effects/AnimateTransitionShader.as | 4 +-
>> .../spark/src/spark/effects/animation/Animation.as | 2 +-
>> .../effects/supportClasses/AnimateInstance.as | 8 +-
>> .../supportClasses/AnimateTransformInstance.as | 6 +-
>> .../spark/src/spark/filters/ShaderFilter.as | 4 +-
>> .../supportClasses/DateTimeFormatterEx.as | 8 +-
>> .../globalization/supportClasses/FormatPattern.as | 2 +-
>> .../spark/src/spark/layouts/ConstraintLayout.as | 14 +-
>> .../spark/TextFieldGridItemRendererInclude.as | 2 +-
>> frameworks/projects/textLayout/build.xml | 35 +-
>> frameworks/projects/textLayout/compile-config.xml | 6 +-
>> 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/addAIRtoSDK.sh | 12 +
>> ide/flashbuilder/makeApacheFlexForFlashBuilder.bat | 18 +-
>> ide/flashbuilder/makeApacheFlexForFlashBuilder.sh | 17 +-
>> ide/setFlashPlayerVersion.sh | 27 +-
>> jenkins.xml | 2 +-
>> local-template.properties | 62 ++
>> modules/asc/src/java/macromedia/abc/Encoder.java | 8 -
>> .../flex2/compiler/common/MxmlConfiguration.java | 3 +-
>> modules/downloads.xml | 2 +-
>> .../java/flash/graphics/g2d/SpriteGraphics2D.java | 3 +-
>> modules/thirdparty/batik/build.xml | 23 +-
>> .../svggen/font/resources/Messages.properties | 2 +-
>> .../resources/XMLResourceDescriptor.properties | 2 +-
>> mustella/README | 7 +-
>> mustella/as3/src/mustella/ErrorArray.as | 18 +
>> .../Properties/DateFormatter_Main_tester.mxml | 5 +-
>> .../Formatters_Properties_Currencies.mxml | 100 +++-
>> .../tests/Formatters/SWFs/DateFormatter_Main.mxml | 34 +-
>> .../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
>> .../Properties/Validators_Date_Properties.mxml | 3 +
>> .../Validators_Date_Properties_spark.mxml | 86 ++-
>> .../DateField/Methods/DateField_Formats.mxml | 588 +++++++++++++++
>> .../ComboBox/Properties/ComboBox_Properties.mxml | 4 +-
>> .../baselines/dropShadowVisible_css_Alert.png | Bin 12180 -> 12182 bytes
>> .../baselines/dropShadowVisible_default_Alert.png | Bin 16297 -> 16308 bytes
>> templates/swfobject/index.template.html | 4 +-
>> 184 files changed, 3981 insertions(+), 1389 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>
>
Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by Justin Mclean <ju...@classsoftware.com>.
HI,
Something has gone badly wrong here, not 100% sure but think you may of merged the wrong way and undid a lot of changes?
Justin
On 08/05/2013, at 8:19 AM, gordonsmith@apache.org wrote:
> Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk 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/94f0c62e
> Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/94f0c62e
> Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/94f0c62e
>
> Branch: refs/heads/develop
> Commit: 94f0c62e965c9c8f05125436e72f92837b329e40
> Parents: 13ac9e6 d923193
> Author: Gordon Smith <go...@apache.org>
> Authored: Mon Apr 29 21:07:34 2013 -0700
> Committer: Gordon Smith <go...@apache.org>
> Committed: Mon Apr 29 21:07:34 2013 -0700
>
> ----------------------------------------------------------------------
> .gitignore | 2 +-
> KEYS | 3 +-
> LICENSE | 2 +-
> NOTICE | 2 +-
> README | 33 +-
> RELEASE_NOTES | 24 +
> build.properties | 65 ++
> build.properties.template | 62 --
> build.xml | 50 +-
> frameworks/build.xml | 3 -
> frameworks/build_framework.xml | 2 +-
> .../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 +-
> .../projects/experimental/.actionScriptProperties | 19 -
> .../projects/experimental/.flexLibProperties | 10 -
> frameworks/projects/experimental/.gitignore | 1 -
> frameworks/projects/experimental/build.xml | 1 +
> .../framework/src/mx/collections/ArrayList.as | 2 +-
> .../framework/src/mx/collections/AsyncListView.as | 6 +-
> .../framework/src/mx/controls/SWFLoader.as | 9 +-
> .../projects/framework/src/mx/core/DesignLayer.as | 2 +-
> .../projects/framework/src/mx/core/UIComponent.as | 6 +-
> .../projects/framework/src/mx/effects/Pause.as | 2 +-
> .../src/mx/formatters/CurrencyFormatter.as | 9 +-
> .../framework/src/mx/formatters/DateBase.as | 39 +-
> .../framework/src/mx/formatters/DateFormatter.as | 143 +++-
> .../framework/src/mx/managers/PopUpManagerImpl.as | 2 +-
> .../projects/framework/src/mx/states/AddItems.as | 4 +-
> .../framework/src/mx/styles/AdvancedStyleClient.as | 2 +-
> .../projects/framework/src/mx/utils/ArrayUtil.as | 13 +-
> .../projects/framework/src/mx/utils/ObjectUtil.as | 30 +-
> .../projects/framework/src/mx/utils/StringUtil.as | 9 +
> .../framework/src/mx/validators/DateValidator.as | 271 ++++---
> .../src/spark/components/SplitViewNavigator.as | 2 +-
> .../src/spark/components/TabbedViewNavigator.as | 2 +-
> .../supportClasses/StyleableStageText.as | 2 +-
> .../src/spark/transitions/FlipViewTransition.as | 2 +-
> .../src/spark/transitions/SlideViewTransition.as | 6 +-
> .../src/spark/transitions/ViewTransitionBase.as | 6 +-
> .../projects/mx/src/mx/controls/DateChooser.as | 3 +
> .../projects/mx/src/mx/controls/DateField.as | 253 ++++---
> frameworks/projects/mx/src/mx/controls/TextArea.as | 2 -
> .../mx/src/mx/controls/listClasses/ListBase.as | 4 +
> .../projects/rpc/src/mx/messaging/Channel.as | 2 +-
> .../rpc/src/mx/rpc/http/HTTPMultiService.as | 4 +-
> .../rpc/src/mx/rpc/http/SerializationFilter.as | 2 +-
> .../projects/rpc/src/mx/rpc/xml/XMLDecoder.as | 2 +-
> .../projects/rpc/src/mx/rpc/xml/XMLEncoder.as | 2 +-
> .../projects/rpc/src/mx/utils/RPCStringUtil.as | 9 +
> .../spark/src/spark/collections/SubListView.as | 4 +-
> .../spark/src/spark/components/ComboBox.as | 2 +-
> .../spark/src/spark/components/DataGrid.as | 202 +++++-
> .../projects/spark/src/spark/components/Form.as | 2 +-
> .../projects/spark/src/spark/components/Grid.as | 286 +++++++-
> .../spark/src/spark/components/RadioButtonGroup.as | 56 ++
> .../spark/components/gridClasses/GridDimensions.as | 2 +-
> .../components/gridClasses/GridHeaderViewLayout.as | 2 +-
> .../supportClasses/IDataProviderEnhance.as | 161 ++++
> .../spark/components/supportClasses/ListBase.as | 305 +++++++-
> .../components/supportClasses/RegExPatterns.as | 221 ++++++
> .../supportClasses/SkinnableComponent.as | 4 +-
> .../spark/components/supportClasses/SliderBase.as | 21 +-
> .../projects/spark/src/spark/effects/Animate.as | 2 +-
> .../src/spark/effects/AnimateTransitionShader.as | 4 +-
> .../spark/src/spark/effects/animation/Animation.as | 2 +-
> .../effects/supportClasses/AnimateInstance.as | 8 +-
> .../supportClasses/AnimateTransformInstance.as | 6 +-
> .../spark/src/spark/filters/ShaderFilter.as | 4 +-
> .../supportClasses/DateTimeFormatterEx.as | 8 +-
> .../globalization/supportClasses/FormatPattern.as | 2 +-
> .../spark/src/spark/layouts/ConstraintLayout.as | 14 +-
> .../spark/TextFieldGridItemRendererInclude.as | 2 +-
> frameworks/projects/textLayout/build.xml | 35 +-
> frameworks/projects/textLayout/compile-config.xml | 6 +-
> 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/addAIRtoSDK.sh | 12 +
> ide/flashbuilder/makeApacheFlexForFlashBuilder.bat | 18 +-
> ide/flashbuilder/makeApacheFlexForFlashBuilder.sh | 17 +-
> ide/setFlashPlayerVersion.sh | 27 +-
> jenkins.xml | 2 +-
> local-template.properties | 62 ++
> modules/asc/src/java/macromedia/abc/Encoder.java | 8 -
> .../flex2/compiler/common/MxmlConfiguration.java | 3 +-
> modules/downloads.xml | 2 +-
> .../java/flash/graphics/g2d/SpriteGraphics2D.java | 3 +-
> modules/thirdparty/batik/build.xml | 23 +-
> .../svggen/font/resources/Messages.properties | 2 +-
> .../resources/XMLResourceDescriptor.properties | 2 +-
> mustella/README | 7 +-
> mustella/as3/src/mustella/ErrorArray.as | 18 +
> .../Properties/DateFormatter_Main_tester.mxml | 5 +-
> .../Formatters_Properties_Currencies.mxml | 100 +++-
> .../tests/Formatters/SWFs/DateFormatter_Main.mxml | 34 +-
> .../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
> .../Properties/Validators_Date_Properties.mxml | 3 +
> .../Validators_Date_Properties_spark.mxml | 86 ++-
> .../DateField/Methods/DateField_Formats.mxml | 588 +++++++++++++++
> .../ComboBox/Properties/ComboBox_Properties.mxml | 4 +-
> .../baselines/dropShadowVisible_css_Alert.png | Bin 12180 -> 12182 bytes
> .../baselines/dropShadowVisible_default_Alert.png | Bin 16297 -> 16308 bytes
> templates/swfobject/index.template.html | 4 +-
> 184 files changed, 3981 insertions(+), 1389 deletions(-)
> ----------------------------------------------------------------------
>
>
[2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by go...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk 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/94f0c62e
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/94f0c62e
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/94f0c62e
Branch: refs/heads/develop
Commit: 94f0c62e965c9c8f05125436e72f92837b329e40
Parents: 13ac9e6 d923193
Author: Gordon Smith <go...@apache.org>
Authored: Mon Apr 29 21:07:34 2013 -0700
Committer: Gordon Smith <go...@apache.org>
Committed: Mon Apr 29 21:07:34 2013 -0700
----------------------------------------------------------------------
.gitignore | 2 +-
KEYS | 3 +-
LICENSE | 2 +-
NOTICE | 2 +-
README | 33 +-
RELEASE_NOTES | 24 +
build.properties | 65 ++
build.properties.template | 62 --
build.xml | 50 +-
frameworks/build.xml | 3 -
frameworks/build_framework.xml | 2 +-
.../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 +-
.../projects/experimental/.actionScriptProperties | 19 -
.../projects/experimental/.flexLibProperties | 10 -
frameworks/projects/experimental/.gitignore | 1 -
frameworks/projects/experimental/build.xml | 1 +
.../framework/src/mx/collections/ArrayList.as | 2 +-
.../framework/src/mx/collections/AsyncListView.as | 6 +-
.../framework/src/mx/controls/SWFLoader.as | 9 +-
.../projects/framework/src/mx/core/DesignLayer.as | 2 +-
.../projects/framework/src/mx/core/UIComponent.as | 6 +-
.../projects/framework/src/mx/effects/Pause.as | 2 +-
.../src/mx/formatters/CurrencyFormatter.as | 9 +-
.../framework/src/mx/formatters/DateBase.as | 39 +-
.../framework/src/mx/formatters/DateFormatter.as | 143 +++-
.../framework/src/mx/managers/PopUpManagerImpl.as | 2 +-
.../projects/framework/src/mx/states/AddItems.as | 4 +-
.../framework/src/mx/styles/AdvancedStyleClient.as | 2 +-
.../projects/framework/src/mx/utils/ArrayUtil.as | 13 +-
.../projects/framework/src/mx/utils/ObjectUtil.as | 30 +-
.../projects/framework/src/mx/utils/StringUtil.as | 9 +
.../framework/src/mx/validators/DateValidator.as | 271 ++++---
.../src/spark/components/SplitViewNavigator.as | 2 +-
.../src/spark/components/TabbedViewNavigator.as | 2 +-
.../supportClasses/StyleableStageText.as | 2 +-
.../src/spark/transitions/FlipViewTransition.as | 2 +-
.../src/spark/transitions/SlideViewTransition.as | 6 +-
.../src/spark/transitions/ViewTransitionBase.as | 6 +-
.../projects/mx/src/mx/controls/DateChooser.as | 3 +
.../projects/mx/src/mx/controls/DateField.as | 253 ++++---
frameworks/projects/mx/src/mx/controls/TextArea.as | 2 -
.../mx/src/mx/controls/listClasses/ListBase.as | 4 +
.../projects/rpc/src/mx/messaging/Channel.as | 2 +-
.../rpc/src/mx/rpc/http/HTTPMultiService.as | 4 +-
.../rpc/src/mx/rpc/http/SerializationFilter.as | 2 +-
.../projects/rpc/src/mx/rpc/xml/XMLDecoder.as | 2 +-
.../projects/rpc/src/mx/rpc/xml/XMLEncoder.as | 2 +-
.../projects/rpc/src/mx/utils/RPCStringUtil.as | 9 +
.../spark/src/spark/collections/SubListView.as | 4 +-
.../spark/src/spark/components/ComboBox.as | 2 +-
.../spark/src/spark/components/DataGrid.as | 202 +++++-
.../projects/spark/src/spark/components/Form.as | 2 +-
.../projects/spark/src/spark/components/Grid.as | 286 +++++++-
.../spark/src/spark/components/RadioButtonGroup.as | 56 ++
.../spark/components/gridClasses/GridDimensions.as | 2 +-
.../components/gridClasses/GridHeaderViewLayout.as | 2 +-
.../supportClasses/IDataProviderEnhance.as | 161 ++++
.../spark/components/supportClasses/ListBase.as | 305 +++++++-
.../components/supportClasses/RegExPatterns.as | 221 ++++++
.../supportClasses/SkinnableComponent.as | 4 +-
.../spark/components/supportClasses/SliderBase.as | 21 +-
.../projects/spark/src/spark/effects/Animate.as | 2 +-
.../src/spark/effects/AnimateTransitionShader.as | 4 +-
.../spark/src/spark/effects/animation/Animation.as | 2 +-
.../effects/supportClasses/AnimateInstance.as | 8 +-
.../supportClasses/AnimateTransformInstance.as | 6 +-
.../spark/src/spark/filters/ShaderFilter.as | 4 +-
.../supportClasses/DateTimeFormatterEx.as | 8 +-
.../globalization/supportClasses/FormatPattern.as | 2 +-
.../spark/src/spark/layouts/ConstraintLayout.as | 14 +-
.../spark/TextFieldGridItemRendererInclude.as | 2 +-
frameworks/projects/textLayout/build.xml | 35 +-
frameworks/projects/textLayout/compile-config.xml | 6 +-
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/addAIRtoSDK.sh | 12 +
ide/flashbuilder/makeApacheFlexForFlashBuilder.bat | 18 +-
ide/flashbuilder/makeApacheFlexForFlashBuilder.sh | 17 +-
ide/setFlashPlayerVersion.sh | 27 +-
jenkins.xml | 2 +-
local-template.properties | 62 ++
modules/asc/src/java/macromedia/abc/Encoder.java | 8 -
.../flex2/compiler/common/MxmlConfiguration.java | 3 +-
modules/downloads.xml | 2 +-
.../java/flash/graphics/g2d/SpriteGraphics2D.java | 3 +-
modules/thirdparty/batik/build.xml | 23 +-
.../svggen/font/resources/Messages.properties | 2 +-
.../resources/XMLResourceDescriptor.properties | 2 +-
mustella/README | 7 +-
mustella/as3/src/mustella/ErrorArray.as | 18 +
.../Properties/DateFormatter_Main_tester.mxml | 5 +-
.../Formatters_Properties_Currencies.mxml | 100 +++-
.../tests/Formatters/SWFs/DateFormatter_Main.mxml | 34 +-
.../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
.../Properties/Validators_Date_Properties.mxml | 3 +
.../Validators_Date_Properties_spark.mxml | 86 ++-
.../DateField/Methods/DateField_Formats.mxml | 588 +++++++++++++++
.../ComboBox/Properties/ComboBox_Properties.mxml | 4 +-
.../baselines/dropShadowVisible_css_Alert.png | Bin 12180 -> 12182 bytes
.../baselines/dropShadowVisible_default_Alert.png | Bin 16297 -> 16308 bytes
templates/swfobject/index.template.html | 4 +-
184 files changed, 3981 insertions(+), 1389 deletions(-)
----------------------------------------------------------------------
[7/7] git commit: [flex-sdk] [refs/heads/develop] - Revised 'compile'
target for frameworks/projects/sparkskins.
Posted by go...@apache.org.
Revised 'compile' target for frameworks/projects/sparkskins.
It is now similar to the majority of other projects
in that it doesn't load flex-config.xml but only compile-config.xml.
This gets Falcon's sparkskinsSWC() functional test closer to passing
by eliminating many errors about <s:SolidColor> etc. not resolving.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/11734d89
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/11734d89
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/11734d89
Branch: refs/heads/develop
Commit: 11734d892c1517decf6b0db348829a16366baa22
Parents: 73bcbc5
Author: Gordon Smith <go...@apache.org>
Authored: Tue May 7 15:11:49 2013 -0700
Committer: Gordon Smith <go...@apache.org>
Committed: Tue May 7 15:11:49 2013 -0700
----------------------------------------------------------------------
frameworks/projects/sparkskins/build.xml | 1 -
frameworks/projects/sparkskins/compile-config.xml | 10 ++++++++++
2 files changed, 10 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/11734d89/frameworks/projects/sparkskins/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/sparkskins/build.xml b/frameworks/projects/sparkskins/build.xml
index 630de65..191f825 100644
--- a/frameworks/projects/sparkskins/build.xml
+++ b/frameworks/projects/sparkskins/build.xml
@@ -61,7 +61,6 @@
<compc fork="true"
output="${FLEX_HOME}/frameworks/libs/sparkskins.swc">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${FLEX_HOME}/frameworks/flex-config.xml"/>
<load-config filename="compile-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/11734d89/frameworks/projects/sparkskins/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/sparkskins/compile-config.xml b/frameworks/projects/sparkskins/compile-config.xml
index f56a880..b7f7c19 100644
--- a/frameworks/projects/sparkskins/compile-config.xml
+++ b/frameworks/projects/sparkskins/compile-config.xml
@@ -19,6 +19,7 @@
<flex-config>
<compiler>
+
<accessible>true</accessible>
<external-library-path>
@@ -31,12 +32,20 @@
<locale/>
<library-path/>
+
+ <namespaces>
+ <namespace>
+ <uri>library://ns.adobe.com/flex/spark</uri>
+ <manifest>../../spark-manifest.xml</manifest>
+ </namespace>
+ </namespaces>
<source-path>
<path-element>src</path-element>
</source-path>
<warn-no-constructor>false</warn-no-constructor>
+
</compiler>
<include-classes>
@@ -46,4 +55,5 @@
<resource-bundle-list>bundles.properties</resource-bundle-list>
<target-player>${playerglobal.version}</target-player>
+
</flex-config>
[5/7] git commit: [flex-sdk] [refs/heads/develop] - Delete 'lib' and
'in' directories as part of 'super-clean', not 'clean'
Posted by go...@apache.org.
Delete 'lib' and 'in' directories as part of 'super-clean', not 'clean'
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/1cfee79b
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/1cfee79b
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/1cfee79b
Branch: refs/heads/develop
Commit: 1cfee79bd56a77a3d251356d1f7cf62f392f9a90
Parents: 0a6b468
Author: Gordon Smith <go...@apache.org>
Authored: Tue May 7 14:52:23 2013 -0700
Committer: Gordon Smith <go...@apache.org>
Committed: Tue May 7 14:52:23 2013 -0700
----------------------------------------------------------------------
build.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1cfee79b/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 07da287..53b3dfa 100644
--- a/build.xml
+++ b/build.xml
@@ -300,6 +300,8 @@
<target name="thirdparty-clean" description="Removes all thirdparty downloads.">
<ant dir="${basedir}/modules" target="thirdparty-clean"/>
<ant dir="${basedir}/frameworks" target="thirdparty-clean"/>
+ <delete dir="${basedir}/in"/>
+ <delete dir="${basedir}/lib"/>
</target>
<target name="clean" depends="modules-clean,frameworks-clean,frameworks-clean,frameworks-rsls-clean,package-clean,checkintests-clean"
@@ -319,8 +321,6 @@
<include name="nai/**"/>
<include name="win/**"/>
</delete>
- <delete dir="${basedir}/in"/>
- <delete dir="${basedir}/lib"/>
<delete dir="${basedir}/out" failonerror="false" includeEmptyDirs="true"/>
<delete dir="${basedir}/temp" failonerror="false" includeEmptyDirs="true"/>
<delete dir="${basedir}/tempDoc" failonerror="false" includeEmptyDirs="true"/>
[3/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by go...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk 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/cf51f24b
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/cf51f24b
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/cf51f24b
Branch: refs/heads/develop
Commit: cf51f24b7daf91fae2516904a33fab61218f6298
Parents: 94f0c62 4738923
Author: Gordon Smith <go...@apache.org>
Authored: Tue Apr 30 12:45:03 2013 -0700
Committer: Gordon Smith <go...@apache.org>
Committed: Tue Apr 30 12:45:03 2013 -0700
----------------------------------------------------------------------
.../projects/framework/src/mx/utils/StringUtil.as | 2 +
.../framework/src/mx/validators/EmailValidator.as | 17 +++++++++++---
modules/downloads.xml | 2 +-
.../src/java/flash/swf/tools/AbcPrinter.java | 13 ++++++++--
4 files changed, 26 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[4/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by go...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk 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/0a6b468f
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/0a6b468f
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/0a6b468f
Branch: refs/heads/develop
Commit: 0a6b468fbbbdaeb96f4b7494ede84389f8e3660b
Parents: cf51f24 6462a0f
Author: Gordon Smith <go...@apache.org>
Authored: Tue May 7 14:33:45 2013 -0700
Committer: Gordon Smith <go...@apache.org>
Committed: Tue May 7 14:33:45 2013 -0700
----------------------------------------------------------------------
RELEASE_NOTES | 386 +++++++++++++++
.../mx/controls/listClasses/AdvancedListBase.as | 2 +-
.../experimental/bundles/da_DK/alert.properties | 19 +
.../experimental/bundles/da_DK/dividers.properties | 19 +
.../experimental/bundles/de_CH/alert.properties | 19 +
.../experimental/bundles/de_CH/dividers.properties | 19 +
.../experimental/bundles/de_DE/alert.properties | 19 +
.../experimental/bundles/de_DE/dividers.properties | 19 +
.../experimental/bundles/el_GR/alert.properties | 19 +
.../experimental/bundles/el_GR/dividers.properties | 19 +
.../experimental/bundles/en_AU/alert.properties | 19 +
.../experimental/bundles/en_AU/dividers.properties | 19 +
.../experimental/bundles/en_CA/alert.properties | 19 +
.../experimental/bundles/en_CA/dividers.properties | 19 +
.../experimental/bundles/en_GB/alert.properties | 19 +
.../experimental/bundles/en_GB/dividers.properties | 19 +
.../experimental/bundles/en_US/alert.properties | 27 +-
.../experimental/bundles/en_US/dividers.properties | 27 +-
.../experimental/bundles/es_ES/alert.properties | 19 +
.../experimental/bundles/es_ES/dividers.properties | 19 +
.../experimental/bundles/fi_FI/alert.properties | 19 +
.../experimental/bundles/fi_FI/dividers.properties | 19 +
.../experimental/bundles/fr_CH/alert.properties | 19 +
.../experimental/bundles/fr_CH/dividers.properties | 25 +-
.../experimental/bundles/fr_FR/alert.properties | 19 +
.../experimental/bundles/fr_FR/dividers.properties | 25 +-
.../experimental/bundles/it_IT/alert.properties | 19 +
.../experimental/bundles/it_IT/dividers.properties | 19 +
.../experimental/bundles/ja_JP/alert.properties | 19 +
.../experimental/bundles/ja_JP/dividers.properties | 19 +
.../experimental/bundles/ko_KR/alert.properties | 19 +
.../experimental/bundles/ko_KR/dividers.properties | 19 +
.../experimental/bundles/nb_NO/alert.properties | 19 +
.../experimental/bundles/nb_NO/dividers.properties | 19 +
.../experimental/bundles/nl_NL/alert.properties | 19 +
.../experimental/bundles/nl_NL/dividers.properties | 19 +
.../experimental/bundles/pt_BR/alert.properties | 19 +
.../experimental/bundles/pt_BR/dividers.properties | 19 +
.../experimental/bundles/pt_PT/alert.properties | 19 +
.../experimental/bundles/pt_PT/dividers.properties | 19 +
.../experimental/bundles/ru_RU/alert.properties | 19 +
.../experimental/bundles/ru_RU/dividers.properties | 19 +
.../experimental/bundles/sv_SE/alert.properties | 19 +
.../experimental/bundles/sv_SE/dividers.properties | 19 +
.../experimental/bundles/zh_CN/alert.properties | 19 +
.../experimental/bundles/zh_CN/dividers.properties | 19 +
.../experimental/bundles/zh_TW/alert.properties | 19 +
.../experimental/bundles/zh_TW/dividers.properties | 19 +
.../src/spark/supportClasses/INavigator.as | 18 +
.../framework/src/mx/formatters/NumberBase.as | 18 +-
.../framework/src/mx/formatters/NumberFormatter.as | 7 +-
.../src/mx/resources/ResourceManagerImpl.as | 9 +
.../projects/framework/src/mx/utils/ObjectUtil.as | 5 +-
.../framework/src/mx/validators/NumberValidator.as | 67 ++--
.../supportClasses/StyleableTextField.as | 5 +-
.../projects/mx/src/mx/controls/CalendarLayout.as | 4 +-
.../projects/mx/src/mx/controls/DateChooser.as | 33 +-
.../projects/mx/src/mx/controls/DateField.as | 22 +-
.../projects/mx/src/mx/controls/NumericStepper.as | 27 +-
.../dataGridClasses/DataGridItemRenderer.as | 2 +-
.../mx/src/mx/controls/listClasses/ListBase.as | 2 +-
.../src/mx/messaging/messages/AbstractMessage.as | 3 +-
.../projects/rpc/src/mx/utils/RPCObjectUtil.as | 92 +++-
.../dataGridClasses/FTEDataGridItemRenderer.as | 2 +-
.../projects/spark/src/mx/core/UIFTETextField.as | 2 +-
.../projects/spark/src/spark/components/List.as | 2 +-
.../spark/src/spark/components/NumericStepper.as | 11 +-
.../components/supportClasses/ButtonBarBase.as | 96 ++++-
.../spark/src/spark/primitives/BitmapImage.as | 6 +-
modules/downloads.xml | 2 +-
.../DateField/Methods/DateField_Formats.mxml | 23 +-
71 files changed, 1630 insertions(+), 118 deletions(-)
----------------------------------------------------------------------