You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/01/28 18:21:59 UTC

[5/5] git commit: [flex-falcon] [refs/heads/develop] - upgrade test results since the compiler now emits org_apache_flex instead of org.apache.flex

upgrade test results since the compiler now emits org_apache_flex instead of org.apache.flex


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

Branch: refs/heads/develop
Commit: 743fe157143b6620401487f49a9b689955dbe25f
Parents: ab1376a
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jan 28 07:57:13 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jan 28 07:57:13 2015 -0800

----------------------------------------------------------------------
 .../flexjs/files/FlexJSTest_again_result.js     |  56 ++---
 .../flexjs/files/LocalFunction_result.js        |   2 +-
 .../flexjs/files/MyInitialView_result.js        | 204 +++++++++----------
 .../flexjs/files/StockDataJSONItemConverter.js  |   8 +-
 .../files/controllers/MyController_result.js    |  62 +++---
 .../flexjs/files/models/MyModel_result.js       |  28 +--
 .../flexjs/files/wildcard_import_result.js      |  10 +-
 .../flexjs/projects/interfaces/Test_result.js   |  28 +--
 .../projects/interfaces/classes/A_result.js     |  14 +-
 .../projects/interfaces/classes/B_result.js     |   6 +-
 .../projects/interfaces/classes/C_result.js     |   6 +-
 .../projects/interfaces/interfaces/IA_result.js |  10 +-
 .../projects/interfaces/interfaces/IB_result.js |   6 +-
 .../projects/interfaces/interfaces/IC_result.js |  10 +-
 .../projects/interfaces/interfaces/ID_result.js |   6 +-
 .../projects/interfaces/interfaces/IE_result.js |  12 +-
 .../flexjs/projects/super/Base_result.js        |   2 +-
 .../test-files/goog/files/call-super_result.js  |   2 +-
 .../test-files/goog/files/get-set_result.js     |   2 +-
 .../test-files/goog/files/output.js             |   2 +-
 .../test-files/goog/files/poc_result.js         |   2 +-
 .../goog/files/qualify-new-object_result.js     |   2 +-
 .../goog/projects/imports/Case_result.js        |   2 +-
 .../goog/projects/imports/comps/A_result.js     |   2 +-
 .../goog/projects/imports/comps/B_result.js     |   2 +-
 .../test-files/vf2js/files/SimpleAS_result.js   |   2 +-
 .../vf2js/projects/interfaces/Test_result.js    |   4 +-
 .../projects/interfaces/classes/A_result.js     |   2 +-
 .../vf2js/projects/sdk/SomeSDKClass_result.js   |   4 +-
 .../sdk/bases/HelperBaseClass_result.js         |   2 +-
 .../simpleMXML/src/SimpleMXML_Project_result.js |   4 +-
 .../simpleMXML/src/example/Component_result.js  |   2 +-
 .../vf2js/projects/super/Base_result.js         |   4 +-
 33 files changed, 255 insertions(+), 255 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js b/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js
index 7355661..5d6a1ca 100644
--- a/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js
@@ -21,30 +21,30 @@
 
 goog.provide('FlexJSTest_again');
 
-goog.require('org.apache.flex.core.Application');
-goog.require('org.apache.flex.core.SimpleCSSValuesImpl');
+goog.require('org_apache_flex_core_Application');
+goog.require('org_apache_flex_core_SimpleCSSValuesImpl');
 goog.require('MyInitialView');
-goog.require('models.MyModel');
-goog.require('controllers.MyController');
-goog.require('org.apache.flex.net.HTTPService');
-goog.require('org.apache.flex.net.dataConverters.LazyCollection');
-goog.require('org.apache.flex.net.JSONInputParser');
+goog.require('models_MyModel');
+goog.require('controllers_MyController');
+goog.require('org_apache_flex_net_HTTPService');
+goog.require('org_apache_flex_net_dataConverters_LazyCollection');
+goog.require('org_apache_flex_net_JSONInputParser');
 goog.require('StockDataJSONItemConverter');
