flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [8/8] git commit: [flex-falcon] [refs/heads/develop] - fix up build to handle remove of externs folder
Date Wed, 20 Jul 2016 05:50:31 GMT
fix up build to handle remove of externs folder


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

Branch: refs/heads/develop
Commit: d9aa9c73b022193a641f770306434419cd24c5ef
Parents: 4cb6a8a
Author: Alex Harui <aharui@apache.org>
Authored: Tue Jul 19 22:46:20 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Jul 19 22:49:54 2016 -0700

----------------------------------------------------------------------
 build.xml                                       | 81 +++++++++++++-------
 compiler-jx/src/test/build.xml                  |  2 +
 .../codegen/externals/ExternalsTestUtils.java   | 64 +++++++++++++---
 .../codegen/externals/TestExternChrome.java     |  1 +
 .../codegen/externals/TestExternES3.java        |  1 +
 .../codegen/externals/TestExternJQuery.java     |  1 +
 .../codegen/externals/TestExternJasmine.java    |  1 +
 .../codegen/externals/TestExternNode.java       |  1 +
 .../externals/TestExternalsJSCompile.java       |  1 +
 .../codegen/externals/TestReferenceModel.java   |  1 +
 .../codegen/externals/TestTypeInheritence.java  |  1 +
 .../codegen/js/flexjs/TestFlexJSClass.java      | 46 +++++------
 .../codegen/js/flexjs/TestFlexJSEmitter.java    |  8 +-
 .../js/flexjs/TestFlexJSExpressions.java        |  4 +-
 .../internal/codegen/js/goog/TestGoogClass.java | 34 ++++----
 .../codegen/js/goog/TestGoogEmitter.java        |  6 +-
 .../src/test/resources/goog/files/call-super.as |  4 +-
 .../resources/goog/files/call-super_result.js   |  6 +-
 .../src/test/resources/goog/files/input.as      |  4 +-
 .../src/test/resources/goog/files/output.js     |  6 +-
 .../src/test/resources/goog/files/poc.as        | 35 ++++-----
 .../src/test/resources/goog/files/poc_result.js | 49 ++++++------
 .../resources/goog/files/qualify-new-object.as  |  8 +-
 .../goog/files/qualify-new-object_result.js     |  7 +-
 24 files changed, 223 insertions(+), 149 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9e9e5e2..9325fa2 100644
--- a/build.xml
+++ b/build.xml
@@ -33,6 +33,31 @@
     <property name="source.jx.kit" value="${kit.jx.prefix}-src"/>
     <property name="binary.jx.kit" value="${kit.jx.prefix}-bin"/>
 
+    <target name="check-typedefs-home"
+        description="Check FLEXJS_TYPEDEFS_HOME">
+        
+        <echo message="FLEXJS_TYPEDEFS_HOME is ${env.FLEXJS_TYPEDEFS_HOME}"/>
+        
+        <available file="${env.FLEXJS_TYPEDEFS_HOME}"
+        type="dir"
+        property="FLEXJS_TYPEDEFS_HOME"
+        value="${env.FLEXJS_TYPEDEFS_HOME}" />
+        
+        <available file="${basedir}/../flex-typedefs"
+        type="dir"
+        property="FLEXJS_TYPEDEFS_HOME"
+        value="${basedir}/../flex-typedefs" />
+        
+        <available file="${basedir}/flex-typedefs"
+        type="dir"
+        property="FLEXJS_TYPEDEFS_HOME"
+        value="${basedir}/flex-typedefs" />
+        
+        <fail message="The environment variable FLEXJS_TYPEDEFS_HOME is not set to a directory"
+        unless="FLEXJS_TYPEDEFS_HOME"/>
+        
+    </target>
+
     <!--
      Optional jars but should be in place for a real release build.
      
@@ -71,11 +96,11 @@
 
     <target name="main" depends="sdk, javadoc, tests" description="Default target - Builds a Falcon SDK, builds Falcon Javadoc, and runs tests."/>
 
-    <target name="all" depends="main, jx, externs, oem, debugger, anttasks" description="Builds Falcon, then FalconJX"/>
+    <target name="all" depends="main, jx, typedefs, oem, debugger, anttasks" description="Builds Falcon, then FalconJX"/>
 
     <target name="jx" depends="compiler.jx, compiler.jx.tests" description="Builds FalconJX" />
     
-    <target name="externs" depends="extern.swcs, extern.tests" description="Build externs and run tests"/>
+    <target name="typedefs" depends="check-typedefs-home, typedef.swcs, typedef.tests" description="Build typedefs and run tests"/>
     
     <target name="oem" depends="compiler.oem" description="Builds FB Integration JAR" />
 
@@ -111,16 +136,16 @@
         <ant dir="compiler-jx/src/test" target="copyLastSuccessfulBuild"/>
     </target>
     
-    <target name="extern.swcs">
-        <ant dir="externs" />
+    <target name="typedef.swcs">
+        <ant dir="${FLEXJS_TYPEDEFS_HOME}" />
     </target>
-    <target name="extern.swcs.clean" >
-        <ant dir="externs" target="clean"/>
+    <target name="typedef.swcs.clean" >
+        <ant dir="${FLEXJS_TYPEDEFS_HOME}" target="clean"/>
     </target>
-    <target name="extern.swcs.wipe" >
-        <ant dir="externs" target="wipe"/>
+    <target name="typedef.swcs.wipe" >
+        <ant dir="${FLEXJS_TYPEDEFS_HOME}" target="wipe"/>
     </target>
