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 2013/03/24 06:46:10 UTC

[1/3] git commit: add output and project files to .gitignore

Updated Branches:
  refs/heads/develop 37fd2bca0 -> fb614905a


add output and project files to .gitignore


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

Branch: refs/heads/develop
Commit: 187f315c4880ccda15205c157acca03613d861b4
Parents: 37fd2bc
Author: Alex Harui <ah...@apache.org>
Authored: Sat Mar 23 22:13:38 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Mar 23 22:39:34 2013 -0700

----------------------------------------------------------------------
 .gitignore |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/187f315c/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index ce2facb..a4f9f8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,9 @@
 .manager
 .scala_dependencies
 .cache
+.actionScriptProperties
+.flexProperties
+.flexLibProperties
 
 # idea conf files
 .idea
@@ -24,6 +27,11 @@ build.log
 release
 out
 gen
+bin-debug
+bin-release
+binjs-debug
+binjs-release
+examples/FlexJSTest_again/html-template
 
 #Apache Flex Projects
 lib/


[2/3] massive refactor to remove flash.*.* from JS and apps. AS beads can still use flash.*.* but apps and top-level components should not. Makes it easier to tell when migrating if you have flash dependencies

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/js/FlexJS/src/flash/events/Event.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/flash/events/Event.js b/frameworks/js/FlexJS/src/flash/events/Event.js
deleted file mode 100644
index 9a34400..0000000
--- a/frameworks/js/FlexJS/src/flash/events/Event.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('flash.events.Event');
-
-/**
- * @constructor
- */
-flash.events.Event = function() {
-    /**
-     * @private
-     * @type {string}
-     */
-     this.type_;
-};
-
-/**
- * @this {flash.events.Event}
- * @param {string} type The event type.
- */
-flash.events.Event.prototype.init = function(type) {
-    this.type_ = type;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/js/FlexJS/src/flash/events/EventDispatcher.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/flash/events/EventDispatcher.js b/frameworks/js/FlexJS/src/flash/events/EventDispatcher.js
deleted file mode 100644
index 4a14fc9..0000000
--- a/frameworks/js/FlexJS/src/flash/events/EventDispatcher.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('flash.events.EventDispatcher');
-
-goog.require('org.apache.flex.FlexGlobal');
-
-/**
- * @constructor
- * @extends {org.apache.flex.FlexGlobal}
- */
-flash.events.EventDispatcher = function() {
-    org.apache.flex.FlexGlobal.call(this);
-
-    /**
-     * @private
-     * @type {Object}
-     */
-    this.listeners_ = {};
-};
-goog.inherits(flash.events.EventDispatcher, org.apache.flex.FlexGlobal);
-
-/**
- * @this {flash.events.EventDispatcher}
- * @param {string} type The event type.
- * @param {function(?): ?} fn The event handler.
- */
-flash.events.EventDispatcher.prototype.addEventListener = function(type, fn) {
-    if (!this.listeners_.type) {
-        this.listeners_[type] = [];
-    }
-
-    this.listeners_[type].push(fn);
-};
-
-/**
- * @this {flash.events.EventDispatcher}
- * @param {Object} event The event to dispatch.
- */
-flash.events.EventDispatcher.prototype.dispatchEvent = function(event) {
-    var arr, i, n, type;
-
-    type = event.type;
-
-    if (this.listeners_[type]) {
-        arr = this.listeners_[type];
-        n = arr.length;
-        for (i = 0; i < n; i++) {
-            arr[i](event);
-        }
-    }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/js/FlexJS/src/org/apache/flex/FlexGlobal.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/FlexGlobal.js b/frameworks/js/FlexJS/src/org/apache/flex/FlexGlobal.js
index 8ae6d7c..b61f0bc 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/FlexGlobal.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/FlexGlobal.js
@@ -14,7 +14,8 @@
 
 goog.provide('org.apache.flex.FlexGlobal');
 
-goog.require('flash.events.Event');
+goog.require('org.apache.flex.events.Event');
+goog.require('org.apache.flex.events.CustomEvent');
 
 /**
  * @constructor
@@ -40,7 +41,9 @@ org.apache.flex.FlexGlobal.createProxy = function(context, method) {
 org.apache.flex.FlexGlobal.newObject = function(ctor, ctorArgs) {
     var evt;
 
-    if (ctor === flash.events.Event && ctorArgs.length === 1) {
+    if ((ctor === org.apache.flex.events.Event ||
+         ctor === org.apache.flex.events.CustomEvent) && 
+         ctorArgs.length === 1) {
         evt = document.createEvent('Event');
         evt.initEvent(ctorArgs[0], false, false);
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/js/FlexJS/src/org/apache/flex/core/Application.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/Application.js b/frameworks/js/FlexJS/src/org/apache/flex/core/Application.js
index 98499d2..2dcfaeb 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/Application.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/Application.js
@@ -57,7 +57,7 @@ org.apache.flex.core.Application.prototype.initialView = null;
 
 /**
  * @expose
- * @type {flash.events.EventDispatcher}
+ * @type {org.apache.flex.events.EventDispatcher}
  */
 org.apache.flex.core.Application.prototype.model = null;
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
index 393fa39..c26de71 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
@@ -63,7 +63,7 @@ org.apache.flex.core.UIBase.prototype.addToParent = function(p) {
 
 /**
  * @this {org.apache.flex.core.UIBase}
- * @param {flash.events.Event} evt The event.
+ * @param {org.apache.flex.events.Event} evt The event.
  */
 org.apache.flex.core.UIBase.prototype.dispatchEvent = function(evt) {
     this.element.dispatchEvent(evt);

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/js/FlexJS/src/org/apache/flex/events/CustomEvent.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/events/CustomEvent.js b/frameworks/js/FlexJS/src/org/apache/flex/events/CustomEvent.js
new file mode 100644
index 0000000..97c64e2
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/events/CustomEvent.js
@@ -0,0 +1,34 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org.apache.flex.events.CustomEvent');
+
+/**
+ * @constructor
+ */
+org.apache.flex.events.CustomEvent = function() {
+    /**
+     * @private
+     * @type {string}
+     */
+     this.type_;
+};
+
+/**
+ * @this {org.apache.flex.events.CustomEvent}
+ * @param {string} type The event type.
+ */
+org.apache.flex.events.CustomEvent.prototype.init = function(type) {
+    this.type_ = type;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/js/FlexJS/src/org/apache/flex/events/Event.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/events/Event.js b/frameworks/js/FlexJS/src/org/apache/flex/events/Event.js
new file mode 100644
index 0000000..9b824bc
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/events/Event.js
@@ -0,0 +1,34 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org.apache.flex.events.Event');
+
+/**
+ * @constructor
+ */
+org.apache.flex.events.Event = function() {
+    /**
+     * @private
+     * @type {string}
+     */
+     this.type_;
+};
+
+/**
+ * @this {org.apache.flex.events.Event}
+ * @param {string} type The event type.
+ */
+org.apache.flex.events.Event.prototype.init = function(type) {
+    this.type_ = type;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/js/FlexJS/src/org/apache/flex/events/EventDispatcher.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/events/EventDispatcher.js b/frameworks/js/FlexJS/src/org/apache/flex/events/EventDispatcher.js
new file mode 100644
index 0000000..dba2c3c
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/events/EventDispatcher.js
@@ -0,0 +1,64 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org.apache.flex.events.EventDispatcher');
+
+goog.require('org.apache.flex.FlexGlobal');
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.FlexGlobal}
+ */
+org.apache.flex.events.EventDispatcher = function() {
+    org.apache.flex.FlexGlobal.call(this);
+
+    /**
+     * @private
+     * @type {Object}
+     */
+    this.listeners_ = {};
+};
+goog.inherits(org.apache.flex.events.EventDispatcher,
+    org.apache.flex.FlexGlobal);
+
+/**
+ * @this {org.apache.flex.events.EventDispatcher}
+ * @param {string} type The event type.
+ * @param {function(?): ?} fn The event handler.
+ */
+org.apache.flex.events.EventDispatcher.prototype.addEventListener = function(type, fn) {
+    if (!this.listeners_.type) {
+        this.listeners_[type] = [];
+    }
+
+    this.listeners_[type].push(fn);
+};
+
+/**
+ * @this {org.apache.flex.events.EventDispatcher}
+ * @param {Object} event The event to dispatch.
+ */
+org.apache.flex.events.EventDispatcher.prototype.dispatchEvent = function(event) {
+    var arr, i, n, type;
+
+    type = event.type;
+
+    if (this.listeners_[type]) {
+        arr = this.listeners_[type];
+        n = arr.length;
+        for (i = 0; i < n; i++) {
+            arr[i](event);
+        }
+    }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/js/FlexJS/src/org/apache/flex/net/HTTPService.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/net/HTTPService.js b/frameworks/js/FlexJS/src/org/apache/flex/net/HTTPService.js
index 95bcc99..87b58e1 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/net/HTTPService.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/net/HTTPService.js
@@ -135,7 +135,7 @@ function(type, fn) {
 
 /**
  * @this {org.apache.flex.net.HTTPService}
- * @param {flash.events.Event} evt The event.
+ * @param {org.apache.flex.events.Event} evt The event.
  */
 org.apache.flex.net.HTTPService.prototype.dispatchEvent = function(evt) {
     this.element.dispatchEvent(evt);


[3/3] git commit: massive refactor to remove flash.*.* from JS and apps. AS beads can still use flash.*.* but apps and top-level components should not. Makes it easier to tell when migrating if you have flash dependencies

Posted by ah...@apache.org.
massive refactor to remove flash.*.* from JS and apps.  AS beads can still use flash.*.* but apps and top-level components should not.  Makes it easier to tell when migrating if you have flash dependencies


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

Branch: refs/heads/develop
Commit: fb614905ac5eac775c765a3aac212164d706efe9
Parents: 187f315
Author: Alex Harui <ah...@apache.org>
Authored: Sat Mar 23 22:16:00 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Mar 23 22:45:53 2013 -0700

----------------------------------------------------------------------
 examples/FlexJSTest_again/src/FlexJSTest.mxml      |   51 ------------
 .../FlexJSTest_again/src/FlexJSTest_again.mxml     |   51 ++++++++++++
 examples/FlexJSTest_again/src/MyInitialView.mxml   |    6 +-
 .../src/StockDataJSONItemConverter.as              |   18 ++++
 .../src/controllers/MyController.as                |   10 +-
 examples/FlexJSTest_again/src/models/MyModel.as    |    4 +-
 .../src/org/apache/flex/binding/ConstantBinding.as |   13 +--
 .../src/org/apache/flex/binding/SimpleBinding.as   |   11 +--
 .../as/src/org/apache/flex/core/Application.as     |   12 ++-
 .../as/src/org/apache/flex/core/IBeadModel.as      |    2 +-
 .../as/src/org/apache/flex/core/IItemRenderer.as   |    2 +-
 .../org/apache/flex/core/IItemRendererParent.as    |    2 +-
 .../as/src/org/apache/flex/core/ISelectionModel.as |    2 +-
 .../org/apache/flex/core/SimpleCSSValuesImpl.as    |    3 +-
 .../src/org/apache/flex/core/SimpleValuesImpl.as   |    4 +-
 frameworks/as/src/org/apache/flex/core/UIBase.as   |    5 +-
 frameworks/as/src/org/apache/flex/core/ViewBase.as |    3 +-
 .../as/src/org/apache/flex/events/CustomEvent.as   |   36 ++++++++
 frameworks/as/src/org/apache/flex/events/Event.as  |   38 +++++++++
 .../src/org/apache/flex/events/EventDispatcher.as  |   34 ++++++++
 .../src/org/apache/flex/events/IEventDispatcher.as |   31 +++++++
 .../src/org/apache/flex/events/ValueChangeEvent.as |    2 -
 .../org/apache/flex/html/staticControls/Button.as  |    5 +-
 .../apache/flex/html/staticControls/CheckBox.as    |    4 +-
 .../apache/flex/html/staticControls/ComboBox.as    |    1 -
 .../flex/html/staticControls/DropDownList.as       |    2 +-
 .../org/apache/flex/html/staticControls/List.as    |    4 +-
 .../apache/flex/html/staticControls/RadioButton.as |    4 +-
 .../flex/html/staticControls/beads/CheckBoxBead.as |    2 +-
 .../flex/html/staticControls/beads/ComboBoxBead.as |   12 ++--
 .../html/staticControls/beads/DropDownListBead.as  |    4 +-
 .../flex/html/staticControls/beads/ListBead.as     |    5 +-
 .../html/staticControls/beads/RadioButtonBead.as   |    2 +-
 .../staticControls/beads/SingleLineBorderBead.as   |    4 +-
 .../staticControls/beads/SolidBackgroundBead.as    |    4 +-
 .../html/staticControls/beads/TextButtonBead.as    |    2 +-
 .../html/staticControls/beads/TextFieldBeadBase.as |    2 +-
 .../html/staticControls/beads/TextInputBead.as     |    9 ++-
 .../beads/TextInputWithBorderBead.as               |    4 +-
 .../beads/TextItemRendererFactoryForArrayData.as   |    2 +-
 .../TextItemRendererFactoryForStringVectorData.as  |    2 +-
 .../staticControls/beads/VScrollBarThumbBead.as    |    5 +-
 .../staticControls/beads/VScrollBarTrackBead.as    |    2 +-
 .../controllers/ButtonAutoRepeatController.as      |    4 +-
 .../beads/controllers/DropDownListController.as    |    6 +-
 .../controllers/ItemRendererMouseController.as     |    4 +-
 .../ListSingleSelectionMouseController.as          |    6 +-
 .../controllers/ScrollBarMouseControllerBase.as    |    4 +-
 .../beads/controllers/VScrollBarMouseController.as |    9 +--
 .../layouts/NonVirtualVerticalScrollingLayout.as   |    4 +-
 .../beads/layouts/VScrollBarLayout.as              |    4 +-
 .../beads/models/ArraySelectionModel.as            |    7 +-
 .../staticControls/beads/models/ComboBoxModel.as   |    5 +-
 .../html/staticControls/beads/models/RangeModel.as |    7 +-
 .../staticControls/beads/models/ScrollBarModel.as  |    2 +-
 .../beads/models/SingleLineBorderModel.as          |    3 +-
 .../beads/models/StringSelectionModel.as           |    4 +-
 .../html/staticControls/beads/models/TextModel.as  |    7 +-
 .../beads/models/ToggleButtonModel.as              |    5 +-
 .../beads/models/ValueToggleButtonModel.as         |    2 +-
 .../supportClasses/DropDownListList.as             |    2 +-
 .../supportClasses/TextFieldItemRenderer.as        |    1 -
 .../as/src/org/apache/flex/net/HTTPService.as      |   33 ++++----
 .../flex/net/dataConverters/LazyCollection.as      |    2 +-
 .../org/apache/flex/utils/MXMLDataInterpreter.as   |    1 -
 frameworks/js/FlexJS/src/flash/events/Event.js     |   34 --------
 .../js/FlexJS/src/flash/events/EventDispatcher.js  |   63 --------------
 .../js/FlexJS/src/org/apache/flex/FlexGlobal.js    |    7 +-
 .../FlexJS/src/org/apache/flex/core/Application.js |    2 +-
 .../js/FlexJS/src/org/apache/flex/core/UIBase.js   |    2 +-
 .../src/org/apache/flex/events/CustomEvent.js      |   34 ++++++++
 .../js/FlexJS/src/org/apache/flex/events/Event.js  |   34 ++++++++
 .../src/org/apache/flex/events/EventDispatcher.js  |   64 +++++++++++++++
 .../FlexJS/src/org/apache/flex/net/HTTPService.js  |    2 +-
 74 files changed, 483 insertions(+), 302 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/examples/FlexJSTest_again/src/FlexJSTest.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_again/src/FlexJSTest.mxml b/examples/FlexJSTest_again/src/FlexJSTest.mxml
deleted file mode 100644
index 2f3cbbd..0000000
--- a/examples/FlexJSTest_again/src/FlexJSTest.mxml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
--->
-<basic:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
-				   xmlns:local="*"
-				   xmlns:basic="library://ns.apache.org/flexjs/basic" 
-				   xmlns:models="models.*" 
-				   xmlns:controllers="controllers.*"
-				   initialize="MyModel(model).labelText='Hello World'"
-				   >
-	<basic:valuesImpl>
-		<basic:SimpleCSSValuesImpl />
-	</basic:valuesImpl>
-	<basic:initialView>
-		<local:MyInitialView />
-	</basic:initialView>
-	<basic:model>
-		<models:MyModel />
-	</basic:model>
-	<basic:controller>
-		<controllers:MyController />
-	</basic:controller>
-    <basic:beads>
-        <basic:HTTPService id="service">
-            <basic:LazyCollection id="collection">
-                <basic:inputParser>
-                    <basic:JSONInputParser />
-                </basic:inputParser>
-                <basic:itemConverter>
-                    <local:StockDataJSONItemConverter />
-                </basic:itemConverter> 
-            </basic:LazyCollection>
-        </basic:HTTPService>
-    </basic:beads>
-</basic:Application>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/examples/FlexJSTest_again/src/FlexJSTest_again.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_again/src/FlexJSTest_again.mxml b/examples/FlexJSTest_again/src/FlexJSTest_again.mxml
new file mode 100644
index 0000000..2f3cbbd
--- /dev/null
+++ b/examples/FlexJSTest_again/src/FlexJSTest_again.mxml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-->
+<basic:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+				   xmlns:local="*"
+				   xmlns:basic="library://ns.apache.org/flexjs/basic" 
+				   xmlns:models="models.*" 
+				   xmlns:controllers="controllers.*"
+				   initialize="MyModel(model).labelText='Hello World'"
+				   >
+	<basic:valuesImpl>
+		<basic:SimpleCSSValuesImpl />
+	</basic:valuesImpl>
+	<basic:initialView>
+		<local:MyInitialView />
+	</basic:initialView>
+	<basic:model>
+		<models:MyModel />
+	</basic:model>
+	<basic:controller>
+		<controllers:MyController />
+	</basic:controller>
+    <basic:beads>
+        <basic:HTTPService id="service">
+            <basic:LazyCollection id="collection">
+                <basic:inputParser>
+                    <basic:JSONInputParser />
+                </basic:inputParser>
+                <basic:itemConverter>
+                    <local:StockDataJSONItemConverter />
+                </basic:itemConverter> 
+            </basic:LazyCollection>
+        </basic:HTTPService>
+    </basic:beads>
+</basic:Application>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/examples/FlexJSTest_again/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_again/src/MyInitialView.mxml b/examples/FlexJSTest_again/src/MyInitialView.mxml
index 3285084..14b4278 100644
--- a/examples/FlexJSTest_again/src/MyInitialView.mxml
+++ b/examples/FlexJSTest_again/src/MyInitialView.mxml
@@ -22,6 +22,8 @@ limitations under the License.
 			   >
     <fx:Script>
         <![CDATA[            
+			import org.apache.flex.events.CustomEvent;
+			
             public function get symbol():String
             {
                 return list.selectedItem as String;
@@ -41,8 +43,8 @@ limitations under the License.
 								 destinationPropertyName="text" />
 		</basic:beads>
 	</basic:Label>
-	<basic:TextButton text="OK" x="100" y="50" click="dispatchEvent(new Event('buttonClicked'))" />
-    <basic:List id="list" x="200" y="25" width="100" height="200" change="dispatchEvent(new Event('listChanged'))">
+	<basic:TextButton text="OK" x="100" y="50" click="dispatchEvent(new CustomEvent('buttonClicked'))" />
+    <basic:List id="list" x="200" y="25" width="100" height="200" change="dispatchEvent(new CustomEvent('listChanged'))">
         <basic:beads>
             <basic:ConstantBinding
                                  sourceID="applicationModel"

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/examples/FlexJSTest_again/src/StockDataJSONItemConverter.as
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_again/src/StockDataJSONItemConverter.as b/examples/FlexJSTest_again/src/StockDataJSONItemConverter.as
index b9fe3b3..a030fe0 100644
--- a/examples/FlexJSTest_again/src/StockDataJSONItemConverter.as
+++ b/examples/FlexJSTest_again/src/StockDataJSONItemConverter.as
@@ -1,3 +1,21 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
 package
 {
     import org.apache.flex.net.JSONItemConverter;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/examples/FlexJSTest_again/src/controllers/MyController.as
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_again/src/controllers/MyController.as b/examples/FlexJSTest_again/src/controllers/MyController.as
index 868ab34..8303aa7 100644
--- a/examples/FlexJSTest_again/src/controllers/MyController.as
+++ b/examples/FlexJSTest_again/src/controllers/MyController.as
@@ -18,10 +18,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 package controllers
 {
-	import flash.events.Event;
-	
 	import org.apache.flex.core.Application;
 	import org.apache.flex.core.IDocument;
+	import org.apache.flex.events.Event;
+	
     
     import models.MyModel;
     	
@@ -31,14 +31,14 @@ package controllers
 		{
 			if (app)
 			{
-				this.app = app as FlexJSTest;
+				this.app = app as FlexJSTest_again;
 				app.addEventListener("viewChanged", viewChangeHandler);
 			}
 		}
 		
         private var queryBegin:String = "http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20yahoo.finance.quotes%20where%20symbol%20in%20(%22";
         private var queryEnd:String = "%22)%0A%09%09&env=http%3A%2F%2Fdatatables.org%2Falltables.env&format=json";
-		private var app:FlexJSTest;
+		private var app:FlexJSTest_again;
 		
 		private function viewChangeHandler(event:Event):void
 		{
@@ -72,7 +72,7 @@ package controllers
         
 		public function setDocument(document:Object, id:String = null):void
 		{
-			this.app = document as FlexJSTest;
+			this.app = document as FlexJSTest_again;
 			app.addEventListener("viewChanged", viewChangeHandler);
 		}
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/examples/FlexJSTest_again/src/models/MyModel.as
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_again/src/models/MyModel.as b/examples/FlexJSTest_again/src/models/MyModel.as
index 4861cb9..bc8a7d0 100644
--- a/examples/FlexJSTest_again/src/models/MyModel.as
+++ b/examples/FlexJSTest_again/src/models/MyModel.as
@@ -18,8 +18,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 package models
 {
-	import flash.events.Event;
-	import flash.events.EventDispatcher;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.EventDispatcher;
 	
 	public class MyModel extends EventDispatcher
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/binding/ConstantBinding.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/binding/ConstantBinding.as b/frameworks/as/src/org/apache/flex/binding/ConstantBinding.as
index f5dd194..bab1e7b 100644
--- a/frameworks/as/src/org/apache/flex/binding/ConstantBinding.as
+++ b/frameworks/as/src/org/apache/flex/binding/ConstantBinding.as
@@ -18,21 +18,18 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.binding
 {
-	import flash.events.Event;
-	import flash.events.IEventDispatcher;
-	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.IDocument;
-
+	
 	public class ConstantBinding implements IBead, IDocument
 	{
 		public function ConstantBinding()
 		{
 		}
 		
-		protected var source:IEventDispatcher;
-		protected var document:IEventDispatcher;
+		protected var source:Object;
+		protected var document:Object;
 		protected var destination:Object;
 
 		public var sourceID:String;
@@ -42,13 +39,13 @@ package org.apache.flex.binding
 		public function set strand(value:IStrand):void
 		{
 			destination = value;
-			source = document[sourceID] as IEventDispatcher;
+			source = document[sourceID];
 			destination[destinationPropertyName] = source[sourcePropertyName];
 		}
 		
 		public function setDocument(document:Object, id:String = null):void
 		{
-			this.document = document as IEventDispatcher;
+			this.document = document;
 		}
 		
 	}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/binding/SimpleBinding.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/binding/SimpleBinding.as b/frameworks/as/src/org/apache/flex/binding/SimpleBinding.as
index 88c45a9..c5bd392 100644
--- a/frameworks/as/src/org/apache/flex/binding/SimpleBinding.as
+++ b/frameworks/as/src/org/apache/flex/binding/SimpleBinding.as
@@ -17,13 +17,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.binding
-{
-	import flash.events.Event;
-	import flash.events.IEventDispatcher;
-	
+{	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.IDocument;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
 
 	public class SimpleBinding implements IBead, IDocument
 	{
@@ -32,7 +31,7 @@ package org.apache.flex.binding
 		}
 		
 		protected var source:IEventDispatcher;
-		protected var document:IEventDispatcher;
+		protected var document:Object;
 		protected var destination:Object;
 
 		public var sourceID:String;
@@ -50,7 +49,7 @@ package org.apache.flex.binding
 		
 		public function setDocument(document:Object, id:String = null):void
 		{
-			this.document = document as IEventDispatcher;
+			this.document = document;
 		}
 		
 		private function changeHandler(event:Event):void

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/core/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/core/Application.as b/frameworks/as/src/org/apache/flex/core/Application.as
index 97bb61f..2c02102 100644
--- a/frameworks/as/src/org/apache/flex/core/Application.as
+++ b/frameworks/as/src/org/apache/flex/core/Application.as
@@ -21,8 +21,12 @@ package org.apache.flex.core
     import flash.display.Sprite;
     import flash.display.StageAlign;
     import flash.display.StageScaleMode;
-    import flash.events.Event;
+	
+	// this import is not used, but keeps the compiler from
+	// complaining about explicit usage of flash.events.Event
+	import flash.events.IOErrorEvent;
     
+	import org.apache.flex.events.Event;
     import org.apache.flex.utils.MXMLDataInterpreter;
     
     //--------------------------------------
@@ -32,7 +36,7 @@ package org.apache.flex.core
     /**
      *  Dispatched at startup.
      */
-    [Event(name="initialize", type="flash.events.Event")]
+    [Event(name="initialize", type="org.apache.flex.events.Event")]
     
     public class Application extends Sprite implements IStrand, IFlexInfo
     {
@@ -45,10 +49,10 @@ package org.apache.flex.core
 				stage.scaleMode = StageScaleMode.NO_SCALE;
 			}
 			
-            loaderInfo.addEventListener(Event.INIT, initHandler);
+            loaderInfo.addEventListener(flash.events.Event.INIT, initHandler);
         }
 
-        private function initHandler(event:Event):void
+        private function initHandler(event:flash.events.Event):void
         {
 	        MXMLDataInterpreter.generateMXMLProperties(this, MXMLProperties);
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/core/IBeadModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/core/IBeadModel.as b/frameworks/as/src/org/apache/flex/core/IBeadModel.as
index 7d274f6..b339984 100644
--- a/frameworks/as/src/org/apache/flex/core/IBeadModel.as
+++ b/frameworks/as/src/org/apache/flex/core/IBeadModel.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.core
 {
-	import flash.events.IEventDispatcher;
+	import org.apache.flex.events.IEventDispatcher;
 
 	/** 
 	 *  Marker interface for models

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/core/IItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/core/IItemRenderer.as b/frameworks/as/src/org/apache/flex/core/IItemRenderer.as
index 8bbaeec..5f7f685 100644
--- a/frameworks/as/src/org/apache/flex/core/IItemRenderer.as
+++ b/frameworks/as/src/org/apache/flex/core/IItemRenderer.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.core
 {
-	import flash.events.IEventDispatcher;
+	import org.apache.flex.events.IEventDispatcher;
 
 	public interface IItemRenderer extends IEventDispatcher
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/core/IItemRendererParent.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/core/IItemRendererParent.as b/frameworks/as/src/org/apache/flex/core/IItemRendererParent.as
index 71ad0e4..c693608 100644
--- a/frameworks/as/src/org/apache/flex/core/IItemRendererParent.as
+++ b/frameworks/as/src/org/apache/flex/core/IItemRendererParent.as
@@ -19,7 +19,7 @@
 package org.apache.flex.core
 {
 	import flash.display.DisplayObject;
-	import flash.events.IEventDispatcher;
+	import org.apache.flex.events.IEventDispatcher;
 
 	public interface IItemRendererParent extends IEventDispatcher
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/core/ISelectionModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/core/ISelectionModel.as b/frameworks/as/src/org/apache/flex/core/ISelectionModel.as
index 779eacc..cdca279 100644
--- a/frameworks/as/src/org/apache/flex/core/ISelectionModel.as
+++ b/frameworks/as/src/org/apache/flex/core/ISelectionModel.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.core
 {
-	import flash.events.IEventDispatcher;
+	import org.apache.flex.events.IEventDispatcher;
 
 	public interface ISelectionModel extends IEventDispatcher, IBeadModel
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as b/frameworks/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as
index f0b484b..567f339 100644
--- a/frameworks/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as
+++ b/frameworks/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as
@@ -18,12 +18,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.core
 {
-	import flash.events.EventDispatcher;
-	import flash.events.IEventDispatcher;
 	import flash.system.ApplicationDomain;
 	import flash.utils.getQualifiedClassName;
 	
 	import org.apache.flex.events.ValueChangeEvent;
+	import org.apache.flex.events.EventDispatcher;
 	
 	public class SimpleCSSValuesImpl extends EventDispatcher implements IValuesImpl
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/core/SimpleValuesImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/core/SimpleValuesImpl.as b/frameworks/as/src/org/apache/flex/core/SimpleValuesImpl.as
index aadd5b0..42fa6d7 100644
--- a/frameworks/as/src/org/apache/flex/core/SimpleValuesImpl.as
+++ b/frameworks/as/src/org/apache/flex/core/SimpleValuesImpl.as
@@ -18,9 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.core
 {
-	import flash.events.EventDispatcher;
-	import flash.events.IEventDispatcher;
-	
+	import org.apache.flex.events.EventDispatcher;	
 	import org.apache.flex.events.ValueChangeEvent;
 	
 	public class SimpleValuesImpl extends EventDispatcher implements IValuesImpl

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/core/UIBase.as b/frameworks/as/src/org/apache/flex/core/UIBase.as
index 0bf3478..3b1eb9e 100644
--- a/frameworks/as/src/org/apache/flex/core/UIBase.as
+++ b/frameworks/as/src/org/apache/flex/core/UIBase.as
@@ -20,9 +20,10 @@ package org.apache.flex.core
 {
 	import flash.display.DisplayObjectContainer;
 	import flash.display.Sprite;
-	import flash.events.Event;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
 	
-	public class UIBase extends Sprite implements IInitModel, IStrand
+	public class UIBase extends Sprite implements IInitModel, IStrand, IEventDispatcher
 	{
 		public function UIBase()
 		{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/core/ViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/core/ViewBase.as b/frameworks/as/src/org/apache/flex/core/ViewBase.as
index 59384ba..3ea4bb5 100644
--- a/frameworks/as/src/org/apache/flex/core/ViewBase.as
+++ b/frameworks/as/src/org/apache/flex/core/ViewBase.as
@@ -18,8 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.core
 {
-	import flash.events.Event;
-	
+	import org.apache.flex.events.Event;	
 	import org.apache.flex.utils.MXMLDataInterpreter;
 
 	[DefaultProperty("mxmlContent")]

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/events/CustomEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/events/CustomEvent.as b/frameworks/as/src/org/apache/flex/events/CustomEvent.as
new file mode 100644
index 0000000..0776e22
--- /dev/null
+++ b/frameworks/as/src/org/apache/flex/events/CustomEvent.as
@@ -0,0 +1,36 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.events
+{
+	/**
+	 *  MXML auto-imports flash.events.Event which then requires
+	 *  full qualification to use org.apache.flex.events.Event.
+	 *  Use CustomEvent to skip all that extra typing.  Eventually
+	 *  we should add a flag to strip out the default auto-imports.
+	 *  Like org.apache.flex.events.Event events on the JS side
+	 *  are DOMEvents and not really instances of this class
+	 */
+	public class CustomEvent extends Event
+	{
+		public function CustomEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false)
+		{
+			super(type, bubbles, cancelable);
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/events/Event.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/events/Event.as b/frameworks/as/src/org/apache/flex/events/Event.as
new file mode 100644
index 0000000..91fd83a
--- /dev/null
+++ b/frameworks/as/src/org/apache/flex/events/Event.as
@@ -0,0 +1,38 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.events
+{
+	import flash.events.Event;
+	
+	/**
+	 *  This class simply wraps flash.events.Event so that
+	 *  no flash packages are needed on the JS side.
+	 *  At runtime, this class is not always the event object
+	 *  that is dispatched.  In most cases we are dispatching
+	 *  DOMEvents instead, so as long as you don't actually
+	 *  check the typeof(event) it will work
+	 */
+	public class Event extends flash.events.Event
+	{
+		public function Event(type:String, bubbles:Boolean=false, cancelable:Boolean=false)
+		{
+			super(type, bubbles, cancelable);
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/events/EventDispatcher.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/events/EventDispatcher.as b/frameworks/as/src/org/apache/flex/events/EventDispatcher.as
new file mode 100644
index 0000000..64c6f87
--- /dev/null
+++ b/frameworks/as/src/org/apache/flex/events/EventDispatcher.as
@@ -0,0 +1,34 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.events
+{
+	import flash.events.EventDispatcher;
+	
+	/**
+	 *  This class simply wraps flash.events.EventDispatcher so that
+	 *  no flash packages are needed on the JS side.
+	 */
+	public class EventDispatcher extends flash.events.EventDispatcher implements IEventDispatcher
+	{
+		public function EventDispatcher()
+		{
+			super();
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/events/IEventDispatcher.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/events/IEventDispatcher.as b/frameworks/as/src/org/apache/flex/events/IEventDispatcher.as
new file mode 100644
index 0000000..b838d23
--- /dev/null
+++ b/frameworks/as/src/org/apache/flex/events/IEventDispatcher.as
@@ -0,0 +1,31 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.events
+{
+	import flash.events.IEventDispatcher;
+	
+	/**
+	 *  This class simply wraps flash.events.EventDispatcher so that
+	 *  no flash packages are needed on the JS side.
+	 */
+	public interface IEventDispatcher extends flash.events.IEventDispatcher
+	{
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/events/ValueChangeEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/events/ValueChangeEvent.as b/frameworks/as/src/org/apache/flex/events/ValueChangeEvent.as
index 973217b..88e7463 100644
--- a/frameworks/as/src/org/apache/flex/events/ValueChangeEvent.as
+++ b/frameworks/as/src/org/apache/flex/events/ValueChangeEvent.as
@@ -18,8 +18,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.events
 {
-	import flash.events.Event;
-	
 	public class ValueChangeEvent extends Event
 	{
 		public function ValueChangeEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false, 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/Button.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/Button.as b/frameworks/as/src/org/apache/flex/html/staticControls/Button.as
index dc75e72..b159d9f 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/Button.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/Button.as
@@ -20,15 +20,16 @@ package org.apache.flex.html.staticControls
 {
 	import flash.display.DisplayObject;
 	import flash.display.SimpleButton;
-	import flash.events.Event;
 	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IBeadModel;
 	import org.apache.flex.core.IInitModel;
 	import org.apache.flex.core.IInitSkin;
 	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
 	
-	public class Button extends SimpleButton implements IStrand, IInitSkin, IInitModel
+	public class Button extends SimpleButton implements IStrand, IInitSkin, IInitModel, IEventDispatcher
 	{
 		public function Button(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null)
 		{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/CheckBox.as b/frameworks/as/src/org/apache/flex/html/staticControls/CheckBox.as
index 4c06e11..ad8ee7c 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/CheckBox.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/CheckBox.as
@@ -20,7 +20,6 @@ package org.apache.flex.html.staticControls
 {
 	import flash.display.DisplayObject;
 	import flash.display.SimpleButton;
-	import flash.events.Event;
 	import flash.events.MouseEvent;
 	
 	import org.apache.flex.core.IBead;
@@ -31,6 +30,7 @@ package org.apache.flex.html.staticControls
 	import org.apache.flex.core.IInitSkin;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
 	
 	public class CheckBox extends SimpleButton implements IStrand, IInitSkin, IInitModel
 	{
@@ -170,7 +170,7 @@ package org.apache.flex.html.staticControls
 		private function internalMouseHandler(event:MouseEvent) : void
 		{
 			selected = !selected;
-			dispatchEvent( new Event(Event.CHANGE) );
+			dispatchEvent(new Event("change"));
 		}
 	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/ComboBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/ComboBox.as b/frameworks/as/src/org/apache/flex/html/staticControls/ComboBox.as
index 6ca72f1..4fd6f54 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/ComboBox.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/ComboBox.as
@@ -22,7 +22,6 @@ package org.apache.flex.html.staticControls
 	import org.apache.flex.core.IComboBoxBead;
 	import org.apache.flex.core.IComboBoxModel;
 	import org.apache.flex.core.IInitSkin;
-	import org.apache.flex.core.ISelectionModel;
 	import org.apache.flex.core.UIBase;
 	import org.apache.flex.core.ValuesManager;
 	

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/DropDownList.as b/frameworks/as/src/org/apache/flex/html/staticControls/DropDownList.as
index ae13cdf..39a414f 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/DropDownList.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/DropDownList.as
@@ -25,7 +25,7 @@ package org.apache.flex.html.staticControls
     import org.apache.flex.html.staticControls.beads.IDropDownListBead;
 	import org.apache.flex.html.staticControls.beads.controllers.DropDownListController;
     
-    [Event("change", flash.events.Event)]
+    [Event("change", org.apache.flex.events.Event)]
     
 	public class DropDownList extends Button
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/List.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/List.as b/frameworks/as/src/org/apache/flex/html/staticControls/List.as
index 723f7ed..7dd7582 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/List.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/List.as
@@ -18,8 +18,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls
 {
-	import flash.events.Event;
-	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IInitSkin;
 	import org.apache.flex.core.IItemRenderer;
@@ -36,7 +34,7 @@ package org.apache.flex.html.staticControls
 	import org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalScrollingLayout;
 	import org.apache.flex.html.staticControls.supportClasses.TextFieldItemRenderer;
 	
-    [Event("change", flash.events.Event)]
+    [Event("change", org.apache.flex.events.Event)]
     
 	/**
 	 *  Label probably should extend TextField directly,

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/RadioButton.as b/frameworks/as/src/org/apache/flex/html/staticControls/RadioButton.as
index 4b71d3e..8df7478 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/RadioButton.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/RadioButton.as
@@ -20,7 +20,6 @@ package org.apache.flex.html.staticControls
 {
 	import flash.display.DisplayObject;
 	import flash.display.SimpleButton;
-	import flash.events.Event;
 	import flash.events.MouseEvent;
 	import flash.utils.Dictionary;
 	
@@ -32,6 +31,7 @@ package org.apache.flex.html.staticControls
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.IValueToggleButtonModel;
 	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
 	
 	public class RadioButton extends SimpleButton implements IStrand, IInitSkin, IInitModel
 	{
@@ -241,7 +241,7 @@ package org.apache.flex.html.staticControls
 			// prevent radiobutton from being turned off by a click
 			if( !selected ) {
 				selected = !selected;
-				dispatchEvent( new Event(Event.CHANGE) );
+				dispatchEvent(new Event("change"));
 			}
 		}
 	}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/CheckBoxBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/CheckBoxBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/CheckBoxBead.as
index ae0c1bd..98ed72b 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/CheckBoxBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/CheckBoxBead.as
@@ -21,7 +21,6 @@ package org.apache.flex.html.staticControls.beads
 	import flash.display.Shape;
 	import flash.display.SimpleButton;
 	import flash.display.Sprite;
-	import flash.events.Event;
 	import flash.text.TextField;
 	import flash.text.TextFieldAutoSize;
 	import flash.text.TextFieldType;
@@ -30,6 +29,7 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.ICheckBoxBead;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.IToggleButtonModel;
+	import org.apache.flex.events.Event;
 	
 	public class CheckBoxBead implements IBead, ICheckBoxBead
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/ComboBoxBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/ComboBoxBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/ComboBoxBead.as
index 306a8f0..ef31444 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/ComboBoxBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/ComboBoxBead.as
@@ -20,13 +20,13 @@ package org.apache.flex.html.staticControls.beads
 {
 	import flash.display.DisplayObjectContainer;
 	import flash.display.Sprite;
-	import flash.events.Event;
-	import flash.events.IEventDispatcher;
 	
 	import org.apache.flex.binding.ConstantBinding;
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IComboBoxBead;
 	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
 	import org.apache.flex.html.staticControls.Button;
 	import org.apache.flex.html.staticControls.List;
 	import org.apache.flex.html.staticControls.TextInput;
@@ -137,21 +137,21 @@ package org.apache.flex.html.staticControls.beads
 			sprite.graphics.endFill();
 		}
 		
-		private function listChangeHandler( event:Event ) : void
+		private function listChangeHandler(event:Event):void
 		{
 			var item:Object = list.selectedItem;
 			textInput.text = item.toString();
 			
-			var newEvent:Event = new Event(Event.CHANGE);
+			var newEvent:Event = new Event("change");
 			IEventDispatcher(strand).dispatchEvent(newEvent);
 		}
 		
-		private function textChangeHandler( event:Event ) : void
+		private function textChangeHandler(event:Event):void
 		{
 			list.selectedItem = textInput.text;
 			list.selectedIndex = -1;
 			
-			var newEvent:Event = new Event(Event.CHANGE);
+			var newEvent:Event = new Event("change");
 			IEventDispatcher(strand).dispatchEvent(newEvent);
 		}
 	}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as
index ccfe6b1..863d72a 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as
@@ -24,8 +24,6 @@ package org.apache.flex.html.staticControls.beads
 	import flash.display.Shape;
 	import flash.display.SimpleButton;
 	import flash.display.Sprite;
-	import flash.events.Event;
-	import flash.events.IEventDispatcher;
 	import flash.text.TextField;
 	import flash.text.TextFieldType;
 	
@@ -34,6 +32,8 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.ISelectionModel;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
 
 	public class DropDownListBead implements IDropDownListBead
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/ListBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/ListBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/ListBead.as
index 06390e8..fa22f55 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/ListBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/ListBead.as
@@ -17,9 +17,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls.beads
-{
-	import flash.events.Event;
-	
+{	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IInitSkin;
 	import org.apache.flex.core.IItemRenderer;
@@ -27,6 +25,7 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.ISelectionModel;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.UIBase;
+	import org.apache.flex.events.Event;
 	import org.apache.flex.html.staticControls.beads.controllers.VScrollBarMouseController;
 	import org.apache.flex.html.staticControls.beads.layouts.VScrollBarLayout;
 	import org.apache.flex.html.staticControls.beads.models.ScrollBarModel;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/RadioButtonBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/RadioButtonBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/RadioButtonBead.as
index e16c483..c109544 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/RadioButtonBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/RadioButtonBead.as
@@ -21,7 +21,6 @@ package org.apache.flex.html.staticControls.beads
 	import flash.display.Shape;
 	import flash.display.SimpleButton;
 	import flash.display.Sprite;
-	import flash.events.Event;
 	import flash.text.TextField;
 	import flash.text.TextFieldAutoSize;
 	import flash.text.TextFieldType;
@@ -30,6 +29,7 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.IRadioButtonBead;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.IValueToggleButtonModel;
+	import org.apache.flex.events.Event;
 	
 	public class RadioButtonBead implements IBead, IRadioButtonBead
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/SingleLineBorderBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/SingleLineBorderBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/SingleLineBorderBead.as
index 9ae8b8c..6aaaad0 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/SingleLineBorderBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/SingleLineBorderBead.as
@@ -19,12 +19,12 @@
 package org.apache.flex.html.staticControls.beads
 {
 	import flash.display.Graphics;
-	import flash.events.Event;
-	import flash.events.IEventDispatcher;
 	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.UIBase;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
 
 	public class SingleLineBorderBead implements IBead
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/SolidBackgroundBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/SolidBackgroundBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/SolidBackgroundBead.as
index af02100..77c94e3 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/SolidBackgroundBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/SolidBackgroundBead.as
@@ -19,12 +19,12 @@
 package org.apache.flex.html.staticControls.beads
 {
 	import flash.display.Graphics;
-	import flash.events.Event;
-	import flash.events.IEventDispatcher;
 	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.UIBase;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
 
 	public class SolidBackgroundBead implements IBead
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextButtonBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextButtonBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextButtonBead.as
index 234e87f..a0530fd 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextButtonBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextButtonBead.as
@@ -20,12 +20,12 @@ package org.apache.flex.html.staticControls.beads
 {
 	import flash.display.Shape;
 	import flash.display.SimpleButton;
-	import flash.events.Event;
 	import flash.text.TextField;
 	import flash.text.TextFieldType;
 	
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.ITextModel;
+	import org.apache.flex.events.Event;
 
 	public class TextButtonBead implements ITextButtonBead
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextFieldBeadBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextFieldBeadBase.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextFieldBeadBase.as
index 933459e..be9b261 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextFieldBeadBase.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextFieldBeadBase.as
@@ -19,13 +19,13 @@
 package org.apache.flex.html.staticControls.beads
 {
 	import flash.display.DisplayObjectContainer;
-	import flash.events.Event;
 	import flash.text.TextField;
 	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.ITextBead;
 	import org.apache.flex.core.ITextModel;
+	import org.apache.flex.events.Event;
 	
 	public class TextFieldBeadBase implements IBead, ITextBead
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextInputBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextInputBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextInputBead.as
index 7ad7653..296dfdc 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextInputBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextInputBead.as
@@ -18,11 +18,14 @@
 package org.apache.flex.html.staticControls.beads
 {
 	import flash.display.DisplayObject;
-	import flash.events.Event;
-	import flash.events.IEventDispatcher;
 	import flash.text.TextFieldType;
+	// this import is not used, but keeps the compiler from
+	// complaining about explicit usage of flash.events.Event
+	import flash.events.IOErrorEvent;
 	
 	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
 	
 	public class TextInputBead extends TextFieldBeadBase
 	{
@@ -49,7 +52,7 @@ package org.apache.flex.html.staticControls.beads
 			
 			// for input, listen for changes to the _textField and update
 			// the model
-			textField.addEventListener(Event.CHANGE, inputChangeHandler);
+			textField.addEventListener(flash.events.Event.CHANGE, inputChangeHandler);
 			
 			IEventDispatcher(strand).addEventListener("widthChanged", sizeChangedHandler);
 			IEventDispatcher(strand).addEventListener("heightChanged", sizeChangedHandler);

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextInputWithBorderBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextInputWithBorderBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextInputWithBorderBead.as
index cc6127c..39efb87 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextInputWithBorderBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextInputWithBorderBead.as
@@ -19,13 +19,13 @@
 package org.apache.flex.html.staticControls.beads
 {
 	import flash.display.DisplayObject;
-	import flash.events.Event;
-	import flash.events.IEventDispatcher;
 	
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.UIBase;
 	import org.apache.flex.html.staticControls.beads.models.SingleLineBorderModel;
 	import org.apache.flex.html.staticControls.supportClasses.Border;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
 
 	public class TextInputWithBorderBead extends TextInputBead
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.as
index 2c2155c..49ac450 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.as
@@ -19,13 +19,13 @@
 package org.apache.flex.html.staticControls.beads
 {
     import flash.display.DisplayObject;
-    import flash.events.Event;
     
     import org.apache.flex.core.IBead;
     import org.apache.flex.core.IItemRendererClassFactory;
     import org.apache.flex.core.IItemRendererParent;
     import org.apache.flex.core.ISelectionModel;
     import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
 
 	public class TextItemRendererFactoryForArrayData implements IBead
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForStringVectorData.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForStringVectorData.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForStringVectorData.as
index e6271b6..748a6f6 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForStringVectorData.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForStringVectorData.as
@@ -19,13 +19,13 @@
 package org.apache.flex.html.staticControls.beads
 {
     import flash.display.DisplayObject;
-    import flash.events.Event;
     
     import org.apache.flex.core.IBead;
     import org.apache.flex.core.IItemRendererClassFactory;
     import org.apache.flex.core.IItemRendererParent;
     import org.apache.flex.core.ISelectionModel;
     import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
 
 	public class TextItemRendererFactoryForStringVectorData implements IBead
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/VScrollBarThumbBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/VScrollBarThumbBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/VScrollBarThumbBead.as
index f2c3b36..5e07417 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/VScrollBarThumbBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/VScrollBarThumbBead.as
@@ -18,15 +18,14 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls.beads
 {
-    import flash.events.Event;
-    import flash.events.IEventDispatcher;
-    
 	import flash.display.Graphics;
 	import flash.display.Shape;
 	import flash.display.SimpleButton;
     import flash.display.DisplayObject;
 
 	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;	
 	
 	public class VScrollBarThumbBead implements IButtonBead
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/VScrollBarTrackBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/VScrollBarTrackBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/VScrollBarTrackBead.as
index 54843e4..292f9a4 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/VScrollBarTrackBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/VScrollBarTrackBead.as
@@ -21,9 +21,9 @@ package org.apache.flex.html.staticControls.beads
 	import flash.display.Graphics;
 	import flash.display.SimpleButton;
 	import flash.display.Shape;
-	import flash.events.Event;
 	
 	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
 	
 	public class VScrollBarTrackBead implements IButtonBead
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ButtonAutoRepeatController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ButtonAutoRepeatController.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ButtonAutoRepeatController.as
index 69dbba4..f0eaddf 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ButtonAutoRepeatController.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ButtonAutoRepeatController.as
@@ -18,8 +18,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls.beads.controllers
 {
-	import flash.events.Event;
-	import flash.events.IEventDispatcher;
 	import flash.events.MouseEvent;
 	import flash.utils.clearInterval;
 	import flash.utils.clearTimeout;
@@ -28,6 +26,8 @@ package org.apache.flex.html.staticControls.beads.controllers
 	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
 
     public class ButtonAutoRepeatController implements IBead
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/DropDownListController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/DropDownListController.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/DropDownListController.as
index 86dcd77..5b7b3ac 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/DropDownListController.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/DropDownListController.as
@@ -19,14 +19,14 @@
 package org.apache.flex.html.staticControls.beads.controllers
 {
 	import flash.display.DisplayObject;
-	import flash.events.Event;
-	import flash.events.IEventDispatcher;
 	import flash.events.MouseEvent;
 	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.ISelectionModel;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.html.staticControls.beads.IDropDownListBead;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
 
 	public class DropDownListController implements IBead
 	{
@@ -54,7 +54,7 @@ package org.apache.flex.html.staticControls.beads.controllers
 			DisplayObject(viewBead.popUp).height = 200;
 			DisplayObject(viewBead.popUp).x = DisplayObject(_strand).x;
 			DisplayObject(viewBead.popUp).y = DisplayObject(_strand).y;
-            IEventDispatcher(viewBead.popUp).addEventListener(Event.CHANGE, changeHandler);
+            IEventDispatcher(viewBead.popUp).addEventListener("change", changeHandler);
         }
         
         private function changeHandler(event:Event):void

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.as
index 863f25e..a129a31 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.as
@@ -18,14 +18,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls.beads.controllers
 {
-	import flash.display.DisplayObject;
-	import flash.events.Event;
-	import flash.events.IEventDispatcher;
 	import flash.events.MouseEvent;
 	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IItemRenderer;
 	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
 
 	public class ItemRendererMouseController implements IBead
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.as
index 0804a60..1c5e182 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.as
@@ -18,15 +18,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls.beads.controllers
 {
-	import flash.events.Event;
-    import flash.events.IEventDispatcher;
-	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IItemRenderer;
 	import org.apache.flex.core.IItemRendererParent;
 	import org.apache.flex.core.ISelectionModel;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.html.staticControls.beads.IListBead;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	
 
 	public class ListSingleSelectionMouseController implements IBead
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ScrollBarMouseControllerBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ScrollBarMouseControllerBase.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ScrollBarMouseControllerBase.as
index 3a6a021..11d02c7 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ScrollBarMouseControllerBase.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/ScrollBarMouseControllerBase.as
@@ -18,13 +18,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls.beads.controllers
 {
-	import flash.events.Event;
-	import flash.events.IEventDispatcher;
 	import flash.events.MouseEvent;
 	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IScrollBarModel;
 	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
 	import org.apache.flex.html.staticControls.beads.IScrollBarBead;
 
 	public class ScrollBarMouseControllerBase implements IBead

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/VScrollBarMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/VScrollBarMouseController.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/VScrollBarMouseController.as
index cbd0a87..b99889e 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/VScrollBarMouseController.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/controllers/VScrollBarMouseController.as
@@ -19,14 +19,11 @@
 package org.apache.flex.html.staticControls.beads.controllers
 {
 	import flash.display.DisplayObject;
-	import flash.events.Event;
-	import flash.events.IEventDispatcher;
 	import flash.events.MouseEvent;
 	
-	import org.apache.flex.core.IScrollBarModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.html.staticControls.beads.IScrollBarBead;
-
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	
 	public class VScrollBarMouseController extends ScrollBarMouseControllerBase
 	{
 		public function VScrollBarMouseController()

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.as
index de758e7..2d1d21d 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.as
@@ -20,14 +20,14 @@ package org.apache.flex.html.staticControls.beads.layouts
 {
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
-	import flash.events.Event;
-	import flash.events.IEventDispatcher;
 	import flash.geom.Rectangle;
 	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IBorderModel;
 	import org.apache.flex.core.IScrollBarModel;
 	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
 	import org.apache.flex.html.staticControls.beads.IListBead;
 	import org.apache.flex.html.staticControls.supportClasses.Border;
 	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/layouts/VScrollBarLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/layouts/VScrollBarLayout.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/layouts/VScrollBarLayout.as
index 0d6404e..bbed850 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/layouts/VScrollBarLayout.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/layouts/VScrollBarLayout.as
@@ -19,12 +19,12 @@
 package org.apache.flex.html.staticControls.beads.layouts
 {
 	import flash.display.DisplayObject;
-    import flash.events.IEventDispatcher;
-	import flash.events.Event;
 	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IScrollBarModel;
 	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.events.Event;
 	import org.apache.flex.html.staticControls.beads.IScrollBarBead;
 
 	public class VScrollBarLayout implements IBead

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.as
index f52cab1..600f84e 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.as
@@ -18,12 +18,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls.beads.models
 {
-	import flash.events.Event;
-	import flash.events.EventDispatcher;
-	
 	import org.apache.flex.core.ISelectionModel;
 	import org.apache.flex.core.IStrand;
-		
+	import org.apache.flex.events.Event;	
+	import org.apache.flex.events.EventDispatcher;
+			
 	public class ArraySelectionModel extends EventDispatcher implements ISelectionModel
 	{
 		public function ArraySelectionModel()

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ComboBoxModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ComboBoxModel.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ComboBoxModel.as
index d11677f..91d2ce0 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ComboBoxModel.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ComboBoxModel.as
@@ -18,11 +18,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls.beads.models
 {
-	import flash.events.Event;
-	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IComboBoxModel;
-		
+	import org.apache.flex.events.Event;
+			
 	public class ComboBoxModel extends ArraySelectionModel implements IBead, IComboBoxModel
 	{
 		public function ComboBoxModel()

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/RangeModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/RangeModel.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/RangeModel.as
index b1fe07e..2b4283e 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/RangeModel.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/RangeModel.as
@@ -18,13 +18,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls.beads.models
 {
-	import flash.events.Event;
-	import flash.events.EventDispatcher;
-	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.IRangeModel;
-		
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.EventDispatcher;
+			
 	public class RangeModel extends EventDispatcher implements IBead, IRangeModel
 	{
 		public function RangeModel()

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ScrollBarModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ScrollBarModel.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ScrollBarModel.as
index 6b8f40c..ce2e52d 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ScrollBarModel.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ScrollBarModel.as
@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls.beads.models
 {
-	import flash.events.Event;
 	
 	import org.apache.flex.core.IScrollBarModel;
+	import org.apache.flex.events.Event;
 		
 	public class ScrollBarModel extends RangeModel implements IScrollBarModel
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/SingleLineBorderModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/SingleLineBorderModel.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/SingleLineBorderModel.as
index 688de14..39908e8 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/SingleLineBorderModel.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/SingleLineBorderModel.as
@@ -18,13 +18,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls.beads.models
 {
-	import flash.events.Event;
-	import flash.events.EventDispatcher;
 	import flash.geom.Rectangle;
 	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IBorderModel;
 	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.EventDispatcher;
 		
 	public class SingleLineBorderModel extends EventDispatcher implements IBead, IBorderModel
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/StringSelectionModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/StringSelectionModel.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/StringSelectionModel.as
index ef98248..1313855 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/StringSelectionModel.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/StringSelectionModel.as
@@ -18,11 +18,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls.beads.models
 {
-	import flash.events.Event;
-	import flash.events.EventDispatcher;
 	
 	import org.apache.flex.core.ISelectionModel;
 	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.EventDispatcher;
 		
 	public class StringSelectionModel extends EventDispatcher implements ISelectionModel
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/TextModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/TextModel.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/TextModel.as
index 298031c..6a994b2 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/TextModel.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/TextModel.as
@@ -17,13 +17,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls.beads.models
-{
-	import flash.events.Event;
-	import flash.events.EventDispatcher;
-	
+{	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.ITextModel;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.EventDispatcher;
 		
 	public class TextModel extends EventDispatcher implements IBead, ITextModel
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ToggleButtonModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ToggleButtonModel.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ToggleButtonModel.as
index fce5968..c96e101 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ToggleButtonModel.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ToggleButtonModel.as
@@ -18,12 +18,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls.beads.models
 {
-	import flash.events.Event;
-	import flash.events.EventDispatcher;
-	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.IToggleButtonModel;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.EventDispatcher;
 	
 	public class ToggleButtonModel extends EventDispatcher implements IBead, IToggleButtonModel
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ValueToggleButtonModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ValueToggleButtonModel.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ValueToggleButtonModel.as
index 6b4e712..a1cc0fb 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ValueToggleButtonModel.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ValueToggleButtonModel.as
@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.staticControls.beads.models
 {
-	import flash.events.Event;
 	
 	import org.apache.flex.core.IValueToggleButtonModel;
+	import org.apache.flex.events.Event;
 
 	public class ValueToggleButtonModel extends ToggleButtonModel implements IValueToggleButtonModel
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/DropDownListList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/DropDownListList.as b/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/DropDownListList.as
index 2d66c6d..cbf6ad5 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/DropDownListList.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/DropDownListList.as
@@ -22,7 +22,7 @@ package org.apache.flex.html.staticControls.supportClasses
     import org.apache.flex.html.staticControls.List;
     import org.apache.flex.html.staticControls.beads.SolidBackgroundBead;
     
-    [Event("change", flash.events.Event)]
+    [Event("change", org.apache.flex.events.Event)]
     
 	public class DropDownListList extends List implements IPopUp
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as b/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as
index 3a27848..9984868 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as
@@ -19,7 +19,6 @@
 package org.apache.flex.html.staticControls.supportClasses
 {
     import flash.text.TextField;
-    import flash.text.TextFieldAutoSize;
     import flash.text.TextFieldType;
     
     import org.apache.flex.core.IBead;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/net/HTTPService.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/net/HTTPService.as b/frameworks/as/src/org/apache/flex/net/HTTPService.as
index 90a8f14..8ec8d0a 100644
--- a/frameworks/as/src/org/apache/flex/net/HTTPService.as
+++ b/frameworks/as/src/org/apache/flex/net/HTTPService.as
@@ -18,8 +18,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.net
 {
-	import flash.events.Event;
-	import flash.events.EventDispatcher;
 	import flash.events.HTTPStatusEvent;
 	import flash.events.IOErrorEvent;
 	import flash.net.URLLoader;
@@ -29,14 +27,16 @@ package org.apache.flex.net
 	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.EventDispatcher;
 	
-	[Event("complete", flash.events.Event)]
+	[Event("complete", org.apache.flex.events.Event)]
 	
-	[Event("ioError", flash.events.IOErrorEvent)]
+	[Event("ioError", org.apache.flex.events.Event)]
 	
-	[Event("httpStatus", flash.events.Event)]
+	[Event("httpStatus", org.apache.flex.events.Event)]
 	
-	[Event("httpResponseStatus", flash.events.Event)]
+	[Event("httpResponseStatus", org.apache.flex.events.Event)]
     
     [DefaultProperty("beads")]
     
@@ -266,9 +266,10 @@ package org.apache.flex.net
 				else
 					request.data = contentData;
 			}
-			urlLoader.addEventListener(Event.COMPLETE, completeHandler);
+			urlLoader.addEventListener(flash.events.Event.COMPLETE, completeHandler);
 			urlLoader.addEventListener(IOErrorEvent.IO_ERROR, ioErrorHandler);
-			urlLoader.addEventListener(HTTPStatusEvent.HTTP_RESPONSE_STATUS, statusHandler);
+			if (HTTPStatusEvent.HTTP_RESPONSE_STATUS) // only on AIR
+				urlLoader.addEventListener(HTTPStatusEvent.HTTP_RESPONSE_STATUS, statusHandler);
 			urlLoader.addEventListener(HTTPStatusEvent.HTTP_STATUS, statusHandler);
             urlLoader.load(request);
         }
@@ -276,19 +277,21 @@ package org.apache.flex.net
 		protected function statusHandler(event:HTTPStatusEvent):void
 		{
 			_status = event.status;
-			_responseHeaders = event.responseHeaders;
-			_responseURL = event.responseURL;
-			dispatchEvent(event);
+			if ("responseHeaders" in event)
+				_responseHeaders = event.responseHeaders;
+			if ("responseURL" in event)
+				_responseURL = event.responseURL;
+			dispatchEvent(new Event(event.type));
 		}
 		
-		protected function ioErrorHandler(event:Event):void
+		protected function ioErrorHandler(event:IOErrorEvent):void
 		{
-			dispatchEvent(event);
+			dispatchEvent(new Event(event.type));
 		}
 		
-        protected function completeHandler(event:Event):void
+        protected function completeHandler(event:flash.events.Event):void
         {
-            dispatchEvent(event);
+            dispatchEvent(new Event(event.type));
         }
         
         public function get data():*

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/net/dataConverters/LazyCollection.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/net/dataConverters/LazyCollection.as b/frameworks/as/src/org/apache/flex/net/dataConverters/LazyCollection.as
index ebebf9c..7b1be41 100644
--- a/frameworks/as/src/org/apache/flex/net/dataConverters/LazyCollection.as
+++ b/frameworks/as/src/org/apache/flex/net/dataConverters/LazyCollection.as
@@ -19,12 +19,12 @@
 package org.apache.flex.net.dataConverters
 {
 	import flash.events.Event;
-	import flash.events.EventDispatcher;
 	import flash.events.IEventDispatcher;
 	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.data.ICollection;
+	import org.apache.flex.events.EventDispatcher;
     import org.apache.flex.net.IInputParser;
     import org.apache.flex.net.IItemConverter;
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb614905/frameworks/as/src/org/apache/flex/utils/MXMLDataInterpreter.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/utils/MXMLDataInterpreter.as b/frameworks/as/src/org/apache/flex/utils/MXMLDataInterpreter.as
index d7e5dd9..170f302 100644
--- a/frameworks/as/src/org/apache/flex/utils/MXMLDataInterpreter.as
+++ b/frameworks/as/src/org/apache/flex/utils/MXMLDataInterpreter.as
@@ -21,7 +21,6 @@ package org.apache.flex.utils
 import flash.display.DisplayObject;
 import flash.display.DisplayObjectContainer;
 
-import org.apache.flex.binding.SimpleBinding;
 import org.apache.flex.core.IStrand;
 import org.apache.flex.core.IBead;
 import org.apache.flex.core.IDocument;