-goog.require('org.apache.flex.events.Event');
+goog.require('org_apache_flex_events_Event');
 
 
 
 
 /**
  * @constructor
- * @extends {org.apache.flex.core.Application}
+ * @extends {org_apache_flex_core_Application}
  */
 FlexJSTest_again = function() {
   FlexJSTest_again.base(this, 'constructor');
   
   /**
    * @private
-   * @type {org.apache.flex.core.SimpleCSSValuesImpl}
+   * @type {org_apache_flex_core_SimpleCSSValuesImpl}
    */
   this.$ID0;
   
@@ -56,31 +56,31 @@ FlexJSTest_again = function() {
   
   /**
    * @private
-   * @type {models.MyModel}
+   * @type {models_MyModel}
    */
   this.$ID2;
   
   /**
    * @private
-   * @type {controllers.MyController}
+   * @type {controllers_MyController}
    */
   this.$ID3;
   
   /**
    * @private
-   * @type {org.apache.flex.net.HTTPService}
+   * @type {org_apache_flex_net_HTTPService}
    */
   this.service;
   
   /**
    * @private
-   * @type {org.apache.flex.net.dataConverters.LazyCollection}
+   * @type {org_apache_flex_net_dataConverters_LazyCollection}
    */
   this.collection;
   
   /**
    * @private
-   * @type {org.apache.flex.net.JSONInputParser}
+   * @type {org_apache_flex_net_JSONInputParser}
    */
   this.$ID4;
   
@@ -106,18 +106,18 @@ FlexJSTest_again = function() {
   ([5,
 'model',
 false,
-[models.MyModel, 1, '_id', true, '$ID2', 0, 0, null],
+[models_MyModel, 1, '_id', true, '$ID2', 0, 0, null],
 'valuesImpl',
 false,
-[org.apache.flex.core.SimpleCSSValuesImpl, 1, '_id', true, '$ID0', 0, 0, null],
+[org_apache_flex_core_SimpleCSSValuesImpl, 1, '_id', true, '$ID0', 0, 0, null],
 'initialView',
 false,
 [MyInitialView, 1, '_id', true, '$ID1', 0, 0, null],
 'controller',
 false,
-[controllers.MyController, 1, '_id', true, '$ID3', 0, 0, null],
+[controllers_MyController, 1, '_id', true, '$ID3', 0, 0, null],
 'beads',
-null, [org.apache.flex.net.HTTPService, 2, 'id', true, 'service', 'beads', null, [org.apache.flex.net.dataConverters.LazyCollection, 3, 'id', true, 'collection', 'inputParser', false, [org.apache.flex.net.JSONInputParser, 1, '_id', true, '$ID4', 0, 0, null], 'itemConverter', false, [StockDataJSONItemConverter, 1, '_id', true, '$ID5', 0, 0, null], 0, 0, null], 0, 0, null],
+null, [org_apache_flex_net_HTTPService, 2, 'id', true, 'service', 'beads', null, [org_apache_flex_net_dataConverters_LazyCollection, 3, 'id', true, 'collection', 'inputParser', false, [org_apache_flex_net_JSONInputParser, 1, '_id', true, '$ID4', 0, 0, null], 'itemConverter', false, [StockDataJSONItemConverter, 1, '_id', true, '$ID5', 0, 0, null], 0, 0, null], 0, 0, null],
 0,
 1,
 'initialize',
@@ -125,7 +125,7 @@ this.$EH0
   ]);
   
 };
-goog.inherits(FlexJSTest_again, org.apache.flex.core.Application);
+goog.inherits(FlexJSTest_again, org_apache_flex_core_Application);
 
 
 /**
@@ -138,17 +138,17 @@ FlexJSTest_again.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'FlexJSTest_aga
 
 /**
  * @expose
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
 FlexJSTest_again.prototype.$EH0 = function(event)
 {
-  org.apache.flex.utils.Language.as(this.model, models.MyModel, true).set_labelText('Hello World');
+  org_apache_flex_utils_Language.as(this.model, models_MyModel, true).set_labelText('Hello World');
 };
 
 
 /**
  * @expose
- * @return {org.apache.flex.net.HTTPService}
+ * @return {org_apache_flex_net_HTTPService}
  */
 FlexJSTest_again.prototype.get_service = function()
 {
@@ -158,20 +158,20 @@ FlexJSTest_again.prototype.get_service = function()
 
 /**
  * @expose
- * @param {org.apache.flex.net.HTTPService} value
+ * @param {org_apache_flex_net_HTTPService} value
  */
 FlexJSTest_again.prototype.set_service = function(value)
 {
   if (value != this.service) {
     this.service = value;
-    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(this, 'service', null, value));
+    this.dispatchEvent(org_apache_flex_events_ValueChangeEvent.createUpdateEvent(this, 'service', null, value));
   }
 };
 
 
 /**
  * @expose
- * @return {org.apache.flex.net.dataConverters.LazyCollection}
+ * @return {org_apache_flex_net_dataConverters_LazyCollection}
  */
 FlexJSTest_again.prototype.get_collection = function()
 {
@@ -181,13 +181,13 @@ FlexJSTest_again.prototype.get_collection = function()
 
 /**
  * @expose
- * @param {org.apache.flex.net.dataConverters.LazyCollection} value
+ * @param {org_apache_flex_net_dataConverters_LazyCollection} value
  */
 FlexJSTest_again.prototype.set_collection = function(value)
 {
   if (value != this.collection) {
     this.collection = value;
-    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(this, 'collection', null, value));
+    this.dispatchEvent(org_apache_flex_events_ValueChangeEvent.createUpdateEvent(this, 'collection', null, value));
   }
 };
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/files/LocalFunction_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/LocalFunction_result.js b/compiler.jx.tests/test-files/flexjs/files/LocalFunction_result.js
index 3c4ce2f..8fbc116 100644
--- a/compiler.jx.tests/test-files/flexjs/files/LocalFunction_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/LocalFunction_result.js
@@ -45,7 +45,7 @@ LocalFunction.prototype.myMemberMethod = function(value) {
   function myLocalFunction(value) {
     return this.myMemberProperty + value;
   };
-  org.apache.flex.utils.Language.trace("WOW! :: " + goog.bind(myLocalFunction, this)(value + 42));
+  org_apache_flex_utils_Language.trace("WOW! :: " + goog.bind(myLocalFunction, this)(value + 42));
 };
 
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
index c3cc35c..5f38962 100644
--- a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
@@ -21,167 +21,167 @@
 
 goog.provide('MyInitialView');
 
-goog.require('org.apache.flex.core.ViewBase');
-goog.require('org.apache.flex.html.Label');
-goog.require('org.apache.flex.binding.SimpleBinding');
-goog.require('org.apache.flex.html.TextButton');
-goog.require('org.apache.flex.html.List');
-goog.require('org.apache.flex.binding.ConstantBinding');
-goog.require('org.apache.flex.html.TextArea');
-goog.require('org.apache.flex.html.TextInput');
-goog.require('org.apache.flex.html.CheckBox');
-goog.require('org.apache.flex.html.RadioButton');
-goog.require('org.apache.flex.html.DropDownList');
-goog.require('org.apache.flex.html.ComboBox');
-goog.require('org.apache.flex.events.CustomEvent');
-goog.require('org.apache.flex.events.Event');
-goog.require('org.apache.flex.utils.Timer');
+goog.require('org_apache_flex_core_ViewBase');
+goog.require('org_apache_flex_html_Label');
+goog.require('org_apache_flex_binding_SimpleBinding');
+goog.require('org_apache_flex_html_TextButton');
+goog.require('org_apache_flex_html_List');
+goog.require('org_apache_flex_binding_ConstantBinding');
+goog.require('org_apache_flex_html_TextArea');
+goog.require('org_apache_flex_html_TextInput');
+goog.require('org_apache_flex_html_CheckBox');
+goog.require('org_apache_flex_html_RadioButton');
+goog.require('org_apache_flex_html_DropDownList');
+goog.require('org_apache_flex_html_ComboBox');
+goog.require('org_apache_flex_events_CustomEvent');
+goog.require('org_apache_flex_events_Event');
+goog.require('org_apache_flex_utils_Timer');
 
 
 
 
 /**
  * @constructor
- * @extends {org.apache.flex.core.ViewBase}
+ * @extends {org_apache_flex_core_ViewBase}
  */
 MyInitialView = function() {
   MyInitialView.base(this, 'constructor');
   
   /**
    * @private
-   * @type {org.apache.flex.html.Label}
+   * @type {org_apache_flex_html_Label}
    */
   this.lbl;
   
   /**
    * @private
-   * @type {org.apache.flex.binding.SimpleBinding}
+   * @type {org_apache_flex_binding_SimpleBinding}
    */
   this.$ID0;
   
   /**
    * @private
-   * @type {org.apache.flex.html.TextButton}
+   * @type {org_apache_flex_html_TextButton}
    */
   this.$ID1;
   
   /**
    * @private
-   * @type {org.apache.flex.html.TextButton}
+   * @type {org_apache_flex_html_TextButton}
    */
   this.$ID2;
   
   /**
    * @private
-   * @type {org.apache.flex.html.Label}
+   * @type {org_apache_flex_html_Label}
    */
   this.timerLabel;
   
   /**
    * @private
-   * @type {org.apache.flex.html.List}
+   * @type {org_apache_flex_html_List}
    */
   this.cityList;
   
   /**
    * @private
-   * @type {org.apache.flex.binding.ConstantBinding}
+   * @type {org_apache_flex_binding_ConstantBinding}
    */
   this.$ID3;
   
   /**
    * @private
-   * @type {org.apache.flex.html.TextArea}
+   * @type {org_apache_flex_html_TextArea}
    */
   this.$ID5;
   
   /**
    * @private
-   * @type {org.apache.flex.binding.SimpleBinding}
+   * @type {org_apache_flex_binding_SimpleBinding}
    */
   this.$ID4;
   
   /**
    * @private
-   * @type {org.apache.flex.html.TextInput}
+   * @type {org_apache_flex_html_TextInput}
    */
   this.input;
   
   /**
    * @private
-   * @type {org.apache.flex.html.TextButton}
+   * @type {org_apache_flex_html_TextButton}
    */
   this.$ID6;
   
   /**
    * @private
-   * @type {org.apache.flex.html.CheckBox}
+   * @type {org_apache_flex_html_CheckBox}
    */
   this.checkbox;
   
   /**
    * @private
-   * @type {org.apache.flex.html.RadioButton}
+   * @type {org_apache_flex_html_RadioButton}
    */
   this.$ID7;
   
   /**
    * @private
-   * @type {org.apache.flex.html.RadioButton}
+   * @type {org_apache_flex_html_RadioButton}
    */
   this.$ID8;
   
   /**
    * @private
-   * @type {org.apache.flex.html.RadioButton}
+   * @type {org_apache_flex_html_RadioButton}
    */
   this.$ID9;
   
   /**
    * @private
-   * @type {org.apache.flex.html.RadioButton}
+   * @type {org_apache_flex_html_RadioButton}
    */
   this.$ID10;
   
   /**
    * @private
-   * @type {org.apache.flex.html.RadioButton}
+   * @type {org_apache_flex_html_RadioButton}
    */
   this.$ID11;
   
   /**
    * @private
-   * @type {org.apache.flex.html.RadioButton}
+   * @type {org_apache_flex_html_RadioButton}
    */
   this.$ID12;
   
   /**
    * @private
-   * @type {org.apache.flex.html.DropDownList}
+   * @type {org_apache_flex_html_DropDownList}
    */
   this.list;
   
   /**
    * @private
-   * @type {org.apache.flex.binding.ConstantBinding}
+   * @type {org_apache_flex_binding_ConstantBinding}
    */
   this.$ID13;
   
   /**
    * @private
-   * @type {org.apache.flex.html.TextButton}
+   * @type {org_apache_flex_html_TextButton}
    */
   this.$ID14;
   
   /**
    * @private
-   * @type {org.apache.flex.html.ComboBox}
+   * @type {org_apache_flex_html_ComboBox}
    */
   this.comboBox;
   
   /**
    * @private
-   * @type {org.apache.flex.binding.ConstantBinding}
+   * @type {org_apache_flex_binding_ConstantBinding}
    */
   this.$ID15;
   
@@ -197,7 +197,7 @@ MyInitialView = function() {
    */
   this.mxmldp;
 };
-goog.inherits(MyInitialView, org.apache.flex.core.ViewBase);
+goog.inherits(MyInitialView, org_apache_flex_core_ViewBase);
 
 
 /**
@@ -210,7 +210,7 @@ MyInitialView.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'MyInitialView', q
 
 /**
  * @private
- * @type {org.apache.flex.utils.Timer}
+ * @type {org_apache_flex_utils_Timer}
  */
 MyInitialView.prototype.timer;
 
@@ -220,7 +220,7 @@ MyInitialView.prototype.timer;
  * @return {string}
  */
 MyInitialView.prototype.get_symbol = function() {
-  return org.apache.flex.utils.Language.as(this.get_list().get_selectedItem(), String);
+  return org_apache_flex_utils_Language.as(this.get_list().get_selectedItem(), String);
 };
 
 
@@ -229,7 +229,7 @@ MyInitialView.prototype.get_symbol = function() {
  * @return {string}
  */
 MyInitialView.prototype.get_city = function() {
-  return org.apache.flex.utils.Language.as(this.get_cityList().get_selectedItem(), String);
+  return org_apache_flex_utils_Language.as(this.get_cityList().get_selectedItem(), String);
 };
 
 
@@ -253,10 +253,10 @@ MyInitialView.prototype.get_comboBoxValue = function() {
 
 /**
  * @expose
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
 MyInitialView.prototype.startTimer = function(event) {
-  this.timer = new org.apache.flex.utils.Timer(1000);
+  this.timer = new org_apache_flex_utils_Timer(1000);
   this.timer.addEventListener('timer', goog.bind(this.timerHandler, this));
   this.timer.start();
 };
@@ -264,7 +264,7 @@ MyInitialView.prototype.startTimer = function(event) {
 
 /**
  * @expose
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
 MyInitialView.prototype.timerHandler = function(event) {
   this.get_timerLabel().set_text(this.timer.get_currentCount().toString());
@@ -273,7 +273,7 @@ MyInitialView.prototype.timerHandler = function(event) {
 
 /**
  * @expose
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
 MyInitialView.prototype.$EH0 = function(event)
 {
@@ -283,7 +283,7 @@ MyInitialView.prototype.$EH0 = function(event)
 
 /**
  * @expose
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
 MyInitialView.prototype.$EH1 = function(event)
 {
@@ -294,57 +294,57 @@ MyInitialView.prototype.$EH1 = function(event)
 
 /**
  * @expose
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
 MyInitialView.prototype.$EH2 = function(event)
 {
-  this.dispatchEvent(new org.apache.flex.events.CustomEvent('cityListChanged'));
+  this.dispatchEvent(new org_apache_flex_events_CustomEvent('cityListChanged'));
 };
 
 
 /**
  * @expose
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
 MyInitialView.prototype.$EH3 = function(event)
 {
-  this.dispatchEvent(new org.apache.flex.events.CustomEvent('transferClicked'));
+  this.dispatchEvent(new org_apache_flex_events_CustomEvent('transferClicked'));
 };
 
 
 /**
  * @expose
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
 MyInitialView.prototype.$EH4 = function(event)
 {
-  this.dispatchEvent(new org.apache.flex.events.CustomEvent('listChanged'));
+  this.dispatchEvent(new org_apache_flex_events_CustomEvent('listChanged'));
 };
 
 
 /**
  * @expose
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
 MyInitialView.prototype.$EH5 = function(event)
 {
-  this.dispatchEvent(new org.apache.flex.events.CustomEvent('buttonClicked'));
+  this.dispatchEvent(new org_apache_flex_events_CustomEvent('buttonClicked'));
 };
 
 
 /**
  * @expose
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
 MyInitialView.prototype.$EH6 = function(event)
 {
-  this.dispatchEvent(new org.apache.flex.events.CustomEvent('comboBoxChanged'));
+  this.dispatchEvent(new org_apache_flex_events_CustomEvent('comboBoxChanged'));
 };
 
 
 /**
  * @expose
- * @return {org.apache.flex.html.Label}
+ * @return {org_apache_flex_html_Label}
  */
 MyInitialView.prototype.get_lbl = function()
 {
@@ -354,20 +354,20 @@ MyInitialView.prototype.get_lbl = function()
 
 /**
  * @expose
- * @param {org.apache.flex.html.Label} value
+ * @param {org_apache_flex_html_Label} value
  */
 MyInitialView.prototype.set_lbl = function(value)
 {
   if (value != this.lbl) {
     this.lbl = value;
-    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(this, 'lbl', null, value));
+    this.dispatchEvent(org_apache_flex_events_ValueChangeEvent.createUpdateEvent(this, 'lbl', null, value));
   }
 };
 
 
 /**
  * @expose
- * @return {org.apache.flex.html.Label}
+ * @return {org_apache_flex_html_Label}
  */
 MyInitialView.prototype.get_timerLabel = function()
 {
@@ -377,20 +377,20 @@ MyInitialView.prototype.get_timerLabel = function()
 
 /**
  * @expose
- * @param {org.apache.flex.html.Label} value
+ * @param {org_apache_flex_html_Label} value
  */
 MyInitialView.prototype.set_timerLabel = function(value)
 {
   if (value != this.timerLabel) {
     this.timerLabel = value;
-    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(this, 'timerLabel', null, value));
+    this.dispatchEvent(org_apache_flex_events_ValueChangeEvent.createUpdateEvent(this, 'timerLabel', null, value));
   }
 };
 
 
 /**
  * @expose
- * @return {org.apache.flex.html.List}
+ * @return {org_apache_flex_html_List}
  */
 MyInitialView.prototype.get_cityList = function()
 {
@@ -400,20 +400,20 @@ MyInitialView.prototype.get_cityList = function()
 
 /**
  * @expose
- * @param {org.apache.flex.html.List} value
+ * @param {org_apache_flex_html_List} value
  */
 MyInitialView.prototype.set_cityList = function(value)
 {
   if (value != this.cityList) {
     this.cityList = value;
-    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(this, 'cityList', null, value));
+    this.dispatchEvent(org_apache_flex_events_ValueChangeEvent.createUpdateEvent(this, 'cityList', null, value));
   }
 };
 
 
 /**
  * @expose
- * @return {org.apache.flex.html.TextInput}
+ * @return {org_apache_flex_html_TextInput}
  */
 MyInitialView.prototype.get_input = function()
 {
@@ -423,20 +423,20 @@ MyInitialView.prototype.get_input = function()
 
 /**
  * @expose
- * @param {org.apache.flex.html.TextInput} value
+ * @param {org_apache_flex_html_TextInput} value
  */
 MyInitialView.prototype.set_input = function(value)
 {
   if (value != this.input) {
     this.input = value;
-    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(this, 'input', null, value));
+    this.dispatchEvent(org_apache_flex_events_ValueChangeEvent.createUpdateEvent(this, 'input', null, value));
   }
 };
 
 
 /**
  * @expose
- * @return {org.apache.flex.html.CheckBox}
+ * @return {org_apache_flex_html_CheckBox}
  */
 MyInitialView.prototype.get_checkbox = function()
 {
@@ -446,20 +446,20 @@ MyInitialView.prototype.get_checkbox = function()
 
 /**
  * @expose
- * @param {org.apache.flex.html.CheckBox} value
+ * @param {org_apache_flex_html_CheckBox} value
  */
 MyInitialView.prototype.set_checkbox = function(value)
 {
   if (value != this.checkbox) {
     this.checkbox = value;
-    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(this, 'checkbox', null, value));
+    this.dispatchEvent(org_apache_flex_events_ValueChangeEvent.createUpdateEvent(this, 'checkbox', null, value));
   }
 };
 
 
 /**
  * @expose
- * @return {org.apache.flex.html.DropDownList}
+ * @return {org_apache_flex_html_DropDownList}
  */
 MyInitialView.prototype.get_list = function()
 {
@@ -469,20 +469,20 @@ MyInitialView.prototype.get_list = function()
 
 /**
  * @expose
- * @param {org.apache.flex.html.DropDownList} value
+ * @param {org_apache_flex_html_DropDownList} value
  */
 MyInitialView.prototype.set_list = function(value)
 {
   if (value != this.list) {
     this.list = value;
-    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(this, 'list', null, value));
+    this.dispatchEvent(org_apache_flex_events_ValueChangeEvent.createUpdateEvent(this, 'list', null, value));
   }
 };
 
 
 /**
  * @expose
- * @return {org.apache.flex.html.ComboBox}
+ * @return {org_apache_flex_html_ComboBox}
  */
 MyInitialView.prototype.get_comboBox = function()
 {
@@ -492,13 +492,13 @@ MyInitialView.prototype.get_comboBox = function()
 
 /**
  * @expose
- * @param {org.apache.flex.html.ComboBox} value
+ * @param {org_apache_flex_html_ComboBox} value
  */
 MyInitialView.prototype.set_comboBox = function(value)
 {
   if (value != this.comboBox) {
     this.comboBox = value;
-    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(this, 'comboBox', null, value));
+    this.dispatchEvent(org_apache_flex_events_ValueChangeEvent.createUpdateEvent(this, 'comboBox', null, value));
   }
 };
 
@@ -515,7 +515,7 @@ MyInitialView.prototype.get_MXMLDescriptor = function()
     var arr = MyInitialView.base(this, 'get_MXMLDescriptor');
     /** @type {Array} */
     var data = [
-org.apache.flex.html.Label,
+org_apache_flex_html_Label,
 4,
 'id',
 true,
@@ -527,11 +527,11 @@ true,
 true,
 25,
 'beads',
-null, [org.apache.flex.binding.SimpleBinding, 5, '_id', true, '$ID0', 'eventName', true, 'labelTextChanged', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'labelText', 'destinationPropertyName', true, 'text', 0, 0, null],
+null, [org_apache_flex_binding_SimpleBinding, 5, '_id', true, '$ID0', 'eventName', true, 'labelTextChanged', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'labelText', 'destinationPropertyName', true, 'text', 0, 0, null],
 0,
 0,
 null,
-org.apache.flex.html.TextButton,
+org_apache_flex_html_TextButton,
 4,
 '_id',
 true,
@@ -550,7 +550,7 @@ true,
 'click',
 this.$EH0,
 null,
-org.apache.flex.html.TextButton,
+org_apache_flex_html_TextButton,
 4,
 '_id',
 true,
@@ -569,7 +569,7 @@ true,
 'click',
 this.$EH1,
 null,
-org.apache.flex.html.Label,
+org_apache_flex_html_Label,
 3,
 'id',
 true,
@@ -583,7 +583,7 @@ true,
 0,
 0,
 null,
-org.apache.flex.html.List,
+org_apache_flex_html_List,
 6,
 'id',
 true,
@@ -601,13 +601,13 @@ true,
 true,
 75,
 'beads',
-null, [org.apache.flex.binding.ConstantBinding, 4, '_id', true, '$ID3', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'cities', 'destinationPropertyName', true, 'dataProvider', 0, 0, null],
+null, [org_apache_flex_binding_ConstantBinding, 4, '_id', true, '$ID3', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'cities', 'destinationPropertyName', true, 'dataProvider', 0, 0, null],
 0,
 1,
 'change',
 this.$EH2,
 null,
-org.apache.flex.html.TextArea,
+org_apache_flex_html_TextArea,
 6,
 '_id',
 true,
@@ -625,11 +625,11 @@ true,
 true,
 75,
 'beads',
-null, [org.apache.flex.binding.SimpleBinding, 5, '_id', true, '$ID4', 'eventName', true, 'labelTextChanged', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'labelText', 'destinationPropertyName', true, 'text', 0, 0, null],
+null, [org_apache_flex_binding_SimpleBinding, 5, '_id', true, '$ID4', 'eventName', true, 'labelTextChanged', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'labelText', 'destinationPropertyName', true, 'text', 0, 0, null],
 0,
 0,
 null,
-org.apache.flex.html.TextInput,
+org_apache_flex_html_TextInput,
 3,
 'id',
 true,
@@ -643,7 +643,7 @@ true,
 0,
 0,
 null,
-org.apache.flex.html.TextButton,
+org_apache_flex_html_TextButton,
 4,
 '_id',
 true,
@@ -662,7 +662,7 @@ true,
 'click',
 this.$EH3,
 null,
-org.apache.flex.html.CheckBox,
+org_apache_flex_html_CheckBox,
 4,
 'id',
 true,
@@ -679,7 +679,7 @@ true,
 0,
 0,
 null,
-org.apache.flex.html.RadioButton,
+org_apache_flex_html_RadioButton,
 6,
 '_id',
 true,
@@ -702,7 +702,7 @@ true,
 0,
 0,
 null,
-org.apache.flex.html.RadioButton,
+org_apache_flex_html_RadioButton,
 7,
 '_id',
 true,
@@ -728,7 +728,7 @@ true,
 0,
 0,
 null,
-org.apache.flex.html.RadioButton,
+org_apache_flex_html_RadioButton,
 6,
 '_id',
 true,
@@ -751,7 +751,7 @@ true,
 0,
 0,
 null,
-org.apache.flex.html.RadioButton,
+org_apache_flex_html_RadioButton,
 7,
 '_id',
 true,
@@ -777,7 +777,7 @@ true,
 0,
 0,
 null,
-org.apache.flex.html.RadioButton,
+org_apache_flex_html_RadioButton,
 6,
 '_id',
 true,
@@ -800,7 +800,7 @@ true,
 0,
 0,
 null,
-org.apache.flex.html.RadioButton,
+org_apache_flex_html_RadioButton,
 6,
 '_id',
 true,
@@ -823,7 +823,7 @@ true,
 0,
 0,
 null,
-org.apache.flex.html.DropDownList,
+org_apache_flex_html_DropDownList,
 6,
 'id',
 true,
@@ -841,13 +841,13 @@ true,
 true,
 24,
 'beads',
-null, [org.apache.flex.binding.ConstantBinding, 4, '_id', true, '$ID13', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'strings', 'destinationPropertyName', true, 'dataProvider', 0, 0, null],
+null, [org_apache_flex_binding_ConstantBinding, 4, '_id', true, '$ID13', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'strings', 'destinationPropertyName', true, 'dataProvider', 0, 0, null],
 0,
 1,
 'change',
 this.$EH4,
 null,
-org.apache.flex.html.TextButton,
+org_apache_flex_html_TextButton,
 4,
 '_id',
 true,
@@ -866,7 +866,7 @@ true,
 'click',
 this.$EH5,
 null,
-org.apache.flex.html.ComboBox,
+org_apache_flex_html_ComboBox,
 5,
 'id',
 true,
@@ -881,7 +881,7 @@ true,
 true,
 100,
 'beads',
-null, [org.apache.flex.binding.ConstantBinding, 4, '_id', true, '$ID15', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'cities', 'destinationPropertyName', true, 'dataProvider', 0, 0, null],
+null, [org_apache_flex_binding_ConstantBinding, 4, '_id', true, '$ID15', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'cities', 'destinationPropertyName', true, 'dataProvider', 0, 0, null],
 0,
 1,
 'change',

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/files/StockDataJSONItemConverter.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/StockDataJSONItemConverter.js b/compiler.jx.tests/test-files/flexjs/files/StockDataJSONItemConverter.js
index 34f5caa..c010141 100644
--- a/compiler.jx.tests/test-files/flexjs/files/StockDataJSONItemConverter.js
+++ b/compiler.jx.tests/test-files/flexjs/files/StockDataJSONItemConverter.js
@@ -13,16 +13,16 @@
  */
 goog.provide('StockDataJSONItemConverter');
 
-goog.require('org.apache.flex.net.JSONItemConverter');
+goog.require('org_apache_flex_net_JSONItemConverter');
 
 /**
  * @constructor
- * @extends {org.apache.flex.net.JSONItemConverter}
+ * @extends {org_apache_flex_net_JSONItemConverter}
  */
 StockDataJSONItemConverter = function() {
 	goog.base(this);
 }
-goog.inherits(StockDataJSONItemConverter, org.apache.flex.net.JSONItemConverter);
+goog.inherits(StockDataJSONItemConverter, org_apache_flex_net_JSONItemConverter);
 
 /**
  * @expose
@@ -36,4 +36,4 @@ StockDataJSONItemConverter.prototype.convertItem = function(data) {
 		return "No Data";
 	obj = obj["query"]["results"]["quote"];
 	return obj;
-};
\ No newline at end of file
+};

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/files/controllers/MyController_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/controllers/MyController_result.js b/compiler.jx.tests/test-files/flexjs/files/controllers/MyController_result.js
index 9ca4b97..27d163b 100644
--- a/compiler.jx.tests/test-files/flexjs/files/controllers/MyController_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/controllers/MyController_result.js
@@ -19,19 +19,19 @@
  * @suppress {checkTypes}
  */
 
-goog.provide('controllers.MyController');
+goog.provide('controllers_MyController');
 
 
 
 /**
  * @constructor
- * @implements {org.apache.flex.core.IDocument}
- * @param {org.apache.flex.core.Application=} app
+ * @implements {org_apache_flex_core_IDocument}
+ * @param {org_apache_flex_core_Application=} app
  */
-controllers.MyController = function(app) {
+controllers_MyController = function(app) {
   app = typeof app !== 'undefined' ? app : null;
   if (app) {
-    this.app = org.apache.flex.utils.Language.as(app, FlexJSTest_again);
+    this.app = org_apache_flex_utils_Language.as(app, FlexJSTest_again);
     app.addEventListener("viewChanged", goog.bind(this.viewChangeHandler, this));
   }
 };
@@ -41,28 +41,28 @@ controllers.MyController = function(app) {
  * @private
  * @type {string}
  */
-controllers.MyController.prototype.queryBegin = "http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20yahoo.finance.quotes%20where%20symbol%20in%20(%22";
+controllers_MyController.prototype.queryBegin = "http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20yahoo.finance.quotes%20where%20symbol%20in%20(%22";
 
 
 /**
  * @private
  * @type {string}
  */
-controllers.MyController.prototype.queryEnd = "%22)%0A%09%09&env=http%3A%2F%2Fdatatables.org%2Falltables.env&format=json";
+controllers_MyController.prototype.queryEnd = "%22)%0A%09%09&env=http%3A%2F%2Fdatatables.org%2Falltables.env&format=json";
 
 
 /**
  * @private
  * @type {FlexJSTest_again}
  */
-controllers.MyController.prototype.app;
+controllers_MyController.prototype.app;
 
 
 /**
  * @private
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
-controllers.MyController.prototype.viewChangeHandler = function(event) {
+controllers_MyController.prototype.viewChangeHandler = function(event) {
   this.app.initialView.addEventListener("buttonClicked", goog.bind(this.buttonClickHandler, this));
   this.app.initialView.addEventListener("listChanged", goog.bind(this.listChangedHandler, this));
   this.app.initialView.addEventListener("cityListChanged", goog.bind(this.cityListChangeHandler, this));
@@ -73,10 +73,10 @@ controllers.MyController.prototype.viewChangeHandler = function(event) {
 
 /**
  * @private
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
-controllers.MyController.prototype.buttonClickHandler = function(event) {
-  var /** @type {string} */ sym = org.apache.flex.utils.Language.as(this.app.initialView, MyInitialView, true).get_symbol();
+controllers_MyController.prototype.buttonClickHandler = function(event) {
+  var /** @type {string} */ sym = org_apache_flex_utils_Language.as(this.app.initialView, MyInitialView, true).get_symbol();
   this.app.get_service().set_url(this.queryBegin + sym + this.queryEnd);
   this.app.get_service().send();
   this.app.get_service().addEventListener("complete", goog.bind(this.completeHandler, this));
@@ -85,46 +85,46 @@ controllers.MyController.prototype.buttonClickHandler = function(event) {
 
 /**
  * @private
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
-controllers.MyController.prototype.completeHandler = function(event) {
-  org.apache.flex.utils.Language.as(this.app.model, models.MyModel, true).set_labelText(org.apache.flex.utils.Language.as(this.app.get_collection().getItemAt(0), String));
+controllers_MyController.prototype.completeHandler = function(event) {
+  org_apache_flex_utils_Language.as(this.app.model, models_MyModel, true).set_labelText(org_apache_flex_utils_Language.as(this.app.get_collection().getItemAt(0), String));
 };
 
 
 /**
  * @private
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
-controllers.MyController.prototype.listChangedHandler = function(event) {
-  org.apache.flex.utils.Language.as(this.app.model, models.MyModel, true).set_labelText(org.apache.flex.utils.Language.as(this.app.initialView, MyInitialView, true).get_symbol());
+controllers_MyController.prototype.listChangedHandler = function(event) {
+  org_apache_flex_utils_Language.as(this.app.model, models_MyModel, true).set_labelText(org_apache_flex_utils_Language.as(this.app.initialView, MyInitialView, true).get_symbol());
 };
 
 
 /**
  * @private
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
-controllers.MyController.prototype.cityListChangeHandler = function(event) {
-  org.apache.flex.utils.Language.as(this.app.model, models.MyModel, true).set_labelText(org.apache.flex.utils.Language.as(this.app.initialView, MyInitialView, true).get_city());
+controllers_MyController.prototype.cityListChangeHandler = function(event) {
+  org_apache_flex_utils_Language.as(this.app.model, models_MyModel, true).set_labelText(org_apache_flex_utils_Language.as(this.app.initialView, MyInitialView, true).get_city());
 };
 
 
 /**
  * @private
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
-controllers.MyController.prototype.transferClickHandler = function(event) {
-  org.apache.flex.utils.Language.as(this.app.model, models.MyModel, true).set_labelText(org.apache.flex.utils.Language.as(this.app.initialView, MyInitialView, true).get_inputText());
+controllers_MyController.prototype.transferClickHandler = function(event) {
+  org_apache_flex_utils_Language.as(this.app.model, models_MyModel, true).set_labelText(org_apache_flex_utils_Language.as(this.app.initialView, MyInitialView, true).get_inputText());
 };
 
 
 /**
  * @private
- * @param {org.apache.flex.events.Event} event
+ * @param {org_apache_flex_events_Event} event
  */
-controllers.MyController.prototype.comboBoxChangeHandler = function(event) {
-  org.apache.flex.utils.Language.as(this.app.model, models.MyModel, true).set_labelText(org.apache.flex.utils.Language.as(this.app.initialView, MyInitialView, true).get_comboBoxValue());
+controllers_MyController.prototype.comboBoxChangeHandler = function(event) {
+  org_apache_flex_utils_Language.as(this.app.model, models_MyModel, true).set_labelText(org_apache_flex_utils_Language.as(this.app.initialView, MyInitialView, true).get_comboBoxValue());
 };
 
 
@@ -133,9 +133,9 @@ controllers.MyController.prototype.comboBoxChangeHandler = function(event) {
  * @param {Object} document
  * @param {string=} id
  */
-controllers.MyController.prototype.setDocument = function(document, id) {
+controllers_MyController.prototype.setDocument = function(document, id) {
   id = typeof id !== 'undefined' ? id : null;
-  this.app = org.apache.flex.utils.Language.as(document, FlexJSTest_again);
+  this.app = org_apache_flex_utils_Language.as(document, FlexJSTest_again);
   this.app.addEventListener("viewChanged", goog.bind(this.viewChangeHandler, this));
 };
 
@@ -145,5 +145,5 @@ controllers.MyController.prototype.setDocument = function(document, id) {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-controllers.MyController.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'MyController', qName: 'controllers.MyController'}], interfaces: [org.apache.flex.core.IDocument] };
+controllers_MyController.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'MyController', qName: 'controllers_MyController'}], interfaces: [org_apache_flex_core_IDocument] };
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/files/models/MyModel_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/models/MyModel_result.js b/compiler.jx.tests/test-files/flexjs/files/models/MyModel_result.js
index ac35168..4f73cf3 100644
--- a/compiler.jx.tests/test-files/flexjs/files/models/MyModel_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/models/MyModel_result.js
@@ -19,32 +19,32 @@
  * @suppress {checkTypes}
  */
 
-goog.provide('models.MyModel');
+goog.provide('models_MyModel');
 
 
 
 /**
  * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
+ * @extends {org_apache_flex_events_EventDispatcher}
  */
-models.MyModel = function() {
-  models.MyModel.base(this, 'constructor');
+models_MyModel = function() {
+  models_MyModel.base(this, 'constructor');
 };
-goog.inherits(models.MyModel, org.apache.flex.events.EventDispatcher);
+goog.inherits(models_MyModel, org_apache_flex_events_EventDispatcher);
 
 
 /**
  * @private
  * @type {string}
  */
-models.MyModel.prototype._labelText;
+models_MyModel.prototype._labelText;
 
 
 /**
  * @expose
  * @return {string}
  */
-models.MyModel.prototype.get_labelText = function() {
+models_MyModel.prototype.get_labelText = function() {
   return this._labelText;
 };
 
@@ -53,10 +53,10 @@ models.MyModel.prototype.get_labelText = function() {
  * @expose
  * @param {string} value
  */
-models.MyModel.prototype.set_labelText = function(value) {
+models_MyModel.prototype.set_labelText = function(value) {
   if (value != this._labelText) {
     this._labelText = value;
-    this.dispatchEvent(new org.apache.flex.events.Event("labelTextChanged"));
+    this.dispatchEvent(new org_apache_flex_events_Event("labelTextChanged"));
   }
 };
 
@@ -65,14 +65,14 @@ models.MyModel.prototype.set_labelText = function(value) {
  * @private
  * @type {Array}
  */
-models.MyModel.prototype._strings = ["AAPL", "ADBE", "GOOG", "MSFT", "YHOO"];
+models_MyModel.prototype._strings = ["AAPL", "ADBE", "GOOG", "MSFT", "YHOO"];
 
 
 /**
  * @expose
  * @return {Array}
  */
-models.MyModel.prototype.get_strings = function() {
+models_MyModel.prototype.get_strings = function() {
   return this._strings;
 };
 
@@ -81,14 +81,14 @@ models.MyModel.prototype.get_strings = function() {
  * @private
  * @type {Array}
  */
-models.MyModel.prototype._cities = ["London", "Miami", "Paris", "Sydney", "Tokyo"];
+models_MyModel.prototype._cities = ["London", "Miami", "Paris", "Sydney", "Tokyo"];
 
 
 /**
  * @expose
  * @return {Array}
  */
-models.MyModel.prototype.get_cities = function() {
+models_MyModel.prototype.get_cities = function() {
   return this._cities;
 };
 
@@ -98,5 +98,5 @@ models.MyModel.prototype.get_cities = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-models.MyModel.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'MyModel', qName: 'models.MyModel'}] };
+models_MyModel.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'MyModel', qName: 'models_MyModel'}] };
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js b/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js
index 3370f1f..72981e3 100644
--- a/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js
@@ -21,15 +21,15 @@
 
 goog.provide('wildcard_import');
 
-goog.require('org.apache.flex.core.Application');
-goog.require('org.apache.flex.html.Button');
+goog.require('org_apache_flex_core_Application');
+goog.require('org_apache_flex_html_Button');
 
 
 
 
 /**
  * @constructor
- * @extends {org.apache.flex.core.Application}
+ * @extends {org_apache_flex_core_Application}
  */
 wildcard_import = function() {
   wildcard_import.base(this, 'constructor');
@@ -46,7 +46,7 @@ wildcard_import = function() {
    */
   this.mxmldp;
 };
-goog.inherits(wildcard_import, org.apache.flex.core.Application);
+goog.inherits(wildcard_import, org_apache_flex_core_Application);
 
 
 /**
@@ -62,7 +62,7 @@ wildcard_import.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'wildcard_import
  */
 wildcard_import.prototype.tmp = function() {
   var /** @type {Button} */ myButton;
-  myButton = new org.apache.flex.html.Button();
+  myButton = new org_apache_flex_html_Button();
 };
 
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test_result.js b/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test_result.js
index d76ea8d..a740c06 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test_result.js
+++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test_result.js
@@ -21,35 +21,35 @@
 
 goog.provide('Test');
 
-goog.require('classes.A');
-goog.require('interfaces.IA');
-goog.require('interfaces.IC');
-goog.require('interfaces.IE');
-goog.require('org.apache.flex.utils.Language');
+goog.require('classes_A');
+goog.require('interfaces_IA');
+goog.require('interfaces_IC');
+goog.require('interfaces_IE');
+goog.require('org_apache_flex_utils_Language');
 
 
 
 /**
  * @constructor
- * @extends {classes.A}
- * @implements {interfaces.IA}
- * @implements {interfaces.IE}
+ * @extends {classes_A}
+ * @implements {interfaces_IA}
+ * @implements {interfaces_IE}
  */
 Test = function() {
   Test.base(this, 'constructor');
-  var /** @type {interfaces.IA} */ ia = org.apache.flex.utils.Language.as(this.doSomething(interfaces.IC), interfaces.IA);
+  var /** @type {interfaces_IA} */ ia = org_apache_flex_utils_Language.as(this.doSomething(interfaces_IC), interfaces_IA);
 };
-goog.inherits(Test, classes.A);
+goog.inherits(Test, classes_A);
 
 
 /**
  * @expose
- * @param {interfaces.IC} ic
- * @return {interfaces.IC}
+ * @param {interfaces_IC} ic
+ * @return {interfaces_IC}
  */
 Test.prototype.doSomething = function(ic) {
   for (var /** @type {number} */ i = 0; i < 3; i++) {
-    var /** @type {classes.A} */ a = null;
+    var /** @type {classes_A} */ a = null;
   }
   return ic;
 };
@@ -60,4 +60,4 @@ Test.prototype.doSomething = function(ic) {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-Test.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'Test', qName: 'Test'}], interfaces: [interfaces.IA, interfaces.IE] };
+Test.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'Test', qName: 'Test'}], interfaces: [interfaces_IA, interfaces_IE] };

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/A_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/A_result.js b/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/A_result.js
index e2dd3f0..6d438ac 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/A_result.js
+++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/A_result.js
@@ -19,20 +19,20 @@
  * @suppress {checkTypes}
  */
 
-goog.provide('classes.A');
+goog.provide('classes_A');
 
-goog.require('classes.C');
+goog.require('classes_C');
 
 
 
 /**
  * @constructor
- * @extends {classes.C}
+ * @extends {classes_C}
  */
-classes.A = function() {
-  classes.A.base(this, 'constructor');
+classes_A = function() {
+  classes_A.base(this, 'constructor');
 };
-goog.inherits(classes.A, classes.C);
+goog.inherits(classes_A, classes_C);
 
 
 /**
@@ -40,4 +40,4 @@ goog.inherits(classes.A, classes.C);
  *
  * @type {Object.<string, Array.<Object>>}
  */
-classes.A.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'A', qName: 'classes.A'}] };
+classes_A.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'A', qName: 'classes_A'}] };

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/B_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/B_result.js b/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/B_result.js
index 2fef89c..1ed92c6 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/B_result.js
+++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/B_result.js
@@ -19,14 +19,14 @@
  * @suppress {checkTypes}
  */
 
-goog.provide('classes.B');
+goog.provide('classes_B');
 
 
 
 /**
  * @constructor
  */
-classes.B = function() {
+classes_B = function() {
 };
 
 
@@ -35,4 +35,4 @@ classes.B = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-classes.B.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'B', qName: 'classes.B'}] };
+classes_B.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'B', qName: 'classes_B'}] };

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/C_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/C_result.js b/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/C_result.js
index 729cda3..e41664d 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/C_result.js
+++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/C_result.js
@@ -19,14 +19,14 @@
  * @suppress {checkTypes}
  */
 
