Merge branches 'develop' and 'feature/maven-migration' of https://git-wip-us.apache.org/repos/asf/flex-falcon into feature/maven-migration
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/bb85fc24 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/bb85fc24 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/bb85fc24 Branch: refs/heads/feature/maven-migration Commit: bb85fc2483da4b8a7b201ba752616d81d3c75e2c Parents: 39cad67 17a315a Author: Christofer Dutz <[email protected]> Authored: Tue Apr 12 09:36:29 2016 +0200 Committer: Christofer Dutz <[email protected]> Committed: Tue Apr 12 09:36:29 2016 +0200 ---------------------------------------------------------------------- .../js/flexjs/TestFlexJSGlobalClasses.java | 1 - .../js/sourcemaps/TestSourceMapExpressions.java | 1 - .../mxml/vf2js/TestVF2JSMXMLApplication.java | 1 - .../compiler/internal/test/MXMLTestBase.java | 31 ++++++------ .../apache/flex/compiler/clients/MXMLJSC.java | 8 ++-- .../flex/compiler/codegen/js/IJSEmitter.java | 1 - .../compiler/internal/codegen/as/ASWriter.java | 1 - .../codegen/js/flexjs/JSFlexJSEmitter.java | 3 +- .../internal/codegen/js/jx/AsIsEmitter.java | 2 - .../codegen/js/jx/FunctionCallEmitter.java | 3 -- .../internal/codegen/js/jx/LiteralEmitter.java | 1 - .../internal/codegen/js/jx/MethodEmitter.java | 1 - .../codegen/js/jx/ParameterEmitter.java | 1 - .../internal/codegen/js/utils/EmitterUtils.java | 1 - .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 50 +++++++++++++++++++- .../mxml/flexjs/MXMLFlexJSPublisher.java | 3 -- .../compiler/internal/mxml/MXMLDataTests.java | 1 - .../flex/compiler/internal/targets/Target.java | 2 +- .../apache/flex/compiler/targets/ITarget.java | 9 ++++ 19 files changed, 79 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
