Merge branch 'refs/heads/develop_whitespace' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/dc0c5fe4 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/dc0c5fe4 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/dc0c5fe4 Branch: refs/heads/develop Commit: dc0c5fe497409905ec2bda0426b4168b81a04794 Parents: 026a53c daa6e77 Author: Erik de Bruin <[email protected]> Authored: Tue Nov 12 12:04:36 2013 +0100 Committer: Erik de Bruin <[email protected]> Committed: Tue Nov 12 12:04:36 2013 +0100 ---------------------------------------------------------------------- .../js/flexjs/TestFlexJSAccessorMembers.java | 12 +- .../codegen/js/flexjs/TestFlexJSAccessors.java | 8 +- .../codegen/js/flexjs/TestFlexJSClass.java | 107 ++++- .../codegen/js/flexjs/TestFlexJSEmiter.java | 48 +- .../js/flexjs/TestFlexJSExpressions.java | 54 ++- .../js/flexjs/TestFlexJSGlobalClasses.java | 4 +- .../js/flexjs/TestFlexJSMethodMembers.java | 54 +-- .../codegen/js/flexjs/TestFlexJSPackage.java | 38 +- .../codegen/js/flexjs/TestFlexJSStatements.java | 317 +++++++++++++- .../flexjs/files/FlexJSTest_again_result.js | 170 ++++---- .../flexjs/files/LocalFunction_result.js | 17 +- .../flexjs/files/MyInitialView_result.js | 433 ++++++++++--------- .../files/controllers/MyController_result.js | 58 ++- .../flexjs/files/models/MyModel_result.js | 29 +- .../flexjs/files/wildcard_import_result.js | 34 +- .../flexjs/projects/interfaces/Test_result.js | 9 +- .../projects/interfaces/classes/A_result.js | 8 +- .../projects/interfaces/classes/B_result.js | 3 +- .../projects/interfaces/classes/C_result.js | 3 +- .../projects/interfaces/interfaces/IA_result.js | 3 + .../projects/interfaces/interfaces/IB_result.js | 2 + .../projects/interfaces/interfaces/IC_result.js | 3 + .../projects/interfaces/interfaces/ID_result.js | 1 + .../projects/interfaces/interfaces/IE_result.js | 1 + .../codegen/js/flexjs/JSFlexJSEmitter.java | 258 ++++++++++- .../js/flexjs/JSFlexJSEmitterTokens.java | 1 + .../internal/codegen/js/goog/JSGoogEmitter.java | 6 +- .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 28 +- 28 files changed, 1256 insertions(+), 453 deletions(-) ----------------------------------------------------------------------