-goog.provide('classes.C');
+goog.provide('classes_C');
 
 
 
 /**
  * @constructor
  */
-classes.C = function() {
+classes_C = function() {
 };
 
 
@@ -35,4 +35,4 @@ classes.C = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-classes.C.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'C', qName: 'classes.C'}] };
+classes_C.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'C', qName: 'classes_C'}] };

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IA_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IA_result.js b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IA_result.js
index 2a00144..cbd3342 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IA_result.js
+++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IA_result.js
@@ -19,17 +19,17 @@
  * @suppress {checkTypes}
  */
 
-goog.provide('interfaces.IA');
+goog.provide('interfaces_IA');
 
-goog.require('interfaces.IC');
+goog.require('interfaces_IC');
 
 
 
 /**
  * @interface
- * @extends {interfaces.IC}
+ * @extends {interfaces_IC}
  */
-interfaces.IA = function() {
+interfaces_IA = function() {
 };
 
 
@@ -38,4 +38,4 @@ interfaces.IA = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-interfaces.IA.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'IA', qName: 'interfaces.IA'}], interfaces: [interfaces.IC] };
+interfaces_IA.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'IA', qName: 'interfaces_IA'}], interfaces: [interfaces_IC] };

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IB_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IB_result.js b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IB_result.js
index d4933c8..343574a 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IB_result.js
+++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IB_result.js
@@ -19,14 +19,14 @@
  * @suppress {checkTypes}
  */
 