-    <target name="extern.tests">
+    <target name="typedef.tests">
         <ant dir="compiler-jx/src/test" target="extern.tests" />
     </target>
     
@@ -285,8 +310,8 @@
         <!-- flex ant tasks -->
         <antcall target="stage-ant-tasks"/>
         
-        <!-- externs -->
-        <antcall target="stage-externs"/>
+        <!-- typedefs -->
+        <antcall target="stage-typedefs"/>
         
         <!--
          Source files have Windows line endings.  Most UNIX editors can handle
@@ -443,9 +468,9 @@
         </copy>
     </target>
 
-    <target name="stage-externs">
-        <copy todir="${basedir}/temp/externs" includeEmptyDirs="false">
-            <fileset dir="${basedir}/externs">
+    <target name="stage-typedefs">
+        <copy todir="${basedir}/temp/flex-typedefs" includeEmptyDirs="false">
+            <fileset dir="${FLEXJS_TYPEDEFS_HOME}">
                 <include name="**"/>
                 <exclude name="**/target/.plxarc" />
                 <exclude name="**/target/failsafe-reports/**" />
@@ -589,19 +614,19 @@
         
         <!-- generated -->
         <mkdir dir="${basedir}/temp/js/libs"/>
-        <copy tofile="${basedir}/temp/js/libs/js.swc" file="${basedir}/externs/js/target/js.swc" />
-        <copy tofile="${basedir}/temp/js/libs/cordova.swc" file="${basedir}/externs/cordova/target/cordova.swc" />
-        <copy tofile="${basedir}/temp/js/libs/createjs.swc" file="${basedir}/externs/createjs/target/createjs.swc" />
-        <copy tofile="${basedir}/temp/js/libs/google_maps.swc" file="${basedir}/externs/google_maps/target/google_maps.swc" />
-        <copy tofile="${basedir}/temp/js/libs/jasmine.swc" file="${basedir}/externs/jasmine/target/jasmine.swc" />
-        <copy tofile="${basedir}/temp/js/libs/jquery.swc" file="${basedir}/externs/jquery/target/jquery-1.9.swc" />
-        <copy tofile="${basedir}/temp/js/libs/GCL.swc" file="${basedir}/externs/GCL/target/GCL.swc" />
-        <copy tofile="${basedir}/temp/js/libs/node.swc" file="${basedir}/externs/node/target/node.swc" />
+        <copy tofile="${basedir}/temp/js/libs/js.swc" file="${FLEXJS_TYPEDEFS_HOME}/js/target/js.swc" />
+        <copy tofile="${basedir}/temp/js/libs/cordova.swc" file="${FLEXJS_TYPEDEFS_HOME}/cordova/target/cordova.swc" />
+        <copy tofile="${basedir}/temp/js/libs/createjs.swc" file="${FLEXJS_TYPEDEFS_HOME}/createjs/target/createjs.swc" />
+        <copy tofile="${basedir}/temp/js/libs/google_maps.swc" file="${FLEXJS_TYPEDEFS_HOME}/google_maps/target/google_maps.swc" />
+        <copy tofile="${basedir}/temp/js/libs/jasmine.swc" file="${FLEXJS_TYPEDEFS_HOME}/jasmine/target/jasmine.swc" />
+        <copy tofile="${basedir}/temp/js/libs/jquery.swc" file="${FLEXJS_TYPEDEFS_HOME}/jquery/target/jquery-1.9.swc" />
+        <copy tofile="${basedir}/temp/js/libs/GCL.swc" file="${FLEXJS_TYPEDEFS_HOME}/GCL/target/GCL.swc" />
+        <copy tofile="${basedir}/temp/js/libs/node.swc" file="${FLEXJS_TYPEDEFS_HOME}/node/target/node.swc" />
         
         <!-- generated -->
-        <mkdir dir="${basedir}/temp/externs"/>
-        <copy todir="${basedir}/temp/externs" includeEmptyDirs="false">
-            <fileset dir="${basedir}/externs">
+        <mkdir dir="${basedir}/temp/flex-typedefs"/>
+        <copy todir="${basedir}/temp/flex-typedefs" includeEmptyDirs="false">
+            <fileset dir="${FLEXJS_TYPEDEFS_HOME}">
                 <include name="**/**"/>
                 <exclude name="**/externs.zip" />
                 <exclude name="**/target/.plxarc" />
@@ -612,8 +637,8 @@
             </fileset>
         </copy>
         <echo>copy easel and tween</echo>
-        <copy todir="${basedir}/temp/externs" includeEmptyDirs="false">
-            <fileset dir="${basedir}/externs">
+        <copy todir="${basedir}/temp/flex-typedefs" includeEmptyDirs="false">
+            <fileset dir="${FLEXJS_TYPEDEFS_HOME}">
                 <include name="createjs/target/downloads/Easel*/src/**"/>
                 <include name="createjs/target/downloads/Tween*/src/**"/>
             </fileset>
@@ -719,7 +744,7 @@
                 <exclude name="**/*.flv"/>
                 <exclude name="**/org.apache.flex.tools.FlexToolGroup"/>
                 <exclude name="debugger/META-INF/MANIFEST.MF"/>
-                <exclude name="externs/target/maven-shared-archive-resources/META-INF/DEPENDENCIES"/>
+                <exclude name="flex-typedefs/target/maven-shared-archive-resources/META-INF/DEPENDENCIES"/>
                 <exclude name="**/*.patch"/>
                 <exclude name="LICENSE.jx.bin"/>
                 <exclude name="README_JX"/>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/build.xml
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/build.xml b/compiler-jx/src/test/build.xml
index 62878bf..deba9f2 100644
--- a/compiler-jx/src/test/build.xml
+++ b/compiler-jx/src/test/build.xml
@@ -72,6 +72,7 @@
                     <exclude name="**/TestFlexJSMXML*.class"/>
                     <exclude name="**/TestMXML*.class"/>
                     <!-- externs tests -->
