Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 25E4318FFA for ; Mon, 12 Oct 2015 20:37:14 +0000 (UTC) Received: (qmail 93340 invoked by uid 500); 12 Oct 2015 20:36:58 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 93174 invoked by uid 500); 12 Oct 2015 20:36:58 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 93019 invoked by uid 99); 12 Oct 2015 20:36:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Oct 2015 20:36:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9FC03E03EC; Mon, 12 Oct 2015 20:36:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aharui@apache.org To: commits@flex.apache.org Date: Mon, 12 Oct 2015 20:36:57 -0000 Message-Id: <44cc12549e4240e1b02fc933dd40d355@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/18] git commit: [flex-falcon] [refs/heads/develop] - refactor tests so only VF2JS tests use spark.swc. Other tests now use GCL.swc Repository: flex-falcon Updated Branches: refs/heads/develop def7ab13f -> dbb747f10 refactor tests so only VF2JS tests use spark.swc. Other tests now use GCL.swc Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7dff7ce1 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7dff7ce1 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7dff7ce1 Branch: refs/heads/develop Commit: 7dff7ce1de48aeee98367df0ffa635cb3c68fe00 Parents: def7ab1 Author: Alex Harui Authored: Fri Oct 9 11:37:58 2015 -0700 Committer: Alex Harui Committed: Fri Oct 9 11:37:58 2015 -0700 ---------------------------------------------------------------------- .../codegen/js/flexjs/TestFlexJSClass.java | 40 ++++---- .../codegen/js/flexjs/TestFlexJSEmiter.java | 8 +- .../js/flexjs/TestFlexJSExpressions.java | 4 +- .../internal/codegen/js/goog/TestGoogClass.java | 34 +++---- .../codegen/js/goog/TestGoogEmiter.java | 8 +- .../codegen/js/vf2js/TestVF2JSClass.java | 30 ++++++ .../codegen/js/vf2js/TestVF2JSProject.java | 13 +++ .../flex/compiler/internal/test/ASTestBase.java | 10 +- .../test-files/goog/files/call-super.as | 6 +- .../test-files/goog/files/call-super_result.js | 6 +- .../test-files/goog/files/get-set.as | 2 +- .../test-files/goog/files/input.as | 6 +- .../test-files/goog/files/output.js | 6 +- compiler.jx.tests/test-files/goog/files/poc.as | 87 ++++++++-------- .../test-files/goog/files/poc_result.js | 101 +++++++++++-------- .../test-files/goog/files/qualify-new-object.as | 10 +- .../goog/files/qualify-new-object_result.js | 8 +- .../test-files/goog/projects/imports/Case.as | 2 +- .../test-files/goog/projects/imports/comps/A.as | 2 +- .../test-files/goog/projects/imports/comps/B.as | 2 +- 20 files changed, 223 insertions(+), 162 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java index 1d9f0b6..6e029eb 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java @@ -44,54 +44,54 @@ public class TestFlexJSClass extends TestGoogClass @Test public void testSimpleExtends() { - IClassNode node = getClassNode("public class A extends Button {public function A() {}}"); + IClassNode node = getClassNode("public class A extends EventTarget {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);"); } @Override @Test public void testSimpleExtendsImplements() { - IClassNode node = getClassNode("public class A extends Button implements IEventDispatcher {public function A() {}}"); + IClassNode node = getClassNode("public class A extends EventTarget implements IEventDispatcher {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @implements {flash.events.IEventDispatcher}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n * @implements {flash.events.IEventDispatcher}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);"); } @Override @Test public void testSimpleExtendsImplementsMultiple() { - IClassNode node = getClassNode("public class A extends Button implements IEventDispatcher, ILogger {public function A() {}}"); + IClassNode node = getClassNode("public class A extends EventTarget implements IEventDispatcher, ListenableKey {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @implements {flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n * @implements {flash.events.IEventDispatcher}\n * @implements {goog.events.ListenableKey}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);"); } @Override @Test public void testSimpleFinalExtendsImplementsMultiple() { - IClassNode node = getClassNode("public final class A extends Button implements IEventDispatcher, ILogger {public function A() {}}"); + IClassNode node = getClassNode("public final class A extends EventTarget implements IEventDispatcher, ListenableKey {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @implements {flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n * @implements {flash.events.IEventDispatcher}\n * @implements {goog.events.ListenableKey}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);"); } @Override @Test public void testQualifiedExtendsImplementsMultiple() { - IClassNode node = getClassNode("public class A extends spark.components.Button implements flash.events.IEventDispatcher, mx.logging.ILogger {public function A() {}}"); + IClassNode node = getClassNode("public class A extends goog.events.EventTarget implements flash.events.IEventDispatcher, goog.events.ListenableKey {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @implements {flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n * @implements {flash.events.IEventDispatcher}\n * @implements {goog.events.ListenableKey}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);"); } @Override @Test public void testExtendsConstructor_super() { - IClassNode node = getClassNode("public class A extends spark.components.Button { public function A() { super('foo', 42);}}"); + IClassNode node = getClassNode("public class A extends goog.events.EventTarget { public function A() { super('foo', 42);}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor', 'foo', 42);\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor', 'foo', 42);\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);"); } @Test @@ -106,9 +106,9 @@ public class TestFlexJSClass extends TestGoogClass @Test public void testMethod_withImplicitSelfInReturnValue() { - IClassNode node = getClassNode("public class B {public function B() {}; public var button:Button = new Button(); public function foo():String {return button.label;};}"); + IClassNode node = getClassNode("public class B {public function B() {}; public var event:Event = new Event(); public function foo():String {return event.type;};}"); asBlockWalker.visitClass(node); - String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n\nthis.button = new spark.components.Button();\n};\n\n\n/**\n * @export\n * @type {spark.components.Button}\n */\norg.apache.flex.B.prototype.button;\n\n\n/**\n * @export\n * @return {string}\n */\norg.apache.flex.B.prototype.foo = function() {\n return this.button.label;\n};"; + String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n\nthis.event = new goog.events.Event();\n};\n\n\n/**\n * @export\n * @type {goog.events.Event}\n */\norg.apache.flex.B.prototype.event;\n\n\n/**\n * @export\n * @return {string}\n */\norg.apache.flex.B.prototype.foo = function() {\n return this.event.type;\n};"; assertOut(expected); } @@ -170,9 +170,9 @@ public class TestFlexJSClass extends TestGoogClass @Test public void testExtendsConstructor_withArguments() { - IClassNode node = getClassNode("public class A extends spark.components.Button {public function A(arg1:String, arg2:int) {}}"); + IClassNode node = getClassNode("public class A extends goog.events.EventTarget {public function A(arg1:String, arg2:int) {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n org.apache.flex.A.base(this, 'constructor', arg1, arg2);\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n org.apache.flex.A.base(this, 'constructor', arg1, arg2);\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);"); } @Override @@ -332,9 +332,9 @@ public class TestFlexJSClass extends TestGoogClass @Test public void testSimpleImplementsMultiple() { - IClassNode node = getClassNode("public class A implements IEventDispatcher, ILogger {public function A() {}}"); + IClassNode node = getClassNode("public class A implements IEventDispatcher, ListenableKey {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n */\norg.apache.flex.A = function() {\n};"); + assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n * @implements {goog.events.ListenableKey}\n */\norg.apache.flex.A = function() {\n};"); } @@ -368,9 +368,9 @@ public class TestFlexJSClass extends TestGoogClass @Test public void testConstructor_withImplicitSuperAndBodyAndComplexInitializer() { - IClassNode node = getClassNode("public class A extends Button {public function A(arg1:String, arg2:int) {arg2 = arg2 + 2;} public var foo:Array = [];}"); + IClassNode node = getClassNode("public class A extends EventTarget {public function A(arg1:String, arg2:int) {arg2 = arg2 + 2;} public var foo:Array = [];}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n org.apache.flex.A.base(this, 'constructor', arg1, arg2);\n \n this.foo = [];\n arg2 = arg2 + 2;\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);\n\n\n/**\n * @export\n * @type {Array}\n */\norg.apache.flex.A.prototype.foo;"); + assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n org.apache.flex.A.base(this, 'constructor', arg1, arg2);\n \n this.foo = [];\n arg2 = arg2 + 2;\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);\n\n\n/**\n * @export\n * @type {Array}\n */\norg.apache.flex.A.prototype.foo;"); } protected IBackend createBackend() http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmiter.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmiter.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmiter.java index cd5ef2b..914b2f4 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmiter.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmiter.java @@ -45,16 +45,16 @@ public class TestFlexJSEmiter extends TestGoogEmiter public void testSimple() { String code = "package com.example.components {" - + "import spark.components.Button;" - + "public class MyTextButton extends Button {" - + "public function MyTextButton() {if (foo() != 42) { bar(); } }" + + "import goog.events.EventTarget;" + + "public class MyEventTarget extends EventTarget {" + + "public function MyEventTarget() {if (foo() != 42) { bar(); } }" + "private var _privateVar:String = \"do \";" + "public var publicProperty:Number = 100;" + "public function myFunction(value: String): String{" + "return \"Don't \" + _privateVar + value; }"; IFileNode node = compileAS(code); asBlockWalker.visitFile(node); - assertOut("/**\n * com.example.components.MyTextButton\n *\n * @fileoverview\n *\n * @suppress {checkTypes}\n */\n\ngoog.provide('com.example.components.MyTextButton');\n\n\n\n/**\n * @constructor\n * @extends {spark.components.Button}\n */\ncom.example.components.MyTextButton = function() {\n com.example.components.MyTextButton.base(this, 'constructor');\n if (foo() != 42) {\n bar();\n }\n};\ngoog.inherits(com.example.components.MyTextButton, spark.components.Button);\n\n\n/**\n * @private\n * @type {string}\n */\ncom.example.components.MyTextButton.prototype._privateVar = \"do \";\n\n\n/**\n * @export\n * @type {number}\n */\ncom.example.components.MyTextButton.prototype.publicProperty = 100;\n\n\n/**\n * @export\n * @param {string} value\n * @return {string}\n */\ncom.example.components.MyTextButton.prototype.myFunction = function(value) {\n return \"Don't \" + this._privateVar + value;\n};\n\n\n/**\n * Metadata\n *\n * @type {Object.>}\n */\ ncom.example.components.MyTextButton.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'MyTextButton', qName: 'com.example.components.MyTextButton'}] };\n"); + assertOut("/**\n * com.example.components.MyEventTarget\n *\n * @fileoverview\n *\n * @suppress {checkTypes}\n */\n\ngoog.provide('com.example.components.MyEventTarget');\n\n\n\n/**\n * @constructor\n * @extends {goog.events.EventTarget}\n */\ncom.example.components.MyEventTarget = function() {\n com.example.components.MyEventTarget.base(this, 'constructor');\n if (foo() != 42) {\n bar();\n }\n};\ngoog.inherits(com.example.components.MyEventTarget, goog.events.EventTarget);\n\n\n/**\n * @private\n * @type {string}\n */\ncom.example.components.MyEventTarget.prototype._privateVar = \"do \";\n\n\n/**\n * @export\n * @type {number}\n */\ncom.example.components.MyEventTarget.prototype.publicProperty = 100;\n\n\n/**\n * @export\n * @param {string} value\n * @return {string}\n */\ncom.example.components.MyEventTarget.prototype.myFunction = function(value) {\n return \"Don't \" + this._privateVar + value;\n};\n\n\n/**\n * Metadata\n *\n * @type {Object. >}\n */\ncom.example.components.MyEventTarget.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'MyEventTarget', qName: 'com.example.components.MyEventTarget'}] };\n"); } @Override http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java index daee543..f880cf3 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java @@ -704,9 +704,9 @@ public class TestFlexJSExpressions extends TestGoogExpressions @Test public void testClassCast() { - IClassNode node = (IClassNode) getNode("import spark.components.Button; public class B implements Button { public function B() { Button(b).label = ''; } }", ClassNode.class, WRAP_LEVEL_PACKAGE); + IClassNode node = (IClassNode) getNode("import goog.events.ListenableKey; public class B implements ListenableKey { public function B() { ListenableKey(b).type = ''; } }", ClassNode.class, WRAP_LEVEL_PACKAGE); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @implements {spark.components.Button}\n */\nB = function() {\n org.apache.flex.utils.Language.as(b, spark.components.Button, true).label = '';\n};"); + assertOut("/**\n * @constructor\n * @implements {goog.events.ListenableKey}\n */\nB = function() {\n org.apache.flex.utils.Language.as(b, goog.events.ListenableKey, true).type = '';\n};"); } @Test http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogClass.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogClass.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogClass.java index bbe0720..2bad420 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogClass.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogClass.java @@ -79,9 +79,9 @@ public class TestGoogClass extends TestClass @Test public void testSimpleExtends() { - IClassNode node = getClassNode("public class A extends Button {public function A() {}}"); + IClassNode node = getClassNode("public class A extends EventTarget {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);"); } @Override @@ -97,45 +97,45 @@ public class TestGoogClass extends TestClass @Test public void testSimpleImplementsMultiple() { - IClassNode node = getClassNode("public class A implements IEventDispatcher, ILogger {public function A() {}}"); + IClassNode node = getClassNode("public class A implements IEventDispatcher, ListenableKey {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n */\norg.apache.flex.A = function() {\n};"); + assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n * @implements {goog.events.ListenableKey}\n */\norg.apache.flex.A = function() {\n};"); } @Override @Test public void testSimpleExtendsImplements() { - IClassNode node = getClassNode("public class A extends Button implements IEventDispatcher {public function A() {}}"); + IClassNode node = getClassNode("public class A extends EventTarget implements IEventDispatcher {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @implements {flash.events.IEventDispatcher}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n * @implements {flash.events.IEventDispatcher}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);"); } @Override @Test public void testSimpleExtendsImplementsMultiple() { - IClassNode node = getClassNode("public class A extends Button implements IEventDispatcher, ILogger {public function A() {}}"); + IClassNode node = getClassNode("public class A extends EventTarget implements IEventDispatcher, ListenableKey {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @implements {flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n * @implements {flash.events.IEventDispatcher}\n * @implements {goog.events.ListenableKey}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);"); } @Override @Test public void testSimpleFinalExtendsImplementsMultiple() { - IClassNode node = getClassNode("public final class A extends Button implements IEventDispatcher, ILogger {public function A() {}}"); + IClassNode node = getClassNode("public final class A extends EventTarget implements IEventDispatcher, ListenableKey {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @implements {flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n * @implements {flash.events.IEventDispatcher}\n * @implements {goog.events.ListenableKey}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);"); } @Override @Test public void testQualifiedExtendsImplementsMultiple() { - IClassNode node = getClassNode("public class A extends spark.components.Button implements flash.events.IEventDispatcher, mx.logging.ILogger {public function A() {}}"); + IClassNode node = getClassNode("public class A extends goog.events.EventTarget implements flash.events.IEventDispatcher, goog.events.ListenableKey {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @implements {flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n * @implements {flash.events.IEventDispatcher}\n * @implements {goog.events.ListenableKey}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);"); } @Override @@ -158,9 +158,9 @@ public class TestGoogClass extends TestClass @Test public void testExtendsConstructor_super() { - IClassNode node = getClassNode("public class A extends spark.components.Button { public function A() { super('foo', 42);}}"); + IClassNode node = getClassNode("public class A extends goog.events.EventTarget { public function A() { super('foo', 42);}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n */\norg.apache.flex.A = function() {\n\tvar self = this;\n\torg.apache.flex.A.base(this, 'constructor', 'foo', 42);\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n */\norg.apache.flex.A = function() {\n\tvar self = this;\n\torg.apache.flex.A.base(this, 'constructor', 'foo', 42);\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);"); } @Override @@ -176,9 +176,9 @@ public class TestGoogClass extends TestClass @Test public void testExtendsConstructor_withArguments() { - IClassNode node = getClassNode("public class A extends spark.components.Button {public function A(arg1:String, arg2:int) {}}"); + IClassNode node = getClassNode("public class A extends goog.events.EventTarget {public function A(arg1:String, arg2:int) {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n\torg.apache.flex.A.base(this, 'constructor', arg1, arg2);\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n\torg.apache.flex.A.base(this, 'constructor', arg1, arg2);\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);"); } @Override @@ -244,7 +244,7 @@ public class TestGoogClass extends TestClass @Override protected IClassNode getClassNode(String code) { - String source = "package org.apache.flex {import flash.events.IEventDispatcher;import mx.logging.ILogger;import spark.components.Button;" + String source = "package org.apache.flex {import flash.events.IEventDispatcher;import goog.events.EventTarget;import goog.events.Event;import goog.events.ListenableKey;" + code + "}"; IFileNode node = compileAS(source); IClassNode child = (IClassNode) findFirstDescendantOfType(node, http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java index e1f1278..21a9c90 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java @@ -41,16 +41,16 @@ public class TestGoogEmiter extends ASTestBase public void testSimple() { String code = "package com.example.components {" - + "import spark.components.Button;" - + "public class MyTextButton extends Button {" - + "public function MyTextButton() {if (foo() != 42) { bar(); } }" + + "import goog.events.EventTarget;" + + "public class MyEventTarget extends EventTarget {" + + "public function MyEventTarget() {if (foo() != 42) { bar(); } }" + "private var _privateVar:String = \"do \";" + "public var publicProperty:Number = 100;" + "public function myFunction(value: String): String{" + "return \"Don't \" + _privateVar + value; }"; IFileNode node = compileAS(code); asBlockWalker.visitFile(node); - assertOut("goog.provide('com.example.components.MyTextButton');\n\ngoog.require('spark.components.Button');\n\n/**\n * @constructor\n * @extends {spark.components.Button}\n */\ncom.example.components.MyTextButton = function() {\n\tvar self = this;\n\tcom.example.components.MyTextButton.base(this, 'constructor');\n\tif (foo() != 42) {\n\t\tbar();\n\t}\n};\ngoog.inherits(com.example.components.MyTextButton, spark.components.Button);\n\n/**\n * @private\n * @type {string}\n */\ncom.example.components.MyTextButton.prototype._privateVar = \"do \";\n\n/**\n * @type {number}\n */\ncom.example.components.MyTextButton.prototype.publicProperty = 100;\n\n/**\n * @param {string} value\n * @return {string}\n */\ncom.example.components.MyTextButton.prototype.myFunction = function(value) {\n\tvar self = this;\n\treturn \"Don't \" + self._privateVar + value;\n};"); + assertOut("goog.provide('com.example.components.MyEventTarget');\n\ngoog.require('goog.events.EventTarget');\n\n/**\n * @constructor\n * @extends {goog.events.EventTarget}\n */\ncom.example.components.MyEventTarget = function() {\n\tvar self = this;\n\tcom.example.components.MyEventTarget.base(this, 'constructor');\n\tif (foo() != 42) {\n\t\tbar();\n\t}\n};\ngoog.inherits(com.example.components.MyEventTarget, goog.events.EventTarget);\n\n/**\n * @private\n * @type {string}\n */\ncom.example.components.MyEventTarget.prototype._privateVar = \"do \";\n\n/**\n * @type {number}\n */\ncom.example.components.MyEventTarget.prototype.publicProperty = 100;\n\n/**\n * @param {string} value\n * @return {string}\n */\ncom.example.components.MyEventTarget.prototype.myFunction = function(value) {\n\tvar self = this;\n\treturn \"Don't \" + self._privateVar + value;\n};"); } @Test http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSClass.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSClass.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSClass.java index b84647d..51d790f 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSClass.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSClass.java @@ -19,10 +19,15 @@ package org.apache.flex.compiler.internal.codegen.js.vf2js; +import java.io.File; +import java.util.List; + import org.apache.flex.compiler.driver.IBackend; import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogClass; import org.apache.flex.compiler.internal.driver.js.vf2js.VF2JSBackend; import org.apache.flex.compiler.tree.as.IClassNode; +import org.apache.flex.compiler.tree.as.IFileNode; +import org.apache.flex.utils.FilenameNormalization; import org.junit.Test; /** @@ -371,6 +376,31 @@ public class TestVF2JSClass extends TestGoogClass assertOut("/**\n * @constructor\n */\norg.apache.flex.B = function() {};\n\n\n/**\n * @export\n * @return {org.apache.flex.B}\n */\norg.apache.flex.B.prototype.clone = function() {\n return new org.apache.flex.B();\n};"); } + @Override + protected void addLibraries(List libraries) + { + libraries.add(new File(FilenameNormalization.normalize(env.FPSDK + + "/" + env.FPVER + "/playerglobal.swc"))); + libraries.add(new File(FilenameNormalization.normalize(env.SDK + + "/frameworks/libs/framework.swc"))); + libraries.add(new File(FilenameNormalization.normalize(env.SDK + + "/frameworks/libs/spark.swc"))); + + super.addLibraries(libraries); + } + + @Override + protected IClassNode getClassNode(String code) + { + String source = "package org.apache.flex {import flash.events.IEventDispatcher;import mx.logging.ILogger;import spark.components.Button;" + + code + "}"; + IFileNode node = compileAS(source); + IClassNode child = (IClassNode) findFirstDescendantOfType(node, + IClassNode.class); + return child; + } + + protected IBackend createBackend() { return new VF2JSBackend(); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSProject.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSProject.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSProject.java index 5160272..d7711d7 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSProject.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSProject.java @@ -108,6 +108,19 @@ public class TestVF2JSProject extends TestGoogProject } @Override + protected void addLibraries(List libraries) + { + libraries.add(new File(FilenameNormalization.normalize(env.FPSDK + + "/" + env.FPVER + "/playerglobal.swc"))); + libraries.add(new File(FilenameNormalization.normalize(env.SDK + + "/frameworks/libs/framework.swc"))); + libraries.add(new File(FilenameNormalization.normalize(env.SDK + + "/frameworks/libs/spark.swc"))); + + super.addLibraries(libraries); + } + + @Override protected IBackend createBackend() { return new VF2JSBackend(); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java index 68da1f8..cdb2c70 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java @@ -55,10 +55,12 @@ public class ASTestBase extends TestBase { libraries.add(new File(FilenameNormalization.normalize(env.FPSDK + "/" + env.FPVER + "/playerglobal.swc"))); - libraries.add(new File(FilenameNormalization.normalize(env.SDK - + "/frameworks/libs/framework.swc"))); - libraries.add(new File(FilenameNormalization.normalize(env.SDK - + "/frameworks/libs/spark.swc"))); +// libraries.add(new File(FilenameNormalization.normalize(env.SDK +// + "/frameworks/libs/framework.swc"))); +// libraries.add(new File(FilenameNormalization.normalize(env.SDK +// + "/frameworks/libs/spark.swc"))); + libraries.add(new File(FilenameNormalization.normalize( + "../externs/GCL/out/bin/GCL.swc"))); super.addLibraries(libraries); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/test-files/goog/files/call-super.as ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/goog/files/call-super.as b/compiler.jx.tests/test-files/goog/files/call-super.as index ae7d40c..3b07ead 100644 --- a/compiler.jx.tests/test-files/goog/files/call-super.as +++ b/compiler.jx.tests/test-files/goog/files/call-super.as @@ -21,9 +21,9 @@ package org.apache.flex import flash.events.IEventDispatcher; -import spark.components.Button; +import goog.events.EventTarget; -public dynamic class A extends Button implements IEventDispatcher +public dynamic class A extends EventTarget implements IEventDispatcher { public function A(z:String) { @@ -39,4 +39,4 @@ public dynamic class A extends Button implements IEventDispatcher return result; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/test-files/goog/files/call-super_result.js ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/goog/files/call-super_result.js b/compiler.jx.tests/test-files/goog/files/call-super_result.js index e2bdfc8..f9d270f 100644 --- a/compiler.jx.tests/test-files/goog/files/call-super_result.js +++ b/compiler.jx.tests/test-files/goog/files/call-super_result.js @@ -14,11 +14,11 @@ goog.provide('org.apache.flex.A'); goog.require('flash.events.IEventDispatcher'); -goog.require('spark.components.Button'); +goog.require('goog.events.EventTarget'); /** * @constructor - * @extends {spark.components.Button} + * @extends {goog.events.EventTarget} * @implements {flash.events.IEventDispatcher} * @param {string} z */ @@ -26,7 +26,7 @@ org.apache.flex.A = function(z) { var self = this; org.apache.flex.A.base(this, 'constructor', z); }; -goog.inherits(org.apache.flex.A, spark.components.Button); +goog.inherits(org.apache.flex.A, goog.events.EventTarget); /** * @param {string} a http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/test-files/goog/files/get-set.as ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/goog/files/get-set.as b/compiler.jx.tests/test-files/goog/files/get-set.as index 18417ad..fce44c4 100644 --- a/compiler.jx.tests/test-files/goog/files/get-set.as +++ b/compiler.jx.tests/test-files/goog/files/get-set.as @@ -37,4 +37,4 @@ public class A } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/test-files/goog/files/input.as ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/goog/files/input.as b/compiler.jx.tests/test-files/goog/files/input.as index fd9baf3..81a4de6 100644 --- a/compiler.jx.tests/test-files/goog/files/input.as +++ b/compiler.jx.tests/test-files/goog/files/input.as @@ -21,9 +21,9 @@ package org.apache.flex import flash.events.IEventDispatcher; -import spark.components.Button; +import goog.events.EventTarget; -public dynamic class A extends spark.components.Button implements IEventDispatcher +public dynamic class A extends goog.events.EventTarget implements IEventDispatcher { public static const MY_CLASS_CONST:String = "myClassConst"; @@ -36,4 +36,4 @@ public dynamic class A extends spark.components.Button implements IEventDispatch public const MY_INSTANCE_CONST:String = "myInstanceConst"; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/test-files/goog/files/output.js ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/goog/files/output.js b/compiler.jx.tests/test-files/goog/files/output.js index af542a3..b046100 100644 --- a/compiler.jx.tests/test-files/goog/files/output.js +++ b/compiler.jx.tests/test-files/goog/files/output.js @@ -14,11 +14,11 @@ goog.provide('org.apache.flex.A'); goog.require('flash.events.IEventDispatcher'); -goog.require('spark.components.Button'); +goog.require('goog.events.EventTarget'); /** * @constructor - * @extends {spark.components.Button} + * @extends {goog.events.EventTarget} * @implements {flash.events.IEventDispatcher} */ org.apache.flex.A = function() { @@ -26,7 +26,7 @@ org.apache.flex.A = function() { org.apache.flex.A.base(this, 'constructor'); self.trace(typeof("a")); }; -goog.inherits(org.apache.flex.A, spark.components.Button); +goog.inherits(org.apache.flex.A, goog.events.EventTarget); /** * @const http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/test-files/goog/files/poc.as ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/goog/files/poc.as b/compiler.jx.tests/test-files/goog/files/poc.as index ceca776..38ba0df 100644 --- a/compiler.jx.tests/test-files/goog/files/poc.as +++ b/compiler.jx.tests/test-files/goog/files/poc.as @@ -21,11 +21,11 @@ package import flash.events.MouseEvent; -import spark.components.Button; -import spark.components.Group; -import spark.components.Label; +import goog.events.BrowserEvent; +import goog.events.Event; +import goog.events.EventTarget; -public class Example extends Group +public class Example extends EventTarget { private static const BYEBYE:String = "Bye Bye"; private static const HELLOWORLD:String = "Hello World"; @@ -37,70 +37,71 @@ public class Example extends Group init(); } - private var _btn1:Button; - private var _btn2:Button; - private var _btn3:Button; - private var _lbl1:Label; - private var _lbl2:Label; + private var _btn1:Event; + private var _btn2:Event; + private var _btn3:Event; + private var _lbl1:BrowserEvent; + private var _lbl2:BrowserEvent; + private var _et1:EventTarget; + private var _et2:EventTarget; + private var _et3:EventTarget; public function init():void { - _lbl1 = new Label(); - _lbl1.x = 100; - _lbl1.y = 25; - _lbl1.text = Example.HELLOWORLD; + _et1 = new EventTarget(); + _et2 = new EventTarget(); + _et3 = new EventTarget(); - addElement(_lbl1); + _lbl1 = new BrowserEvent(); + _lbl1.clientX = 100; + _lbl1.clientY = 25; + _lbl1.type = Example.HELLOWORLD; - _lbl2 = new Label(); - _lbl2.x = 200; - _lbl2.y = 25; - _lbl2.text = Example.counter + ""; + dispatchEvent(_lbl1); - addElement(_lbl2); + _lbl2 = new BrowserEvent(); + _lbl2.clientX = 200; + _lbl2.clientY = 25; + _lbl2.type = Example.counter + ""; - _btn1 = new Button(); - _btn1.x = 100; - _btn1.y = 50; - _btn1.label = "Click me"; - _btn1.addEventListener(MouseEvent.CLICK, btn1clickHandler); + dispatchEvent(_lbl2); - addElement(_btn1); + _btn1 = new Event(); + _btn1.type = "Click me"; + _et1.addEventListener(MouseEvent.CLICK, btn1clickHandler); + + _et1.dispatchEvent(_btn1); - _btn2 = new Button(); - _btn2.x = 200; - _btn2.y = 50; - _btn2.label = "Add it"; - _btn2.addEventListener(MouseEvent.CLICK, btn2clickHandler); + _btn2 = new Event(); + _btn2.type = "Add it"; + _et2.addEventListener(MouseEvent.CLICK, btn2clickHandler); - addElement(_btn2); + _et2.dispatchEvent(_btn2); - _btn3 = new Button(); - _btn3.x = 300; - _btn3.y = 50; - _btn3.label = "Move it"; - _btn3.addEventListener(MouseEvent.CLICK, btn3clickHandler); + _btn3 = new Event(); + _btn3.type = "Move it"; + _et3.addEventListener(MouseEvent.CLICK, btn3clickHandler); - addElement(_btn3); + _et3.dispatchEvent(_btn3); } protected function btn1clickHandler(event:MouseEvent):void { - if (_lbl1.text == Example.HELLOWORLD) - _lbl1.text = Example.BYEBYE; + if (_lbl1.type == Example.HELLOWORLD) + _lbl1.type = Example.BYEBYE; else - _lbl1.text = Example.HELLOWORLD; + _lbl1.type = Example.HELLOWORLD; } protected function btn2clickHandler(event:MouseEvent):void { - _lbl2.text = --Example.counter + ""; + _lbl2.type = --Example.counter + ""; } protected function btn3clickHandler(event:MouseEvent):void { - _btn3.x += 10; + _lbl2.clientX += 10; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/test-files/goog/files/poc_result.js ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/goog/files/poc_result.js b/compiler.jx.tests/test-files/goog/files/poc_result.js index e9d176a..a7e0f28 100644 --- a/compiler.jx.tests/test-files/goog/files/poc_result.js +++ b/compiler.jx.tests/test-files/goog/files/poc_result.js @@ -14,20 +14,20 @@ goog.provide('Example'); goog.require('flash.events.MouseEvent'); -goog.require('spark.components.Button'); -goog.require('spark.components.Group'); -goog.require('spark.components.Label'); +goog.require('goog.events.BrowserEvent'); +goog.require('goog.events.Event'); +goog.require('goog.events.EventTarget'); /** * @constructor - * @extends {spark.components.Group} + * @extends {goog.events.EventTarget} */ Example = function() { var self = this; Example.base(this, 'constructor'); self.init(); }; -goog.inherits(Example, spark.components.Group); +goog.inherits(Example, goog.events.EventTarget); /** * @private @@ -51,64 +51,79 @@ Example.counter = 100; /** * @private - * @type {spark.components.Button} + * @type {goog.events.Event} */ Example.prototype._btn1; /** * @private - * @type {spark.components.Button} + * @type {goog.events.Event} */ Example.prototype._btn2; /** * @private - * @type {spark.components.Button} + * @type {goog.events.Event} */ Example.prototype._btn3; /** * @private - * @type {spark.components.Label} + * @type {goog.events.BrowserEvent} */ Example.prototype._lbl1; /** * @private - * @type {spark.components.Label} + * @type {goog.events.BrowserEvent} */ Example.prototype._lbl2; +/** + * @private + * @type {goog.events.EventTarget} + */ +Example.prototype._et1; + +/** + * @private + * @type {goog.events.EventTarget} + */ +Example.prototype._et2; + +/** + * @private + * @type {goog.events.EventTarget} + */ +Example.prototype._et3; + Example.prototype.init = function() { var self = this; - self._lbl1 = new spark.components.Label(); - self._lbl1.x = 100; - self._lbl1.y = 25; - self._lbl1.text = Example.HELLOWORLD; - self.addElement(self._lbl1); - self._lbl2 = new spark.components.Label(); - self._lbl2.x = 200; - self._lbl2.y = 25; - self._lbl2.text = Example.counter + ""; - self.addElement(self._lbl2); - self._btn1 = new spark.components.Button(); - self._btn1.x = 100; - self._btn1.y = 50; - self._btn1.label = "Click me"; - self._btn1.addEventListener(flash.events.MouseEvent.CLICK, self.btn1clickHandler); - self.addElement(self._btn1); - self._btn2 = new spark.components.Button(); - self._btn2.x = 200; - self._btn2.y = 50; - self._btn2.label = "Add it"; - self._btn2.addEventListener(flash.events.MouseEvent.CLICK, self.btn2clickHandler); - self.addElement(self._btn2); - self._btn3 = new spark.components.Button(); - self._btn3.x = 300; - self._btn3.y = 50; - self._btn3.label = "Move it"; - self._btn3.addEventListener(flash.events.MouseEvent.CLICK, self.btn3clickHandler); - self.addElement(self._btn3); + self._et1 = new goog.events.EventTarget(); + self._et2 = new goog.events.EventTarget(); + self._et3 = new goog.events.EventTarget(); + self._lbl1 = new goog.events.BrowserEvent(); + self._lbl1.clientX = 100; + self._lbl1.clientY = 25; + self._lbl1.type = Example.HELLOWORLD; + self.dispatchEvent(self._lbl1); + self._lbl2 = new goog.events.BrowserEvent(); + self._lbl2.clientX = 200; + self._lbl2.clientY = 25; + self._lbl2.type = Example.counter + ""; + self.dispatchEvent(self._lbl2); + self._btn1 = new goog.events.Event(); + self._btn1.type = "Click me"; + self._et1.addEventListener(flash.events.MouseEvent.CLICK, self.btn1clickHandler); + self._et1.dispatchEvent(self._btn1); + self._btn2 = new goog.events.Event(); + self._btn2.type = "Add it"; + self._et2.addEventListener(flash.events.MouseEvent.CLICK, self.btn2clickHandler); + self._et2.dispatchEvent(self._btn2); + self._btn3 = new goog.events.Event(); + self._btn3.type = "Move it"; + self._et3.addEventListener(flash.events.MouseEvent.CLICK, self.btn3clickHandler); + self._et3.dispatchEvent(self._btn3); }; /** @@ -116,10 +131,10 @@ Example.prototype.init = function() { */ Example.prototype.btn1clickHandler = function(event) { var self = this; - if (self._lbl1.text == Example.HELLOWORLD) - self._lbl1.text = Example.BYEBYE; + if (self._lbl1.type == Example.HELLOWORLD) + self._lbl1.type = Example.BYEBYE; else - self._lbl1.text = Example.HELLOWORLD; + self._lbl1.type = Example.HELLOWORLD; }; /** @@ -127,7 +142,7 @@ Example.prototype.btn1clickHandler = function(event) { */ Example.prototype.btn2clickHandler = function(event) { var self = this; - self._lbl2.text = --Example.counter + ""; + self._lbl2.type = --Example.counter + ""; }; /** @@ -135,5 +150,5 @@ Example.prototype.btn2clickHandler = function(event) { */ Example.prototype.btn3clickHandler = function(event) { var self = this; - self._btn3.x += 10; + self._lbl2.clientX += 10; }; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/test-files/goog/files/qualify-new-object.as ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/goog/files/qualify-new-object.as b/compiler.jx.tests/test-files/goog/files/qualify-new-object.as index 0991176..d9e6a10 100644 --- a/compiler.jx.tests/test-files/goog/files/qualify-new-object.as +++ b/compiler.jx.tests/test-files/goog/files/qualify-new-object.as @@ -21,7 +21,7 @@ package org.apache.flex import flash.events.EventDispatcher; -import spark.components.Button; +import goog.events.EventTarget; public class A extends EventDispatcher { @@ -30,13 +30,13 @@ public class A extends EventDispatcher init(); } - private var _privateVar:Button; + private var _privateVar:EventTarget; public function init():void { - var btn:Button = new Button(); + var btn:EventTarget = new EventTarget(); - _privateVar = new Button(); + _privateVar = new EventTarget(); addEventListener("click", function () {}); } @@ -48,4 +48,4 @@ public class A extends EventDispatcher doIt(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/test-files/goog/files/qualify-new-object_result.js ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/goog/files/qualify-new-object_result.js b/compiler.jx.tests/test-files/goog/files/qualify-new-object_result.js index e10f9fd..1ba905f 100644 --- a/compiler.jx.tests/test-files/goog/files/qualify-new-object_result.js +++ b/compiler.jx.tests/test-files/goog/files/qualify-new-object_result.js @@ -14,7 +14,7 @@ goog.provide('org.apache.flex.A'); goog.require('flash.events.EventDispatcher'); -goog.require('spark.components.Button'); +goog.require('goog.events.EventTarget'); /** * @constructor @@ -29,14 +29,14 @@ goog.inherits(org.apache.flex.A, flash.events.EventDispatcher); /** * @private - * @type {spark.components.Button} + * @type {goog.events.EventTarget} */ org.apache.flex.A.prototype._privateVar; org.apache.flex.A.prototype.init = function() { var self = this; - var /** @type {spark.components.Button} */ btn = new spark.components.Button(); - self._privateVar = new spark.components.Button(); + var /** @type {goog.events.EventTarget} */ btn = new goog.events.EventTarget(); + self._privateVar = new goog.events.EventTarget(); self.addEventListener("click", function() { }); }; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/test-files/goog/projects/imports/Case.as ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/goog/projects/imports/Case.as b/compiler.jx.tests/test-files/goog/projects/imports/Case.as index 2e97dc5..1922d4d 100644 --- a/compiler.jx.tests/test-files/goog/projects/imports/Case.as +++ b/compiler.jx.tests/test-files/goog/projects/imports/Case.as @@ -27,4 +27,4 @@ package var bar:A = new A(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/test-files/goog/projects/imports/comps/A.as ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/goog/projects/imports/comps/A.as b/compiler.jx.tests/test-files/goog/projects/imports/comps/A.as index 5779917..e8f39c4 100644 --- a/compiler.jx.tests/test-files/goog/projects/imports/comps/A.as +++ b/compiler.jx.tests/test-files/goog/projects/imports/comps/A.as @@ -25,4 +25,4 @@ package comps var foo:B = new B(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7dff7ce1/compiler.jx.tests/test-files/goog/projects/imports/comps/B.as ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/goog/projects/imports/comps/B.as b/compiler.jx.tests/test-files/goog/projects/imports/comps/B.as index e2e3e4c..551b279 100644 --- a/compiler.jx.tests/test-files/goog/projects/imports/comps/B.as +++ b/compiler.jx.tests/test-files/goog/projects/imports/comps/B.as @@ -24,4 +24,4 @@ package comps { } } -} \ No newline at end of file +}