-goog.provide('interfaces.IB');
+goog.provide('interfaces_IB');
 
 
 
 /**
  * @interface
  */
-interfaces.IB = function() {
+interfaces_IB = function() {
 };
 
 
@@ -35,4 +35,4 @@ interfaces.IB = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-interfaces.IB.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'IB', qName: 'interfaces.IB'}] };
+interfaces_IB.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'IB', qName: 'interfaces_IB'}] };

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IC_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IC_result.js b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IC_result.js
index 9e5298b..4c031ea 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IC_result.js
+++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IC_result.js
@@ -19,17 +19,17 @@
  * @suppress {checkTypes}
  */
 
-goog.provide('interfaces.IC');
+goog.provide('interfaces_IC');
 
-goog.require('interfaces.ID');
+goog.require('interfaces_ID');
 
 
 
 /**
  * @interface
- * @extends {interfaces.ID}
+ * @extends {interfaces_ID}
  */
-interfaces.IC = function() {
+interfaces_IC = function() {
 };
 
 
@@ -38,4 +38,4 @@ interfaces.IC = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-interfaces.IC.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'IC', qName: 'interfaces.IC'}], interfaces: [interfaces.ID] };
+interfaces_IC.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'IC', qName: 'interfaces_IC'}], interfaces: [interfaces_ID] };

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/ID_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/ID_result.js b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/ID_result.js
index a730bbb..8ad978b 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/ID_result.js
+++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/ID_result.js
@@ -19,14 +19,14 @@
  * @suppress {checkTypes}
  */
 