+                    <exclude name="**/TestFlexJSClass.class"/>
                     <exclude name="**/TestExtern*.class"/>
                     <exclude name="**/TestAnnotationEnum.class"/>
                     <exclude name="**/TestCollectImports.class"/>
@@ -157,6 +158,7 @@
             <batchtest todir="${compiler}/target/junit-results">
                 <fileset dir="${compiler}/target/test-classes">
                     <!-- externs tests -->
+                    <exclude name="**/TestFlexJSClass.class"/>
                     <include name="**/TestExtern*.class"/>
                     <include name="**/TestAnnotationEnum.class"/>
                     <include name="**/TestCollectImports.class"/>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java
index 88367c4..34286c9 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java
@@ -35,23 +35,67 @@ public class ExternalsTestUtils
             "../../../externs/js/src/main/javascript/missing.js"));
 
     // XXX AS3.as is a namespace needed to override toString in some classes
-    public static File AS3_NAMESPACE_FILE = FilenameNormalization.normalize(new File(
-            "../../../externs/js/src/main/flex/AS3.as"));
+    public static File AS3_NAMESPACE_FILE;
 
-    public static File EXTERNAL_JS_DIR = FilenameNormalization.normalize(new File(
-            "../../../externs/js/target/downloads"));
+    public static File EXTERNAL_JS_DIR;
 
-    public static File EXTERNAL_JQUERY_DIR = FilenameNormalization.normalize(new File(
-            "../../../externs/jquery/target/downloads"));
+    public static File EXTERNAL_JQUERY_DIR;
 
-    public static File EXTERNAL_JASMINE_DIR = FilenameNormalization.normalize(new File(
-            "../../../externs/jasmine/target/downloads"));
+    public static File EXTERNAL_JASMINE_DIR;
 
-    public static File EXTERNAL_NODE_DIR = FilenameNormalization.normalize(new File(
-            "../../../externs/node/target/downloads/closure-compiler-master/contrib/nodejs"));
+    public static File EXTERNAL_NODE_DIR;
 
     public static File AS_ROOT_DIR = new File(TEMP_DIR, "externals/as");
 