-goog.provide('interfaces.ID');
+goog.provide('interfaces_ID');
 
 
 
 /**
  * @interface
  */
-interfaces.ID = function() {
+interfaces_ID = function() {
 };
 
 
@@ -35,4 +35,4 @@ interfaces.ID = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-interfaces.ID.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'ID', qName: 'interfaces.ID'}] };
+interfaces_ID.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'ID', qName: 'interfaces_ID'}] };

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
index 63d68c7..19275b0 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
+++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js
@@ -19,30 +19,30 @@
  * @suppress {checkTypes}
  */
 
-goog.provide('interfaces.IE');
+goog.provide('interfaces_IE');
 
 
 
 /**
  * @interface
  */
-interfaces.IE = function() {
+interfaces_IE = function() {
 };
 
 
-interfaces.IE.prototype.myMethod = function() {};
+interfaces_IE.prototype.myMethod = function() {};
 
 
 /**
  * @return {string}
  */
-interfaces.IE.prototype.get_myProp = function() {};
+interfaces_IE.prototype.get_myProp = function() {};
 
 
 /**
  * @param {string} value
  */
-interfaces.IE.prototype.set_myProp = function(value) {};
+interfaces_IE.prototype.set_myProp = function(value) {};
 
 
 /**
@@ -50,4 +50,4 @@ interfaces.IE.prototype.set_myProp = function(value) {};
  *
  * @type {Object.<string, Array.<Object>>}
  */
-interfaces.IE.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'IE', qName: 'interfaces.IE'}] };
+interfaces_IE.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'IE', qName: 'interfaces_IE'}] };

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/flexjs/projects/super/Base_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/projects/super/Base_result.js b/compiler.jx.tests/test-files/flexjs/projects/super/Base_result.js
index b89d15e..e482ccc 100644
--- a/compiler.jx.tests/test-files/flexjs/projects/super/Base_result.js
+++ b/compiler.jx.tests/test-files/flexjs/projects/super/Base_result.js
@@ -22,7 +22,7 @@
 goog.provide('Base');
 
 goog.require('Super');
-goog.require('org.apache.flex.utils.Language');
+goog.require('org_apache_flex_utils_Language');
 
 
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/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 93b52aa..6b751fb 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
@@ -38,4 +38,4 @@ org.apache.flex.A.prototype.hasSuperCall = function(a, b) {
 	org.apache.flex.A.base(this, 'hasSuperCall', a, b, 100);
 	var /** @type {string} */ result = myRegularFunctionCall(-1);
 	return result;
-};
\ No newline at end of file
+};

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/goog/files/get-set_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/goog/files/get-set_result.js b/compiler.jx.tests/test-files/goog/files/get-set_result.js
index 75637a6..5a422a1 100644
--- a/compiler.jx.tests/test-files/goog/files/get-set_result.js
+++ b/compiler.jx.tests/test-files/goog/files/get-set_result.js
@@ -46,4 +46,4 @@ Object.defineProperty(
 		var self = this;
 		self._a = value;
 	}, configurable:true}
-);
\ No newline at end of file
+);

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/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 bee3fbb..a2d00e5 100644
--- a/compiler.jx.tests/test-files/goog/files/output.js
+++ b/compiler.jx.tests/test-files/goog/files/output.js
@@ -44,4 +44,4 @@ org.apache.flex.A.prototype._a = new ArgumentError();
  * @const
  * @type {string}
  */