+    public static void init()
+    {
+    	File f = new File(
+        "../../../flex-typedefs/js/src/main/javascript/missing.js");
+    	if (!f.exists())
+    		 f = new File(
+    	        "../../../../flex-typedefs/js/src/main/javascript/missing.js");
+        // XXX missing.js is a temp location until we can figure out where it should placed in the build
+        MISSING_JS_FILE = FilenameNormalization.normalize(f);
+
+        f = new File(
+        "../../../flex-typedefs/js/src/main/flex/AS3.as");
+        if (!f.exists())
+        	f = new File(
+            "../../../../flex-typedefs/js/src/main/flex/AS3.as");
+        // XXX AS3.as is a namespace needed to override toString in some classes
+        AS3_NAMESPACE_FILE = FilenameNormalization.normalize(f);
+
+        f = new File(
+        "../../../flex-typedefs/js/target/downloads");
+        if (!f.exists())
+        	f = new File(
+            "../../../../flex-typedefs/js/target/downloads");
+        EXTERNAL_JS_DIR = FilenameNormalization.normalize(f);
+
+        f = new File(
+        "../../../flex-typedefs/jquery/target/downloads");
+        if (!f.exists())
+        	f = new File(
+            "../../../../flex-typedefs/jquery/target/downloads");
+        
+        EXTERNAL_JQUERY_DIR = FilenameNormalization.normalize(f);
+
+        f = new File(
+                "../../../flex-typedefs/jasmine/target/downloads");
+        if (!f.exists())
+        	f = new File(
+                    "../../../../flex-typedefs/jasmine/target/downloads");
+        EXTERNAL_JASMINE_DIR = FilenameNormalization.normalize(f);
+
+        f = new File(
+        "../../../flex-typedefs/node/target/downloads/closure-compiler-master/contrib/nodejs");
+        if (!f.exists())
+        	f = new File(
+            "../../../../flex-typedefs/node/target/downloads/closure-compiler-master/contrib/nodejs");
+        EXTERNAL_NODE_DIR = FilenameNormalization.normalize(f);
+    	
+    }
+    
     public static void addTestExcludesFull(ExternCConfiguration config)
     {
         config.addFieldExclude("Window", "focus");

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternChrome.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternChrome.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternChrome.java
index 8659690..e79889d 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternChrome.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternChrome.java
@@ -144,6 +144,7 @@ public class TestExternChrome extends ExternalsTestBase
     @Override
     protected void configure(ExternCConfiguration install) throws IOException
     {
+    	ExternalsTestUtils.init();
         config.setASRoot(ExternalsTestUtils.AS_ROOT_DIR);
 
         String coreRoot = ExternalsTestUtils.EXTERNAL_JS_DIR.getAbsolutePath();

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternES3.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternES3.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternES3.java
index 29ac6fb..6052a19 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternES3.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternES3.java
@@ -113,6 +113,7 @@ public class TestExternES3 extends ExternalsTestBase
     @Override
     protected void configure(ExternCConfiguration config) throws IOException
     {
+    	ExternalsTestUtils.init();
         config.setASRoot(ExternalsTestUtils.AS_ROOT_DIR);
 
         String coreRoot = ExternalsTestUtils.EXTERNAL_JS_DIR.getAbsolutePath();

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternJQuery.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternJQuery.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternJQuery.java
index 7a2c1d0..bcd4d3a 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternJQuery.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternJQuery.java
@@ -58,6 +58,7 @@ public class TestExternJQuery extends ExternalsTestBase
     @Override
     protected void configure(ExternCConfiguration config) throws IOException
     {
+    	ExternalsTestUtils.init();
         config.setASRoot(ExternalsTestUtils.AS_ROOT_DIR);
 
         String coreRoot = ExternalsTestUtils.EXTERNAL_JQUERY_DIR.getAbsolutePath();

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternJasmine.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternJasmine.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternJasmine.java
index 9e2c805..2f32f1b 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternJasmine.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternJasmine.java
@@ -74,6 +74,7 @@ public class TestExternJasmine extends ExternalsTestBase
     @Override
     protected void configure(ExternCConfiguration install) throws IOException
     {
+    	ExternalsTestUtils.init();
         config.setASRoot(ExternalsTestUtils.AS_ROOT_DIR);
 
         String coreRoot = ExternalsTestUtils.EXTERNAL_JASMINE_DIR.getAbsolutePath();

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternNode.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternNode.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternNode.java
index b47dfa3..6563f12 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternNode.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternNode.java
@@ -52,6 +52,7 @@ public class TestExternNode extends ExternalsTestBase
     @Override
     protected void configure(ExternCConfiguration config) throws IOException
     {
+    	ExternalsTestUtils.init();
         config.setASRoot(ExternalsTestUtils.AS_ROOT_DIR);
 
         config.addNamedModule("assert");

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternalsJSCompile.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternalsJSCompile.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternalsJSCompile.java
index feff678..fdb4887 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternalsJSCompile.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternalsJSCompile.java
@@ -87,6 +87,7 @@ public class TestExternalsJSCompile
         backend = new FlexJSBackend();
 
         config = new ExternCConfiguration();
+        ExternalsTestUtils.init();
         config.setASRoot(ExternalsTestUtils.AS_ROOT_DIR);
         ExternalsTestUtils.addTestExcludesFull(config);
         ExternalsTestUtils.addTestExternalsFull(config);

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestReferenceModel.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestReferenceModel.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestReferenceModel.java
index d4374b3..075391d 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestReferenceModel.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestReferenceModel.java
@@ -37,6 +37,7 @@ public class TestReferenceModel extends ExternalsTestBase
 
         client.cleanOutput();
 
+    	ExternalsTestUtils.init();
         // TODO (mschmalle) this root needs to create 'classes' in the root and move 
         // constants and functions up into it aside classes
         assertFalse(ExternalsTestUtils.AS_ROOT_DIR.exists());

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestTypeInheritence.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestTypeInheritence.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestTypeInheritence.java
index ee19443..985f431 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestTypeInheritence.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestTypeInheritence.java
@@ -81,6 +81,7 @@ public class TestTypeInheritence extends ExternalsTestBase
     @Override
     protected void configure(ExternCConfiguration config) throws IOException
     {
+    	ExternalsTestUtils.init();
         config.setASRoot(ExternalsTestUtils.AS_ROOT_DIR);
     }
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java
index 509c491..e34ef50 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java
@@ -44,70 +44,70 @@ public class TestFlexJSClass extends TestGoogClass
     @Test
     public void testSimpleExtends()
     {
-        IClassNode node = getClassNode("public class A extends EventTarget {public function A() {}}");
+        IClassNode node = getClassNode("public class A extends EventDispatcher {public function A() {}}");
         asBlockWalker.visitClass(node);
-        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);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n */\norg.apache.flex.A = function() {\n  org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
     }
 
     @Test
     public void testSimpleExtendsWithArgs()
     {
-        IClassNode node = getClassNode("public class A extends EventTarget {public function A(arg:String) { super(arg);}}");
+        IClassNode node = getClassNode("public class A extends EventDispatcher {public function A(arg:String) { super(arg);}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n * @param {string} arg\n */\norg.apache.flex.A = function(arg) {\n  org.apache.flex.A.base(this, 'constructor', arg);\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @param {string} arg\n */\norg.apache.flex.A = function(arg) {\n  org.apache.flex.A.base(this, 'constructor', arg);\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
     }
 
     @Test
     public void testSimpleExtendsWithArgsImplicitSuper()
     {
-        IClassNode node = getClassNode("public class A extends EventTarget {public function A(arg:String) {}}");
+        IClassNode node = getClassNode("public class A extends EventDispatcher {public function A(arg:String) {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {goog.events.EventTarget}\n * @param {string} arg\n */\norg.apache.flex.A = function(arg) {\n  org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @param {string} arg\n */\norg.apache.flex.A = function(arg) {\n  org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
     }
 
     @Override
     @Test
     public void testSimpleExtendsImplements()
     {
-        IClassNode node = getClassNode("public class A extends EventTarget implements IEventDispatcher {public function A() {}}");
+        IClassNode node = getClassNode("public class A extends EventDispatcher implements IEventDispatcher {public function A() {}}");
         asBlockWalker.visitClass(node);
-        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);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\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, flash.events.EventDispatcher);");
     }
 
     @Override
     @Test
     public void testSimpleExtendsImplementsMultiple()
     {
-        IClassNode node = getClassNode("public class A extends EventTarget implements IEventDispatcher, ListenableKey {public function A() {}}");
+        IClassNode node = getClassNode("public class A extends EventDispatcher implements IEventDispatcher, IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        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);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n  org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
     }
 
     @Override
     @Test
     public void testSimpleFinalExtendsImplementsMultiple()
     {
-        IClassNode node = getClassNode("public final class A extends EventTarget implements IEventDispatcher, ListenableKey {public function A() {}}");
+        IClassNode node = getClassNode("public final class A extends EventDispatcher implements IEventDispatcher, IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        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);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n  org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
     }
 
     @Override
     @Test
     public void testQualifiedExtendsImplementsMultiple()
     {
-        IClassNode node = getClassNode("public class A extends goog.events.EventTarget implements flash.events.IEventDispatcher, goog.events.ListenableKey {public function A() {}}");
+        IClassNode node = getClassNode("public class A extends flash.events.EventDispatcher implements flash.events.IEventDispatcher, flash.display.IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        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);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n  org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
     }
 
     @Override
     @Test
     public void testExtendsConstructor_super()
     {
-        IClassNode node = getClassNode("public class A extends goog.events.EventTarget { public function A() { super('foo', 42);}}");
+        IClassNode node = getClassNode("public class A extends flash.events.EventDispatcher { public function A() { super('foo', 42);}}");
         asBlockWalker.visitClass(node);
-        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);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n */\norg.apache.flex.A = function() {\n  org.apache.flex.A.base(this, 'constructor', 'foo', 42);\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
     }
 
     @Test
@@ -124,7 +124,7 @@ public class TestFlexJSClass extends TestGoogClass
     {
         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.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};";
+        String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n\nthis.event = new flash.events.Event();\n};\n\n\n/**\n * @export\n * @type {flash.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);
     }
 
@@ -186,9 +186,9 @@ public class TestFlexJSClass extends TestGoogClass
     @Test
     public void testExtendsConstructor_withArguments()
     {
-        IClassNode node = getClassNode("public class A extends goog.events.EventTarget {public function A(arg1:String, arg2:int) {}}");
+        IClassNode node = getClassNode("public class A extends flash.events.EventDispatcher {public function A(arg1:String, arg2:int) {}}");
         asBlockWalker.visitClass(node);
-        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');\n};\ngoog.inherits(org.apache.flex.A, goog.events.EventTarget);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n  org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
     }
 
     @Override
@@ -348,9 +348,9 @@ public class TestFlexJSClass extends TestGoogClass
     @Test
     public void testSimpleImplementsMultiple()
     {
-        IClassNode node = getClassNode("public class A implements IEventDispatcher, ListenableKey {public function A() {}}");
+        IClassNode node = getClassNode("public class A implements IEventDispatcher, IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n * @implements {goog.events.ListenableKey}\n */\norg.apache.flex.A = function() {\n};");
+        assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n};");
     }
 
 
@@ -384,9 +384,9 @@ public class TestFlexJSClass extends TestGoogClass
     @Test
     public void testConstructor_withImplicitSuperAndBodyAndComplexInitializer()
     {
-        IClassNode node = getClassNode("public class A extends EventTarget {public function A(arg1:String, arg2:int) {arg2 = arg2 + 2;} public var foo:Array = [];}");
+        IClassNode node = getClassNode("public class A extends EventDispatcher {public function A(arg1:String, arg2:int) {arg2 = arg2 + 2;} public var foo:Array = [];}");
         asBlockWalker.visitClass(node);
-        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');\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;");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n  org.apache.flex.A.base(this, 'constructor');\n  \n  this.foo = [];\n  arg2 = arg2 + 2;\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);\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/d9aa9c73/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java
index 013d930..cbbd3fc 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java
@@ -47,8 +47,8 @@ public class TestFlexJSEmitter extends TestGoogEmitter
     public void testSimple()
     {
         String code = "package com.example.components {"
-                + "import goog.events.EventTarget;"
-                + "public class MyEventTarget extends EventTarget {"
+                + "import flash.events.EventDispatcher;"
+                + "public class MyEventTarget extends EventDispatcher {"
                 + "public function MyEventTarget() {if (foo() != 42) { bar(); } }"
                 + "private var _privateVar:String = \"do \";"
                 + "public var publicProperty:Number = 100;"
@@ -70,7 +70,7 @@ public class TestFlexJSEmitter extends TestGoogEmitter
         		"\n" +
         		"/**\n" +
         		" * @constructor\n" +
-        		" * @extends {goog.events.EventTarget}\n" +
+        		" * @extends {flash.events.EventDispatcher}\n" +
         		" */\n" +
         		"com.example.components.MyEventTarget = function() {\n" +
         		"  com.example.components.MyEventTarget.base(this, 'constructor');\n" +
@@ -78,7 +78,7 @@ public class TestFlexJSEmitter extends TestGoogEmitter
         		"    bar();\n" +
         		"  }\n" +
         		"};\n" +
-        		"goog.inherits(com.example.components.MyEventTarget, goog.events.EventTarget);\n" +
+        		"goog.inherits(com.example.components.MyEventTarget, flash.events.EventDispatcher);\n" +
         		"\n" +
         		"\n" +
         		"/**\n" +

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
index 6f9b599..62d4d46 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
@@ -723,9 +723,9 @@ public class TestFlexJSExpressions extends TestGoogExpressions
     @Test
     public void testClassCast()
     {
-        IClassNode node = (IClassNode) getNode("import goog.events.ListenableKey; public class B implements ListenableKey { public function B() { ListenableKey(b).type = ''; } }", ClassNode.class, WRAP_LEVEL_PACKAGE);
+        IClassNode node = (IClassNode) getNode("import flash.display.IBitmapDrawable; public class B implements IBitmapDrawable { public function B() { IBitmapDrawable(b).type = ''; } }", ClassNode.class, WRAP_LEVEL_PACKAGE);
         asBlockWalker.visitClass(node);
-        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};");
+        assertOut("/**\n * @constructor\n * @implements {flash.display.IBitmapDrawable}\n */\nB = function() {\n  org.apache.flex.utils.Language.as(b, flash.display.IBitmapDrawable, true).type = '';\n};");
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogClass.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogClass.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogClass.java
index 2bad420..59d184b 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogClass.java
+++ b/compiler-jx/src/test/java/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 EventTarget {public function A() {}}");
+        IClassNode node = getClassNode("public class A extends EventDispatcher {public function A() {}}");
         asBlockWalker.visitClass(node);
-        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);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
     }
 
     @Override
@@ -97,45 +97,45 @@ public class TestGoogClass extends TestClass
     @Test
     public void testSimpleImplementsMultiple()
     {
-        IClassNode node = getClassNode("public class A implements IEventDispatcher, ListenableKey {public function A() {}}");
+        IClassNode node = getClassNode("public class A implements IEventDispatcher, IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n * @implements {goog.events.ListenableKey}\n */\norg.apache.flex.A = function() {\n};");
+        assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n};");
     }
 
     @Override
     @Test
     public void testSimpleExtendsImplements()
     {
-        IClassNode node = getClassNode("public class A extends EventTarget implements IEventDispatcher {public function A() {}}");
+        IClassNode node = getClassNode("public class A extends EventDispatcher implements IEventDispatcher {public function A() {}}");
         asBlockWalker.visitClass(node);
-        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);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\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, flash.events.EventDispatcher);");
     }
 
     @Override
     @Test
     public void testSimpleExtendsImplementsMultiple()
     {
-        IClassNode node = getClassNode("public class A extends EventTarget implements IEventDispatcher, ListenableKey {public function A() {}}");
+        IClassNode node = getClassNode("public class A extends EventDispatcher implements IEventDispatcher, IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        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);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
     }
 
     @Override
     @Test
     public void testSimpleFinalExtendsImplementsMultiple()
     {
-        IClassNode node = getClassNode("public final class A extends EventTarget implements IEventDispatcher, ListenableKey {public function A() {}}");
+        IClassNode node = getClassNode("public final class A extends EventDispatcher implements IEventDispatcher, IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        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);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
     }
 
     @Override
     @Test
     public void testQualifiedExtendsImplementsMultiple()
     {
-        IClassNode node = getClassNode("public class A extends goog.events.EventTarget implements flash.events.IEventDispatcher, goog.events.ListenableKey {public function A() {}}");
+        IClassNode node = getClassNode("public class A extends flash.events.EventDispatcher implements flash.events.IEventDispatcher, flash.display.IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        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);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
     }
 
     @Override
@@ -158,9 +158,9 @@ public class TestGoogClass extends TestClass
     @Test
     public void testExtendsConstructor_super()
     {
-        IClassNode node = getClassNode("public class A extends goog.events.EventTarget { public function A() { super('foo', 42);}}");
+        IClassNode node = getClassNode("public class A extends flash.events.EventDispatcher { public function A() { super('foo', 42);}}");
         asBlockWalker.visitClass(node);
-        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);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\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, flash.events.EventDispatcher);");
     }
 
     @Override
@@ -176,9 +176,9 @@ public class TestGoogClass extends TestClass
     @Test
     public void testExtendsConstructor_withArguments()
     {
-        IClassNode node = getClassNode("public class A extends goog.events.EventTarget {public function A(arg1:String, arg2:int) {}}");
+        IClassNode node = getClassNode("public class A extends flash.events.EventDispatcher {public function A(arg1:String, arg2:int) {}}");
         asBlockWalker.visitClass(node);
-        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);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\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, flash.events.EventDispatcher);");
     }
 
     @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 goog.events.EventTarget;import goog.events.Event;import goog.events.ListenableKey;"
+        String source = "package org.apache.flex {import flash.events.IEventDispatcher;import flash.events.EventDispatcher;import flash.events.Event;import flash.display.IBitmapDrawable;"
                 + code + "}";
         IFileNode node = compileAS(source);
         IClassNode child = (IClassNode) findFirstDescendantOfType(node,

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmitter.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmitter.java
index 92f0ecb..2b882d6 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmitter.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmitter.java
@@ -41,8 +41,8 @@ public class TestGoogEmitter extends ASTestBase
     public void testSimple()
     {
         String code = "package com.example.components {"
-                + "import goog.events.EventTarget;"
-                + "public class MyEventTarget extends EventTarget {"
+                + "import flash.events.EventDispatcher;"
+                + "public class MyEventTarget extends EventDispatcher {"
                 + "public function MyEventTarget() {if (foo() != 42) { bar(); } }"
                 + "private var _privateVar:String = \"do \";"
                 + "public var publicProperty:Number = 100;"
@@ -50,7 +50,7 @@ public class TestGoogEmitter extends ASTestBase
                 + "return \"Don't \" + _privateVar + value; }";
         IFileNode node = compileAS(code);
         asBlockWalker.visitFile(node);
-        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};");
+        assertOut("goog.provide('com.example.components.MyEventTarget');\n\ngoog.require('flash.events.EventDispatcher');\n\n/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\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, flash.events.EventDispatcher);\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/d9aa9c73/compiler-jx/src/test/resources/goog/files/call-super.as
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/resources/goog/files/call-super.as b/compiler-jx/src/test/resources/goog/files/call-super.as
index 3b07ead..8c3bfe1 100644
--- a/compiler-jx/src/test/resources/goog/files/call-super.as
+++ b/compiler-jx/src/test/resources/goog/files/call-super.as
@@ -21,9 +21,9 @@ package org.apache.flex
 
 import flash.events.IEventDispatcher;
 
-import goog.events.EventTarget;
+import flash.events.EventDispatcher;
 
-public dynamic class A extends EventTarget implements IEventDispatcher
+public dynamic class A extends EventDispatcher implements IEventDispatcher
 {
 	public function A(z:String)
 	{

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/resources/goog/files/call-super_result.js
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/resources/goog/files/call-super_result.js b/compiler-jx/src/test/resources/goog/files/call-super_result.js
index f9d270f..e03949e 100644
--- a/compiler-jx/src/test/resources/goog/files/call-super_result.js
+++ b/compiler-jx/src/test/resources/goog/files/call-super_result.js
@@ -14,11 +14,11 @@
 goog.provide('org.apache.flex.A');
 
 goog.require('flash.events.IEventDispatcher');
-goog.require('goog.events.EventTarget');
+goog.require('flash.events.EventDispatcher');
 
 /**
  * @constructor
- * @extends {goog.events.EventTarget}
+ * @extends {flash.events.EventDispatcher}
  * @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, goog.events.EventTarget);
+goog.inherits(org.apache.flex.A, flash.events.EventDispatcher);
 
 /**
  * @param {string} a

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/resources/goog/files/input.as
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/resources/goog/files/input.as b/compiler-jx/src/test/resources/goog/files/input.as
index 81a4de6..c39cc2e 100644
--- a/compiler-jx/src/test/resources/goog/files/input.as
+++ b/compiler-jx/src/test/resources/goog/files/input.as
@@ -21,9 +21,9 @@ package org.apache.flex
 
 import flash.events.IEventDispatcher;
 
-import goog.events.EventTarget;
+import flash.events.EventDispatcher;
 
-public dynamic class A extends goog.events.EventTarget implements IEventDispatcher
+public dynamic class A extends flash.events.EventDispatcher implements IEventDispatcher
 {
 	public static const MY_CLASS_CONST:String = "myClassConst";
 	

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/resources/goog/files/output.js
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/resources/goog/files/output.js b/compiler-jx/src/test/resources/goog/files/output.js
index b046100..adff013 100644
--- a/compiler-jx/src/test/resources/goog/files/output.js
+++ b/compiler-jx/src/test/resources/goog/files/output.js
@@ -14,11 +14,11 @@
 goog.provide('org.apache.flex.A');
 
 goog.require('flash.events.IEventDispatcher');
-goog.require('goog.events.EventTarget');
+goog.require('flash.events.EventDispatcher');
 
 /**
  * @constructor
- * @extends {goog.events.EventTarget}
+ * @extends {flash.events.EventDispatcher}
  * @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, goog.events.EventTarget);
+goog.inherits(org.apache.flex.A, flash.events.EventDispatcher);
 
 /**
  * @const

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/resources/goog/files/poc.as
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/resources/goog/files/poc.as b/compiler-jx/src/test/resources/goog/files/poc.as
index 38ba0df..8efb4ca 100644
--- a/compiler-jx/src/test/resources/goog/files/poc.as
+++ b/compiler-jx/src/test/resources/goog/files/poc.as
@@ -21,11 +21,10 @@ package
 
 import flash.events.MouseEvent;
 
-import goog.events.BrowserEvent;
-import goog.events.Event;
-import goog.events.EventTarget;
+import flash.events.Event;
+import flash.events.EventDispatcher;
 
-public class Example extends EventTarget
+public class Example extends EventDispatcher
 {
 	private static const BYEBYE:String = "Bye Bye";
 	private static const HELLOWORLD:String = "Hello World";
@@ -40,28 +39,28 @@ public class Example extends EventTarget
 	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;
+	private var _lbl1:MouseEvent;
+	private var _lbl2:MouseEvent;
+	private var _et1:EventDispatcher;
+	private var _et2:EventDispatcher;
+	private var _et3:EventDispatcher;
 	
 	public function init():void
 	{
-		_et1 = new EventTarget();
-		_et2 = new EventTarget();
-		_et3 = new EventTarget();
+		_et1 = new EventDispatcher();
+		_et2 = new EventDispatcher();
+		_et3 = new EventDispatcher();
 		
-		_lbl1 = new BrowserEvent();
-		_lbl1.clientX = 100;
-		_lbl1.clientY = 25;
+		_lbl1 = new MouseEvent();
+		_lbl1.localX = 100;
+		_lbl1.localY = 25;
 		_lbl1.type = Example.HELLOWORLD;
 		
 		dispatchEvent(_lbl1);
 		
-		_lbl2 = new BrowserEvent();
-		_lbl2.clientX = 200;
-		_lbl2.clientY = 25;
+		_lbl2 = new MouseEvent();
+		_lbl2.localX = 200;
+		_lbl2.localY = 25;
 		_lbl2.type = Example.counter + "";
 		
 		dispatchEvent(_lbl2);

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/resources/goog/files/poc_result.js
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/resources/goog/files/poc_result.js b/compiler-jx/src/test/resources/goog/files/poc_result.js
index a7e0f28..a179045 100644
--- a/compiler-jx/src/test/resources/goog/files/poc_result.js
+++ b/compiler-jx/src/test/resources/goog/files/poc_result.js
@@ -14,20 +14,19 @@
 goog.provide('Example');
 
 goog.require('flash.events.MouseEvent');
-goog.require('goog.events.BrowserEvent');
-goog.require('goog.events.Event');
-goog.require('goog.events.EventTarget');
+goog.require('flash.events.Event');
+goog.require('flash.events.EventDispatcher');
 
 /**
  * @constructor
- * @extends {goog.events.EventTarget}
+ * @extends {flash.events.EventDispatcher}
  */
 Example = function() {
 	var self = this;
 	Example.base(this, 'constructor');
 	self.init();
 };
-goog.inherits(Example, goog.events.EventTarget);
+goog.inherits(Example, flash.events.EventDispatcher);
 
 /**
  * @private
@@ -51,76 +50,76 @@ Example.counter = 100;
 
 /**
  * @private
- * @type {goog.events.Event}
+ * @type {flash.events.Event}
  */
 Example.prototype._btn1;
 
 /**
  * @private
- * @type {goog.events.Event}
+ * @type {flash.events.Event}
  */
 Example.prototype._btn2;
 
 /**
  * @private
- * @type {goog.events.Event}
+ * @type {flash.events.Event}
  */
 Example.prototype._btn3;
 
 /**
  * @private
- * @type {goog.events.BrowserEvent}
+ * @type {flash.events.MouseEvent}
  */
 Example.prototype._lbl1;
 
 /**
  * @private
- * @type {goog.events.BrowserEvent}
+ * @type {flash.events.MouseEvent}
  */
 Example.prototype._lbl2;
 
 /**
  * @private
- * @type {goog.events.EventTarget}
+ * @type {flash.events.EventDispatcher}
  */
 Example.prototype._et1;
 
 /**
  * @private
- * @type {goog.events.EventTarget}
+ * @type {flash.events.EventDispatcher}
  */
 Example.prototype._et2;
 
 /**
  * @private
- * @type {goog.events.EventTarget}
+ * @type {flash.events.EventDispatcher}
  */
 Example.prototype._et3;
 
 Example.prototype.init = function() {
 	var self = this;
-	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._et1 = new flash.events.EventDispatcher();
+	self._et2 = new flash.events.EventDispatcher();
+	self._et3 = new flash.events.EventDispatcher();
+	self._lbl1 = new flash.events.MouseEvent();
+	self._lbl1.localX = 100;
+	self._lbl1.localY = 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 = new flash.events.MouseEvent();
+	self._lbl2.localX = 200;
+	self._lbl2.localY = 25;
 	self._lbl2.type = Example.counter + "";
 	self.dispatchEvent(self._lbl2);
-	self._btn1 = new goog.events.Event();
+	self._btn1 = new flash.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 = new flash.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 = new flash.events.Event();
 	self._btn3.type = "Move it";
 	self._et3.addEventListener(flash.events.MouseEvent.CLICK, self.btn3clickHandler);
 	self._et3.dispatchEvent(self._btn3);

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/resources/goog/files/qualify-new-object.as
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/resources/goog/files/qualify-new-object.as b/compiler-jx/src/test/resources/goog/files/qualify-new-object.as
index d9e6a10..899bf8c 100644
--- a/compiler-jx/src/test/resources/goog/files/qualify-new-object.as
+++ b/compiler-jx/src/test/resources/goog/files/qualify-new-object.as
@@ -21,8 +21,6 @@ package org.apache.flex
 
 import flash.events.EventDispatcher;
 
-import goog.events.EventTarget;
-
 public class A extends EventDispatcher
 {
 	public function A() 
@@ -30,13 +28,13 @@ public class A extends EventDispatcher
 		init();
 	}
 	
-	private var _privateVar:EventTarget;
+	private var _privateVar:EventDispatcher;
 	
 	public function init():void
 	{
-		var btn:EventTarget = new EventTarget();
+		var btn:EventDispatcher = new EventDispatcher();
 		
-		_privateVar = new EventTarget();
+		_privateVar = new EventDispatcher();
 		
 		addEventListener("click", function () {});
 	}

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d9aa9c73/compiler-jx/src/test/resources/goog/files/qualify-new-object_result.js
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/resources/goog/files/qualify-new-object_result.js b/compiler-jx/src/test/resources/goog/files/qualify-new-object_result.js
index 1ba905f..fc20a5d 100644
--- a/compiler-jx/src/test/resources/goog/files/qualify-new-object_result.js
+++ b/compiler-jx/src/test/resources/goog/files/qualify-new-object_result.js
@@ -14,7 +14,6 @@
 goog.provide('org.apache.flex.A');
 
 goog.require('flash.events.EventDispatcher');
-goog.require('goog.events.EventTarget');
 
 /**
  * @constructor
@@ -29,14 +28,14 @@ goog.inherits(org.apache.flex.A, flash.events.EventDispatcher);
 
 /**
  * @private
- * @type {goog.events.EventTarget}
+ * @type {flash.events.EventDispatcher}
  */
 org.apache.flex.A.prototype._privateVar;
 
 org.apache.flex.A.prototype.init = function() {
 	var self = this;
-	var /** @type {goog.events.EventTarget} */ btn = new goog.events.EventTarget();
-	self._privateVar = new goog.events.EventTarget();
+	var /** @type {flash.events.EventDispatcher} */ btn = new flash.events.EventDispatcher();
+	self._privateVar = new flash.events.EventDispatcher();
 	self.addEventListener("click", function() {
 	});
 };


Mime
View raw message