-org.apache.flex.A.prototype.MY_INSTANCE_CONST = "myInstanceConst";
\ No newline at end of file
+org.apache.flex.A.prototype.MY_INSTANCE_CONST = "myInstanceConst";

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/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 8f8e4cb..3b983ef 100644
--- a/compiler.jx.tests/test-files/goog/files/poc_result.js
+++ b/compiler.jx.tests/test-files/goog/files/poc_result.js
@@ -136,4 +136,4 @@ Example.prototype.btn2clickHandler = function(event) {
 Example.prototype.btn3clickHandler = function(event) {
 	var self = this;
 	self._btn3.x += 10;
-};
\ No newline at end of file
+};

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/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 a5dc7d7..b5821e4 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
@@ -46,4 +46,4 @@ org.apache.flex.A.prototype.start = function() {
 	var /** @type {string} */ localVar = self._privateVar.label;
 	self.init();
 	doIt();
-};
\ No newline at end of file
+};

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/goog/projects/imports/Case_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/goog/projects/imports/Case_result.js b/compiler.jx.tests/test-files/goog/projects/imports/Case_result.js
index c1cd56e..2d090e9 100644
--- a/compiler.jx.tests/test-files/goog/projects/imports/Case_result.js
+++ b/compiler.jx.tests/test-files/goog/projects/imports/Case_result.js
@@ -21,4 +21,4 @@ goog.require('comps.A');
 Case = function() {
 	var self = this;
 	var /** @type {comps.A} */ bar = new comps.A();
-};
\ No newline at end of file
+};

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/goog/projects/imports/comps/A_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/goog/projects/imports/comps/A_result.js b/compiler.jx.tests/test-files/goog/projects/imports/comps/A_result.js
index 971ce86..5d128a5 100644
--- a/compiler.jx.tests/test-files/goog/projects/imports/comps/A_result.js
+++ b/compiler.jx.tests/test-files/goog/projects/imports/comps/A_result.js
@@ -19,4 +19,4 @@ goog.provide('comps.A');
 comps.A = function() {
 	var self = this;
 	var /** @type {comps.B} */ foo = new B();
-};
\ No newline at end of file
+};

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/goog/projects/imports/comps/B_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/goog/projects/imports/comps/B_result.js b/compiler.jx.tests/test-files/goog/projects/imports/comps/B_result.js
index 9382710..643887e 100644
--- a/compiler.jx.tests/test-files/goog/projects/imports/comps/B_result.js
+++ b/compiler.jx.tests/test-files/goog/projects/imports/comps/B_result.js
@@ -17,4 +17,4 @@ goog.provide('comps.B');
  * @constructor
  */
 comps.B = function() {
-};
\ No newline at end of file
+};

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/vf2js/files/SimpleAS_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/vf2js/files/SimpleAS_result.js b/compiler.jx.tests/test-files/vf2js/files/SimpleAS_result.js
index a063d87..8235246 100644
--- a/compiler.jx.tests/test-files/vf2js/files/SimpleAS_result.js
+++ b/compiler.jx.tests/test-files/vf2js/files/SimpleAS_result.js
@@ -30,7 +30,7 @@ goog.provide('org.apache.flex.A');
  */
 org.apache.flex.A = function() {
   org.apache.flex.A.base(this, 'constructor');
-  org.apache.flex.utils.Language.trace(typeof("a"));
+  org_apache_flex_utils_Language.trace(typeof("a"));
 };
 goog.inherits(org.apache.flex.A, vf2js_s.components.Button);
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/vf2js/projects/interfaces/Test_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/vf2js/projects/interfaces/Test_result.js b/compiler.jx.tests/test-files/vf2js/projects/interfaces/Test_result.js
index 2d3c7a5..522524e 100644
--- a/compiler.jx.tests/test-files/vf2js/projects/interfaces/Test_result.js
+++ b/compiler.jx.tests/test-files/vf2js/projects/interfaces/Test_result.js
@@ -25,7 +25,7 @@ goog.require('classes.A');
 goog.require('interfaces.IA');
 goog.require('interfaces.IC');
 goog.require('interfaces.IE');
-goog.require('org.apache.flex.utils.Language');
+goog.require('org_apache_flex_utils_Language');
 
 
 
@@ -37,7 +37,7 @@ goog.require('org.apache.flex.utils.Language');
  */
 Test = function() {
   Test.base(this, 'constructor');
-  var /** @type {interfaces.IA} */ ia = org.apache.flex.utils.Language.as(this.doSomething(interfaces.IC), interfaces.IA);
+  var /** @type {interfaces.IA} */ ia = org_apache_flex_utils_Language.as(this.doSomething(interfaces.IC), interfaces.IA);
 };
 goog.inherits(Test, classes.A);
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/vf2js/projects/interfaces/classes/A_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/vf2js/projects/interfaces/classes/A_result.js b/compiler.jx.tests/test-files/vf2js/projects/interfaces/classes/A_result.js
index 80208da..5c7fe66 100644
--- a/compiler.jx.tests/test-files/vf2js/projects/interfaces/classes/A_result.js
+++ b/compiler.jx.tests/test-files/vf2js/projects/interfaces/classes/A_result.js
@@ -39,7 +39,7 @@ goog.inherits(classes.A, classes.C);
  * @expose
  */
 classes.A.prototype.doStuff = function() {
-  org.apache.flex.utils.Language.trace("STUFF!!!");
+  org_apache_flex_utils_Language.trace("STUFF!!!");
 };
 
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/vf2js/projects/sdk/SomeSDKClass_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/vf2js/projects/sdk/SomeSDKClass_result.js b/compiler.jx.tests/test-files/vf2js/projects/sdk/SomeSDKClass_result.js
index a622dc1..5ce8532 100644
--- a/compiler.jx.tests/test-files/vf2js/projects/sdk/SomeSDKClass_result.js
+++ b/compiler.jx.tests/test-files/vf2js/projects/sdk/SomeSDKClass_result.js
@@ -23,7 +23,7 @@ goog.provide('SomeSDKClass');
 
 goog.require('mx.core.mx_internal');
 goog.require('bases.HelperBaseClass');
-goog.require('org.apache.flex.utils.Language');
+goog.require('org_apache_flex_utils_Language');
 
 
 
@@ -111,4 +111,4 @@ Helper.prototype.url_;
  */
 Helper.prototype.get_url = function() {
   return this.url_;
-};
\ No newline at end of file
+};

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/vf2js/projects/sdk/bases/HelperBaseClass_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/vf2js/projects/sdk/bases/HelperBaseClass_result.js b/compiler.jx.tests/test-files/vf2js/projects/sdk/bases/HelperBaseClass_result.js
index 9d18b3d..e8a198a 100644
--- a/compiler.jx.tests/test-files/vf2js/projects/sdk/bases/HelperBaseClass_result.js
+++ b/compiler.jx.tests/test-files/vf2js/projects/sdk/bases/HelperBaseClass_result.js
@@ -43,4 +43,4 @@ bases.HelperBaseClass.prototype.doSomething = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-bases.HelperBaseClass.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'HelperBaseClass', qName: 'bases.HelperBaseClass'}] };
\ No newline at end of file
+bases.HelperBaseClass.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'HelperBaseClass', qName: 'bases.HelperBaseClass'}] };

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js b/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js
index 9373345..e34f12d 100644
--- a/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js
+++ b/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js
@@ -23,7 +23,7 @@ goog.provide('SimpleMXML_Project');
 
 goog.require('spark.components.Application');
 goog.require('example.Component');
-goog.require('org.apache.flex.utils.Language');
+goog.require('org_apache_flex_utils_Language');
 
 
 
@@ -65,4 +65,4 @@ SimpleMXML_Project.prototype.myComponent;
  * @expose
  */
 SimpleMXML_Project.prototype.start = function () {
-};
\ No newline at end of file
+};

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/example/Component_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/example/Component_result.js b/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/example/Component_result.js
index 23f3aa4..89b829f 100644
--- a/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/example/Component_result.js
+++ b/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/example/Component_result.js
@@ -42,4 +42,4 @@ example.Component.prototype.myProperty = {};
  *
  * @type {Object.<string, Array.<Object>>}
  */
-example.Component.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'Component', qName: 'example.Component'}] };
\ No newline at end of file
+example.Component.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'Component', qName: 'example.Component'}] };

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/743fe157/compiler.jx.tests/test-files/vf2js/projects/super/Base_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/vf2js/projects/super/Base_result.js b/compiler.jx.tests/test-files/vf2js/projects/super/Base_result.js
index db6e56d..72c0ab9 100644
--- a/compiler.jx.tests/test-files/vf2js/projects/super/Base_result.js
+++ b/compiler.jx.tests/test-files/vf2js/projects/super/Base_result.js
@@ -22,7 +22,7 @@
 goog.provide('Base');
 
 goog.require('Super');
-goog.require('org.apache.flex.utils.Language');
+goog.require('org_apache_flex_utils_Language');
 
 
 
@@ -117,4 +117,4 @@ Base.prototype.doStuff = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-Base.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'Base', qName: 'Base'}] };
\ No newline at end of file
+Base.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'Base', qName: 'Base'}] };