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 2014/03/25 22:03:33 UTC

[01/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Repository: flex-asjs
Updated Branches:
  refs/heads/develop a0bd0cd54 -> 5e7bde8f0


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/UIItemRendererBase.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/UIItemRendererBase.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/UIItemRendererBase.js
deleted file mode 100644
index 8651da0..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/UIItemRendererBase.js
+++ /dev/null
@@ -1,208 +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('org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase');
-
-goog.require('org.apache.flex.core.IItemRenderer');
-goog.require('org.apache.flex.core.IItemRendererFactory');
-goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.events.Event');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- * @implements {org.apache.flex.core.IItemRenderer}
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase =
-function() {
-  goog.base(this);
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'UIItemRendererBase',
-                qName: 'org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase' }],
-      interfaces: ['org.apache.flex.core.IItemRenderer, org.apache.flex.core.IItemRendererFactory']};
-
-
-/**
- * @expose
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.addedToParent =
-function() {
-  goog.base(this, 'addedToParent');
-};
-
-
-/**
- * @expose
- * @return {Object} The data being used for the itemRenderer.
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_data =
-function() {
-  return this.data_;
-};
-
-
-/**
- * @expose
- * @param {Object} value The data to use for the itemRenderer.
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_data =
-function(value) {
-  this.data_ = value;
-};
-
-
-/**
- * @expose
- * @return {String} The name of the field being used to display the label.
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_labelField =
-function() {
-  return this.labelField_;
-};
-
-
-/**
- * @expose
- * @param {String} value The name of the field to use for the label.
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_labelField =
-function(value) {
-  this.labelField_ = value;
-};
-
-
-/**
- * @expose
- * @return {Number} The index value set for this itemRenderer.
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_index =
-function() {
-  return this.index_;
-};
-
-
-/**
- * @expose
- * @param {Number} value The row index for this itemRenderer.
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_index =
-function(value) {
-  this.index_ = value;
-};
-
-
-/**
- * @expose
- * @return {Boolean} The current value of the hovered state.
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_hovered =
-function() {
-  return this.hovered_;
-};
-
-
-/**
- * @expose
- * @param {Boolean} value Set to true if the itemRenderer should go into hovered state.
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_hovered =
-function(value) {
-  this.hovered_ = value;
-};
-
-
-/**
- * @expose
- * @return {Boolean} Whether or not the itemRenderer is selected.
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_selected =
-function() {
-  return this.selected_;
-};
-
-
-/**
- * @expose
- * @param {Boolean} value True if this itemRenderer instance is selected.
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_selected =
-function(value) {
-  this.selected_ = value;
-};
-
-
-/**
- * @expose
- * @return {Boolean} The value of the down selection.
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_down =
-function() {
-  return this.down_;
-};
-
-
-/**
- * @expose
- * @param {Boolean} value True if the mouse is in the down position.
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_down =
-function(value) {
-  this.down_ = value;
-};
-
-
-/**
- * @expose
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.updateRenderer =
-function() {
-  if (this.get_down()) {
-  }
-  else if (this.get_hovered()) {
-  }
-  else if (this.get_selected()) {
-  }
-};
-
-
-/**
- * @expose
- * @param {Event} value The event that triggered the size change.
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.sizeChangeHandler =
-function(value) {
-  //this.adjustSize();
-};
-
-
-/**
- * @expose
- */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.adjustSize =
-function() {
-  // handle in sub-class
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.js
new file mode 100644
index 0000000..ff85b7a
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.js
@@ -0,0 +1,112 @@
+/**
+ * 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.html.staticControls.supportClasses.ButtonBarButtonItemRenderer');
+
+goog.require('org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController');
+goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.html.staticControls.supportClasses.DataItemRenderer}
+ */
+org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer =
+    function() {
+  goog.base(this);
+};
+goog.inherits(
+    org.apache.flex.html.staticControls.
+        supportClasses.ButtonBarButtonItemRenderer,
+    org.apache.flex.html.staticControls.supportClasses.DataItemRenderer);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'ButtonBarButtonItemRenderer',
+                qName: 'org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer' }] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
+    prototype.createElement = function() {
+
+  this.element = document.createElement('div');
+  this.positioner = this.element;
+
+  this.button = document.createElement('button');
+  this.element.appendChild(this.button);
+
+  this.element.flexjs_wrapper = this;
+  this.set_className('ButtonBarButtonItemRenderer');
+
+  // itemRenderers should provide something for the background to handle
+  // the selection and highlight
+  this.backgroundView = this.element;
+
+  this.controller = new org.apache.flex.html.staticControls.beads.controllers.
+      ItemRendererMouseController();
+  this.controller.set_strand(this);
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The strand.
+ */
+org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
+    prototype.set_strand = function(value) {
+
+  this.strand_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {Object} The strand.
+ */
+org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
+    prototype.get_strand = function() {
+  return this.strand_;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The text to display.
+ */
+org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
+    prototype.set_data = function(value) {
+
+  goog.base(this, 'set_data', value);
+
+  if (value.hasOwnProperty('label')) {
+    this.button.innerHTML = value.label;
+  }
+  else if (value.hasOwnProperty('title')) {
+    this.button.innerHTML = value.title;
+  }
+  else {
+    this.button.innerHHTML = String(value);
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataGridColumn.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataGridColumn.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataGridColumn.js
new file mode 100644
index 0000000..8b59a9b
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataGridColumn.js
@@ -0,0 +1,107 @@
+/**
+ * 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.html.staticControls.supportClasses.DataGridColumn');
+
+goog.require('mx.core.IFactory');
+
+
+
+/**
+ * @constructor
+ */
+org.apache.flex.html.staticControls.supportClasses.DataGridColumn =
+    function() {
+};
+
+
+/**
+ * @expose
+ * @return {mx.core.IFactory} The object factory for the itemRenderer.
+ */
+org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_itemRenderer =
+function() {
+  return this.itemRenderer_;
+};
+
+
+/**
+ * @expose
+ * @param {mx.core.IFactory} value The object factory for the itemRenderer.
+ */
+org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_itemRenderer =
+function(value) {
+  this.itemRenderer_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {Number} The width of the column.
+ */
+org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_columnWidth =
+function() {
+  return this.columnWidth_;
+};
+
+
+/**
+ * @expose
+ * @param {Number} value The width of the column.
+ */
+org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_columnWidth =
+function(value) {
+  this.columnWidth_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {String} The label for the column.
+ */
+org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_label =
+function() {
+  return this.label_;
+};
+
+
+/**
+ * @expose
+ * @param {String} value The label for the column.
+ */
+org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_label =
+function(value) {
+  this.label_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {String} The field for the data for the column.
+ */
+org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_dataField =
+function() {
+  return this.dataField_;
+};
+
+
+/**
+ * @expose
+ * @param {String} value The field for the data for the column.
+ */
+org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_dataField =
+function(value) {
+  this.dataField_ = value;
+};
+

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataItemRenderer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataItemRenderer.js
new file mode 100644
index 0000000..48d8c4f
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataItemRenderer.js
@@ -0,0 +1,158 @@
+/**
+ * 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.html.staticControls.supportClasses.DataItemRenderer');
+
+goog.require('org.apache.flex.core.IItemRenderer');
+goog.require('org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController');
+goog.require('org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase}
+ * @implements {org.apache.flex.core.IItemRenderer}
+ */
+org.apache.flex.html.staticControls.supportClasses.DataItemRenderer =
+    function() {
+  goog.base(this);
+};
+goog.inherits(
+    org.apache.flex.html.staticControls.supportClasses.DataItemRenderer,
+    org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+    prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'DataItemRenderer',
+                qName: 'org.apache.flex.html.staticControls.supportClasses.DataItemRenderer' }],
+      interfaces: [org.apache.flex.core.IItemRenderer] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+    prototype.createElement = function() {
+
+  this.element = document.createElement('div');
+  this.positioner = this.element;
+
+  this.element.flexjs_wrapper = this;
+  this.set_className('DataItemRenderer');
+
+  // itemRenderers should provide something for the background to handle
+  // the selection and highlight
+  this.backgroundView = this.element;
+
+  this.controller = new org.apache.flex.html.staticControls.beads.controllers.
+      ItemRendererMouseController();
+  this.controller.set_strand(this);
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {Object} The item renderer's parent.
+ */
+org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+    prototype.get_itemRendererParent = function() {
+  return this.rendererParent_;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The item renderer's parent.
+ */
+org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+    prototype.set_itemRendererParent = function(value) {
+  this.rendererParent_ = value;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The renderer's index.
+ */
+org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+    prototype.set_index = function(value) {
+  this.index_ = value;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The name of field to use.
+ */
+org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+    prototype.set_dataField = function(value) {
+
+  this.dataField_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {string} The name of the field to use.
+ */
+org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+    prototype.get_dataField = function() {
+
+  return this.dataField_;
+};
+
+
+/**
+ * @override
+ * @param {Boolean} value The selection state.
+ */
+org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+    prototype.set_selected = function(value) {
+  this.selected_ = value;
+
+  if (value) {
+    this.backgroundView.style.backgroundColor = '#9C9C9C';
+  } else {
+    this.backgroundView.style.backgroundColor = null;
+  }
+};
+
+
+/**
+ * @override
+ * @param {Boolean} value The hovered state.
+ */
+org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+    prototype.set_hovered = function(value) {
+  this.hovered_ = value;
+
+  if (value) {
+    this.backgroundView.style.backgroundColor = '#ECECEC';
+  } else {
+    if (this.selected_) {
+      this.backgroundView.style.backgroundColor = '#9C9C9C';
+    } else {
+      this.backgroundView.style.backgroundColor = null;
+    }
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js
new file mode 100644
index 0000000..83fb799
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js
@@ -0,0 +1,108 @@
+/**
+ * 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.html.staticControls.supportClasses.NonVirtualDataGroup');
+
+goog.require('org.apache.flex.core.UIBase');
+goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
+goog.require('org.apache.flex.utils.Language');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup =
+    function() {
+  this.renderers = [];
+  goog.base(this);
+};
+goog.inherits(
+    org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'NonVirtualDataGroup',
+                qName: 'org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup' }] };
+
+
+/**
+ * @expose
+ * @param {Object} value The strand.
+ */
+org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
+    prototype.set_strand = function(value) {
+  this.strand_ = value;
+};
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
+    prototype.createElement = function() {
+  this.element = document.createElement('div');
+  this.element.style.overflow = 'auto';
+  this.element.style.display = 'inline-block';
+  this.element.style.position = 'inherit';
+  this.element.flexjs_wrapper = this;
+  this.set_className('NonVirtualDataGroup');
+
+  this.positioner = this.element;
+
+  return this.element;
+};
+
+
+/**
+ * @override
+ * @param {Object} value The child element being added.
+ */
+org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
+    prototype.addElement = function(value) {
+  goog.base(this, 'addElement', value);
+
+  var itemRenderer = org.apache.flex.utils.Language.as(value,
+                           org.apache.flex.html.staticControls.supportClasses.DataItemRenderer);
+  itemRenderer.set_index(this.renderers.length);
+  itemRenderer.set_itemRendererParent(this);
+  this.renderers.push(value);
+};
+
+
+/**
+ * @expose
+ */
+org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
+    prototype.removeAllElements = function() {
+    // to do
+};
+
+
+/**
+ * @expose
+ * @param {Object} index The index for the itemRenderer.
+ * @return {Object} The itemRenderer that matches the index.
+ */
+org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
+    prototype.getItemRendererForIndex = function(index) {
+  return this.renderers[index];
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js
new file mode 100644
index 0000000..c19729e
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js
@@ -0,0 +1,178 @@
+/**
+ * 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.html.staticControls.supportClasses.StringItemRenderer');
+
+goog.require('org.apache.flex.core.IItemRenderer');
+goog.require('org.apache.flex.core.UIBase');
+goog.require('org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController');
+goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.html.staticControls.supportClasses.DataItemRenderer}
+ * @implements {org.apache.flex.core.IItemRenderer}
+ */
+org.apache.flex.html.staticControls.supportClasses.StringItemRenderer =
+    function() {
+  goog.base(this);
+};
+goog.inherits(
+    org.apache.flex.html.staticControls.supportClasses.StringItemRenderer,
+    org.apache.flex.html.staticControls.supportClasses.DataItemRenderer);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+    prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'StringItemRenderer',
+                qName: 'org.apache.flex.html.staticControls.supportClasses.StringItemRenderer' }],
+      interfaces: [org.apache.flex.core.IItemRenderer] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+    prototype.createElement = function() {
+
+  this.element = document.createElement('div');
+  this.positioner = this.element;
+
+  this.element.flexjs_wrapper = this;
+  this.set_className('StringItemRenderer');
+
+  // itemRenderers should provide something for the background to handle
+  // the selection and highlight
+  this.backgroundView = this.element;
+
+  this.controller = new org.apache.flex.html.staticControls.beads.controllers.
+      ItemRendererMouseController();
+  this.controller.set_strand(this);
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The strand.
+ */
+org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+    prototype.set_strand = function(value) {
+
+  this.strand_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {Object} The strand.
+ */
+org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+    prototype.get_strand = function() {
+  return this.strand_;
+};
+
+
+/**
+ * @expose
+ * @return {Object} The item renderer's parent.
+ */
+org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+    prototype.get_itemRendererParent = function() {
+  return this.rendererParent_;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The item renderer's parent.
+ */
+org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+    prototype.set_itemRendererParent = function(value) {
+  this.rendererParent_ = value;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The renderer's index.
+ */
+org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+    prototype.set_index = function(value) {
+  this.index_ = value;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The text to display.
+ */
+org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+    prototype.set_text = function(value) {
+
+  this.element.innerHTML = value;
+};
+
+
+/**
+ * @expose
+ * @return {Object} The text being displayed.
+ */
+org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+    prototype.get_text = function() {
+
+  return this.element.innerHTML;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The text to display.
+ */
+org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+    prototype.set_data = function(value) {
+
+  goog.base(this, 'set_data', value);
+
+  if (this.get_labelField()) {
+    this.element.innerHTML = String(value[this.get_labelField()]);
+  }
+  else if (this.get_dataField()) {
+    this.element.innerHTML = String(value[this.get_dataField()]);
+  }
+  else if (value.toString) {
+    this.element.innerHTML = value.toString();
+  } else {
+    this.element.innerHTML = String(value);
+  }
+};
+
+
+/**
+ * @expose
+ * @return {Object} The text being displayed.
+ */
+org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+    prototype.get_data = function() {
+
+  return this.element.innerHTML;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/UIItemRendererBase.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/UIItemRendererBase.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/UIItemRendererBase.js
new file mode 100644
index 0000000..8651da0
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/UIItemRendererBase.js
@@ -0,0 +1,208 @@
+/**
+ * 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.html.staticControls.supportClasses.UIItemRendererBase');
+
+goog.require('org.apache.flex.core.IItemRenderer');
+goog.require('org.apache.flex.core.IItemRendererFactory');
+goog.require('org.apache.flex.core.UIBase');
+goog.require('org.apache.flex.events.Event');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ * @implements {org.apache.flex.core.IItemRenderer}
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase =
+function() {
+  goog.base(this);
+};
+goog.inherits(
+    org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'UIItemRendererBase',
+                qName: 'org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase' }],
+      interfaces: ['org.apache.flex.core.IItemRenderer, org.apache.flex.core.IItemRendererFactory']};
+
+
+/**
+ * @expose
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.addedToParent =
+function() {
+  goog.base(this, 'addedToParent');
+};
+
+
+/**
+ * @expose
+ * @return {Object} The data being used for the itemRenderer.
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_data =
+function() {
+  return this.data_;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The data to use for the itemRenderer.
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_data =
+function(value) {
+  this.data_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {String} The name of the field being used to display the label.
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_labelField =
+function() {
+  return this.labelField_;
+};
+
+
+/**
+ * @expose
+ * @param {String} value The name of the field to use for the label.
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_labelField =
+function(value) {
+  this.labelField_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {Number} The index value set for this itemRenderer.
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_index =
+function() {
+  return this.index_;
+};
+
+
+/**
+ * @expose
+ * @param {Number} value The row index for this itemRenderer.
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_index =
+function(value) {
+  this.index_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {Boolean} The current value of the hovered state.
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_hovered =
+function() {
+  return this.hovered_;
+};
+
+
+/**
+ * @expose
+ * @param {Boolean} value Set to true if the itemRenderer should go into hovered state.
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_hovered =
+function(value) {
+  this.hovered_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {Boolean} Whether or not the itemRenderer is selected.
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_selected =
+function() {
+  return this.selected_;
+};
+
+
+/**
+ * @expose
+ * @param {Boolean} value True if this itemRenderer instance is selected.
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_selected =
+function(value) {
+  this.selected_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {Boolean} The value of the down selection.
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_down =
+function() {
+  return this.down_;
+};
+
+
+/**
+ * @expose
+ * @param {Boolean} value True if the mouse is in the down position.
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_down =
+function(value) {
+  this.down_ = value;
+};
+
+
+/**
+ * @expose
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.updateRenderer =
+function() {
+  if (this.get_down()) {
+  }
+  else if (this.get_hovered()) {
+  }
+  else if (this.get_selected()) {
+  }
+};
+
+
+/**
+ * @expose
+ * @param {Event} value The event that triggered the size change.
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.sizeChangeHandler =
+function(value) {
+  //this.adjustSize();
+};
+
+
+/**
+ * @expose
+ */
+org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.adjustSize =
+function() {
+  // handle in sub-class
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/CheckBox.js
new file mode 100644
index 0000000..4bb0af5
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/CheckBox.js
@@ -0,0 +1,88 @@
+/**
+ * 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.html5.staticControls.CheckBox');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html5.staticControls.CheckBox = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html5.staticControls.CheckBox,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * @override
+ */
+org.apache.flex.html5.staticControls.CheckBox.prototype.createElement =
+    function() {
+  var cb;
+
+  this.element = document.createElement('label');
+
+  cb = document.createElement('input');
+  cb.type = 'checkbox';
+  this.element.appendChild(cb);
+  this.element.appendChild(document.createTextNode('check box'));
+
+  this.positioner = this.element;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html5.staticControls.CheckBox.prototype.get_text = function() {
+  return this.element.childNodes.item(1).nodeValue;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html5.staticControls.CheckBox.prototype.set_text =
+    function(value) {
+  this.element.childNodes.item(1).nodeValue = value;
+};
+
+
+/**
+ * @expose
+ * @return {boolean} The selected getter.
+ */
+org.apache.flex.html5.staticControls.CheckBox.prototype.get_selected =
+    function() {
+  return this.element.childNodes.item(0).checked;
+};
+
+
+/**
+ * @expose
+ * @param {boolean} value The selected setter.
+ */
+org.apache.flex.html5.staticControls.CheckBox.prototype.set_selected =
+    function(value) {
+  this.element.childNodes.item(0).checked = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js
new file mode 100644
index 0000000..b6925e6
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js
@@ -0,0 +1,196 @@
+/**
+ * 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.html5.staticControls.ComboBox');
+
+goog.require('org.apache.flex.core.ListBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.ListBase}
+ */
+org.apache.flex.html5.staticControls.ComboBox = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html5.staticControls.ComboBox,
+    org.apache.flex.core.ListBase);
+
+
+/**
+ * @override
+ */
+org.apache.flex.html5.staticControls.ComboBox.prototype.createElement =
+    function() {
+  var button, input;
+
+  this.element = document.createElement('div');
+
+  input = document.createElement('input');
+  input.style.position = 'absolute';
+  input.style.width = '80px';
+  this.element.appendChild(input);
+
+  button = document.createElement('div');
+  button.style.position = 'absolute';
+  button.style.top = '0px';
+  button.style.right = '0px';
+  button.style.background = '#bbb';
+  button.style.width = '16px';
+  button.style.height = '20px';
+  button.style.margin = '0';
+  button.style.border = 'solid #609 1px';
+  button.onclick = /** @type {function (Event)} */ (goog.bind(this.buttonClicked, this));
+  this.element.appendChild(button);
+
+  this.element.style.position = 'relative';
+
+  this.positioner = this.element;
+
+  // add a click handler so that a click outside of the combo box can
+  // dismiss the pop-up should it be visible.
+  goog.events.listen(document, 'click',
+      goog.bind(this.dismissPopup, this));
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @param {Event} event The event.
+ */
+org.apache.flex.html5.staticControls.ComboBox.prototype.selectChanged =
+    function(event) {
+  var select;
+
+  select = event.currentTarget;
+  this.set_selectedItem(select.value);
+
+  this.popup.parentNode.removeChild(this.popup);
+  this.popup = null;
+
+  this.dispatchEvent('change');
+};
+
+
+/**
+ * @expose
+ * @param {Event} event The event.
+ */
+org.apache.flex.html5.staticControls.ComboBox.prototype.dismissPopup =
+    function(event) {
+  if (this.popup) {
+    this.popup.parentNode.removeChild(this.popup);
+    this.popup = null;
+  }
+};
+
+
+/**
+ * @expose
+ * @param {Event} event The event.
+ */
+org.apache.flex.html5.staticControls.ComboBox.prototype.buttonClicked =
+    function(event) {
+  /**
+   * @type {Array.<string>}
+   */
+  var dp;
+  var i, input, left, n, opt, opts, pn, popup, select, si, top, width;
+
+  event.stopPropagation();
+
+  if (this.popup) {
+    this.popup.parentNode.removeChild(this.popup);
+    this.popup = null;
+    return;
+  }
+
+  input = this.element.childNodes.item(0);
+
+  pn = this.element;
+  top = pn.offsetTop + input.offsetHeight;
+  left = pn.offsetLeft;
+  width = pn.offsetWidth;
+
+  popup = document.createElement('div');
+  popup.className = 'popup';
+  popup.id = 'test';
+  popup.style.position = 'absolute';
+  popup.style.top = top.toString() + 'px';
+  popup.style.left = left.toString() + 'px';
+  popup.style.width = width.toString() + 'px';
+  popup.style.margin = '0px auto';
+  popup.style.padding = '0px';
+  popup.style.zIndex = '10000';
+
+  select = document.createElement('select');
+  select.style.width = width.toString() + 'px';
+  select.onchange = /** @type {function(Event)} */ (goog.bind(this.selectChanged, this));
+  opts = select.options;
+
+  dp = /** @type {Array.<string>} */ (this.get_dataProvider());
+  n = dp.length;
+  for (i = 0; i < n; i++) {
+    opt = document.createElement('option');
+    opt.text = dp[i];
+    opts.add(opt);
+  }
+
+  select.size = n;
+
+  si = this.get_selectedIndex();
+  if (si < 0) {
+    select.value = null;
+  } else {
+    select.value = dp[si];
+  }
+
+  this.popup = popup;
+
+  popup.appendChild(select);
+  document.body.appendChild(popup);
+};
+
+
+/**
+ * @override
+ * @expose
+ * @param {Array.<Object>} value The collection of data.
+ */
+org.apache.flex.html5.staticControls.ComboBox.prototype.set_dataProvider =
+    function(value) {
+  this.dataProvider = value;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html5.staticControls.ComboBox.prototype.get_text = function() {
+  return this.element.childNodes.item(0).value;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html5.staticControls.ComboBox.prototype.set_text =
+    function(value) {
+  this.element.childNodes.item(0).value = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/DropDownList.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/DropDownList.js
new file mode 100644
index 0000000..406c262
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/DropDownList.js
@@ -0,0 +1,29 @@
+/**
+ * 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.html5.staticControls.DropDownList');
+
+goog.require('org.apache.flex.core.ListBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.ListBase}
+ */
+org.apache.flex.html5.staticControls.DropDownList = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html5.staticControls.DropDownList,
+    org.apache.flex.core.ListBase);

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/Label.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/Label.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/Label.js
new file mode 100644
index 0000000..0265ce7
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/Label.js
@@ -0,0 +1,61 @@
+/**
+ * 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.html5.staticControls.Label');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html5.staticControls.Label = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html5.staticControls.Label,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * @override
+ */
+org.apache.flex.html5.staticControls.Label.prototype.createElement =
+    function() {
+  goog.base(this, 'createElement');
+
+  this.positioner = this.element;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html5.staticControls.Label.prototype.get_text = function() {
+  return this.element.innerHTML;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html5.staticControls.Label.prototype.set_text =
+    function(value) {
+  this.element.innerHTML = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/List.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/List.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/List.js
new file mode 100644
index 0000000..754a77f
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/List.js
@@ -0,0 +1,42 @@
+/**
+ * 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.html5.staticControls.List');
+
+goog.require('org.apache.flex.core.ListBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.ListBase}
+ */
+org.apache.flex.html5.staticControls.List = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html5.staticControls.List,
+    org.apache.flex.core.ListBase);
+
+
+/**
+ * @override
+ */
+org.apache.flex.html5.staticControls.List.prototype.createElement =
+    function() {
+  goog.base(this, 'createElement');
+
+  this.element.size = 5;
+
+  return this.element;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/RadioButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/RadioButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/RadioButton.js
new file mode 100644
index 0000000..4e5bc1f
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/RadioButton.js
@@ -0,0 +1,109 @@
+/**
+ * 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.html5.staticControls.RadioButton');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html5.staticControls.RadioButton = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html5.staticControls.RadioButton,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * @override
+ */
+org.apache.flex.html5.staticControls.RadioButton.prototype.createElement =
+    function() {
+  var rb;
+
+  this.element = document.createElement('label');
+
+  rb = document.createElement('input');
+  rb.type = 'radio';
+  this.element.appendChild(rb);
+  this.element.appendChild(document.createTextNode('radio button'));
+
+  this.positioner = this.element;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {string} The groupName getter.
+ */
+org.apache.flex.html5.staticControls.RadioButton.prototype.get_groupName =
+    function() {
+  return this.element.childNodes.item(0).name;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The groupName setter.
+ */
+org.apache.flex.html5.staticControls.RadioButton.prototype.set_groupName =
+    function(value) {
+  this.element.childNodes.item(0).name = value;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html5.staticControls.RadioButton.prototype.get_text =
+    function() {
+  return this.element.childNodes.item(1).nodeValue;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html5.staticControls.RadioButton.prototype.set_text =
+    function(value) {
+  this.element.childNodes.item(1).nodeValue = value;
+};
+
+
+/**
+ * @expose
+ * @return {boolean} The selected getter.
+ */
+org.apache.flex.html5.staticControls.RadioButton.prototype.get_selected =
+    function() {
+  return this.element.childNodes.item(0).checked;
+};
+
+
+/**
+ * @expose
+ * @param {boolean} value The selected setter.
+ */
+org.apache.flex.html5.staticControls.RadioButton.prototype.set_selected =
+    function(value) {
+  this.element.childNodes.item(0).checked = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/TextArea.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/TextArea.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/TextArea.js
new file mode 100644
index 0000000..e65d895
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/TextArea.js
@@ -0,0 +1,61 @@
+/**
+ * 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.html5.staticControls.TextArea');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html5.staticControls.TextArea = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html5.staticControls.TextArea,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * @override
+ */
+org.apache.flex.html5.staticControls.TextArea.prototype.createElement =
+    function() {
+  this.element = document.createElement('textarea');
+
+  this.positioner = this.element;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html5.staticControls.TextArea.prototype.get_text = function() {
+  return this.element.value;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html5.staticControls.TextArea.prototype.set_text =
+    function(value) {
+  this.element.value = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/TextButton.js
new file mode 100644
index 0000000..a244aa5
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/TextButton.js
@@ -0,0 +1,63 @@
+/**
+ * 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.html5.staticControls.TextButton');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html5.staticControls.TextButton = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html5.staticControls.TextButton,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * @override
+ */
+org.apache.flex.html5.staticControls.TextButton.prototype.createElement =
+    function() {
+  this.element = document.createElement('button');
+  this.element.setAttribute('type', 'button');
+
+  this.positioner = this.element;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html5.staticControls.TextButton.prototype.get_text =
+    function() {
+  return this.element.innerHTML;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html5.staticControls.TextButton.prototype.set_text =
+    function(value) {
+  this.element.innerHTML = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/TextInput.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/TextInput.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/TextInput.js
new file mode 100644
index 0000000..9dc0d83
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/TextInput.js
@@ -0,0 +1,62 @@
+/**
+ * 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.html5.staticControls.TextInput');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html5.staticControls.TextInput = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html5.staticControls.TextInput,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * @override
+ */
+org.apache.flex.html5.staticControls.TextInput.prototype.createElement =
+    function() {
+  this.element = document.createElement('input');
+  this.element.setAttribute('type', 'input');
+
+  this.positioner = this.element;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html5.staticControls.TextInput.prototype.get_text = function() {
+  return this.element.value;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html5.staticControls.TextInput.prototype.set_text =
+    function(value) {
+  this.element.value = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/CheckBox.js
deleted file mode 100644
index 4bb0af5..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/CheckBox.js
+++ /dev/null
@@ -1,88 +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('org.apache.flex.html5.staticControls.CheckBox');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html5.staticControls.CheckBox = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html5.staticControls.CheckBox,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * @override
- */
-org.apache.flex.html5.staticControls.CheckBox.prototype.createElement =
-    function() {
-  var cb;
-
-  this.element = document.createElement('label');
-
-  cb = document.createElement('input');
-  cb.type = 'checkbox';
-  this.element.appendChild(cb);
-  this.element.appendChild(document.createTextNode('check box'));
-
-  this.positioner = this.element;
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.html5.staticControls.CheckBox.prototype.get_text = function() {
-  return this.element.childNodes.item(1).nodeValue;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.html5.staticControls.CheckBox.prototype.set_text =
-    function(value) {
-  this.element.childNodes.item(1).nodeValue = value;
-};
-
-
-/**
- * @expose
- * @return {boolean} The selected getter.
- */
-org.apache.flex.html5.staticControls.CheckBox.prototype.get_selected =
-    function() {
-  return this.element.childNodes.item(0).checked;
-};
-
-
-/**
- * @expose
- * @param {boolean} value The selected setter.
- */
-org.apache.flex.html5.staticControls.CheckBox.prototype.set_selected =
-    function(value) {
-  this.element.childNodes.item(0).checked = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/ComboBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/ComboBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/ComboBox.js
deleted file mode 100644
index b6925e6..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/ComboBox.js
+++ /dev/null
@@ -1,196 +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('org.apache.flex.html5.staticControls.ComboBox');
-
-goog.require('org.apache.flex.core.ListBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.ListBase}
- */
-org.apache.flex.html5.staticControls.ComboBox = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html5.staticControls.ComboBox,
-    org.apache.flex.core.ListBase);
-
-
-/**
- * @override
- */
-org.apache.flex.html5.staticControls.ComboBox.prototype.createElement =
-    function() {
-  var button, input;
-
-  this.element = document.createElement('div');
-
-  input = document.createElement('input');
-  input.style.position = 'absolute';
-  input.style.width = '80px';
-  this.element.appendChild(input);
-
-  button = document.createElement('div');
-  button.style.position = 'absolute';
-  button.style.top = '0px';
-  button.style.right = '0px';
-  button.style.background = '#bbb';
-  button.style.width = '16px';
-  button.style.height = '20px';
-  button.style.margin = '0';
-  button.style.border = 'solid #609 1px';
-  button.onclick = /** @type {function (Event)} */ (goog.bind(this.buttonClicked, this));
-  this.element.appendChild(button);
-
-  this.element.style.position = 'relative';
-
-  this.positioner = this.element;
-
-  // add a click handler so that a click outside of the combo box can
-  // dismiss the pop-up should it be visible.
-  goog.events.listen(document, 'click',
-      goog.bind(this.dismissPopup, this));
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @param {Event} event The event.
- */
-org.apache.flex.html5.staticControls.ComboBox.prototype.selectChanged =
-    function(event) {
-  var select;
-
-  select = event.currentTarget;
-  this.set_selectedItem(select.value);
-
-  this.popup.parentNode.removeChild(this.popup);
-  this.popup = null;
-
-  this.dispatchEvent('change');
-};
-
-
-/**
- * @expose
- * @param {Event} event The event.
- */
-org.apache.flex.html5.staticControls.ComboBox.prototype.dismissPopup =
-    function(event) {
-  if (this.popup) {
-    this.popup.parentNode.removeChild(this.popup);
-    this.popup = null;
-  }
-};
-
-
-/**
- * @expose
- * @param {Event} event The event.
- */
-org.apache.flex.html5.staticControls.ComboBox.prototype.buttonClicked =
-    function(event) {
-  /**
-   * @type {Array.<string>}
-   */
-  var dp;
-  var i, input, left, n, opt, opts, pn, popup, select, si, top, width;
-
-  event.stopPropagation();
-
-  if (this.popup) {
-    this.popup.parentNode.removeChild(this.popup);
-    this.popup = null;
-    return;
-  }
-
-  input = this.element.childNodes.item(0);
-
-  pn = this.element;
-  top = pn.offsetTop + input.offsetHeight;
-  left = pn.offsetLeft;
-  width = pn.offsetWidth;
-
-  popup = document.createElement('div');
-  popup.className = 'popup';
-  popup.id = 'test';
-  popup.style.position = 'absolute';
-  popup.style.top = top.toString() + 'px';
-  popup.style.left = left.toString() + 'px';
-  popup.style.width = width.toString() + 'px';
-  popup.style.margin = '0px auto';
-  popup.style.padding = '0px';
-  popup.style.zIndex = '10000';
-
-  select = document.createElement('select');
-  select.style.width = width.toString() + 'px';
-  select.onchange = /** @type {function(Event)} */ (goog.bind(this.selectChanged, this));
-  opts = select.options;
-
-  dp = /** @type {Array.<string>} */ (this.get_dataProvider());
-  n = dp.length;
-  for (i = 0; i < n; i++) {
-    opt = document.createElement('option');
-    opt.text = dp[i];
-    opts.add(opt);
-  }
-
-  select.size = n;
-
-  si = this.get_selectedIndex();
-  if (si < 0) {
-    select.value = null;
-  } else {
-    select.value = dp[si];
-  }
-
-  this.popup = popup;
-
-  popup.appendChild(select);
-  document.body.appendChild(popup);
-};
-
-
-/**
- * @override
- * @expose
- * @param {Array.<Object>} value The collection of data.
- */
-org.apache.flex.html5.staticControls.ComboBox.prototype.set_dataProvider =
-    function(value) {
-  this.dataProvider = value;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.html5.staticControls.ComboBox.prototype.get_text = function() {
-  return this.element.childNodes.item(0).value;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.html5.staticControls.ComboBox.prototype.set_text =
-    function(value) {
-  this.element.childNodes.item(0).value = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/DropDownList.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/DropDownList.js
deleted file mode 100644
index 406c262..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/DropDownList.js
+++ /dev/null
@@ -1,29 +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('org.apache.flex.html5.staticControls.DropDownList');
-
-goog.require('org.apache.flex.core.ListBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.ListBase}
- */
-org.apache.flex.html5.staticControls.DropDownList = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html5.staticControls.DropDownList,
-    org.apache.flex.core.ListBase);

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/Label.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/Label.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/Label.js
deleted file mode 100644
index 0265ce7..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/Label.js
+++ /dev/null
@@ -1,61 +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('org.apache.flex.html5.staticControls.Label');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html5.staticControls.Label = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html5.staticControls.Label,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * @override
- */
-org.apache.flex.html5.staticControls.Label.prototype.createElement =
-    function() {
-  goog.base(this, 'createElement');
-
-  this.positioner = this.element;
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.html5.staticControls.Label.prototype.get_text = function() {
-  return this.element.innerHTML;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.html5.staticControls.Label.prototype.set_text =
-    function(value) {
-  this.element.innerHTML = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/List.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/List.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/List.js
deleted file mode 100644
index 754a77f..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/List.js
+++ /dev/null
@@ -1,42 +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('org.apache.flex.html5.staticControls.List');
-
-goog.require('org.apache.flex.core.ListBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.ListBase}
- */
-org.apache.flex.html5.staticControls.List = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html5.staticControls.List,
-    org.apache.flex.core.ListBase);
-
-
-/**
- * @override
- */
-org.apache.flex.html5.staticControls.List.prototype.createElement =
-    function() {
-  goog.base(this, 'createElement');
-
-  this.element.size = 5;
-
-  return this.element;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/RadioButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/RadioButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/RadioButton.js
deleted file mode 100644
index 4e5bc1f..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/RadioButton.js
+++ /dev/null
@@ -1,109 +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('org.apache.flex.html5.staticControls.RadioButton');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html5.staticControls.RadioButton = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html5.staticControls.RadioButton,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * @override
- */
-org.apache.flex.html5.staticControls.RadioButton.prototype.createElement =
-    function() {
-  var rb;
-
-  this.element = document.createElement('label');
-
-  rb = document.createElement('input');
-  rb.type = 'radio';
-  this.element.appendChild(rb);
-  this.element.appendChild(document.createTextNode('radio button'));
-
-  this.positioner = this.element;
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @return {string} The groupName getter.
- */
-org.apache.flex.html5.staticControls.RadioButton.prototype.get_groupName =
-    function() {
-  return this.element.childNodes.item(0).name;
-};
-
-
-/**
- * @expose
- * @param {string} value The groupName setter.
- */
-org.apache.flex.html5.staticControls.RadioButton.prototype.set_groupName =
-    function(value) {
-  this.element.childNodes.item(0).name = value;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.html5.staticControls.RadioButton.prototype.get_text =
-    function() {
-  return this.element.childNodes.item(1).nodeValue;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.html5.staticControls.RadioButton.prototype.set_text =
-    function(value) {
-  this.element.childNodes.item(1).nodeValue = value;
-};
-
-
-/**
- * @expose
- * @return {boolean} The selected getter.
- */
-org.apache.flex.html5.staticControls.RadioButton.prototype.get_selected =
-    function() {
-  return this.element.childNodes.item(0).checked;
-};
-
-
-/**
- * @expose
- * @param {boolean} value The selected setter.
- */
-org.apache.flex.html5.staticControls.RadioButton.prototype.set_selected =
-    function(value) {
-  this.element.childNodes.item(0).checked = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/TextArea.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/TextArea.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/TextArea.js
deleted file mode 100644
index e65d895..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/TextArea.js
+++ /dev/null
@@ -1,61 +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('org.apache.flex.html5.staticControls.TextArea');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html5.staticControls.TextArea = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html5.staticControls.TextArea,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * @override
- */
-org.apache.flex.html5.staticControls.TextArea.prototype.createElement =
-    function() {
-  this.element = document.createElement('textarea');
-
-  this.positioner = this.element;
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.html5.staticControls.TextArea.prototype.get_text = function() {
-  return this.element.value;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.html5.staticControls.TextArea.prototype.set_text =
-    function(value) {
-  this.element.value = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/TextButton.js
deleted file mode 100644
index a244aa5..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/TextButton.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('org.apache.flex.html5.staticControls.TextButton');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html5.staticControls.TextButton = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html5.staticControls.TextButton,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * @override
- */
-org.apache.flex.html5.staticControls.TextButton.prototype.createElement =
-    function() {
-  this.element = document.createElement('button');
-  this.element.setAttribute('type', 'button');
-
-  this.positioner = this.element;
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.html5.staticControls.TextButton.prototype.get_text =
-    function() {
-  return this.element.innerHTML;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.html5.staticControls.TextButton.prototype.set_text =
-    function(value) {
-  this.element.innerHTML = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/TextInput.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/TextInput.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/TextInput.js
deleted file mode 100644
index 9dc0d83..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/staticControls/TextInput.js
+++ /dev/null
@@ -1,62 +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('org.apache.flex.html5.staticControls.TextInput');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html5.staticControls.TextInput = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html5.staticControls.TextInput,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * @override
- */
-org.apache.flex.html5.staticControls.TextInput.prototype.createElement =
-    function() {
-  this.element = document.createElement('input');
-  this.element.setAttribute('type', 'input');
-
-  this.positioner = this.element;
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.html5.staticControls.TextInput.prototype.get_text = function() {
-  return this.element.value;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.html5.staticControls.TextInput.prototype.set_text =
-    function(value) {
-  this.element.value = value;
-};


[16/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/PanelView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/PanelView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/PanelView.as
new file mode 100644
index 0000000..2108ea1
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/PanelView.as
@@ -0,0 +1,180 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.Sprite;
+	
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.IUIBase;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.UIMetrics;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.html.staticControls.Container;
+	import org.apache.flex.html.staticControls.ControlBar;
+	import org.apache.flex.html.staticControls.Panel;
+	import org.apache.flex.html.staticControls.TitleBar;
+	import org.apache.flex.utils.BeadMetrics;
+	
+	/**
+	 *  The Panel class creates the visual elements of the org.apache.flex.html.staticControls.Panel 
+	 *  component. A Panel has a org.apache.flex.html.staticControls.TitleBar, content, and an 
+	 *  optional org.apache.flex.html.staticControls.ControlBar.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class PanelView extends ContainerView implements IBeadView
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function PanelView()
+		{
+			_titleBar = new TitleBar();
+		}
+		
+		private var _titleBar:TitleBar;
+		
+		/**
+		 *  The org.apache.flex.html.staticControls.TitleBar component of the 
+		 *  org.apache.flex.html.staticControls.Panel.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get titleBar():TitleBar
+		{
+			return _titleBar;
+		}
+		
+		private var _controlBar:ControlBar;
+		
+		/**
+		 *  The org.apache.flex.html.staticControls.ControlBar for the Panel; may be null.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get controlBar():ControlBar
+		{
+			return _controlBar;
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		override public function set strand(value:IStrand):void
+		{
+			super.strand = value;
+			_strand = value;
+			
+			// replace the TitleBar's model with the Panel's model (it implements ITitleBarModel) so that
+			// any changes to values in the Panel's model that correspond values in the TitleBar will 
+			// be picked up automatically by the TitleBar.
+			titleBar.model = Panel(_strand).model;
+			Container(_strand).addElement(titleBar);
+			
+			var controlBarItems:Array = Panel(_strand).controlBar;
+			if( controlBarItems && controlBarItems.length > 0 ) {
+				_controlBar = new ControlBar();
+				
+				for each(var comp:IUIBase in controlBarItems) {
+					_controlBar.addElement(comp);
+				}
+				
+				Container(_strand).addElement(controlBar);
+			}
+			
+			IEventDispatcher(_strand).addEventListener("childrenAdded", changeHandler);            
+		}
+		
+		/**
+		 *  Always returns true because Panel's content is separate from its chrome
+		 *  elements such as the title bar and optional control bar.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		override protected function contentAreaNeeded():Boolean
+		{
+			return true;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function changeHandler(event:Event):void
+		{
+			var metrics:UIMetrics = BeadMetrics.getMetrics(_strand);
+			
+			var w:Number = UIBase(_strand).explicitWidth;
+			if (isNaN(w)) w = Math.max(titleBar.width,actualParent.width+metrics.left+metrics.right,controlBar?controlBar.width:0);
+			
+			var h:Number = UIBase(_strand).explicitHeight;
+			if (isNaN(h)) h = titleBar.height + actualParent.height + (controlBar ? controlBar.height : 0) +
+				metrics.top + metrics.bottom;
+			
+			titleBar.x = 0;
+			titleBar.y = 0;
+			titleBar.width = w;
+			
+			var remainingHeight:Number = h - titleBar.height;
+			
+			if( controlBar ) {
+				controlBar.x = 0;
+				controlBar.y = h - controlBar.height;
+				//controlBar.y = actualParent.y + actualParent.height + metrics.bottom;
+				controlBar.width = w;
+				
+				remainingHeight -= controlBar.height;
+			}
+			
+			actualParent.x = metrics.left;
+			actualParent.y = titleBar.y + titleBar.height + metrics.top;
+			actualParent.width = w;
+			actualParent.height = remainingHeight - metrics.top - metrics.bottom;
+			
+			UIBase(_strand).width = w;
+			UIBase(_strand).height = h;
+		}
+        
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/RadioButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/RadioButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/RadioButtonView.as
new file mode 100644
index 0000000..bc24661
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/RadioButtonView.as
@@ -0,0 +1,282 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.Shape;
+	import flash.display.SimpleButton;
+	import flash.display.Sprite;
+	import flash.text.TextFieldAutoSize;
+	import flash.text.TextFieldType;
+	
+	import org.apache.flex.core.CSSTextField;
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.IValueToggleButtonModel;
+	import org.apache.flex.events.Event;
+	
+	/**
+	 *  The RadioButtonView class creates the visual elements of the org.apache.flex.html.staticControls.RadioButton 
+	 *  component. 
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class RadioButtonView implements IBeadView
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function RadioButtonView()
+		{
+			sprites = [ upSprite = new Sprite(),
+				        downSprite = new Sprite(),
+						overSprite = new Sprite(),
+						upAndSelectedSprite = new Sprite(),
+						downAndSelectedSprite = new Sprite(),
+						overAndSelectedSprite = new Sprite() ];
+			
+			for each( var s:Sprite in sprites )
+			{
+				var tf:CSSTextField = new CSSTextField();
+				tf.type = TextFieldType.DYNAMIC;
+				tf.autoSize = TextFieldAutoSize.LEFT;
+				tf.name = "textField";
+				var icon:Shape = new Shape();
+				icon.name = "icon";
+				s.addChild(icon);
+				s.addChild(tf);
+			}
+		}
+		
+		private var upSprite:Sprite;
+		private var downSprite:Sprite;
+		private var overSprite:Sprite;
+		private var upAndSelectedSprite:Sprite;
+		private var downAndSelectedSprite:Sprite;
+		private var overAndSelectedSprite:Sprite;
+		
+		private var sprites:Array;
+		
+		private var _toggleButtonModel:IValueToggleButtonModel;
+		
+		/**
+		 *  The model used for the RadioButton.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get toggleButtonModel() : IValueToggleButtonModel
+		{
+			return _toggleButtonModel;
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			_toggleButtonModel = value.getBeadByType(IValueToggleButtonModel) as IValueToggleButtonModel;
+			_toggleButtonModel.addEventListener("textChange", textChangeHandler);
+			_toggleButtonModel.addEventListener("htmlChange", htmlChangeHandler);
+			_toggleButtonModel.addEventListener("selectedValueChange", selectedValueChangeHandler);
+			if (_toggleButtonModel.text != null)
+				text = _toggleButtonModel.text;
+			if (_toggleButtonModel.html != null)
+				html = _toggleButtonModel.html;
+			
+			layoutControl();
+			
+			var hitArea:Shape = new Shape();
+			hitArea.graphics.beginFill(0x000000);
+			hitArea.graphics.drawRect(12,0,upSprite.width, upSprite.height);
+			hitArea.graphics.endFill();
+			
+			SimpleButton(value).upState = upSprite;
+			SimpleButton(value).downState = downSprite;
+			SimpleButton(value).overState = overSprite;
+			SimpleButton(value).hitTestState = hitArea;
+			
+			if (toggleButtonModel.text !== null)
+				text = toggleButtonModel.text;
+			if (toggleButtonModel.html !== null)
+				html = toggleButtonModel.html;
+			
+			if (toggleButtonModel.selected && toggleButtonModel.value == value) {
+				selected = true;
+			}
+		}
+		
+		/**
+		 *  The string label for the org.apache.flex.html.staticControls.RadioButton.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get text():String
+		{
+			var tf:CSSTextField = upSprite.getChildByName('textField') as CSSTextField;
+			return tf.text;
+		}
+		public function set text(value:String):void
+		{
+			for each( var s:Sprite in sprites )
+			{
+				var tf:CSSTextField = s.getChildByName('textField') as CSSTextField;
+				tf.text = value;
+			}
+			
+			layoutControl();
+		}
+		
+		/**
+		 *  The HTML string for the org.apache.flex.html.staticControls.RadioButton.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get html():String
+		{
+			var tf:CSSTextField = upSprite.getChildByName('textField') as CSSTextField;
+			return tf.htmlText;
+		}
+		public function set html(value:String):void
+		{
+			for each(var s:Sprite in sprites)
+			{
+				var tf:CSSTextField = s.getChildByName('textField') as CSSTextField;
+				tf.htmlText = value;
+			}
+			
+			layoutControl();
+		}
+		
+		/**
+		 * @private
+		 */
+		private function textChangeHandler(event:Event):void
+		{
+			text = toggleButtonModel.text;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function htmlChangeHandler(event:Event):void
+		{
+			html = toggleButtonModel.html;
+		}
+		
+		private var _selected:Boolean;
+		
+		/**
+		 * The selection state of the RadioButton
+		 */
+		public function get selected():Boolean
+		{
+			return _selected;
+		}
+		public function set selected(value:Boolean):void
+		{
+			_selected = value;
+			
+			if( value ) {
+				SimpleButton(_strand).upState = upAndSelectedSprite;
+				SimpleButton(_strand).downState = downAndSelectedSprite;
+				SimpleButton(_strand).overState = overAndSelectedSprite;
+				
+			} else {
+				SimpleButton(_strand).upState = upSprite;
+				SimpleButton(_strand).downState = downSprite;
+				SimpleButton(_strand).overState = overSprite;
+			}
+			
+			layoutControl();
+		}
+		
+		/**
+		 * @private
+		 */
+		private function selectedValueChangeHandler(event:Event):void
+		{
+			selected = _toggleButtonModel.value == _toggleButtonModel.selectedValue;
+		}
+		
+		/**
+		 * @private
+		 */
+		protected function layoutControl() : void
+		{
+			for each(var s:Sprite in sprites)
+			{
+				var icon:Shape = s.getChildByName("icon") as Shape;
+				var tf:CSSTextField = s.getChildByName("textField") as CSSTextField;
+				
+				drawRadioButton(icon);
+				
+				var mh:Number = Math.max(icon.height,tf.height);
+				
+				icon.x = 0;
+				icon.y = (mh - icon.height)/2;
+				
+				tf.x = icon.x + icon.width + 1;
+				tf.y = (mh - tf.height)/2;
+			}
+			
+		}
+		
+		/**
+		 * @private
+		 */
+		protected function drawRadioButton(icon:Shape) : void
+		{
+			icon.graphics.clear();
+			icon.graphics.beginFill(0xCCCCCC);
+			icon.graphics.lineStyle(1,0x333333);
+			icon.graphics.drawEllipse(0,0,10,10);
+			icon.graphics.endFill();
+			
+			if( selected ) {
+				icon.graphics.beginFill(0x555555);
+				icon.graphics.drawEllipse(2,2,6,6);
+				icon.graphics.endFill();
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ScrollBarView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ScrollBarView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ScrollBarView.as
new file mode 100644
index 0000000..5bc7723
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ScrollBarView.as
@@ -0,0 +1,158 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	
+	import org.apache.flex.core.IBeadLayout;
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IScrollBarModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.Strand;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.html.staticControls.Button;
+	import org.apache.flex.html.staticControls.beads.controllers.ButtonAutoRepeatController;
+
+    /**
+     *  The ScrollBarView class is the default view for
+     *  the org.apache.flex.html.staticControls.supportClasses.ScrollBar class.
+     *  It implements the classic desktop-like ScrollBar.
+     *  A different view would implement more modern scrollbars that hide themselves
+     *  until hovered over with the mouse.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class ScrollBarView extends Strand implements IBeadView, IStrand, IScrollBarView
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function ScrollBarView()
+		{
+		}
+				
+		private var sbModel:IScrollBarModel;
+		
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			sbModel = value.getBeadByType(IScrollBarModel) as IScrollBarModel;
+            
+            // TODO: (aharui) put in values impl
+			_increment = new Button();
+			Button(_increment).addBead(new DownArrowButtonView());
+            Button(_increment).addBead(new ButtonAutoRepeatController());
+			_decrement = new Button();
+			Button(_decrement).addBead(new UpArrowButtonView());
+            Button(_decrement).addBead(new ButtonAutoRepeatController());
+			_track = new Button();				
+			Button(_track).addBead(new VScrollBarTrackView());
+			_thumb = new Button();				
+			Button(_thumb).addBead(new VScrollBarThumbView());
+            
+            UIBase(value).addChild(_decrement);
+            UIBase(value).addChild(_increment);
+            UIBase(value).addChild(_track);
+            UIBase(value).addChild(_thumb);
+            
+            if( _strand.getBeadByType(IBeadLayout) == null ) {
+                var layout:IBeadLayout = new (ValuesManager.valuesImpl.getValue(_strand, "iBeadLayout")) as IBeadLayout;
+                _strand.addBead(layout);
+            }
+            
+		}
+						
+		private var _decrement:DisplayObject;
+		private var _increment:DisplayObject;
+		private var _track:DisplayObject;
+		private var _thumb:DisplayObject;
+		
+        /**
+         *  @copy org.apache.flex.html.staticControls.beads.IScrollBarView#decrement
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get decrement():DisplayObject
+		{
+			return _decrement;
+		}
+
+        /**
+         *  @copy org.apache.flex.html.staticControls.beads.IScrollBarView#increment
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get increment():DisplayObject
+		{
+			return _increment;
+		}
+        
+        /**
+         *  @copy org.apache.flex.html.staticControls.beads.IScrollBarView#track
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get track():DisplayObject
+		{
+			return _track;
+		}
+        
+        /**
+         *  @copy org.apache.flex.html.staticControls.beads.IScrollBarView#thumb
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get thumb():DisplayObject
+		{
+			return _thumb;
+		}
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SimpleAlertView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SimpleAlertView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SimpleAlertView.as
new file mode 100644
index 0000000..682c2c9
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SimpleAlertView.as
@@ -0,0 +1,150 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import org.apache.flex.core.IAlertModel;
+	import org.apache.flex.core.IBead;
+    import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IMeasurementBead;
+	import org.apache.flex.core.IStrand;
+    import org.apache.flex.core.IParent;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.UIMetrics;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.html.staticControls.Label;
+	import org.apache.flex.html.staticControls.TextButton;
+	import org.apache.flex.utils.BeadMetrics;
+	
+	/**
+	 *  The SimpleAlertView class creates the visual elements of the 
+	 *  org.apache.flex.html.staticControls.SimpleAlert component.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class SimpleAlertView implements IBeadView
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function SimpleAlertView()
+		{
+		}
+		
+		private var messageLabel:Label;
+		private var okButton:TextButton;
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+            
+			var backgroundColor:Object = ValuesManager.valuesImpl.getValue(value, "background-color");
+			var backgroundImage:Object = ValuesManager.valuesImpl.getValue(value, "background-image");
+			if (backgroundColor != null || backgroundImage != null)
+			{
+				if (value.getBeadByType(IBackgroundBead) == null)
+					value.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBackgroundBead")) as IBead);					
+			}
+			
+			var borderStyle:String;
+			var borderStyles:Object = ValuesManager.valuesImpl.getValue(value, "border");
+			if (borderStyles is Array)
+			{
+				borderStyle = borderStyles[1];
+			}
+			if (borderStyle == null)
+			{
+				borderStyle = ValuesManager.valuesImpl.getValue(value, "border-style") as String;
+			}
+			if (borderStyle != null && borderStyle != "none")
+			{
+				if (value.getBeadByType(IBorderBead) == null)
+					value.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBorderBead")) as IBead);	
+			}
+			
+			var model:IAlertModel = _strand.getBeadByType(IAlertModel) as IAlertModel;
+			model.addEventListener("messageChange",handleMessageChange);
+			model.addEventListener("htmlMessageChange",handleMessageChange);
+
+            messageLabel = new Label();
+			messageLabel.text = model.message;
+			messageLabel.html = model.htmlMessage;
+			IParent(_strand).addElement(messageLabel);
+			
+			okButton = new TextButton();
+			okButton.text = model.okLabel;
+			IParent(_strand).addElement(okButton);
+			okButton.addEventListener("click",handleOK);
+			
+			handleMessageChange(null);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleMessageChange(event:Event):void
+		{
+			var ruler:IMeasurementBead = messageLabel.getBeadByType(IMeasurementBead) as IMeasurementBead;
+			if( ruler == null ) {
+				messageLabel.addBead(ruler = new (ValuesManager.valuesImpl.getValue(messageLabel, "iMeasurementBead")) as IMeasurementBead);
+			}
+			var maxWidth:Number = Math.max(UIBase(_strand).width,ruler.measuredWidth);
+			
+			var metrics:UIMetrics = BeadMetrics.getMetrics(_strand);
+			
+			messageLabel.x = metrics.left;
+			messageLabel.y = metrics.top;
+			messageLabel.width = maxWidth;
+			
+			okButton.x = (maxWidth - okButton.width)/2;
+			okButton.y = messageLabel.y + messageLabel.height + 20;
+			
+			UIBase(_strand).width = maxWidth + metrics.left + metrics.right;
+			UIBase(_strand).height = okButton.y + okButton.height + metrics.bottom;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleOK(event:Event):void
+		{
+			var newEvent:Event = new Event("close");
+			IEventDispatcher(_strand).dispatchEvent(newEvent);
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SingleLineBorderBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SingleLineBorderBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SingleLineBorderBead.as
new file mode 100644
index 0000000..fb0f679
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SingleLineBorderBead.as
@@ -0,0 +1,94 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.Graphics;
+	
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+
+    /**
+     *  The SingleLineBorderBead class draws a single line solid border.
+     *  The color and thickness can be specified in CSS.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class SingleLineBorderBead implements IBead, IBorderBead, IGraphicsDrawing
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function SingleLineBorderBead()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+            IEventDispatcher(value).addEventListener("heightChanged", changeHandler);
+            IEventDispatcher(value).addEventListener("widthChanged", changeHandler);
+		}
+		        
+		private function changeHandler(event:Event):void
+		{
+			var styleObject:* = ValuesManager.valuesImpl.getValue(_strand,"border-color");
+			var borderColor:Number = Number(styleObject);
+			if( isNaN(borderColor) ) borderColor = 0x000000;
+			styleObject = ValuesManager.valuesImpl.getValue(_strand,"border-thickness");
+			var borderThickness:Number = Number(styleObject);
+			if( isNaN(borderThickness) ) borderThickness = 1;
+			
+            var host:UIBase = UIBase(_strand);
+            var g:Graphics = host.graphics;
+            var w:Number = host.width;
+            var h:Number = host.height;
+			
+			var gd:IGraphicsDrawing = _strand.getBeadByType(IGraphicsDrawing) as IGraphicsDrawing;
+			if( this == gd ) g.clear();
+			
+			g.lineStyle();
+            g.beginFill(borderColor);
+            g.drawRect(0, 0, w, h);
+            g.drawRect(borderThickness, borderThickness, w-2*borderThickness, h-2*borderThickness);
+            g.endFill();
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderThumbView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderThumbView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderThumbView.as
new file mode 100644
index 0000000..3242274
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderThumbView.as
@@ -0,0 +1,114 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.Graphics;
+	import flash.display.Shape;
+	import flash.display.SimpleButton;
+	
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	
+	/**
+	 *  The SliderThumbView class creates the draggable input element for the 
+	 *  org.apache.flex.html.staticControls.Slider component.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class SliderThumbView implements IBeadView
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function SliderThumbView()
+		{
+			hitArea = new Shape();
+			upView = new Shape();
+			downView = new Shape();
+			overView = new Shape();
+		}
+		
+		/**
+		 * @private
+		 */
+		private function drawView(g:Graphics, bgColor:uint):void
+		{
+			g.clear();
+			g.lineStyle(1,0x000000);
+			g.beginFill(bgColor);
+			g.drawCircle(SimpleButton(_strand).width/2, SimpleButton(_strand).height/2, 10);
+			g.endFill();
+		}
+		
+		private var _strand:IStrand;
+		
+		private var hitArea:Shape;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			drawView(hitArea.graphics, 0xDD0000);
+			drawView(upView.graphics, 0xFFFFFF);
+			drawView(downView.graphics, 0x999999);
+			drawView(overView.graphics, 0xDDDDDD);
+			
+			SimpleButton(value).upState = upView;
+			SimpleButton(value).downState = downView;
+			SimpleButton(value).overState = overView;
+			SimpleButton(value).hitTestState = hitArea;
+			
+			IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
+			IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler);
+		}
+		
+		private var upView:Shape;
+		private var downView:Shape;
+		private var overView:Shape;
+		
+		/**
+		 * @private
+		 */
+		private function sizeChangeHandler( event:Event ) : void
+		{
+			drawView(hitArea.graphics, 0xDD0000);
+			drawView(upView.graphics, 0xFFFFFF);
+			drawView(downView.graphics, 0x999999);
+			drawView(overView.graphics, 0xDDDDDD);
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderTrackView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderTrackView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderTrackView.as
new file mode 100644
index 0000000..6fc5047
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderTrackView.as
@@ -0,0 +1,114 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.Graphics;
+	import flash.display.Shape;
+	import flash.display.SimpleButton;
+	
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	
+	/**
+	 *  The SliderTrackView class creates the track area for the org.apache.flex.html.staticControls.Slider
+	 *  component.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class SliderTrackView implements IBeadView
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function SliderTrackView()
+		{
+			hitArea = new Shape();
+			upView = new Shape();
+			downView = new Shape();
+			overView = new Shape();
+		}
+		
+		/**
+		 * @private
+		 */
+		private function drawView(g:Graphics, bgColor:uint):void
+		{
+			g.clear();
+			g.lineStyle(1,0x000000);
+			g.beginFill(bgColor);
+			g.drawRect(0, 0, SimpleButton(_strand).width, SimpleButton(_strand).height);
+			g.endFill();
+		}
+		
+		private var _strand:IStrand;
+		
+		private var hitArea:Shape;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			drawView(hitArea.graphics, 0xDD0000);
+			drawView(upView.graphics, 0xCCCCCC);
+			drawView(downView.graphics, 0x808080);
+			drawView(overView.graphics, 0xEEEEEE);
+			
+			SimpleButton(value).upState = upView;
+			SimpleButton(value).downState = downView;
+			SimpleButton(value).overState = overView;
+			SimpleButton(value).hitTestState = hitArea;
+			
+			IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
+			IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler);
+		}
+		
+		private var upView:Shape;
+		private var downView:Shape;
+		private var overView:Shape;
+		
+		/**
+		 * @private
+		 */
+		private function sizeChangeHandler( event:Event ) : void
+		{
+			drawView(hitArea.graphics, 0xDD0000);
+			drawView(upView.graphics, 0xCCCCCC);
+			drawView(downView.graphics, 0x808080);
+			drawView(overView.graphics, 0xEEEEEE);
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderView.as
new file mode 100644
index 0000000..83893dc
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderView.as
@@ -0,0 +1,180 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	import flash.display.Sprite;
+	
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IBeadModel;
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IRangeModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.html.staticControls.Button;
+	
+	/**
+	 *  The SliderView class creates the visual elements of the org.apache.flex.html.staticControls.Slider 
+	 *  component. The Slider has a track and a thumb control which are also created with view beads.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class SliderView implements ISliderView, IBeadView
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function SliderView()
+		{
+		}
+		
+		private var rangeModel:IRangeModel;
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			_track = new Button();
+			Button(_track).addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iTrackView")) as IBead);
+			
+			_thumb = new Button();
+			Button(_thumb).addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iThumbView")) as IBead);
+			
+			UIBase(_strand).addChild(_track);
+			UIBase(_strand).addChild(_thumb);
+			
+			IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
+			IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler);
+			
+			rangeModel = _strand.getBeadByType(IBeadModel) as IRangeModel;
+			
+			// listen for changes to the model and adjust the UI accordingly.
+			IEventDispatcher(rangeModel).addEventListener("valueChange",modelChangeHandler);
+			IEventDispatcher(rangeModel).addEventListener("minimumChange",modelChangeHandler);
+			IEventDispatcher(rangeModel).addEventListener("maximumChange",modelChangeHandler);
+			IEventDispatcher(rangeModel).addEventListener("stepSizeChange",modelChangeHandler);
+			IEventDispatcher(rangeModel).addEventListener("snapIntervalChange",modelChangeHandler);
+			
+			// set a minimum size to trigger the size change handler
+			var needsSizing:Boolean = true;
+			if( UIBase(_strand).width < 100 ) {
+				UIBase(_strand).width = 100;
+				needsSizing = false;
+			}
+			if( UIBase(_strand).height < 30 ) {
+				UIBase(_strand).height = 30;
+				needsSizing = false;
+			}
+			
+			if( needsSizing ) sizeChangeHandler(null);
+		}
+		
+		private var _track:DisplayObject;
+		private var _thumb:DisplayObject;
+		
+		/**
+		 *  The track component.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get track():DisplayObject
+		{
+			return _track;
+		}
+		
+		/**
+		 *  The thumb component.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get thumb():DisplayObject
+		{
+			return _thumb;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function sizeChangeHandler( event:Event ) : void
+		{
+			var w:Number = UIBase(_strand).width;
+			var h:Number = UIBase(_strand).height;
+			
+			_thumb.width = 20;
+			_thumb.height = UIBase(_strand).height;
+			
+			_thumb.x = 10;
+			_thumb.y = 0;
+			
+			// the track is inset 1/2 of the thumbwidth so the thumb can
+			// overlay the track on either end with the thumb center being
+			// on the track's edge
+			_track.width = UIBase(_strand).width - _thumb.width;
+			_track.height = 5;
+			_track.x = _thumb.width/2;
+			_track.y = (UIBase(_strand).height - _track.height)/2;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function modelChangeHandler( event:Event ) : void
+		{
+			setThumbPositionFromValue(rangeModel.value);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function setThumbPositionFromValue( value:Number ) : void
+		{
+			var p:Number = (value-rangeModel.minimum)/(rangeModel.maximum-rangeModel.minimum);
+			var xloc:Number = p*(UIBase(_strand).width - _thumb.width);
+			
+			_thumb.x = xloc;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SolidBackgroundBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SolidBackgroundBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SolidBackgroundBead.as
new file mode 100644
index 0000000..4a90b8a
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SolidBackgroundBead.as
@@ -0,0 +1,145 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.Graphics;
+	
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+
+    /**
+     *  The SolidBackgroundBead class draws a solid filled background.
+     *  The color and opacity can be specified in CSS.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class SolidBackgroundBead implements IBead, IBackgroundBead, IGraphicsDrawing
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function SolidBackgroundBead()
+		{
+		}
+				
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+            IEventDispatcher(value).addEventListener("heightChanged", changeHandler);
+            IEventDispatcher(value).addEventListener("widthChanged", changeHandler);
+			
+			var bgColor:Object = ValuesManager.valuesImpl.getValue(value, "background-color");
+			if( bgColor != null ) {
+				backgroundColor = uint(bgColor);
+			}
+			
+			var bgAlpha:Object = ValuesManager.valuesImpl.getValue(value, "opacity");
+			if( bgAlpha != null ) {
+				opacity = Number(bgAlpha);
+			}
+		}
+		
+		private var _backgroundColor:uint;
+		
+        /**
+         *  The background color
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get backgroundColor():uint
+		{
+			return _backgroundColor;
+		}
+        
+        /**
+         *  @private
+         */
+		public function set backgroundColor(value:uint):void
+		{
+			_backgroundColor = value;
+			if (_strand)
+				changeHandler(null);
+		}
+		
+		private var _opacity:Number = 1.0;
+		
+        /**
+         *  The opacity (alpha).
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get opacity():Number
+		{
+			return _opacity;
+		}
+		
+        /**
+         *  @private
+         */
+		public function set opacity(value:Number):void
+		{
+			_opacity = value;
+			if( _strand )
+				changeHandler(null);
+		}
+		
+		private function changeHandler(event:Event):void
+		{
+            var host:UIBase = UIBase(_strand);
+            var g:Graphics = host.graphics;
+            var w:Number = host.width;
+            var h:Number = host.height;
+			
+			var gd:IGraphicsDrawing = _strand.getBeadByType(IGraphicsDrawing) as IGraphicsDrawing;
+			if( this == gd ) g.clear();
+
+            g.beginFill(backgroundColor,opacity);
+            g.drawRect(0, 0, w, h);
+            g.endFill();
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SpinnerView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SpinnerView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SpinnerView.as
new file mode 100644
index 0000000..e2ed0aa
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SpinnerView.as
@@ -0,0 +1,134 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	
+	import org.apache.flex.core.IBeadModel;
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IRangeModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.UIBase;
+	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.beads.controllers.ButtonAutoRepeatController;
+	
+	/**
+	 *  The SpinnerView class creates the visual elements of the org.apache.flex.html.staticControls.Spinner 
+	 *  component.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class SpinnerView implements ISpinnerView, IBeadView
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function SpinnerView()
+		{
+		}
+		
+		private var rangeModel:IRangeModel;
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+            
+			_increment = new Button();
+			Button(_increment).addBead(new UpArrowButtonView());
+			Button(_increment).addBead(new ButtonAutoRepeatController());
+			_decrement = new Button();
+			Button(_decrement).addBead(new DownArrowButtonView());
+			Button(_decrement).addBead(new ButtonAutoRepeatController());
+						
+			Button(_increment).x = 0;
+			Button(_increment).y = 0;
+			Button(_decrement).x = 0;
+			Button(_decrement).y = Button(_increment).height;
+			
+			UIBase(_strand).addChild(_decrement);
+			UIBase(_strand).addChild(_increment);
+			rangeModel = _strand.getBeadByType(IBeadModel) as IRangeModel;
+			
+			IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
+			IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler);
+		}
+		
+		private var _decrement:DisplayObject;
+		private var _increment:DisplayObject;
+		
+		/**
+		 *  The component for decrementing the org.apache.flex.html.staticControls.Spinner value.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get decrement():DisplayObject
+		{
+			return _decrement;
+		}
+		
+		/**
+		 *  The component for incrementing the org.apache.flex.html.staticControls.Spinner value.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get increment():DisplayObject
+		{
+			return _increment;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function sizeChangeHandler( event:Event ) : void
+		{
+			_increment.width = UIBase(_strand).width;
+			_increment.height = UIBase(_strand).height/2;
+			_increment.y      = 0;
+			_decrement.width = UIBase(_strand).width;
+			_decrement.height = UIBase(_strand).height/2;
+			_decrement.y      = _increment.height;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextAreaView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextAreaView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextAreaView.as
new file mode 100644
index 0000000..631466e
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextAreaView.as
@@ -0,0 +1,258 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	import flash.events.Event;
+	import flash.events.IEventDispatcher;
+	import flash.text.TextFieldType;
+	
+	import org.apache.flex.core.IBead;
+    import org.apache.flex.core.IBeadModel;
+	import org.apache.flex.core.IScrollBarModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.IParent;
+    import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.html.staticControls.beads.models.ScrollBarModel;
+	import org.apache.flex.html.staticControls.supportClasses.Border;
+	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
+
+    /**
+     *  The TextAreaView class is the default view for
+     *  the org.apache.flex.html.staticControls.TextArea class.
+     *  It implements the classic desktop-like TextArea with
+     *  a border and scrollbars.  It does not support right-to-left text.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class TextAreaView extends TextFieldViewBase implements IStrand
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function TextAreaView()
+		{
+			super();
+			
+			textField.selectable = true;
+			textField.type = TextFieldType.INPUT;
+			textField.mouseEnabled = true;
+			textField.multiline = true;
+			textField.wordWrap = true;
+		}
+		
+		private var _border:Border;
+		
+        /**
+         *  The border.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get border():Border
+		{
+			return _border;
+		}
+		
+		private var _vScrollBar:ScrollBar;
+		
+        /**
+         *  The vertical ScrollBar.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get vScrollBar():ScrollBar
+		{
+			if (!_vScrollBar)
+				_vScrollBar = createScrollBar();
+			return _vScrollBar;
+		}
+		
+        /**
+         *  @private
+         */
+		override public function set strand(value:IStrand):void
+		{
+			super.strand = value;
+			
+			// add a border to this
+			_border = new Border();
+			_border.model = new (ValuesManager.valuesImpl.getValue(value, "iBorderModel")) as IBeadModel;
+			_border.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBorderBead")) as IBead);
+            IParent(strand).addElement(border);
+			
+			var vb:ScrollBar = vScrollBar;
+			
+			// Default size
+			var ww:Number = DisplayObject(strand).width;
+			if( isNaN(ww) || ww == 0 ) DisplayObject(strand).width = 100;
+			var hh:Number = DisplayObject(strand).height;
+			if( isNaN(hh) || hh == 0 ) DisplayObject(strand).height = 42;
+			
+			// for input, listen for changes to the _textField and update
+			// the model
+			textField.addEventListener(Event.SCROLL, textScrollHandler);
+			
+			IEventDispatcher(strand).addEventListener("widthChanged", sizeChangedHandler);
+			IEventDispatcher(strand).addEventListener("heightChanged", sizeChangedHandler);
+			sizeChangedHandler(null);
+		}
+				
+		private function createScrollBar():ScrollBar
+		{
+			var vsb:ScrollBar;
+			vsb = new ScrollBar();
+			var vsbm:ScrollBarModel = new ScrollBarModel();
+			vsbm.maximum = 100;
+			vsbm.minimum = 0;
+			vsbm.pageSize = 10;
+			vsbm.pageStepSize = 10;
+			vsbm.snapInterval = 1;
+			vsbm.stepSize = 1;
+			vsbm.value = 0;
+			vsb.model = vsbm;
+			vsb.width = 16;
+            IParent(strand).addElement(vsb);
+			
+			vsb.addEventListener("scroll", scrollHandler);
+			
+			return vsb;
+		}
+		
+		private function textScrollHandler(event:Event):void
+		{
+			var visibleLines:int = textField.bottomScrollV - textField.scrollV + 1;
+			var scrollableLines:int = textField.numLines - visibleLines + 1;
+			var vsbm:ScrollBarModel = ScrollBarModel(vScrollBar.model);
+			vsbm.minimum = 0;
+			vsbm.maximum = textField.numLines+1;
+			vsbm.value = textField.scrollV;
+			vsbm.pageSize = visibleLines;
+			vsbm.pageStepSize = visibleLines;
+		}
+		
+		private function sizeChangedHandler(event:Event):void
+		{
+			var ww:Number = DisplayObject(strand).width - DisplayObject(vScrollBar).width;
+			if( !isNaN(ww) && ww > 0 ) {
+				textField.width = ww;
+				_border.width = ww;
+			}
+			
+			var hh:Number = DisplayObject(strand).height;
+			if( !isNaN(hh) && hh > 0 ) {
+				textField.height = hh;
+				_border.height = hh;
+			}
+			
+			var sb:DisplayObject = DisplayObject(vScrollBar);
+			sb.y = 0;
+			sb.x = textField.width - 1;
+			sb.height = textField.height;
+		}
+		
+		private function scrollHandler(event:Event):void
+		{
+			var vpos:Number = IScrollBarModel(vScrollBar.model).value;
+			textField.scrollV = vpos;
+		}
+		
+        /**
+         *  @copy org.apache.flex.core.UIBase#beads
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public var beads:Array;
+		
+		private var _beads:Vector.<IBead>;
+
+        /**
+         *  @copy org.apache.flex.core.UIBase#addBead()
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function addBead(bead:IBead):void
+		{
+			if (!_beads)
+				_beads = new Vector.<IBead>;
+			_beads.push(bead);
+			bead.strand = this;
+		}
+		
+        /**
+         *  @copy org.apache.flex.core.UIBase#getBeadByType()
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function getBeadByType(classOrInterface:Class):IBead
+		{
+			for each (var bead:IBead in _beads)
+			{
+				if (bead is classOrInterface)
+					return bead;
+			}
+			return null;
+		}
+		
+        /**
+         *  @copy org.apache.flex.core.UIBase#removeBead()
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function removeBead(value:IBead):IBead	
+		{
+			var n:int = _beads.length;
+			for (var i:int = 0; i < n; i++)
+			{
+				var bead:IBead = _beads[i];
+				if (bead == value)
+				{
+					_beads.splice(i, 1);
+					return bead;
+				}
+			}
+			return null;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonMeasurementBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonMeasurementBead.as
new file mode 100644
index 0000000..e546cdd
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonMeasurementBead.as
@@ -0,0 +1,86 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import org.apache.flex.core.IMeasurementBead;
+	import org.apache.flex.core.IStrand;
+	
+	/**
+	 *  The TextButtonMeasurementBead class helps measure a org.apache.flex.html.staticControls.TextButton.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class TextButtonMeasurementBead implements IMeasurementBead
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function TextButtonMeasurementBead()
+		{
+		}
+		
+		/**
+		 *  The overall width of the org.apache.flex.html.staticControls.TextButton.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get measuredWidth():Number
+		{
+			var view:TextButtonView = _strand.getBeadByType(TextButtonView) as TextButtonView;
+			if( view ) return Math.max(view.upTextField.textWidth,view.downTextField.textWidth,view.overTextField.textWidth);
+			else return 0;
+		}
+		
+		/**
+		 * The overall height of the org.apache.flex.html.staticControls.TextButton
+		 */
+		public function get measuredHeight():Number
+		{
+			var view:TextButtonView = _strand.getBeadByType(TextButtonView) as TextButtonView;
+			if( view ) return Math.max(view.upTextField.textHeight,view.downTextField.textHeight,view.overTextField.textHeight);
+			else return 0;
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonView.as
new file mode 100644
index 0000000..2665d4f
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonView.as
@@ -0,0 +1,218 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	import flash.display.Shape;
+	import flash.display.SimpleButton;
+	import flash.text.TextFieldType;
+	
+	import org.apache.flex.core.CSSTextField;
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.ITextModel;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+
+    /**
+     *  The TextButtonView class is the default view for
+     *  the org.apache.flex.html.staticControls.TextButton class.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class TextButtonView implements IBeadView
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function TextButtonView()
+		{
+			upTextField = new CSSTextField();
+			downTextField = new CSSTextField();
+			overTextField = new CSSTextField();
+			upTextField.border = true;
+			downTextField.border = true;
+			overTextField.border = true;
+			upTextField.background = true;
+			downTextField.background = true;
+			overTextField.background = true;
+			upTextField.borderColor = 0;
+			downTextField.borderColor = 0;
+			overTextField.borderColor = 0;
+			upTextField.backgroundColor = 0xCCCCCC;
+			downTextField.backgroundColor = 0x808080;
+			overTextField.backgroundColor = 0xFFCCCC;
+			upTextField.selectable = false;
+			upTextField.type = TextFieldType.DYNAMIC;
+			downTextField.selectable = false;
+			downTextField.type = TextFieldType.DYNAMIC;
+			overTextField.selectable = false;
+			overTextField.type = TextFieldType.DYNAMIC;
+			upTextField.autoSize = "left";
+			downTextField.autoSize = "left";
+			overTextField.autoSize = "left";
+
+		}
+		
+		private var textModel:ITextModel;
+		
+		private var _strand:IStrand;
+		
+		private var shape:Shape;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			textModel = value.getBeadByType(ITextModel) as ITextModel;
+			textModel.addEventListener("textChange", textChangeHandler);
+			textModel.addEventListener("htmlChange", htmlChangeHandler);
+			shape = new Shape();
+			shape.graphics.beginFill(0xCCCCCC);
+			shape.graphics.drawRect(0, 0, 10, 10);
+			shape.graphics.endFill();
+			SimpleButton(value).upState = upTextField;
+			SimpleButton(value).downState = downTextField;
+			SimpleButton(value).overState = overTextField;
+			SimpleButton(value).hitTestState = shape;
+			upTextField.styleParent = value;
+			downTextField.styleParent = value;
+			overTextField.styleParent = value;
+			if (textModel.text !== null)
+				text = textModel.text;
+			if (textModel.html !== null)
+				html = textModel.html;
+			
+			IEventDispatcher(_strand).addEventListener("widthChanged",sizeChangeHandler);
+			IEventDispatcher(_strand).addEventListener("heightChanged",sizeChangeHandler);
+		}
+		        
+		private function textChangeHandler(event:Event):void
+		{
+			text = textModel.text;
+		}
+		
+		private function htmlChangeHandler(event:Event):void
+		{
+			html = textModel.html;
+		}
+		
+		private function sizeChangeHandler(event:Event):void
+		{
+			upTextField.width = downTextField.width = overTextField.width = DisplayObject(_strand).width;
+			upTextField.height= downTextField.height= overTextField.height= DisplayObject(_strand).height;
+		}
+		
+        /**
+         *  The CSSTextField in the up state
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public var upTextField:CSSTextField;
+
+        /**
+         *  The CSSTextField in the down state
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public var downTextField:CSSTextField;
+
+        /**
+         *  The CSSTextField in the over state
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public var overTextField:CSSTextField;
+		
+        /**
+         *  @copy org.apache.flex.html.core.ITextModel#text
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get text():String
+		{
+			return upTextField.text;
+		}
+        
+        /**
+         *  @private
+         */
+		public function set text(value:String):void
+		{
+			upTextField.text = value;
+			downTextField.text = value;
+			overTextField.text = value;
+			shape.graphics.clear();
+			shape.graphics.beginFill(0xCCCCCC);
+			shape.graphics.drawRect(0, 0, upTextField.textWidth, upTextField.textHeight);
+			shape.graphics.endFill();
+			
+		}
+		
+        /**
+         *  @copy org.apache.flex.html.core.ITextModel#text
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get html():String
+		{
+			return upTextField.htmlText;
+		}
+		
+        /**
+         *  @private
+         */
+		public function set html(value:String):void
+		{
+			upTextField.htmlText = value;
+			downTextField.htmlText = value;
+			overTextField.htmlText = value;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldLabelMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldLabelMeasurementBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldLabelMeasurementBead.as
new file mode 100644
index 0000000..3645247
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldLabelMeasurementBead.as
@@ -0,0 +1,92 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import org.apache.flex.core.IMeasurementBead;
+	import org.apache.flex.core.IStrand;
+	
+	/**
+	 *  The TextFieldLabelMeasurementBead class helps to measure org.apache.flex.html.staticControls.Label 
+	 *  components.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class TextFieldLabelMeasurementBead implements IMeasurementBead
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function TextFieldLabelMeasurementBead()
+		{
+		}
+		
+		/**
+		 *  The overall width of the org.apache.flex.html.staticControls.Label.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get measuredWidth():Number
+		{
+			var view:TextFieldView = _strand.getBeadByType(TextFieldView) as TextFieldView;
+			if( view ) return view.textField.textWidth;
+			else return 0;
+		}
+		
+		/**
+		 *  The overall height of the org.apache.flex.html.staticControls.Label.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get measuredHeight():Number
+		{
+			var view:TextFieldView = _strand.getBeadByType(TextFieldView) as TextFieldView;
+			if( view ) return view.textField.textHeight;
+			else return 0;
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldView.as
new file mode 100644
index 0000000..b796eda
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldView.as
@@ -0,0 +1,53 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.text.TextFieldType;
+	
+    /**
+     *  The TextFieldView class is the default view for
+     *  the org.apache.flex.html.staticControls.Label class.
+     *  It displays text using a TextField, so there is no
+     *  right-to-left text support in this view.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class TextFieldView extends TextFieldViewBase
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function TextFieldView()
+		{
+			super();
+			
+			textField.selectable = false;
+			textField.type = TextFieldType.DYNAMIC;
+			textField.mouseEnabled = false;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
new file mode 100644
index 0000000..2f0831c
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
@@ -0,0 +1,167 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	import flash.display.DisplayObjectContainer;
+	
+	import org.apache.flex.core.CSSTextField;
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.ITextModel;
+	import org.apache.flex.events.Event;
+	
+    /**
+     *  The TextFieldViewBase class is the base class for
+     *  the components that display text.
+     *  It displays text using a TextField, so there is no
+     *  right-to-left text support in this view.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class TextFieldViewBase implements IBeadView, ITextFieldView
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function TextFieldViewBase()
+		{
+			_textField = new CSSTextField();
+		}
+		
+		private var _textField:CSSTextField;
+		
+        /**
+         *  @copy org.apache.flex.core.ITextModel#textField
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get textField() : CSSTextField
+		{
+			return _textField;
+		}
+		
+		private var _textModel:ITextModel;
+		
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			_textModel = value.getBeadByType(ITextModel) as ITextModel;
+            _textModel.addEventListener("textChange", textChangeHandler);
+            _textModel.addEventListener("htmlChange", htmlChangeHandler);
+            _textModel.addEventListener("widthChanged", sizeChangeHandler);
+            _textModel.addEventListener("heightChanged", sizeChangeHandler);
+			DisplayObjectContainer(value).addChild(_textField);
+			sizeChangeHandler(null);
+			if (_textModel.text !== null)
+				text = _textModel.text;
+			if (_textModel.html !== null)
+				html = _textModel.html;
+		}
+
+        /**
+         *  @private
+         */
+		public function get strand() : IStrand
+		{
+			return _strand;
+		}
+		
+        /**
+         *  @copy org.apache.flex.core.ITextModel#text
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get text():String
+		{
+			return _textField.text;
+		}
+
+        /**
+         *  @private
+         */
+        public function set text(value:String):void
+		{
+            if (value == null)
+                value = "";
+			_textField.text = value;
+		}
+		
+        /**
+         *  @copy org.apache.flex.core.ITextModel#html
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get html():String
+		{
+			return _textField.htmlText;
+		}
+		
+        /**
+         *  @private
+         */
+        public function set html(value:String):void
+		{
+			_textField.htmlText = value;
+		}
+		
+		private function textChangeHandler(event:Event):void
+		{
+			text = _textModel.text;
+		}
+		
+		private function htmlChangeHandler(event:Event):void
+		{
+			html = _textModel.html;
+		}
+		
+		private function sizeChangeHandler(event:Event):void
+		{
+			textField.width = DisplayObject(_strand).width;
+			textField.height = DisplayObject(_strand).height;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputView.as
new file mode 100644
index 0000000..d746fe5
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputView.as
@@ -0,0 +1,88 @@
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	import flash.text.TextFieldType;
+	
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	
+    /**
+     *  The TextInputView class is the view for
+     *  the org.apache.flex.html.staticControls.TextInput in
+     *  a ComboBox and other controls 
+     *  because it does not display a border.
+     *  It displays text using a TextField, so there is no
+     *  right-to-left text support in this view.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class TextInputView extends TextFieldViewBase
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function TextInputView()
+		{
+			super();
+			
+			textField.selectable = true;
+			textField.type = TextFieldType.INPUT;
+			textField.mouseEnabled = true;
+			textField.multiline = false;
+			textField.wordWrap = false;
+		}
+		
+        /**
+         *  @private
+         */
+		override public function set strand(value:IStrand):void
+		{
+			super.strand = value;
+			
+			// Default size
+			var ww:Number = DisplayObject(strand).width;
+			if( isNaN(ww) || ww == 0 ) DisplayObject(strand).width = 100;
+			var hh:Number = DisplayObject(strand).height;
+			if( isNaN(hh) || hh == 0 ) DisplayObject(strand).height = 18;
+			
+			IEventDispatcher(strand).addEventListener("widthChanged", sizeChangedHandler);
+			IEventDispatcher(strand).addEventListener("heightChanged", sizeChangedHandler);
+			sizeChangedHandler(null);
+		}
+		
+		private function sizeChangedHandler(event:Event):void
+		{
+			var ww:Number = DisplayObject(strand).width;
+			if( !isNaN(ww) && ww > 0 ) textField.width = ww;
+			
+			var hh:Number = DisplayObject(strand).height;
+			if( !isNaN(hh) && hh > 0 ) textField.height = hh;
+		}
+	}
+}
\ No newline at end of file


[26/35] sed removal of staticControls. Now to see what I missed

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as
index 67f1458..d65229f 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
@@ -27,14 +27,14 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.UIBase;
 	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.html.staticControls.Container;
-	import org.apache.flex.html.staticControls.supportClasses.Border;
-	import org.apache.flex.html.staticControls.supportClasses.ContainerContentArea;
-	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
+	import org.apache.flex.html.Container;
+	import org.apache.flex.html.supportClasses.Border;
+	import org.apache.flex.html.supportClasses.ContainerContentArea;
+	import org.apache.flex.html.supportClasses.ScrollBar;
 	
     /**
      *  The ContainerView class is the default view for
-     *  the org.apache.flex.html.staticControls.Container class.
+     *  the org.apache.flex.html.Container class.
      *  It lets you use some CSS styles to manage the border, background
      *  and padding around the content area.
      *  
@@ -250,4 +250,4 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ControlBarMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ControlBarMeasurementBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ControlBarMeasurementBead.as
index 8dcbf6d..97b24b5 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ControlBarMeasurementBead.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ControlBarMeasurementBead.as
@@ -16,17 +16,17 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObjectContainer;
 	
 	import org.apache.flex.core.IMeasurementBead;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.IUIBase;
-	import org.apache.flex.html.staticControls.Container;
+	import org.apache.flex.html.Container;
 	
 	/**
-	 *  The ControlBarMeasurementBead class measures the size of a org.apache.flex.html.staticControls.ControlBar
+	 *  The ControlBarMeasurementBead class measures the size of a org.apache.flex.html.ControlBar
 	 *  component.
 	 *  
 	 *  @langversion 3.0
@@ -113,4 +113,4 @@ package org.apache.flex.html.staticControls.beads
 			_strand = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
index 565c8df..c26e89f 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IDataProviderItemRendererMapper;
@@ -140,4 +140,4 @@ package org.apache.flex.html.staticControls.beads
 			IEventDispatcher(_strand).dispatchEvent(new Event("itemsCreated"));
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DownArrowButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DownArrowButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DownArrowButtonView.as
index 3be7ed6..6f461ed 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DownArrowButtonView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DownArrowButtonView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.Graphics;
 	import flash.display.Shape;
@@ -100,4 +100,4 @@ package org.apache.flex.html.staticControls.beads
 		private var overView:Shape;
         
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DropDownListView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DropDownListView.as
index 0849c7a..4f9f40d 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DropDownListView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DropDownListView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
@@ -38,7 +38,7 @@ package org.apache.flex.html.staticControls.beads
 
     /**
      *  The DropDownListView class is the default view for
-     *  the org.apache.flex.html.staticControls.DropDownList class.
+     *  the org.apache.flex.html.DropDownList class.
      *  It displays a simple text label with what appears to be a
      *  down arrow button on the right, but really, the entire
      *  view is the button that will display or dismiss the dropdown.
@@ -280,4 +280,4 @@ package org.apache.flex.html.staticControls.beads
         }
         
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBackgroundBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBackgroundBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBackgroundBead.as
index 921bc8a..2590a9a 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBackgroundBead.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBackgroundBead.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IBead;
 
@@ -32,4 +32,4 @@ package org.apache.flex.html.staticControls.beads
 	public interface IBackgroundBead extends IBead
 	{
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBorderBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBorderBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBorderBead.as
index 66115c8..3e4fc39 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBorderBead.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBorderBead.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IBead;
 
@@ -32,4 +32,4 @@ package org.apache.flex.html.staticControls.beads
 	public interface IBorderBead extends IBead
 	{
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IComboBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IComboBoxView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IComboBoxView.as
index dc4ceb7..650d300 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IComboBoxView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IComboBoxView.as
@@ -16,14 +16,14 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
     import org.apache.flex.core.IBeadView;
     import org.apache.flex.core.IStrand;
     
 	/**
 	 *  The IComboBoxView interface provides the protocol for any bead that
-	 *  creates the visual parts for a org.apache.flex.html.staticControls.ComboBox control.
+	 *  creates the visual parts for a org.apache.flex.html.ComboBox control.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -75,4 +75,4 @@ package org.apache.flex.html.staticControls.beads
 		function get popUpVisible():Boolean;
 		function set popUpVisible(value:Boolean):void;
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IDropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IDropDownListView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IDropDownListView.as
index ca865bc..688bcc5 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IDropDownListView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IDropDownListView.as
@@ -16,14 +16,14 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
     import org.apache.flex.core.IBeadView;
     import org.apache.flex.core.IStrand;
 
     /**
      *  The IDropDownListView interface is the interface for views for
-     *  the org.apache.flex.html.staticControls.DropDownList.
+     *  the org.apache.flex.html.DropDownList.
      *  
      *  @langversion 3.0
      *  @playerversion Flash 10.2
@@ -34,7 +34,7 @@ package org.apache.flex.html.staticControls.beads
 	{
         
         /**
-         *  @copy org.apache.flex.html.staticControls.beads.DropDownListView#popup
+         *  @copy org.apache.flex.html.beads.DropDownListView#popup
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
@@ -44,7 +44,7 @@ package org.apache.flex.html.staticControls.beads
         function get popUp():IStrand;
         
         /**
-         *  @copy org.apache.flex.html.staticControls.beads.DropDownListView#popupVisible
+         *  @copy org.apache.flex.html.beads.DropDownListView#popupVisible
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
@@ -54,4 +54,4 @@ package org.apache.flex.html.staticControls.beads
         function get popUpVisible():Boolean;
         function set popUpVisible(value:Boolean):void;
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IGraphicsDrawing.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IGraphicsDrawing.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IGraphicsDrawing.as
index e19f7f6..91d1838 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IGraphicsDrawing.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IGraphicsDrawing.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
     /**
      *  The IGraphicsDrawing interface is a marker interface for beads
@@ -33,4 +33,4 @@ package org.apache.flex.html.staticControls.beads
 	{
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IListView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IListView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IListView.as
index 6b53e18..5046399 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IListView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IListView.as
@@ -16,14 +16,14 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {	
 	import org.apache.flex.core.IItemRendererParent;
 	import org.apache.flex.core.IStrand;
 
 	/**
 	 *  The IListView interface provides the protocol for any bead that
-	 *  creates the visual parts for a org.apache.flex.html.staticControls.List control.
+	 *  creates the visual parts for a org.apache.flex.html.List control.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -53,4 +53,4 @@ package org.apache.flex.html.staticControls.beads
 		 */
 		function get strand():IStrand;
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IScrollBarView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IScrollBarView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IScrollBarView.as
index 0ccfac2..c42daa7 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IScrollBarView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IScrollBarView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	
@@ -25,7 +25,7 @@ package org.apache.flex.html.staticControls.beads
 
     /**
      *  The IScrollBarView interface is the interface for views for
-     *  the org.apache.flex.html.staticControls.supportClasses.ScrollBar.
+     *  the org.apache.flex.html.supportClasses.ScrollBar.
      *  
      *  @langversion 3.0
      *  @playerversion Flash 10.2
@@ -77,4 +77,4 @@ package org.apache.flex.html.staticControls.beads
 		function get thumb():DisplayObject;
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISliderView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISliderView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISliderView.as
index aa2b912..18e0d56 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISliderView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISliderView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	
@@ -24,7 +24,7 @@ package org.apache.flex.html.staticControls.beads
 	
 	/**
 	 *  The ISliderView interface provides the protocol for any bead that
-	 *  creates the visual parts for a org.apache.flex.html.staticControls.Slider control.
+	 *  creates the visual parts for a org.apache.flex.html.Slider control.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -34,7 +34,7 @@ package org.apache.flex.html.staticControls.beads
 	public interface ISliderView extends IBead
 	{
 		/**
-		 *  The component used for the track area of the org.apache.flex.html.staticControls.Slider.
+		 *  The component used for the track area of the org.apache.flex.html.Slider.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -44,7 +44,7 @@ package org.apache.flex.html.staticControls.beads
 		function get track():DisplayObject;
 		
 		/**
-		 *  The component used for the thumb button of the org.apache.flex.html.staticControls.Slider.
+		 *  The component used for the thumb button of the org.apache.flex.html.Slider.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -53,4 +53,4 @@ package org.apache.flex.html.staticControls.beads
 		 */
 		function get thumb():DisplayObject;
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISpinnerView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISpinnerView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISpinnerView.as
index 4ef5f81..794eb58 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISpinnerView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISpinnerView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	
@@ -24,7 +24,7 @@ package org.apache.flex.html.staticControls.beads
 	
 	/**
 	 *  The ISpinnerView interface provides the protocol for any bead that
-	 *  creates the visual parts for a org.apache.flex.html.staticControls.Spinner control.
+	 *  creates the visual parts for a org.apache.flex.html.Spinner control.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -34,7 +34,7 @@ package org.apache.flex.html.staticControls.beads
 	public interface ISpinnerView extends IBead
 	{
 		/**
-		 *  The component used to increment the org.apache.flex.html.staticControls.Spinner value.
+		 *  The component used to increment the org.apache.flex.html.Spinner value.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -44,7 +44,7 @@ package org.apache.flex.html.staticControls.beads
 		function get increment():DisplayObject;
 		
 		/**
-		 *  The component used to decrement the org.apache.flex.html.staticControls.Spinner value.
+		 *  The component used to decrement the org.apache.flex.html.Spinner value.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -53,4 +53,4 @@ package org.apache.flex.html.staticControls.beads
 		 */
 		function get decrement():DisplayObject;
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextFieldView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextFieldView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextFieldView.as
index f9bff0b..e94ee34 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextFieldView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextFieldView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.CSSTextField;
 
@@ -41,4 +41,4 @@ package org.apache.flex.html.staticControls.beads
          */
 		function get textField():CSSTextField;
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextItemRenderer.as
index 0e86593..4fdc074 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextItemRenderer.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextItemRenderer.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IItemRenderer;
 
@@ -42,4 +42,4 @@ package org.apache.flex.html.staticControls.beads
         function get text():String;
         function set text(value:String):void;
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ImageView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ImageView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ImageView.as
index 3b12779..9c5bd9b 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ImageView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ImageView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.Bitmap;
 	import flash.display.Loader;
@@ -31,7 +31,7 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.events.IEventDispatcher;
 	
 	/**
-	 *  The ImageView class creates the visual elements of the org.apache.flex.html.staticControls.Image component.
+	 *  The ImageView class creates the visual elements of the org.apache.flex.html.Image component.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -118,4 +118,4 @@ package org.apache.flex.html.staticControls.beads
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ListView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ListView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ListView.as
index ff86d64..d01272a 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ListView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ListView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {	
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
@@ -37,14 +37,14 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.ValuesManager;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.beads.models.ScrollBarModel;
-	import org.apache.flex.html.staticControls.beads.models.SingleLineBorderModel;
-	import org.apache.flex.html.staticControls.supportClasses.Border;
-	import org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup;
-	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
+	import org.apache.flex.html.beads.models.ScrollBarModel;
+	import org.apache.flex.html.beads.models.SingleLineBorderModel;
+	import org.apache.flex.html.supportClasses.Border;
+	import org.apache.flex.html.supportClasses.NonVirtualDataGroup;
+	import org.apache.flex.html.supportClasses.ScrollBar;
 
 	/**
-	 *  The List class creates the visual elements of the org.apache.flex.html.staticControls.List 
+	 *  The List class creates the visual elements of the org.apache.flex.html.List 
 	 *  component. A List consists of the area to display the data (in the dataGroup), any 
 	 *  scrollbars, and so forth.
 	 *  
@@ -64,7 +64,7 @@ package org.apache.flex.html.staticControls.beads
 		private var _border:Border;
 		
 		/**
-		 *  The border surrounding the org.apache.flex.html.staticControls.List.
+		 *  The border surrounding the org.apache.flex.html.List.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -94,7 +94,7 @@ package org.apache.flex.html.staticControls.beads
 		private var _vScrollBar:ScrollBar;
 		
 		/**
-		 *  The vertical org.apache.flex.html.staticControls.ScrollBar, if needed.
+		 *  The vertical org.apache.flex.html.ScrollBar, if needed.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -109,7 +109,7 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 		/**
-		 *  The horizontal org.apache.flex.html.staticControls.ScrollBar, currently null.
+		 *  The horizontal org.apache.flex.html.ScrollBar, currently null.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -257,4 +257,4 @@ package org.apache.flex.html.staticControls.beads
 		}
 				
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
index 600e50c..232feb4 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
@@ -30,17 +30,17 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.createjs.staticControls.Label;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.Spinner;
-	import org.apache.flex.html.staticControls.TextInput;
-	import org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout;
-	import org.apache.flex.html.staticControls.supportClasses.Border;
-	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
+	import org.apache.flex.html.Spinner;
+	import org.apache.flex.html.TextInput;
+	import org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout;
+	import org.apache.flex.html.supportClasses.Border;
+	import org.apache.flex.html.supportClasses.ScrollBar;
 	
 	/**
 	 *  The NumericStepperView class creates the visual elements of the 
-	 *  org.apache.flex.html.staticControls.NumericStepper component. A NumberStepper consists of a 
-	 *  org.apache.flex.html.staticControls.TextInput component to display the value and a 
-	 *  org.apache.flex.html.staticControls.Spinner to change the value.
+	 *  org.apache.flex.html.NumericStepper component. A NumberStepper consists of a 
+	 *  org.apache.flex.html.TextInput component to display the value and a 
+	 *  org.apache.flex.html.Spinner to change the value.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -213,4 +213,4 @@ package org.apache.flex.html.staticControls.beads
 			return _strand as DisplayObject;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/PanelView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/PanelView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/PanelView.as
index 2108ea1..6ce3be6 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/PanelView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/PanelView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.Sprite;
 	
@@ -27,16 +27,16 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.UIMetrics;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.Container;
-	import org.apache.flex.html.staticControls.ControlBar;
-	import org.apache.flex.html.staticControls.Panel;
-	import org.apache.flex.html.staticControls.TitleBar;
+	import org.apache.flex.html.Container;
+	import org.apache.flex.html.ControlBar;
+	import org.apache.flex.html.Panel;
+	import org.apache.flex.html.TitleBar;
 	import org.apache.flex.utils.BeadMetrics;
 	
 	/**
-	 *  The Panel class creates the visual elements of the org.apache.flex.html.staticControls.Panel 
-	 *  component. A Panel has a org.apache.flex.html.staticControls.TitleBar, content, and an 
-	 *  optional org.apache.flex.html.staticControls.ControlBar.
+	 *  The Panel class creates the visual elements of the org.apache.flex.html.Panel 
+	 *  component. A Panel has a org.apache.flex.html.TitleBar, content, and an 
+	 *  optional org.apache.flex.html.ControlBar.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -61,8 +61,8 @@ package org.apache.flex.html.staticControls.beads
 		private var _titleBar:TitleBar;
 		
 		/**
-		 *  The org.apache.flex.html.staticControls.TitleBar component of the 
-		 *  org.apache.flex.html.staticControls.Panel.
+		 *  The org.apache.flex.html.TitleBar component of the 
+		 *  org.apache.flex.html.Panel.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -77,7 +77,7 @@ package org.apache.flex.html.staticControls.beads
 		private var _controlBar:ControlBar;
 		
 		/**
-		 *  The org.apache.flex.html.staticControls.ControlBar for the Panel; may be null.
+		 *  The org.apache.flex.html.ControlBar for the Panel; may be null.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -177,4 +177,4 @@ package org.apache.flex.html.staticControls.beads
 		}
         
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/RadioButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/RadioButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/RadioButtonView.as
index bc24661..b133259 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/RadioButtonView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/RadioButtonView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.Shape;
 	import flash.display.SimpleButton;
@@ -31,7 +31,7 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.events.Event;
 	
 	/**
-	 *  The RadioButtonView class creates the visual elements of the org.apache.flex.html.staticControls.RadioButton 
+	 *  The RadioButtonView class creates the visual elements of the org.apache.flex.html.RadioButton 
 	 *  component. 
 	 *  
 	 *  @langversion 3.0
@@ -140,7 +140,7 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 		/**
-		 *  The string label for the org.apache.flex.html.staticControls.RadioButton.
+		 *  The string label for the org.apache.flex.html.RadioButton.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -164,7 +164,7 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 		/**
-		 *  The HTML string for the org.apache.flex.html.staticControls.RadioButton.
+		 *  The HTML string for the org.apache.flex.html.RadioButton.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -279,4 +279,4 @@ package org.apache.flex.html.staticControls.beads
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ScrollBarView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ScrollBarView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ScrollBarView.as
index 5bc7723..7575ed2 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ScrollBarView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ScrollBarView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	
@@ -27,12 +27,12 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.Strand;
 	import org.apache.flex.core.UIBase;
 	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.html.staticControls.Button;
-	import org.apache.flex.html.staticControls.beads.controllers.ButtonAutoRepeatController;
+	import org.apache.flex.html.Button;
+	import org.apache.flex.html.beads.controllers.ButtonAutoRepeatController;
 
     /**
      *  The ScrollBarView class is the default view for
-     *  the org.apache.flex.html.staticControls.supportClasses.ScrollBar class.
+     *  the org.apache.flex.html.supportClasses.ScrollBar class.
      *  It implements the classic desktop-like ScrollBar.
      *  A different view would implement more modern scrollbars that hide themselves
      *  until hovered over with the mouse.
@@ -103,7 +103,7 @@ package org.apache.flex.html.staticControls.beads
 		private var _thumb:DisplayObject;
 		
         /**
-         *  @copy org.apache.flex.html.staticControls.beads.IScrollBarView#decrement
+         *  @copy org.apache.flex.html.beads.IScrollBarView#decrement
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
@@ -116,7 +116,7 @@ package org.apache.flex.html.staticControls.beads
 		}
 
         /**
-         *  @copy org.apache.flex.html.staticControls.beads.IScrollBarView#increment
+         *  @copy org.apache.flex.html.beads.IScrollBarView#increment
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
@@ -129,7 +129,7 @@ package org.apache.flex.html.staticControls.beads
 		}
         
         /**
-         *  @copy org.apache.flex.html.staticControls.beads.IScrollBarView#track
+         *  @copy org.apache.flex.html.beads.IScrollBarView#track
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
@@ -142,7 +142,7 @@ package org.apache.flex.html.staticControls.beads
 		}
         
         /**
-         *  @copy org.apache.flex.html.staticControls.beads.IScrollBarView#thumb
+         *  @copy org.apache.flex.html.beads.IScrollBarView#thumb
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
@@ -155,4 +155,4 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SimpleAlertView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SimpleAlertView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SimpleAlertView.as
index 682c2c9..17080cb 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SimpleAlertView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SimpleAlertView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IAlertModel;
 	import org.apache.flex.core.IBead;
@@ -29,13 +29,13 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.ValuesManager;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.Label;
-	import org.apache.flex.html.staticControls.TextButton;
+	import org.apache.flex.html.Label;
+	import org.apache.flex.html.TextButton;
 	import org.apache.flex.utils.BeadMetrics;
 	
 	/**
 	 *  The SimpleAlertView class creates the visual elements of the 
-	 *  org.apache.flex.html.staticControls.SimpleAlert component.
+	 *  org.apache.flex.html.SimpleAlert component.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -147,4 +147,4 @@ package org.apache.flex.html.staticControls.beads
 			IEventDispatcher(_strand).dispatchEvent(newEvent);
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SingleLineBorderBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SingleLineBorderBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SingleLineBorderBead.as
index fb0f679..1621cde 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SingleLineBorderBead.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SingleLineBorderBead.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.Graphics;
 	
@@ -91,4 +91,4 @@ package org.apache.flex.html.staticControls.beads
             g.endFill();
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderThumbView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderThumbView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderThumbView.as
index 3242274..702e515 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderThumbView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderThumbView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.Graphics;
 	import flash.display.Shape;
@@ -29,7 +29,7 @@ package org.apache.flex.html.staticControls.beads
 	
 	/**
 	 *  The SliderThumbView class creates the draggable input element for the 
-	 *  org.apache.flex.html.staticControls.Slider component.
+	 *  org.apache.flex.html.Slider component.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -111,4 +111,4 @@ package org.apache.flex.html.staticControls.beads
 			drawView(overView.graphics, 0xDDDDDD);
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderTrackView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderTrackView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderTrackView.as
index 6fc5047..6bd6001 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderTrackView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderTrackView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.Graphics;
 	import flash.display.Shape;
@@ -28,7 +28,7 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.events.IEventDispatcher;
 	
 	/**
-	 *  The SliderTrackView class creates the track area for the org.apache.flex.html.staticControls.Slider
+	 *  The SliderTrackView class creates the track area for the org.apache.flex.html.Slider
 	 *  component.
 	 *  
 	 *  @langversion 3.0
@@ -111,4 +111,4 @@ package org.apache.flex.html.staticControls.beads
 			drawView(overView.graphics, 0xEEEEEE);
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderView.as
index 83893dc..6ee07a7 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SliderView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	import flash.display.Sprite;
@@ -30,10 +30,10 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.ValuesManager;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.Button;
+	import org.apache.flex.html.Button;
 	
 	/**
-	 *  The SliderView class creates the visual elements of the org.apache.flex.html.staticControls.Slider 
+	 *  The SliderView class creates the visual elements of the org.apache.flex.html.Slider 
 	 *  component. The Slider has a track and a thumb control which are also created with view beads.
 	 *  
 	 *  @langversion 3.0
@@ -177,4 +177,4 @@ package org.apache.flex.html.staticControls.beads
 			_thumb.x = xloc;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SolidBackgroundBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SolidBackgroundBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SolidBackgroundBead.as
index 4a90b8a..605664f 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SolidBackgroundBead.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SolidBackgroundBead.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.Graphics;
 	
@@ -142,4 +142,4 @@ package org.apache.flex.html.staticControls.beads
             g.endFill();
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SpinnerView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SpinnerView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SpinnerView.as
index e2ed0aa..edfd6ac 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SpinnerView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/SpinnerView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	
@@ -27,11 +27,11 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.UIBase;
 	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.beads.controllers.ButtonAutoRepeatController;
+	import org.apache.flex.html.Button;
+	import org.apache.flex.html.beads.controllers.ButtonAutoRepeatController;
 	
 	/**
-	 *  The SpinnerView class creates the visual elements of the org.apache.flex.html.staticControls.Spinner 
+	 *  The SpinnerView class creates the visual elements of the org.apache.flex.html.Spinner 
 	 *  component.
 	 *  
 	 *  @langversion 3.0
@@ -93,7 +93,7 @@ package org.apache.flex.html.staticControls.beads
 		private var _increment:DisplayObject;
 		
 		/**
-		 *  The component for decrementing the org.apache.flex.html.staticControls.Spinner value.
+		 *  The component for decrementing the org.apache.flex.html.Spinner value.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -106,7 +106,7 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 		/**
-		 *  The component for incrementing the org.apache.flex.html.staticControls.Spinner value.
+		 *  The component for incrementing the org.apache.flex.html.Spinner value.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -131,4 +131,4 @@ package org.apache.flex.html.staticControls.beads
 			_decrement.y      = _increment.height;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextAreaView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextAreaView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextAreaView.as
index 631466e..3bb10fd 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextAreaView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextAreaView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	import flash.events.Event;
@@ -29,13 +29,13 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.IParent;
     import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.html.staticControls.beads.models.ScrollBarModel;
-	import org.apache.flex.html.staticControls.supportClasses.Border;
-	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
+	import org.apache.flex.html.beads.models.ScrollBarModel;
+	import org.apache.flex.html.supportClasses.Border;
+	import org.apache.flex.html.supportClasses.ScrollBar;
 
     /**
      *  The TextAreaView class is the default view for
-     *  the org.apache.flex.html.staticControls.TextArea class.
+     *  the org.apache.flex.html.TextArea class.
      *  It implements the classic desktop-like TextArea with
      *  a border and scrollbars.  It does not support right-to-left text.
      *  
@@ -255,4 +255,4 @@ package org.apache.flex.html.staticControls.beads
 			return null;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonMeasurementBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonMeasurementBead.as
index e546cdd..1341389 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonMeasurementBead.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonMeasurementBead.as
@@ -16,13 +16,13 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IMeasurementBead;
 	import org.apache.flex.core.IStrand;
 	
 	/**
-	 *  The TextButtonMeasurementBead class helps measure a org.apache.flex.html.staticControls.TextButton.
+	 *  The TextButtonMeasurementBead class helps measure a org.apache.flex.html.TextButton.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -44,7 +44,7 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 		/**
-		 *  The overall width of the org.apache.flex.html.staticControls.TextButton.
+		 *  The overall width of the org.apache.flex.html.TextButton.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -59,7 +59,7 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 		/**
-		 * The overall height of the org.apache.flex.html.staticControls.TextButton
+		 * The overall height of the org.apache.flex.html.TextButton
 		 */
 		public function get measuredHeight():Number
 		{
@@ -83,4 +83,4 @@ package org.apache.flex.html.staticControls.beads
 			_strand = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonView.as
index 2665d4f..3a8c9d6 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextButtonView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	import flash.display.Shape;
@@ -32,7 +32,7 @@ package org.apache.flex.html.staticControls.beads
 
     /**
      *  The TextButtonView class is the default view for
-     *  the org.apache.flex.html.staticControls.TextButton class.
+     *  the org.apache.flex.html.TextButton class.
      *  
      *  @langversion 3.0
      *  @playerversion Flash 10.2
@@ -215,4 +215,4 @@ package org.apache.flex.html.staticControls.beads
 			overTextField.htmlText = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldLabelMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldLabelMeasurementBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldLabelMeasurementBead.as
index 3645247..ca38a0b 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldLabelMeasurementBead.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldLabelMeasurementBead.as
@@ -16,13 +16,13 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IMeasurementBead;
 	import org.apache.flex.core.IStrand;
 	
 	/**
-	 *  The TextFieldLabelMeasurementBead class helps to measure org.apache.flex.html.staticControls.Label 
+	 *  The TextFieldLabelMeasurementBead class helps to measure org.apache.flex.html.Label 
 	 *  components.
 	 *  
 	 *  @langversion 3.0
@@ -45,7 +45,7 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 		/**
-		 *  The overall width of the org.apache.flex.html.staticControls.Label.
+		 *  The overall width of the org.apache.flex.html.Label.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -60,7 +60,7 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 		/**
-		 *  The overall height of the org.apache.flex.html.staticControls.Label.
+		 *  The overall height of the org.apache.flex.html.Label.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -89,4 +89,4 @@ package org.apache.flex.html.staticControls.beads
 			_strand = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldView.as
index b796eda..2157490 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldView.as
@@ -16,13 +16,13 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.text.TextFieldType;
 	
     /**
      *  The TextFieldView class is the default view for
-     *  the org.apache.flex.html.staticControls.Label class.
+     *  the org.apache.flex.html.Label class.
      *  It displays text using a TextField, so there is no
      *  right-to-left text support in this view.
      *  
@@ -50,4 +50,4 @@ package org.apache.flex.html.staticControls.beads
 			textField.mouseEnabled = false;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
index 2f0831c..a18180d 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
@@ -164,4 +164,4 @@ package org.apache.flex.html.staticControls.beads
 			textField.height = DisplayObject(_strand).height;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputView.as
index d746fe5..c5b39c6 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputView.as
@@ -15,7 +15,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	import flash.text.TextFieldType;
@@ -26,7 +26,7 @@ package org.apache.flex.html.staticControls.beads
 	
     /**
      *  The TextInputView class is the view for
-     *  the org.apache.flex.html.staticControls.TextInput in
+     *  the org.apache.flex.html.TextInput in
      *  a ComboBox and other controls 
      *  because it does not display a border.
      *  It displays text using a TextField, so there is no
@@ -85,4 +85,4 @@ package org.apache.flex.html.staticControls.beads
 			if( !isNaN(hh) && hh > 0 ) textField.height = hh;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputWithBorderView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputWithBorderView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputWithBorderView.as
index 4fd1566..d205086 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputWithBorderView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputWithBorderView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	
@@ -25,13 +25,13 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.IParent;
     import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.html.staticControls.supportClasses.Border;
+	import org.apache.flex.html.supportClasses.Border;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
 
     /**
      *  The TextInputWithBorderView class is the default view for
-     *  the org.apache.flex.html.staticControls.TextInput.
+     *  the org.apache.flex.html.TextInput.
      *  It displays text using a TextField, so there is no
      *  right-to-left text support in this view.
      *  
@@ -76,4 +76,4 @@ package org.apache.flex.html.staticControls.beads
 			_border.height = hh;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
index 7f3ecb0..635b851 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
     import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IDataProviderItemRendererMapper;
@@ -138,4 +138,4 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForStringVectorData.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForStringVectorData.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForStringVectorData.as
index 7e5f41f..5c034d9 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForStringVectorData.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForStringVectorData.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
     
     import org.apache.flex.core.IBead;
@@ -125,4 +125,4 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TitleBarMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TitleBarMeasurementBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TitleBarMeasurementBead.as
index 9976ea6..4647113 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TitleBarMeasurementBead.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TitleBarMeasurementBead.as
@@ -16,16 +16,16 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IMeasurementBead;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.html.staticControls.TitleBar;
+	import org.apache.flex.html.TitleBar;
 	
 	/**
 	 *  The TitleBarMeasurementBead class measures the overall size of a 
-	 *  org.apache.flex.html.staticControls.TitleBar.
+	 *  org.apache.flex.html.TitleBar.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -47,7 +47,7 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 		/**
-		 *  The overall width of the org.apache.flex.html.staticControls.TitleBar.
+		 *  The overall width of the org.apache.flex.html.TitleBar.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -68,7 +68,7 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 		/**
-		 *  The overall height of the org.apache.flex.html.staticControls.TitleBar.
+		 *  The overall height of the org.apache.flex.html.TitleBar.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -103,4 +103,4 @@ package org.apache.flex.html.staticControls.beads
 			_strand = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/UpArrowButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/UpArrowButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/UpArrowButtonView.as
index 6ef6efb..b7da755 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/UpArrowButtonView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/UpArrowButtonView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.Graphics;
 	import flash.display.Shape;
@@ -100,4 +100,4 @@ package org.apache.flex.html.staticControls.beads
 		private var overView:Shape;
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarThumbView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarThumbView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarThumbView.as
index c147a50..201e421 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarThumbView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarThumbView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.Graphics;
 	import flash.display.Shape;
@@ -124,4 +124,4 @@ package org.apache.flex.html.staticControls.beads
 		private var overView:Shape;
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarTrackView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarTrackView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarTrackView.as
index 7f9dc8d..4f12d8b 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarTrackView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarTrackView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	import flash.display.Graphics;
@@ -109,4 +109,4 @@ package org.apache.flex.html.staticControls.beads
 		private var overView:Shape;
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/AlertController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/AlertController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/AlertController.as
index 7622b54..3982d0f 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/AlertController.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/AlertController.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.controllers
+package org.apache.flex.html.beads.controllers
 {	
     import flash.display.DisplayObject;
     
@@ -26,8 +26,8 @@ package org.apache.flex.html.staticControls.beads.controllers
 	import org.apache.flex.events.IEventDispatcher;
 
 	/**
-	 *  The AlertControler class bead handles the close event on the org.apache.flex.html.staticControls.Alert 
-	 *  by removing the org.apache.flex.html.staticControls.Alert from the display.
+	 *  The AlertControler class bead handles the close event on the org.apache.flex.html.Alert 
+	 *  by removing the org.apache.flex.html.Alert from the display.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -85,4 +85,4 @@ package org.apache.flex.html.staticControls.beads.controllers
             DisplayObject(_strand).parent.removeChild(DisplayObject(_strand));
         }
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ButtonAutoRepeatController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ButtonAutoRepeatController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ButtonAutoRepeatController.as
index 70b2348..fe3a7b7 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ButtonAutoRepeatController.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ButtonAutoRepeatController.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.controllers
+package org.apache.flex.html.beads.controllers
 {
 	import flash.events.MouseEvent;
 	import flash.utils.clearInterval;
@@ -144,4 +144,4 @@ package org.apache.flex.html.staticControls.beads.controllers
        	    IEventDispatcher(_strand).dispatchEvent(new Event("buttonRepeat"));
         }
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ComboBoxController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ComboBoxController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ComboBoxController.as
index 1f333ef..4b9faf7 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ComboBoxController.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ComboBoxController.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.controllers
+package org.apache.flex.html.beads.controllers
 {
 	import flash.display.DisplayObject;
 	import flash.events.MouseEvent;
@@ -26,11 +26,11 @@ package org.apache.flex.html.staticControls.beads.controllers
 	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.IComboBoxView;
+	import org.apache.flex.html.beads.IComboBoxView;
 
 	/**
 	 *  The ComboBoxController class bead handles mouse events on the elements of
-	 *  the org.apache.flex.html.staticControls.ComboBox. This includes selecting the 
+	 *  the org.apache.flex.html.ComboBox. This includes selecting the 
 	 *  button to display the selection list pop-up as well as selecting an item from the 
 	 *  pop-up list.
 	 *  
@@ -101,4 +101,4 @@ package org.apache.flex.html.staticControls.beads.controllers
         }
 	
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropDownListController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropDownListController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropDownListController.as
index 47287be..48d9a6a 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropDownListController.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropDownListController.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.controllers
+package org.apache.flex.html.beads.controllers
 {
 	import flash.display.DisplayObject;
 	import flash.geom.Point;
@@ -27,11 +27,11 @@ package org.apache.flex.html.staticControls.beads.controllers
 	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.IDropDownListView;
+	import org.apache.flex.html.beads.IDropDownListView;
 
     /**
      *  The DropDownListController class is the controller for
-     *  org.apache.flex.html.staticControls.DropDownList.  Controllers
+     *  org.apache.flex.html.DropDownList.  Controllers
      *  watch for events from the interactive portions of a View and
      *  update the data model or dispatch a semantic event.
      *  This controller watches for the click event and displays the
@@ -101,4 +101,4 @@ package org.apache.flex.html.staticControls.beads.controllers
         }
 	
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/EditableTextKeyboardController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/EditableTextKeyboardController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/EditableTextKeyboardController.as
index 01f8e9f..4a8115f 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/EditableTextKeyboardController.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/EditableTextKeyboardController.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.controllers
+package org.apache.flex.html.beads.controllers
 {
 	import org.apache.flex.core.CSSTextField;
 	import org.apache.flex.core.IBead;
@@ -24,7 +24,7 @@ package org.apache.flex.html.staticControls.beads.controllers
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.ITextModel;
 	import org.apache.flex.core.UIBase;
-	import org.apache.flex.html.staticControls.beads.ITextFieldView;
+	import org.apache.flex.html.beads.ITextFieldView;
 	
 	/**
 	 *  The EditableTextKeyboardController class bead intercepts keyboard events on the
@@ -83,4 +83,4 @@ package org.apache.flex.html.staticControls.beads.controllers
 			model.text = textField.text;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as
index d72bbdb..30c27e3 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.controllers
+package org.apache.flex.html.beads.controllers
 {
 	import flash.events.MouseEvent;
 	
@@ -123,4 +123,4 @@ package org.apache.flex.html.staticControls.beads.controllers
 		}
 	
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.as
index fe5dfa1..0b8d14f 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.controllers
+package org.apache.flex.html.beads.controllers
 {
 	import org.apache.flex.core.IBeadController;
 	import org.apache.flex.core.IItemRenderer;
@@ -26,12 +26,12 @@ package org.apache.flex.html.staticControls.beads.controllers
 	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.IListView;
+	import org.apache.flex.html.beads.IListView;
 	
 
     /**
      *  The ListSingleSelectionMouseController class is a controller for
-     *  org.apache.flex.html.staticControls.List.  Controllers
+     *  org.apache.flex.html.List.  Controllers
      *  watch for events from the interactive portions of a View and
      *  update the data model or dispatch a semantic event.
      *  This controller watches for events from the item renderers
@@ -121,4 +121,4 @@ package org.apache.flex.html.staticControls.beads.controllers
         }
 	
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ScrollBarMouseControllerBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ScrollBarMouseControllerBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ScrollBarMouseControllerBase.as
index de4f73c..5ca1358 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ScrollBarMouseControllerBase.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ScrollBarMouseControllerBase.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.controllers
+package org.apache.flex.html.beads.controllers
 {
 	import flash.events.MouseEvent;
 	
@@ -25,7 +25,7 @@ package org.apache.flex.html.staticControls.beads.controllers
 	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.IScrollBarView;
+	import org.apache.flex.html.beads.IScrollBarView;
 
     /**
      *  The ScrollBarMouseControllerBase class is the base class
@@ -182,4 +182,4 @@ package org.apache.flex.html.staticControls.beads.controllers
 		}
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SliderMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SliderMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SliderMouseController.as
index 3b6e295..c979e2f 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SliderMouseController.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SliderMouseController.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.controllers
+package org.apache.flex.html.beads.controllers
 {
 	import flash.events.MouseEvent;
 	import flash.geom.Point;
@@ -28,11 +28,11 @@ package org.apache.flex.html.staticControls.beads.controllers
 	import org.apache.flex.core.UIBase;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.beads.ISliderView;
+	import org.apache.flex.html.beads.ISliderView;
 	
 	/**
 	 *  The SliderMouseController class bead handles mouse events on the 
-	 *  org.apache.flex.html.staticControls.Slider's component parts (thumb and track) and 
+	 *  org.apache.flex.html.Slider's component parts (thumb and track) and 
 	 *  dispatches change events on behalf of the Slider (as well as co-ordinating visual 
 	 *  changes (such as moving the thumb when the track has been tapped or clicked).
 	 *  
@@ -145,4 +145,4 @@ package org.apache.flex.html.staticControls.beads.controllers
 			IEventDispatcher(_strand).dispatchEvent(new Event("valueChanged"));
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.as
index 9823184..1b44419 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.controllers
+package org.apache.flex.html.beads.controllers
 {
 	import flash.events.MouseEvent;
 	
@@ -26,11 +26,11 @@ package org.apache.flex.html.staticControls.beads.controllers
 	import org.apache.flex.core.UIBase;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.beads.ISpinnerView;
+	import org.apache.flex.html.beads.ISpinnerView;
 	
 	/**
 	 *  The SpinnerMouseController class bead handles mouse events on the 
-	 *  org.apache.flex.html.staticControls.Spinner's component buttons, changing the 
+	 *  org.apache.flex.html.Spinner's component buttons, changing the 
 	 *  value of the Spinner.
 	 *  
 	 *  @langversion 3.0
@@ -95,4 +95,4 @@ package org.apache.flex.html.staticControls.beads.controllers
 			IEventDispatcher(_strand).dispatchEvent(new Event("valueChanged"));
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as
index cc8d29f..6961b73 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.controllers
+package org.apache.flex.html.beads.controllers
 {
 	import flash.display.DisplayObject;
 	import flash.events.MouseEvent;
@@ -26,7 +26,7 @@ package org.apache.flex.html.staticControls.beads.controllers
 	
     /**
      *  The VScrollBarMouseController class is the controller for
-     *  org.apache.flex.html.staticControls.supportClasses.ScrollBar
+     *  org.apache.flex.html.supportClasses.ScrollBar
      *  that acts as the Vertical ScrollBar.
      *  
      *  @langversion 3.0
@@ -98,4 +98,4 @@ package org.apache.flex.html.staticControls.beads.controllers
 			sbView.thumb.stage.removeEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler);			
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
index d27b2dd..c8c4d74 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.layouts
+package org.apache.flex.html.beads.layouts
 {
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
@@ -29,8 +29,8 @@ package org.apache.flex.html.staticControls.beads.layouts
 	import org.apache.flex.events.IEventDispatcher;
 	
 	/**
-	 *  The ButtonBarLayout class bead sizes and positions the org.apache.flex.html.staticControls.Button 
-	 *  elements that make up a org.apache.flex.html.staticControls.ButtonBar. This bead arranges the Buttons 
+	 *  The ButtonBarLayout class bead sizes and positions the org.apache.flex.html.Button 
+	 *  elements that make up a org.apache.flex.html.ButtonBar. This bead arranges the Buttons 
 	 *  horizontally and makes them all the same width unless the buttonWidths property has been set in which case
 	 *  the values stored in that array are used.
 	 *  
@@ -118,4 +118,4 @@ package org.apache.flex.html.staticControls.beads.layouts
 			}
 		}
 	}
-}
\ No newline at end of file
+}


[08/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalLayout.as
deleted file mode 100644
index 58bec68..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalLayout.as
+++ /dev/null
@@ -1,172 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.layouts
-{
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	
-	import org.apache.flex.core.IBeadLayout;
-	import org.apache.flex.core.ILayoutParent;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-
-    /**
-     *  The NonVirtualHorizontalLayout class is a simple layout
-     *  bead.  It takes the set of children and lays them out
-     *  horizontally in one row, separating them according to
-     *  CSS layout rules for margin and vertical-align styles.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class NonVirtualHorizontalLayout implements IBeadLayout
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function NonVirtualHorizontalLayout()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			IEventDispatcher(value).addEventListener("widthChanged", changeHandler);
-			IEventDispatcher(value).addEventListener("childrenAdded", changeHandler);
-			IEventDispatcher(value).addEventListener("itemsCreated", changeHandler);
-		}
-	
-		private function changeHandler(event:Event):void
-		{
-			var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
-			var contentView:DisplayObjectContainer = layoutParent.contentView;
-			
-			var n:int = contentView.numChildren;
-			var marginLeft:Object;
-			var marginRight:Object;
-			var marginTop:Object;
-			var marginBottom:Object;
-			var margin:Object;
-			var maxHeight:Number = 0;
-			var verticalMargins:Array = [];
-			
-			for (var i:int = 0; i < n; i++)
-			{
-				var child:DisplayObject = contentView.getChildAt(i);
-				margin = ValuesManager.valuesImpl.getValue(child, "margin");
-				if (margin is Array)
-				{
-					if (margin.length == 1)
-						marginLeft = marginTop = marginRight = marginBottom = margin[0];
-					else if (margin.length <= 3)
-					{
-						marginLeft = marginRight = margin[1];
-						marginTop = marginBottom = margin[0];
-					}
-					else if (margin.length == 4)
-					{
-						marginLeft = margin[3];
-						marginBottom = margin[2];
-						marginRight = margin[1];
-						marginTop = margin[0];					
-					}
-				}
-				else if (margin == null)
-				{
-					marginLeft = ValuesManager.valuesImpl.getValue(child, "margin-left");
-					marginTop = ValuesManager.valuesImpl.getValue(child, "margin-top");
-					marginRight = ValuesManager.valuesImpl.getValue(child, "margin-right");
-					marginBottom = ValuesManager.valuesImpl.getValue(child, "margin-bottom");
-				}
-				else
-				{
-					marginLeft = marginTop = marginBottom = marginRight = margin;
-				}
-				var ml:Number;
-				var mr:Number;
-				var mt:Number;
-				var mb:Number;
-				var lastmr:Number;
-				mt = Number(marginTop);
-				if (isNaN(mt))
-					mt = 0;
-				mb = Number(marginBottom);
-				if (isNaN(mb))
-					mb = 0;
-				if (marginLeft == "auto")
-					ml = 0;
-				else
-				{
-					ml = Number(marginLeft);
-					if (isNaN(ml))
-						ml = 0;
-				}
-				if (marginRight == "auto")
-					mr = 0;
-				else
-				{
-					mr = Number(marginRight);
-					if (isNaN(mr))
-						mr = 0;
-				}
-				child.y = mt;
-				maxHeight = Math.max(maxHeight, ml + child.height + mr);
-				var xx:Number;
-				if (i == 0)
-					child.x = ml;
-				else
-					child.x = xx + ml + lastmr;
-				xx = child.x + child.width;
-				lastmr = mr;
-				var valign:Object = ValuesManager.valuesImpl.getValue(child, "vertical-align");
-				verticalMargins.push({ marginTop: marginTop, marginBottom: marginBottom, valign: valign });
-			}
-			for (i = 0; i < n; i++)
-			{
-				var obj:Object = verticalMargins[0]
-				child = contentView.getChildAt(i);
-				if (obj.valign == "middle")
-					child.y = maxHeight - child.height / 2;
-				else if (valign == "bottom")
-					child.y = maxHeight - child.height - obj.marginBottom;
-				else
-					child.y = obj.marginTop;
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalScrollingLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalScrollingLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalScrollingLayout.as
deleted file mode 100644
index 32e3597..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalScrollingLayout.as
+++ /dev/null
@@ -1,136 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.layouts
-{
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	
-	import org.apache.flex.core.IBeadLayout;
-	import org.apache.flex.core.IBorderModel;
-	import org.apache.flex.core.ILayoutParent;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.supportClasses.Border;
-	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
-	
-    /**
-     *  The NonVirtualHorizontalScrollingLayout class is a layout
-     *  bead that displays a set of children horizontally in one row, 
-     *  separating them according to CSS layout rules for margin and 
-     *  vertical-align styles and lays out a horizontal ScrollBar
-     *  below the children.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class NonVirtualHorizontalScrollingLayout implements IBeadLayout
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function NonVirtualHorizontalScrollingLayout()
-		{
-		}
-		
-		private var hScrollBar:ScrollBar;
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			IEventDispatcher(value).addEventListener("heightChanged", changeHandler);
-			IEventDispatcher(value).addEventListener("widthChanged", changeHandler);
-			IEventDispatcher(value).addEventListener("itemsCreated", changeHandler);
-		}
-		
-		private function changeHandler(event:Event):void
-		{            
-			var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
-			var contentView:DisplayObjectContainer = layoutParent.contentView;
-			var border:Border = layoutParent.border;
-			var borderModel:IBorderModel = border.model as IBorderModel;
-			
-			var ww:Number = layoutParent.resizableView.width;
-			var hh:Number = layoutParent.resizableView.height;
-			border.width = ww;
-			border.height = hh;
-			
-			contentView.width = ww - borderModel.offsets.left - borderModel.offsets.right;
-			contentView.height = hh - borderModel.offsets.top - borderModel.offsets.bottom;
-			contentView.x = borderModel.offsets.left;
-			contentView.y = borderModel.offsets.top;
-			
-			var n:int = contentView.numChildren;
-			var xx:Number = 0;
-			for (var i:int = 0; i < n; i++)
-			{
-				var ir:DisplayObject = contentView.getChildAt(i);
-				ir.x = xx;
-				ir.height = contentView.height;
-				xx += ir.width;			
-			}
-			/*
-			if (xx > dataGroup.width)
-			{
-				hScrollBar = listView.hScrollBar;
-				dataGroup.height -= hScrollBar.height;
-				IScrollBarModel(hScrollBar.model).maximum = xx;
-				IScrollBarModel(hScrollBar.model).pageSize = dataGroup.width;
-				IScrollBarModel(hScrollBar.model).pageStepSize = dataGroup.width;
-				hScrollBar.visible = true;
-				hScrollBar.width = dataGroup.width;
-				hScrollBar.x = dataGroup.x;
-				hScrollBar.y = dataGroup.height;
-				var xpos:Number = IScrollBarModel(hScrollBar.model).value;
-				dataGroup.scrollRect = new Rectangle(xpos, 0, xpos + dataGroup.width, dataGroup.height);
-				hScrollBar.addEventListener("scroll", scrollHandler);
-			}
-			else if (hScrollBar)
-			{
-				dataGroup.scrollRect = null;
-				hScrollBar.visible = false;
-			}
-			*/
-		}
-		
-		/*private function scrollHandler(event:Event):void
-		{
-			var xpos:Number = IScrollBarModel(hScrollBar.model).value;
-			dataGroup.scrollRect = new Rectangle(xpos, 0, xpos + dataGroup.width, dataGroup.height);
-		}*/
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.as
deleted file mode 100644
index 33f48e8..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.as
+++ /dev/null
@@ -1,191 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.layouts
-{
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.ILayoutParent;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-
-    /**
-     *  The NonVirtualVerticalLayout class is a simple layout
-     *  bead.  It takes the set of children and lays them out
-     *  vertically in one column, separating them according to
-     *  CSS layout rules for margin and horizontal-align styles.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class NonVirtualVerticalLayout implements IBead
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function NonVirtualVerticalLayout()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			IEventDispatcher(value).addEventListener("heightChanged", changeHandler);
-			IEventDispatcher(value).addEventListener("childrenAdded", changeHandler);
-			IEventDispatcher(value).addEventListener("itemsCreated", changeHandler);
-			IEventDispatcher(value).addEventListener("beadsAdded", changeHandler);
-		}
-	
-		private function changeHandler(event:Event):void
-		{
-			var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
-			var contentView:DisplayObjectContainer = layoutParent.contentView;
-			
-			var n:int = contentView.numChildren;
-			var hasHorizontalFlex:Boolean;
-			var flexibleHorizontalMargins:Array = [];
-			var marginLeft:Object;
-			var marginRight:Object;
-			var marginTop:Object;
-			var marginBottom:Object;
-			var margin:Object;
-			var maxWidth:Number = 0;
-			for (var i:int = 0; i < n; i++)
-			{
-				var child:DisplayObject = contentView.getChildAt(i);
-				margin = ValuesManager.valuesImpl.getValue(child, "margin");
-				if (margin is Array)
-				{
-					if (margin.length == 1)
-						marginLeft = marginTop = marginRight = marginBottom = margin[0];
-					else if (margin.length <= 3)
-					{
-						marginLeft = marginRight = margin[1];
-						marginTop = marginBottom = margin[0];
-					}
-					else if (margin.length == 4)
-					{
-						marginLeft = margin[3];
-						marginBottom = margin[2];
-						marginRight = margin[1];
-						marginTop = margin[0];					
-					}
-				}
-				else if (margin == null)
-				{
-					marginLeft = ValuesManager.valuesImpl.getValue(child, "margin-left");
-					marginTop = ValuesManager.valuesImpl.getValue(child, "margin-top");
-					marginRight = ValuesManager.valuesImpl.getValue(child, "margin-right");
-					marginBottom = ValuesManager.valuesImpl.getValue(child, "margin-bottom");
-				}
-				else
-				{
-					marginLeft = marginTop = marginBottom = marginRight = margin;
-				}
-				var ml:Number;
-				var mr:Number;
-				var mt:Number;
-				var mb:Number;
-				var lastmb:Number;
-				mt = Number(marginTop);
-				if (isNaN(mt))
-					mt = 0;
-				mb = Number(marginBottom);
-				if (isNaN(mb))
-					mb = 0;
-				var yy:Number;
-				if (i == 0)
-					child.y = mt;
-				else
-					child.y = yy + Math.max(mt, lastmb);
-				yy = child.y + child.height;
-				lastmb = mb;
-				flexibleHorizontalMargins[i] = {};
-				if (marginLeft == "auto")
-				{
-					ml = 0;
-					flexibleHorizontalMargins[i].marginLeft = marginLeft;
-					hasHorizontalFlex = true;
-				}
-				else
-				{
-					ml = Number(marginLeft);
-					if (isNaN(ml))
-					{
-						ml = 0;
-						flexibleHorizontalMargins[i].marginLeft = marginLeft;
-					}
-					else
-						flexibleHorizontalMargins[i].marginLeft = ml;
-				}
-				if (marginRight == "auto")
-				{
-					mr = 0;
-					flexibleHorizontalMargins[i].marginRight = marginRight;
-					hasHorizontalFlex = true;
-				}
-				else
-				{
-					mr = Number(marginRight);
-					if (isNaN(mr))
-					{
-						mr = 0;
-						flexibleHorizontalMargins[i].marginRight = marginRight;
-					}
-					else
-						flexibleHorizontalMargins[i].marginRight = mr;
-				}
-				child.x = ml;
-				maxWidth = Math.max(maxWidth, ml + child.width + mr);
-			}
-			if (hasHorizontalFlex)
-			{
-				for (i = 0; i < n; i++)
-				{
-					child = contentView.getChildAt(i);
-					var obj:Object = flexibleHorizontalMargins[i];
-					if (obj.marginLeft == "auto" && obj.marginRight == "auto")
-						child.x = maxWidth - child.width / 2;
-					else if (obj.marginLeft == "auto")
-						child.x = maxWidth - child.width - obj.marginRight;
-				}
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.as
deleted file mode 100644
index 6f2f424..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.as
+++ /dev/null
@@ -1,140 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.layouts
-{
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	import flash.geom.Rectangle;
-	
-	import org.apache.flex.core.IBeadLayout;
-	import org.apache.flex.core.IBorderModel;
-	import org.apache.flex.core.ILayoutParent;
-	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.supportClasses.Border;
-	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
-
-    /**
-     *  The NonVirtualVerticalScrollingLayout class is a layout
-     *  bead that displays a set of children vertically in one row, 
-     *  separating them according to CSS layout rules for margin and 
-     *  vertical-align styles and lays out a vertical ScrollBar
-     *  to the right of the children.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class NonVirtualVerticalScrollingLayout implements IBeadLayout
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function NonVirtualVerticalScrollingLayout()
-		{
-		}
-        
-        private var vScrollBar:ScrollBar;	
-
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			IEventDispatcher(value).addEventListener("heightChanged", changeHandler);
-			IEventDispatcher(value).addEventListener("widthChanged", changeHandler);
-			IEventDispatcher(value).addEventListener("itemsCreated", changeHandler);
-			IEventDispatcher(value).addEventListener("layoutNeeded", changeHandler);
-		}
-	
-		private function changeHandler(event:Event):void
-		{            
-			var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
-			var contentView:DisplayObjectContainer = layoutParent.contentView;
-			var border:Border = layoutParent.border;
-			var borderModel:IBorderModel = border.model as IBorderModel;
-			
-            var ww:Number = DisplayObject(layoutParent.resizableView).width;
-            var hh:Number = DisplayObject(layoutParent.resizableView).height;
-            border.width = ww;
-            border.height = hh;
-           
-			contentView.width = ww - borderModel.offsets.left - borderModel.offsets.right;
-			contentView.height = hh - borderModel.offsets.top - borderModel.offsets.bottom;
-			contentView.x = borderModel.offsets.left;
-			contentView.y = borderModel.offsets.top;
-			
-			var n:int = contentView.numChildren;
-			var yy:Number = 0;
-			for (var i:int = 0; i < n; i++)
-			{
-				var ir:DisplayObject = contentView.getChildAt(i);
-				ir.y = yy;
-				ir.width = contentView.width;
-				yy += ir.height;			
-			}
-			if (yy > contentView.height)
-			{
-                vScrollBar = layoutParent.vScrollBar;
-				contentView.width -= vScrollBar.width;
-				IScrollBarModel(vScrollBar.model).maximum = yy;
-				IScrollBarModel(vScrollBar.model).pageSize = contentView.height;
-				IScrollBarModel(vScrollBar.model).pageStepSize = contentView.height;
-				vScrollBar.visible = true;
-				vScrollBar.height = contentView.height;
-				vScrollBar.y = contentView.y;
-				vScrollBar.x = contentView.width;
-                var vpos:Number = IScrollBarModel(vScrollBar.model).value;
-				contentView.scrollRect = new Rectangle(0, vpos, contentView.width, vpos + contentView.height);
-                vScrollBar.addEventListener("scroll", scrollHandler);
-			}
-			else if (vScrollBar)
-			{
-				contentView.scrollRect = null;
-				vScrollBar.visible = false;
-			}
-		}
-
-        private function scrollHandler(event:Event):void
-        {
-			var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
-			var contentView:DisplayObjectContainer = layoutParent.contentView;
-			
-            var vpos:Number = IScrollBarModel(vScrollBar.model).value;
-			contentView.scrollRect = new Rectangle(0, vpos, contentView.width, vpos + contentView.height);
-        }
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/TileLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/TileLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/TileLayout.as
deleted file mode 100644
index b43457a..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/TileLayout.as
+++ /dev/null
@@ -1,184 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.layouts
-{	
-	import org.apache.flex.core.IBeadLayout;
-	import org.apache.flex.core.ILayoutParent;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.IUIBase;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	
-	/**
-	 *  The TileLayout class bead sizes and positions the elements it manages into rows and columns.
-	 *  The size of each element is determined either by setting TileLayout's columnWidth and rowHeight
-	 *  properties, or having the tile size determined by factoring the numColumns into the area assigned
-	 *  for the layout.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class TileLayout implements IBeadLayout
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function TileLayout()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			IEventDispatcher(_strand).addEventListener("itemsCreated",handleCreated);
-			IEventDispatcher(_strand).addEventListener("childrenAdded",handleCreated);
-		}
-		
-		private var _numColumns:Number = 4;
-		private var _columnWidth:Number = Number.NaN;
-		private var _rowHeight:Number = Number.NaN;
-		
-		/**
-		 *  The number of tiles to fit horizontally into the layout.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get numColumns():Number
-		{
-			return _numColumns;
-		}
-		public function set numColumns(value:Number):void
-		{
-			_numColumns = value;
-		}
-		
-		/**
-		 *  The width of each column, in pixels. If left unspecified, the
-		 *  columnWidth is determined by dividing the numColumns into the
-		 *  strand's bounding box width.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get columnWidth():Number
-		{
-			return _columnWidth;
-		}
-		public function set columnWidth(value:Number):void
-		{
-			_columnWidth = value;
-		}
-		
-		/**
-		 *  The height of each row, in pixels. If left unspecified, the
-		 *  rowHeight is determine by dividing the possible number of rows
-		 *  into the strand's bounding box height.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get rowHeight():Number
-		{
-			return _rowHeight;
-		}
-		public function set rowHeight(value:Number):void
-		{
-			_rowHeight = value;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleCreated(event:Event):void
-		{
-			// this is where we know the strand has things in it and we want to
-			// get the part of the strand that holds the items for the layout
-			updateLayout();
-		}
-		
-		/**
-		 * @private
-		 */
-		protected function updateLayout():void
-		{
-			// this is where the layout is calculated
-			var p:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
-			var area:UIBase = p.contentView as UIBase;
-			if (area == null) return;
-			
-			var xpos:Number = 0;
-			var ypos:Number = 0;
-			var useWidth:Number = columnWidth;
-			var useHeight:Number = rowHeight;
-			var n:Number = area.numChildren;
-			if (n == 0) return;
-			
-			if (isNaN(useWidth)) useWidth = Math.floor(area.width / numColumns); // + gap
-			if (isNaN(useHeight)) {
-				// given the width and total number of items, how many rows?
-				var numRows:Number = Math.floor(n/numColumns);
-				useHeight = Math.floor(area.height / numRows);
-			}
-			
-			for(var i:int=0; i < n; i++)
-			{
-				var child:IUIBase = area.getChildAt(i) as IUIBase;
-				child.width = useWidth;
-				child.height = useHeight;
-				child.x = xpos;
-				child.y = ypos;
-				
-				xpos += useWidth;
-				
-				var test:Number = (i+1)%numColumns;
-				
-				if (test == 0) {
-					xpos = 0;
-					ypos += useHeight;
-				} 
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/VScrollBarLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/VScrollBarLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/VScrollBarLayout.as
deleted file mode 100644
index 7642379..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/VScrollBarLayout.as
+++ /dev/null
@@ -1,111 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.layouts
-{
-	import flash.display.DisplayObject;
-	
-	import org.apache.flex.core.IBeadLayout;
-	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.IScrollBarView;
-
-    /**
-     *  The VScrollBarLayout class is a layout
-     *  bead that displays lays out the pieces of a
-     *  vertical ScrollBar like the thumb, track
-     *  and arrow buttons.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class VScrollBarLayout implements IBeadLayout
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function VScrollBarLayout()
-		{
-		}
-		
-		private var sbModel:IScrollBarModel;
-		private var sbView:IScrollBarView;
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			sbView = _strand.getBeadByType(IScrollBarView) as IScrollBarView;
-			sbModel = _strand.getBeadByType(IScrollBarModel) as IScrollBarModel;
-			sbModel.addEventListener("maximumChange", changeHandler);
-			sbModel.addEventListener("minimumChange", changeHandler);
-			sbModel.addEventListener("snapIntervalChange", changeHandler);
-			sbModel.addEventListener("stepSizeChange", changeHandler);
-            sbModel.addEventListener("pageSizeChange", changeHandler);
-			sbModel.addEventListener("valueChange", changeHandler);
-			IEventDispatcher(_strand).addEventListener("heightChanged", changeHandler);
-			changeHandler(null);
-		}
-	
-		private function changeHandler(event:Event):void
-		{
-			var h:Number = DisplayObject(_strand).height;
-			var increment:DisplayObject = sbView.increment;
-			var decrement:DisplayObject = sbView.decrement;
-			var track:DisplayObject = sbView.track;
-			var thumb:DisplayObject = sbView.thumb;
-			
-			decrement.x = 0;
-			decrement.y = 0;
-			increment.x = 0;
-			increment.y = h - increment.height;
-			track.x = 0;
-			track.y = decrement.height;
-			track.height = increment.y - decrement.height;
-            thumb.height = sbModel.pageSize / (sbModel.maximum - sbModel.minimum) * track.height;
-			if (track.height > thumb.height)
-			{
-				thumb.visible = true;
-				thumb.y = (sbModel.value / (sbModel.maximum - sbModel.minimum - sbModel.pageSize) * (track.height - thumb.height)) + track.y;
-			}
-			else
-			{
-				thumb.visible = false;
-			}
-		}
-						
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/AlertModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/AlertModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/AlertModel.as
deleted file mode 100644
index 7ad8f11..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/AlertModel.as
+++ /dev/null
@@ -1,288 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{
-	import org.apache.flex.core.IAlertModel;
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.EventDispatcher;
-	
-	/**
-	 *  The AlertModel class bead implements the org.apache.flex.core.IAlertModel and holds the properties
-	 *  for an org.apache.flex.html.staticControls.Alert such the buttons to use and message to display.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class AlertModel extends EventDispatcher implements IAlertModel, IBead
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function AlertModel()
-		{
-			super();
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-		
-		private var _title:String;
-		
-		/**
-		 *  The title for the Alert.
-		 * 
-		 *  @copy org.apache.flex.core.IAlertModel#title
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get title():String
-		{
-			return _title;
-		}
-		public function set title(value:String):void
-		{
-			if( value != _title ) {
-				_title = value;
-				dispatchEvent( new Event("titleChange") );
-			}
-		}
-
-		private var _htmlTitle:String;
-		
-		/**
-		 *  The HTML title for the Alert.
-		 * 
-		 *  @copy org.apache.flex.core.IAlertModel#htmlTitle
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get htmlTitle():String
-		{
-			return _htmlTitle;
-		}
-		public function set htmlTitle(value:String):void
-		{
-			if( value != _htmlTitle ) {
-				_htmlTitle = value;
-				dispatchEvent( new Event("htmlTitleChange") );
-			}
-		}
-		
-		private var _message:String;
-		
-		/**
-		 *  The message to display.
-		 * 
-		 *  @copy org.apache.flex.core.IAlertModel#message
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get message():String
-		{
-			return _message;
-		}
-		public function set message(value:String):void
-		{
-			if( value != _message ) {
-				_message = value;
-				dispatchEvent( new Event("messageChange") );
-			}
-		}
-		
-		private var _htmlMessage:String;
-		
-		/**
-		 *  The HTML message to display.
-		 * 
-		 *  @copy org.apache.flex.core.IAlertModel#htmlMessage
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get htmlMessage():String
-		{
-			return _htmlMessage;
-		}
-		public function set htmlMessage(value:String):void
-		{
-			if( value != _htmlMessage )
-			{
-				_htmlMessage = value;
-				dispatchEvent( new Event("htmlMessageChange") );
-			}
-		}
-		
-		private var _flags:uint;
-		
-		/**
-		 *  Which buttons to display (see Alert for details).
-		 * 
-		 *  @copy org.apache.flex.core.IAlertModel#flags
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get flags():uint
-		{
-			return _flags;
-		}
-		public function set flags(value:uint):void
-		{
-			if( value != _flags )
-			{
-				_flags = value;
-				dispatchEvent( new Event("flagsChange") );
-			}
-		}
-		
-		private var _okLabel:String = "OK";
-		
-		/**
-		 *  The label to use for the OK button.
-		 * 
-		 *  @copy org.apache.flex.core.IAlertModel#okLabel
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get okLabel():String
-		{
-			return _okLabel;
-		}
-		public function set okLabel(value:String):void
-		{
-			if( value != _okLabel )
-			{
-				_okLabel = value;
-				dispatchEvent( new Event("okLabelChange") );
-			}
-		}
-		
-		private var _cancelLabel:String = "Cancel";
-		
-		/**
-		 *  The label to use for the Cancel button.
-		 * 
-		 *  @copy org.apache.flex.core.IAlertModel#cancelLabel
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get cancelLabel():String
-		{
-			return _cancelLabel;
-		}
-		public function set cancelLabel(value:String):void
-		{
-			if( value != _cancelLabel )
-			{
-				_cancelLabel = value;
-				dispatchEvent( new Event("cancelLabelChange") );
-			}
-		}
-		
-		private var _yesLabel:String = "YES";
-		
-		/**
-		 *  The label to use for the Yes button.
-		 * 
-		 *  @copy org.apache.flex.core.IAlertModel#yesLabel
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get yesLabel():String
-		{
-			return _yesLabel;
-		}
-		public function set yesLabel(value:String):void
-		{
-			if( value != _yesLabel )
-			{
-				_yesLabel = value;
-				dispatchEvent( new Event("yesLabelChange") );
-			}
-		}
-		
-		private var _noLabel:String = "NO";
-		
-		/**
-		 *  The label to use for the NO button.
-		 * 
-		 *  @copy org.apache.flex.core.IAlertModel#noLabel
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get noLabel():String
-		{
-			return _noLabel;
-		}
-		public function set noLabel(value:String):void
-		{
-			if( value != _noLabel )
-			{
-				_noLabel = value;
-				dispatchEvent( new Event("noLabelChange") );
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.as
deleted file mode 100644
index 8859ab8..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.as
+++ /dev/null
@@ -1,234 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{
-	import org.apache.flex.core.IRollOverModel;
-	import org.apache.flex.core.ISelectionModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.EventDispatcher;
-			
-    /**
-     *  The ArraySelectionModel class is a selection model for
-     *  a dataProvider that is an array. It assumes that items
-     *  can be fetched from the dataProvider
-     *  dataProvider[index].  Other selection models
-     *  would support other kinds of data providers.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class ArraySelectionModel extends EventDispatcher implements ISelectionModel, IRollOverModel
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function ArraySelectionModel()
-		{
-		}
-
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-		
-		private var _dataProvider:Object;
-        
-        /**
-         *  @copy org.apache.flex.core.ISelectionModel#dataProvider
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get dataProvider():Object
-		{
-			return _dataProvider;
-		}
-
-        /**
-         *  @private
-         */
-		public function set dataProvider(value:Object):void
-		{
-            _dataProvider = value;
-			dispatchEvent(new Event("dataProviderChanged"));
-		}
-
-		private var _selectedIndex:int = -1;
-		private var _rollOverIndex:int = -1;
-		private var _labelField:String = null;
-		
-        /**
-         *  @copy org.apache.flex.core.ISelectionModel#labelField
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get labelField():String
-		{
-			return _labelField;
-		}
-
-        /**
-         *  @private
-         */
-		public function set labelField(value:String):void
-		{
-			if (value != _labelField) {
-				_labelField = value;
-				dispatchEvent(new Event("labelFieldChanged"));
-			}
-		}
-		
-        /**
-         *  @copy org.apache.flex.core.ISelectionModel#selectedIndex
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get selectedIndex():int
-		{
-			return _selectedIndex;
-		}
-
-        /**
-         *  @private
-         */
-		public function set selectedIndex(value:int):void
-		{
-			_selectedIndex = value;
-			_selectedItem = (value == -1) ? null : (value < _dataProvider.length) ? _dataProvider[value] : null;
-			dispatchEvent(new Event("selectedIndexChanged"));			
-		}
-		
-        /**
-         *  @copy org.apache.flex.core.IRollOverModel#rollOverIndex
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get rollOverIndex():int
-		{
-			return _rollOverIndex;
-		}
-
-        /**
-         *  @private
-         */
-		public function set rollOverIndex(value:int):void
-		{
-			_rollOverIndex = value;
-			dispatchEvent(new Event("rollOverIndexChanged"));			
-		}
-		
-		private var _selectedItem:Object;
-		
-        /**
-         *  @copy org.apache.flex.core.ISelectionModel#selectedItem
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get selectedItem():Object
-		{
-			return _selectedItem;
-		}
-
-        /**
-         *  @private
-         */
-		public function set selectedItem(value:Object):void
-		{
-			_selectedItem = value;	
-			var n:int = _dataProvider.length;
-			for (var i:int = 0; i < n; i++)
-			{
-				if (_dataProvider[i] == value)
-				{
-					_selectedIndex = i;
-					break;
-				}
-			}
-			dispatchEvent(new Event("selectedItemChanged"));			
-			dispatchEvent(new Event("selectedIndexChanged"));
-		}
-		
-		private var _selectedString:String;
-		
-        /**
-         *  An alternative to selectedItem for strongly typing the
-         *  the selectedItem if the Array is an Array of Strings.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get selectedString():String
-		{
-			return String(_selectedItem);
-		}
-
-        /**
-         *  @private
-         */
-		public function set selectedString(value:String):void
-		{
-			_selectedString = value;
-			var n:int = _dataProvider.length;
-			for (var i:int = 0; i < n; i++)
-			{
-				if (String(_dataProvider[i]) == value)
-				{
-					_selectedIndex = i;
-					break;
-				}
-			}
-			dispatchEvent(new Event("selectedItemChanged"));			
-			dispatchEvent(new Event("selectedIndexChanged"));			
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ComboBoxModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ComboBoxModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ComboBoxModel.as
deleted file mode 100644
index 0699c1d..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ComboBoxModel.as
+++ /dev/null
@@ -1,100 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IComboBoxModel;
-	import org.apache.flex.events.Event;
-			
-	/**
-	 *  The ComboBoxModel class bead extends org.apache.flex.html.staticControls.beads.models.ArraySelectionModel 
-	 *  and adds the text being displayed by the org.apache.flex.html.staticControls.ComboBox's input field.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ComboBoxModel extends ArraySelectionModel implements IBead, IComboBoxModel
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ComboBoxModel()
-		{
-		}
-
-		private var _text:String;
-		
-		/**
-		 *  The string to display in the org.apache.flex.html.staticControls.ComboBox input field.
-		 * 
-		 *  @copy org.apache.flex.core.IComboBoxModel#text
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get text():String
-		{
-			return _text;
-		}
-		
-		public function set text(value:String):void
-		{
-			if (value != _text)
-			{
-				_text = value;
-				dispatchEvent(new Event("textChange"));
-			}
-		}
-		
-		private var _html:String;
-		
-		/**
-		 *  The HTML string to display in the org.apache.flex.html.staticControls.ComboBox input field.
-		 * 
-		 *  @copy org.apache.flex.core.IComboBoxModel#html
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get html():String
-		{
-			return _html;
-		}
-		
-		public function set html(value:String):void
-		{
-			if (value != _html)
-			{
-				_html = value;
-				dispatchEvent(new Event("htmlChange"));
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ImageModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ImageModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ImageModel.as
deleted file mode 100644
index 1973b09..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ImageModel.as
+++ /dev/null
@@ -1,89 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{
-	import org.apache.flex.core.IImageModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.EventDispatcher;
-	
-	/**
-	 *  The ImageModel class bead defines the data associated with an org.apache.flex.html.staticControls.Image
-	 *  component, namely the source of the image.
-	 *
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ImageModel extends EventDispatcher implements IImageModel
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ImageModel()
-		{
-			super();
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-		
-		private var _source:String;
-		
-		/**
-		 *  The source of the image.
-		 * 
-		 *  @copy org.apache.flex.core.IImageModel#source
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get source():String
-		{
-			return _source;
-		}
-		public function set source(value:String):void
-		{
-			if (value != _source) {
-				_source = value;
-				dispatchEvent( new Event("urlChanged") );
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/PanelModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/PanelModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/PanelModel.as
deleted file mode 100644
index 02716c9..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/PanelModel.as
+++ /dev/null
@@ -1,138 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IPanelModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.EventDispatcher;
-	
-	/**
-	 *  The PanelModel bead class holds the values for a org.apache.flex.html.staticControls.Panel, such as its
-	 *  title.
-	 *
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class PanelModel extends EventDispatcher implements IBead, IPanelModel
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function PanelModel()
-		{
-			super();
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-		
-		private var _title:String;
-		
-		/**
-		 *  The title string for the org.apache.flex.html.staticControls.Panel.
-		 * 
-		 *  @copy org.apache.flex.core.ITitleBarModel#title
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get title():String
-		{
-			return _title;
-		}
-		public function set title(value:String):void
-		{
-			if( value != _title ) {
-				_title = value;
-				dispatchEvent( new Event('titleChange') );
-			}
-		}
-		
-		private var _htmlTitle:String;
-		
-		/**
-		 *  The HTML string for the title.
-		 * 
-		 *  @copy org.apache.flex.core.ITitleBarModel#htmlTitle
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get htmlTitle():String
-		{
-			return _htmlTitle;
-		}
-		public function set htmlTitle(value:String):void
-		{
-			if( value != _htmlTitle ) {
-				_htmlTitle = value;
-				dispatchEvent( new Event('htmlTitleChange') );
-			}
-		}
-		
-		private var _showCloseButton:Boolean = false;
-		
-		/**
-		 *  Indicates whether or not there is a Close button for the org.apache.flex.html.staticControls.Panel.
-		 * 
-		 *  @copy org.apache.flex.core.ITitleBarModel#showCloseButton
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get showCloseButton():Boolean
-		{
-			return _showCloseButton;
-		}
-		public function set showCloseButton(value:Boolean):void
-		{
-			if( value != _showCloseButton ) {
-				_showCloseButton = value;
-				dispatchEvent( new Event('showCloseButtonChange') );
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/RangeModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/RangeModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/RangeModel.as
deleted file mode 100644
index 9a5e421..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/RangeModel.as
+++ /dev/null
@@ -1,222 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{
-	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;
-			
-	/**
-	 *  The RangeModel class bead defines a set of for a numeric range of values
-	 *  which includes a minimum, maximum, and current value.
-	 *
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class RangeModel extends EventDispatcher implements IBead, IRangeModel
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function RangeModel()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-
-		private var _maximum:Number = 100;
-		
-		/**
-		 *  The maximum value for the range (defaults to 100).
-		 * 
-		 *  @copy org.apache.flex.core.IRangeModel#maximum
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get maximum():Number
-		{
-			return _maximum;
-		}
-		
-		public function set maximum(value:Number):void
-		{
-			if (value != _maximum)
-			{
-				_maximum = value;
-				dispatchEvent(new Event("maximumChange"));
-			}
-		}
-		
-		private var _minimum:Number = 0;
-		
-		/**
-		 *  The minimum value for the range (defaults to 0).
-		 * 
-		 *  @copy org.apache.flex.core.IRangeModel#minimum
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get minimum():Number
-		{
-			return _minimum;
-		}
-		
-		public function set minimum(value:Number):void
-		{
-			if (value != _minimum)
-			{
-				_minimum = value;
-				dispatchEvent(new Event("minimumChange"));
-			}
-		}
-
-		private var _snapInterval:Number = 1;
-		
-		/**
-		 *  The modulus value for the range. 
-		 * 
-		 *  @copy org.apache.flex.core.IRangeModel#snapInterval
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get snapInterval():Number
-		{
-			return _snapInterval;
-		}
-		
-		public function set snapInterval(value:Number):void
-		{
-			if (value != _snapInterval)
-			{
-				_snapInterval = value;
-				dispatchEvent(new Event("snapIntervalChange"));
-			}
-		}
-		
-		private var _stepSize:Number = 1;
-		
-		/**
-		 *  The amount to adjust the value either up or down toward the edge of the range.
-		 * 
-		 *  @copy org.apache.flex.core.IRangeModel#stepSize
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get stepSize():Number
-		{
-			return _stepSize;
-		}
-		
-		public function set stepSize(value:Number):void
-		{
-			if (value != _stepSize)
-			{
-				_stepSize = value;
-				dispatchEvent(new Event("stepSizeChange"));
-			}
-		}
-		
-		private var _value:Number = 0;
-		
-		/**
-		 *  The current value of the range, between the minimum and maximum values. Attempting
-		 *  to set the value outside of the minimum-maximum range changes the value to still be
-		 *  within the range. Note that the value is adjusted by the stepSize.
-		 * 
-		 *  @copy org.apache.flex.core.IRangeModel#value
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get value():Number
-		{
-			return _value;
-		}
-		
-		public function set value(newValue:Number):void
-		{
-			if (newValue != _value)
-			{
-				// value must lie within the boundaries of minimum & maximum
-				// and be on a step interval, so the value is adjusted to 
-				// what is coming in.
-				newValue = Math.max(minimum, newValue - stepSize);
-				newValue = Math.min(maximum, newValue + stepSize);
-				_value = snap(newValue);
-				dispatchEvent(new Event("valueChange"));
-			}
-		}
-		
-		/**
-		 * @private
-		 */
-		protected function snap(value:Number):Number
-		{
-			var si:Number = snapInterval;
-			var n:Number = Math.round((value - minimum) / si) * si + minimum;
-			if (value > 0)
-			{
-				if (value - n < n + si - value)
-					return n;
-				return n + si;
-				
-			}
-			if (value - n > n + si - value)
-				return n + si;
-			return n;
-		}
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ScrollBarModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ScrollBarModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ScrollBarModel.as
deleted file mode 100644
index 27fbef0..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ScrollBarModel.as
+++ /dev/null
@@ -1,98 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{
-	
-	import org.apache.flex.core.IScrollBarModel;
-	import org.apache.flex.events.Event;
-		
-	/**
-	 *  The ScrollBarModel class bead extends the org.apache.flex.html.staticControls.beads.models.RangeModel 
-	 *  and adds page size and page step sizes.
-	 *
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ScrollBarModel extends RangeModel implements IScrollBarModel
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ScrollBarModel()
-		{
-		}
-		
-		private var _pageSize:Number;
-		
-		/**
-		 *  The amount represented by the thumb control of the org.apache.flex.html.staticControls.ScrollBar.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get pageSize():Number
-		{
-			return _pageSize;
-		}
-		
-		public function set pageSize(value:Number):void
-		{
-			if (value != _pageSize)
-			{
-				_pageSize = value;
-				dispatchEvent(new Event("pageSizeChange"));
-			}
-		}
-				
-		private var _pageStepSize:Number;
-		
-		/**
-		 *  The amount to adjust the org.apache.flex.html.staticControls.ScrollBar if the scroll bar's 
-		 *  track area is selected.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get pageStepSize():Number
-		{
-			return _pageStepSize;
-		}
-		
-		public function set pageStepSize(value:Number):void
-		{
-			if (value != _pageStepSize)
-			{
-				_pageStepSize = value;
-				dispatchEvent(new Event("pageStepSizeChange"));
-			}
-		}
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/SingleLineBorderModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/SingleLineBorderModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/SingleLineBorderModel.as
deleted file mode 100644
index 64eb045..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/SingleLineBorderModel.as
+++ /dev/null
@@ -1,85 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{
-	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;
-		
-    /**
-     *  The SingleLineBorderModel class is a data model for
-     *  a single line border. This model is very simple,
-     *  it only stores the offsets from the edges of the
-     *  component.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class SingleLineBorderModel extends EventDispatcher implements IBead, IBorderModel
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function SingleLineBorderModel()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-
-        static private var rect:Rectangle = new Rectangle(1, 1, 1, 1);
-        
-        /**
-         *  The offsets of the border from the edges of the
-         *  component.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function get offsets():Rectangle
-        {
-            return rect;
-        }
-
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/StringSelectionModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/StringSelectionModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/StringSelectionModel.as
deleted file mode 100644
index a72dc64..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/StringSelectionModel.as
+++ /dev/null
@@ -1,221 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{
-	
-	import org.apache.flex.core.ISelectionModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.EventDispatcher;
-		
-    /**
-     *  The StringSelectionModel class is a selection model for
-     *  selecting a single string from a vector of strings. 
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class StringSelectionModel extends EventDispatcher implements ISelectionModel
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function StringSelectionModel()
-		{
-		}
-
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-		
-		private var _strings:Vector.<String>;
-
-        /**
-         *  The vector of strings.  This is the same
-         *  as the dataProvider property but is
-         *  strongly typed.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get strings():Vector.<String>
-		{
-			return _strings;
-		}
-        
-        /**
-         *  @private
-         */
-		public function set strings(value:Vector.<String>):void
-		{
-			_strings = value;
-			dispatchEvent(new Event("dataProviderChanged"));
-		}
-
-        /**
-         *  The dataProvider, which is a
-         *  Vector.&lt;String&gt;.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get dataProvider():Object
-		{
-			return _strings;
-		}
-
-        /**
-         *  @private
-         */
-		public function set dataProvider(value:Object):void
-		{
-			_strings = value as Vector.<String>;
-			dispatchEvent(new Event("dataProviderChanged"));
-		}
-
-		private var _selectedIndex:int = -1;
-		
-        /**
-         *  @copy org.apache.flex.core.ISelectionModel#selectedIndex
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get selectedIndex():int
-		{
-			return _selectedIndex;
-		}
-
-        /**
-         *  @private
-         */
-		public function set selectedIndex(value:int):void
-		{
-			_selectedIndex = value;
-			_selectedString = (value == -1) ? null : (value < _strings.length) ? _strings[value] : null;
-			dispatchEvent(new Event("selectedIndexChanged"));			
-		}
-		private var _selectedString:String;
-		
-        /**
-         *  @copy org.apache.flex.core.ISelectionModel#selectedItem
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get selectedItem():Object
-		{
-			return _selectedString;
-		}
-        
-        /**
-         *  @private
-         */
-		public function set selectedItem(value:Object):void
-		{
-			selectedString = String(value);	
-		}
-
-        /**
-         *  The selected string.  This is the same as the
-         *  selectedItem, but is strongly-typed.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get selectedString():String
-		{
-			return _selectedString;
-		}
-        
-        /**
-         *  @private
-         */
-		public function set selectedString(value:String):void
-		{
-			_selectedString = value;
-			var n:int = _strings.length;
-			for (var i:int = 0; i < n; i++)
-			{
-				if (_strings[i] == value)
-				{
-					_selectedIndex = i;
-					break;
-				}
-			}
-			dispatchEvent(new Event("selectedItemChanged"));			
-		}
-		
-		
-		private var _labelField:String;
-		
-        /**
-         *  The labelField, which is not used in this
-         *  implementation.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get labelField():String
-		{
-			return _labelField;
-		}
-        
-        /**
-         *  @private
-         */
-		public function set labelField(value:String):void
-		{
-			if (value != _labelField) {
-				_labelField = value;
-				dispatchEvent(new Event("labelFieldChanged"));
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/TextModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/TextModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/TextModel.as
deleted file mode 100644
index 3adf825..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/TextModel.as
+++ /dev/null
@@ -1,122 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{	
-	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;
-		
-    /**
-     *  The TextModel class is most basic data model for a
-     *  component that displays text.  All FlexJS components
-     *  that display text should also support HTML, although
-     *  the Flash Player implementations may only support
-     *  a subset of HTML. 
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class TextModel extends EventDispatcher implements IBead, ITextModel
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function TextModel()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-
-		private var _text:String;
-
-        /**
-         *  @copy org.apache.flex.core.ITextModel#text
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function get text():String
-		{
-			return _text;
-		}
-		
-        /**
-         *  @private
-         */
-		public function set text(value:String):void
-		{
-			if (value != _text)
-			{
-				_text = value;
-				dispatchEvent(new Event("textChange"));
-			}
-		}
-		
-		private var _html:String;
-        
-        /**
-         *  @copy org.apache.flex.core.ITextModel#html
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get html():String
-		{
-			return _html;
-		}
-		
-        /**
-         *  @private
-         */
-		public function set html(value:String):void
-		{
-			if (value != _html)
-			{
-				_html = value;
-				dispatchEvent(new Event("htmlChange"));
-			}
-		}
-	}
-}
\ No newline at end of file


[18/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleList.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleList.as
new file mode 100644
index 0000000..ba096c6
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleList.as
@@ -0,0 +1,46 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	/**
+	 *  The SimpleList class is a component that displays data in a vertical column. This
+	 *  component differs from org.apache.flex.html.staticControls.List in that it displays 
+	 *  only string values and maps to the &lt;select&gt; HTML element.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class SimpleList extends List
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function SimpleList()
+		{
+			super();
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Slider.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Slider.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Slider.as
new file mode 100644
index 0000000..07717a5
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Slider.as
@@ -0,0 +1,152 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import org.apache.flex.core.IRangeModel;
+	import org.apache.flex.core.UIBase;
+	
+	[Event(name="valueChanged", type="org.apache.flex.events.Event")]
+	
+	/**
+	 *  The Slider class is a component that displays a range of values using a
+	 *  track and a thumb control. The Slider uses the following bead types:
+	 * 
+	 *  org.apache.flex.core.IBeadModel: the data model, typically an IRangeModel, that holds the Slider values.
+	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the Slider.
+	 *  org.apache.flex.core.IBeadController: the bead that handles input.
+	 *  org.apache.flex.core.IThumbValue: the bead responsible for the display of the thumb control.
+	 *  org.apache.flex.core.ITrackView: the bead responsible for the display of the track.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class Slider extends UIBase
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function Slider()
+		{
+			super();
+			
+			className = "Slider";
+			
+			IRangeModel(model).value = 0;
+			IRangeModel(model).minimum = 0;
+			IRangeModel(model).maximum = 100;
+			IRangeModel(model).stepSize = 1;
+			IRangeModel(model).snapInterval = 1;
+		}
+		
+		/**
+		 *  The current value of the Slider.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get value():Number
+		{
+			return IRangeModel(model).value;
+		}
+		public function set value(newValue:Number):void
+		{
+			IRangeModel(model).value = newValue;
+		}
+		
+		/**
+		 *  The minimum value of the Slider.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get minimum():Number
+		{
+			return IRangeModel(model).minimum;
+		}
+		public function set minimum(value:Number):void
+		{
+			IRangeModel(model).minimum = value;
+		}
+		
+		/**
+		 *  The maximum value of the Slider.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get maximum():Number
+		{
+			return IRangeModel(model).maximum;
+		}
+		public function set maximum(value:Number):void
+		{
+			IRangeModel(model).maximum = value;
+		}
+		
+		/**
+		 *  The modulus of the Slider value. The thumb will be positioned
+		 *  at the nearest multiple of this value.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get snapInterval():Number
+		{
+			return IRangeModel(model).snapInterval;
+		}
+		public function set snapInterval(value:Number):void
+		{
+			IRangeModel(model).snapInterval = value;
+		}
+        
+		/**
+		 *  The amount to move the thumb when the track is selected. This value is
+		 *  adjusted to fit the nearest snapInterval.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get stepSize():Number
+        {
+            return IRangeModel(model).stepSize;
+        }
+        public function set stepSize(value:Number):void
+        {
+            IRangeModel(model).stepSize = value;
+        }
+
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Spinner.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Spinner.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Spinner.as
new file mode 100644
index 0000000..fb77659
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Spinner.as
@@ -0,0 +1,146 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import org.apache.flex.core.IRangeModel;
+	import org.apache.flex.core.UIBase;
+	
+	[Event(name="valueChanged", type="org.apache.flex.events.Event")]
+	
+	/**
+	 *  The Spinner class is a component that displays a control for incrementing a value
+	 *  and a control for decrementing a value. The org.apache.flex.html.staticControls.NumericStepper 
+	 *  uses a Spinner as part of the component. Spinner uses the following beads:
+	 * 
+	 *  org.apache.flex.core.IBeadModel: an IRangeModel to hold the properties.
+	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the Spinner.
+	 *  org.apache.flex.core.IBeadController: a bead that handles the input events.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class Spinner extends UIBase
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function Spinner()
+		{
+			super();
+			
+			className = "Spinner";
+		}
+		
+		/**
+		 *  The current value of the Spinner.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get value():Number
+		{
+			return IRangeModel(model).value;
+		}
+		public function set value(newValue:Number):void
+		{
+			IRangeModel(model).value = newValue;
+		}
+		
+		/**
+		 *  The minimum value of the Spinner.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get minimum():Number
+		{
+			return IRangeModel(model).minimum;
+		}
+		public function set minimum(value:Number):void
+		{
+			IRangeModel(model).minimum = value;
+		}
+		
+		/**
+		 *  The maximum value of the Spinner.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get maximum():Number
+		{
+			return IRangeModel(model).maximum;
+		}
+		public function set maximum(value:Number):void
+		{
+			IRangeModel(model).maximum = value;
+		}
+		
+		/**
+		 *  The modulus for the value. If this property is set,
+		 *  the value displayed with a muliple of the snapInterval.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get snapInterval():Number
+		{
+			return IRangeModel(model).snapInterval;
+		}
+		public function set snapInterval(value:Number):void
+		{
+			IRangeModel(model).snapInterval = value;
+		}
+		
+		/**
+		 *  The amount to increase or descrease the value. The value
+		 *  will not exceed the minimum or maximum value. The final
+		 *  value is affected by the snapInterval.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get stepSize():Number
+		{
+			return IRangeModel(model).stepSize;
+		}
+		public function set stepSize(value:Number):void
+		{
+			IRangeModel(model).stepSize = value;
+		}
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextArea.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextArea.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextArea.as
new file mode 100644
index 0000000..b1cd581
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextArea.as
@@ -0,0 +1,91 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import org.apache.flex.core.ITextModel;
+	import org.apache.flex.core.UIBase;
+	
+    /**
+     *  The TextArea class implements the basic control for
+     *  multi-line text input.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */    
+	public class TextArea extends UIBase
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function TextArea()
+		{
+			super();
+		}
+		
+        /**
+         *  @copy org.apache.flex.html.staticControls.Label#text
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get text():String
+		{
+			return ITextModel(model).text;
+		}
+
+        /**
+         *  @private
+         */
+		public function set text(value:String):void
+		{
+			ITextModel(model).text = value;
+		}
+		
+        /**
+         *  @copy org.apache.flex.html.staticControls.Label#html
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get html():String
+		{
+			return ITextModel(model).html;
+		}
+
+        /**
+         *  @private
+         */
+		public function set html(value:String):void
+		{
+			ITextModel(model).html = value;
+		}
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextButton.as
new file mode 100644
index 0000000..3658005
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextButton.as
@@ -0,0 +1,90 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import org.apache.flex.core.ITextModel;
+	
+    /**
+     *  The TextButton class implements a basic button that
+     *  displays text.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */    
+	public class TextButton extends Button
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function TextButton()
+		{
+			super();
+		}
+		
+        /**
+         *  @copy org.apache.flex.html.staticControls.Label#text
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get text():String
+		{
+			return ITextModel(model).text;
+		}
+
+        /**
+         *  @private
+         */
+		public function set text(value:String):void
+		{
+			ITextModel(model).text = value;
+		}
+		
+        /**
+         *  @copy org.apache.flex.html.staticControls.Label#html
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get html():String
+		{
+			return ITextModel(model).html;
+		}
+
+        /**
+         *  @private
+         */
+		public function set html(value:String):void
+		{
+			ITextModel(model).html = value;
+		}
+
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextInput.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextInput.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextInput.as
new file mode 100644
index 0000000..ce85fa4
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextInput.as
@@ -0,0 +1,115 @@
+//
+//  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.html.staticControls
+{
+	import org.apache.flex.core.ITextModel;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.events.Event;
+
+	/**
+     *  Dispatched when the user changes the text.
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	[Event(name="change", type="org.apache.flex.events.Event")]
+
+    /**
+     *  The TextInput class implements the basic control for
+     *  single-line text input.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */    
+	public class TextInput extends UIBase
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function TextInput()
+		{
+			super();
+
+			model.addEventListener("textChange", textChangeHandler);
+		}
+		
+        /**
+         *  @copy org.apache.flex.html.staticControls.Label#text
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get text():String
+		{
+			return ITextModel(model).text;
+		}
+
+        /**
+         *  @private
+         */
+		public function set text(value:String):void
+		{
+			ITextModel(model).text = value;
+		}
+		
+        /**
+         *  @copy org.apache.flex.html.staticControls.Label#html
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get html():String
+		{
+			return ITextModel(model).html;
+		}
+
+        /**
+         *  @private
+         */
+		public function set html(value:String):void
+		{
+			ITextModel(model).html = value;
+		}
+
+		/**
+		 * @dispatch change event in response to a textChange event
+		 *
+		 *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+		 */
+		public function textChangeHandler(event:Event):void
+		{
+            dispatchEvent(new Event(Event.CHANGE));
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TitleBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TitleBar.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TitleBar.as
new file mode 100644
index 0000000..1b1ec40
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TitleBar.as
@@ -0,0 +1,247 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import flash.display.Shape;
+	
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IBeadLayout;
+	import org.apache.flex.core.IChrome;
+	import org.apache.flex.core.ITitleBarModel;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.html.staticControls.Label;
+	
+	/**
+	 *  The TitleBar class is a Container component that displays a title and an
+	 *  optional close button. The TitleBar uses the following bead types:
+	 * 
+	 *  org.apache.flex.core.IBeadModel: the data model, which includes the title and showCloseButton values.
+	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the component.
+	 *  org.apache.flex.core.IBeadLayout: the bead that handles size and position of the component parts 
+	 *  (org.apache.flex.html.staticControls.Label and org.apache.flex.html.staticControls.Button).
+	 *  org.apache.flex.core.IMeasurementBead: a bead that helps determine the size of the 
+	 *  org.apache.flex.html.staticControls.TitleBar for layout.
+	 * 
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class TitleBar extends Container implements IChrome
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function TitleBar()
+		{
+			super();
+			
+			className = "TitleBar";
+		}
+		
+		/**
+		 *  The title string to display.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get title():String
+		{
+			return ITitleBarModel(model).title;
+		}
+		public function set title(value:String):void
+		{
+			ITitleBarModel(model).title = value;
+		}
+		
+		/**
+		 *  The HTML title to display.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get htmlTitle():String
+		{
+			return ITitleBarModel(model).htmlTitle;
+		}
+		public function set htmlTitle(value:String):void
+		{
+			ITitleBarModel(model).htmlTitle = value;
+		}
+		
+		/**
+		 *  Whether or not to show a org.apache.flex.html.staticControls.Button that indicates the component
+		 *  may be closed.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get showCloseButton():Boolean
+		{
+			return ITitleBarModel(model).showCloseButton;
+		}
+		public function set showCloseButton(value:Boolean):void
+		{
+			ITitleBarModel(model).showCloseButton = value;
+		}
+		
+		/**
+		 * @private
+		 */
+		private var _titleLabel:Label;
+		public function get titleLabel():Label
+		{
+			return _titleLabel;
+		}
+		
+		/**
+		 * @private
+		 */
+		private var _closeButton:Button;
+		public function get closeButton():Button
+		{
+			return closeButton;
+		}
+		
+		/**
+		 * @private
+		 */
+		override public function addedToParent():void
+		{
+			super.addedToParent();
+			
+			if( getBeadByType(IBeadLayout) == null )
+				addBead(new (ValuesManager.valuesImpl.getValue(this, "iBeadLayout")) as IBead);
+			
+			// add the label for the title and the button for the close
+			_titleLabel = createTitle();
+			_titleLabel.className = className;
+			_titleLabel.id = "title";
+			addElement(_titleLabel);
+			
+			_closeButton = createCloseButton();
+			_closeButton.className = className;
+			_closeButton.id = "closeButton";
+			addElement(_closeButton);
+			
+			childrenAdded();
+            
+            model.addEventListener('titleChange',handlePropertyChange);
+            model.addEventListener('htmlTitleChange',handlePropertyChange);
+            model.addEventListener('showCloseButtonChange',handlePropertyChange);
+
+			// dispatch this event to force any beads to update
+			dispatchEvent(new Event("widthChanged"));
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handlePropertyChange(event:Event):void
+		{
+			if( event.type == "showCloseButtonChange" ) {
+				if( closeButton ) closeButton.visible = showCloseButton;
+			}
+			else if( event.type == "titleChange" ) {
+				if( titleLabel ) {
+					titleLabel.text = title;
+				}
+			}
+			else if( event.type == "htmlTitleChange" ) {
+				if( titleLabel ) {
+					titleLabel.html = htmlTitle;
+				}
+			}
+			
+			dispatchEvent(new Event("widthChanged"));
+		}
+		
+		/**
+		 * @private
+		 */
+		protected function createTitle() : Label
+		{
+			var label:Label = new Label();
+			label.text = title;
+			return label;
+		}
+		
+		/**
+		 * @private
+		 */
+		protected function createCloseButton() : Button
+		{
+			var upState:Shape = new Shape();
+			upState.graphics.clear();
+			upState.graphics.beginFill(0xCCCCCC);
+			upState.graphics.drawRect(0,0,11,11);
+			upState.graphics.endFill();
+			
+			var overState:Shape = new Shape();
+			overState.graphics.clear();
+			overState.graphics.beginFill(0x999999);
+			overState.graphics.drawRect(0,0,11,11);
+			overState.graphics.endFill();
+			
+			var downState:Shape = new Shape();
+			downState.graphics.clear();
+			downState.graphics.beginFill(0x666666);
+			downState.graphics.drawRect(0, 0, 11, 11);
+			downState.graphics.endFill();
+			
+			var hitArea:Shape = new Shape();
+			hitArea.graphics.clear();
+			hitArea.graphics.beginFill(0x000000);
+			hitArea.graphics.drawRect(0, 0, 11, 11);
+			hitArea.graphics.endFill();
+			
+			var button:Button = new Button();
+            button.upState = upState;
+            button.overState = overState;
+            button.downState = downState;
+            button.hitTestState = hitArea;
+			button.visible = showCloseButton;
+			
+			button.addEventListener('click',closeButtonHandler);
+			
+			return button;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function closeButtonHandler(event:org.apache.flex.events.Event) : void
+		{
+			var newEvent:Event = new Event('close',true);
+			dispatchEvent(newEvent);
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as
new file mode 100644
index 0000000..b0c7322
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as
@@ -0,0 +1,125 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.accessories
+{
+	import flash.events.TextEvent;
+	
+	import org.apache.flex.core.CSSTextField;
+	import org.apache.flex.core.IBead;
+	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.ITextFieldView;
+	
+	/**
+	 *  The NumericOnlyTextInputBead class is a specialty bead that can be used with
+	 *  any TextInput control. The bead prevents non-numeric entry into the text input
+	 *  area.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class NumericOnlyTextInputBead implements IBead
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function NumericOnlyTextInputBead()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			IEventDispatcher(value).addEventListener("viewChanged",viewChangeHandler);
+		}
+		
+		private var _decimalSeparator:String = ".";
+		
+		/**
+		 *  The character used to separate the integer and fraction parts of numbers.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get decimalSeparator():String
+		{
+			return _decimalSeparator;
+		}
+		public function set decimalSeparator(value:String):void
+		{
+			if (_decimalSeparator != value) {
+				_decimalSeparator = value;
+			}
+		}
+		
+		/**
+		 * @private
+		 */
+		private function viewChangeHandler(event:Event):void
+		{			
+			// get the ITextFieldView bead, which is required for this bead to work
+			var textView:ITextFieldView = _strand.getBeadByType(ITextFieldView) as ITextFieldView;
+			if (textView) {
+				var textField:CSSTextField = textView.textField;
+				textField.restrict = "0-9" + decimalSeparator;
+				
+				// listen for changes to this textField and prevent non-numeric values, such
+				// as 34.09.94
+				textField.addEventListener(TextEvent.TEXT_INPUT, handleTextInput);
+			}
+			else {
+				throw new Error("NumericOnlyTextInputBead requires strand to have an ITextFieldView bead");
+			}
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleTextInput(event:TextEvent):void
+		{
+			var insert:String = event.text;
+			var caretIndex:int = (event.target as CSSTextField).caretIndex;
+			var current:String = (event.target as CSSTextField).text;
+			var value:String = current.substring(0,caretIndex) + insert + current.substr(caretIndex);
+			var n:Number = Number(value);
+			if (isNaN(n)) event.preventDefault();
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/PasswordInputBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/PasswordInputBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/PasswordInputBead.as
new file mode 100644
index 0000000..268ceea
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/PasswordInputBead.as
@@ -0,0 +1,85 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.accessories
+{
+	import org.apache.flex.core.CSSTextField;
+	import org.apache.flex.core.IBead;
+	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.ITextFieldView;
+	
+	/**
+	 *  The PasswordInput class is a specialty bead that can be used with
+	 *  any TextInput control. The bead secures the text input area by masking
+	 *  the input as it is typed.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class PasswordInputBead implements IBead
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function PasswordInputBead()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			IEventDispatcher(value).addEventListener("viewChanged",viewChangeHandler);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function viewChangeHandler(event:Event):void
+		{			
+			// get the ITextFieldView bead, which is required for this bead to work
+			var textView:ITextFieldView = _strand.getBeadByType(ITextFieldView) as ITextFieldView;
+			if (textView) {
+				var textField:CSSTextField = textView.textField;
+				textField.displayAsPassword = true;
+			}
+			else {
+				throw new Error("PasswordInputBead requires strand to have a TextInputView bead");
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/TextPromptBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/TextPromptBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/TextPromptBead.as
new file mode 100644
index 0000000..4f41a67
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/TextPromptBead.as
@@ -0,0 +1,131 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.accessories
+{
+	import flash.text.TextFieldType;
+	
+	import org.apache.flex.core.CSSTextField;
+	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;
+	
+	/**
+	 *  The TextPromptBead class is a specialty bead that can be used with
+	 *  any TextInput control. The bead places a string into the input field
+	 *  when there is no value associated with the text property.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class TextPromptBead implements IBead
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function TextPromptBead()
+		{
+		}
+		
+		private var _prompt:String;
+		
+		/**
+		 *  The string to use as the placeholder prompt.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get prompt():String
+		{
+			return _prompt;
+		}
+		public function set prompt(value:String):void
+		{
+			_prompt = value;
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			// listen for changes in text to hide or show the prompt
+			var model:Object = UIBase(_strand).model;
+			if (!model.hasOwnProperty("text")) {
+				throw new Error("Model requires a text property when used with TextPromptBead");
+			}
+			IEventDispatcher(model).addEventListener("textChange",handleTextChange);
+			
+			// create a TextField that displays the prompt - it shows
+			// and hides based on the model's content
+			promptField = new CSSTextField();
+			promptField.selectable = false;
+			promptField.type = TextFieldType.DYNAMIC;
+			promptField.mouseEnabled = false;
+			promptField.multiline = false;
+			promptField.wordWrap = false;
+			promptField.textColor = 0xBBBBBB;
+			
+			// trigger the event handler to display if needed
+			handleTextChange(null);
+		}
+		
+		private var promptField:CSSTextField;
+		private var promptAdded:Boolean;
+		
+		/**
+		 * @private
+		 */
+		private function handleTextChange( event:Event ):void
+		{	
+			// see what the model currently has to determine if the prompt should be
+			// displayed or not.
+			var model:Object = UIBase(_strand).model;
+			
+			if (model.text != null && model.text.length > 0 ) {
+				if (promptAdded) UIBase(_strand).removeChild(promptField);
+				promptAdded = false;
+			}
+			else {
+				if (!promptAdded) UIBase(_strand).addChild(promptField);
+				promptField.text = prompt;
+				promptAdded = true;
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertMeasurementBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertMeasurementBead.as
new file mode 100644
index 0000000..f0d315b
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertMeasurementBead.as
@@ -0,0 +1,88 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import org.apache.flex.core.IMeasurementBead;
+	import org.apache.flex.core.IStrand;
+	
+	/**
+	 *  The AlertMeasureBead class provides boundary measurements for an 
+	 *  org.apache.flex.html.staticControls.Alert component.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class AlertMeasurementBead implements IMeasurementBead
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function AlertMeasurementBead()
+		{
+		}
+		
+		/**
+		 *  Returns the overall width of the org.apache.flex.html.staticControls.Alert component.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get measuredWidth():Number
+		{
+			return 0;
+		}
+		
+		/**
+		 *  Returns the overall height of the org.apache.flex.html.staticControls.Alert component.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get measuredHeight():Number
+		{
+			return 0;
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as
new file mode 100644
index 0000000..c43149b
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as
@@ -0,0 +1,223 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import org.apache.flex.core.IAlertModel;
+	import org.apache.flex.core.IBead;
+    import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IMeasurementBead;
+    import org.apache.flex.core.IParent;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.UIMetrics;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.createjs.staticControls.Label;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.html.staticControls.Alert;
+	import org.apache.flex.html.staticControls.ControlBar;
+	import org.apache.flex.html.staticControls.TextButton;
+	import org.apache.flex.html.staticControls.TitleBar;
+	import org.apache.flex.utils.BeadMetrics;
+	
+	/**
+	 *  The AlertView class creates the visual elements of the org.apache.flex.html.staticControls.Alert
+	 *  component. The job of the view bead is to put together the parts of the Alert, such as the 
+	 *  title bar, message, and various buttons, within the space of the Alert component strand.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class AlertView implements IBeadView
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function AlertView()
+		{
+		}
+		
+		private var _titleBar:TitleBar;
+		private var _controlBar:ControlBar;
+		private var _label:Label;
+		private var _okButton:TextButton;
+		private var _cancelButton:TextButton;
+		private var _yesButton:TextButton;
+		private var _noButton:TextButton;
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+
+            var backgroundColor:Object = ValuesManager.valuesImpl.getValue(value, "background-color");
+			var backgroundImage:Object = ValuesManager.valuesImpl.getValue(value, "background-image");
+			if (backgroundColor != null || backgroundImage != null)
+			{
+				if (value.getBeadByType(IBackgroundBead) == null)
+					value.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBackgroundBead")) as IBead);					
+			}
+			
+			var borderStyle:String;
+			var borderStyles:Object = ValuesManager.valuesImpl.getValue(value, "border");
+			if (borderStyles is Array)
+			{
+				borderStyle = borderStyles[1];
+			}
+			if (borderStyle == null)
+			{
+				borderStyle = ValuesManager.valuesImpl.getValue(value, "border-style") as String;
+			}
+			if (borderStyle != null && borderStyle != "none")
+			{
+				if (value.getBeadByType(IBorderBead) == null)
+					value.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBorderBead")) as IBead);	
+			}
+			
+			var flags:uint = IAlertModel(UIBase(_strand).model).flags;
+			if( flags & Alert.OK ) {
+				_okButton = new TextButton();
+				_okButton.text = IAlertModel(UIBase(_strand).model).okLabel;
+				_okButton.addEventListener("click",handleOK);
+			}
+			if( flags & Alert.CANCEL ) {
+				_cancelButton = new TextButton();
+				_cancelButton.text = IAlertModel(UIBase(_strand).model).cancelLabel;
+				_cancelButton.addEventListener("click",handleCancel);
+			}
+			if( flags & Alert.YES ) {
+				_yesButton = new TextButton();
+				_yesButton.text = IAlertModel(UIBase(_strand).model).yesLabel;
+				_yesButton.addEventListener("click",handleYes);
+			}
+			if( flags & Alert.NO ) {
+				_noButton = new TextButton();
+				_noButton.text = IAlertModel(UIBase(_strand).model).noLabel;
+				_noButton.addEventListener("click",handleNo);
+			}
+			
+			_titleBar = new TitleBar();
+			_titleBar.title = IAlertModel(UIBase(_strand).model).title;
+			
+			_label = new Label();
+			_label.text = IAlertModel(UIBase(_strand).model).message;
+			
+			_controlBar = new ControlBar();
+			if( _okButton ) _controlBar.addElement(_okButton);
+			if( _cancelButton ) _controlBar.addElement(_cancelButton);
+			if( _yesButton  ) _controlBar.addElement(_yesButton);
+			if( _noButton ) _controlBar.addElement(_noButton);
+			
+		    IParent(_strand).addElement(_titleBar);
+            IParent(_strand).addElement(_controlBar);
+            IParent(_strand).addElement(_label);
+			
+			sizeHandler(null);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function sizeHandler(event:Event):void
+		{
+			var labelMeasure:IMeasurementBead = _label.measurementBead;
+			var titleMeasure:IMeasurementBead = _titleBar.measurementBead;
+			var ctrlMeasure:IMeasurementBead  = _controlBar.measurementBead;
+			var maxWidth:Number = Math.max(titleMeasure.measuredWidth, ctrlMeasure.measuredWidth, labelMeasure.measuredWidth);
+			
+			var metrics:UIMetrics = BeadMetrics.getMetrics(_strand);
+
+			_titleBar.x = metrics.left;
+			_titleBar.y = metrics.top;
+			_titleBar.width = maxWidth;
+			
+			// content placement here
+			_label.x = metrics.left;
+			_label.y = _titleBar.y + _titleBar.height + 2;
+			_label.width = maxWidth;
+			
+			_controlBar.x = metrics.left;
+			_controlBar.y = _label.y + _label.height + 2;
+			_controlBar.width = maxWidth;
+			
+			UIBase(_strand).width = maxWidth + metrics.left + metrics.right;
+			UIBase(_strand).height = _controlBar.y + _controlBar.height + metrics.bottom + 2;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleOK(event:Event):void
+		{
+			// create some custom event where the detail value
+			// is the OK button flag. Do same for other event handlers
+			dispatchCloseEvent(Alert.OK);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleCancel(event:Event):void
+		{
+			dispatchCloseEvent(Alert.CANCEL);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleYes(event:Event):void
+		{
+			dispatchCloseEvent(Alert.YES);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleNo(event:Event):void
+		{
+			dispatchCloseEvent(Alert.NO);
+		}
+		
+		/**
+		 * @private
+		 */
+		public function dispatchCloseEvent(buttonFlag:uint):void
+		{
+			// TO DO: buttonFlag should be part of the event
+			var newEvent:Event = new Event("close",true);
+			IEventDispatcher(_strand).dispatchEvent(newEvent);
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ButtonBarView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ButtonBarView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ButtonBarView.as
new file mode 100644
index 0000000..873d4eb
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ButtonBarView.as
@@ -0,0 +1,94 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	import flash.display.DisplayObjectContainer;
+	
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IBeadModel;
+	import org.apache.flex.core.ILayoutParent;
+	import org.apache.flex.core.IParent;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.html.staticControls.supportClasses.Border;
+
+	/**
+	 *  The ButtonBarView class creates the visual elements of the org.apache.flex.html.staticControls.ButtonBar 
+	 *  component. A ButtonBar is a type of List and ButtonBarView extends the ListView bead, adding a border.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ButtonBarView extends ListView
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ButtonBarView()
+		{
+			super();
+		}
+		
+		private var _border:Border;
+		
+		/**
+		 *  The ButtonBar's border.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		override public function get border():Border
+		{
+			return _border;
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		override public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			super.strand = value;
+			
+			_border = new Border();
+			_border.model = new (ValuesManager.valuesImpl.getValue(value, "iBorderModel")) as IBeadModel;
+			_border.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBorderBead")) as IBead);
+			IParent(_strand).addElement(_border);
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSButtonView.as
new file mode 100644
index 0000000..22f7c84
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSButtonView.as
@@ -0,0 +1,155 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.Loader;
+	import flash.display.Shape;
+	import flash.display.SimpleButton;
+	import flash.display.Sprite;
+	import flash.events.Event;
+	import flash.net.URLRequest;
+	
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.ITextModel;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.utils.SolidBorderUtil;
+
+    /**
+     *  The CSSButtonView class is the default view for
+     *  the org.apache.flex.html.staticControls.Button class.
+     *  It allows the look of the button to be expressed
+     *  in CSS via the background-image style.  This view
+     *  does not display text.  Use CSSTextButtonView and
+     *  TextButton instead.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class CSSButtonView implements IBeadView
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function CSSButtonView()
+		{
+			upSprite = new Sprite();
+			downSprite = new Sprite();
+			overSprite = new Sprite();
+		}
+		
+		private var textModel:ITextModel;
+		
+		private var _strand:IStrand;
+		
+		private var shape:Shape;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			shape = new Shape();
+			shape.graphics.beginFill(0xCCCCCC);
+			shape.graphics.drawRect(0, 0, 10, 10);
+			shape.graphics.endFill();
+			SimpleButton(value).upState = upSprite;
+			SimpleButton(value).downState = downSprite;
+			SimpleButton(value).overState = overSprite;
+			SimpleButton(value).hitTestState = shape;
+
+            setupBackground(overSprite, "hover");
+            setupBackground(downSprite, "active");
+            setupBackground(upSprite);
+		}
+	
+		private function setupSkin(sprite:Sprite, state:String = null):void
+		{
+			var borderColor:uint;
+			var borderThickness:uint;
+			var borderStyle:String;
+			var borderStyles:Object = ValuesManager.valuesImpl.getValue(_strand, "border", state);
+			if (borderStyles is Array)
+			{
+				borderColor = borderStyles[2];
+				borderStyle = borderStyles[1];
+				borderThickness = borderStyles[0];
+			}
+			var value:Object = ValuesManager.valuesImpl.getValue(_strand, "border-style", state);
+			if (value != null)
+				borderStyle = value as String;
+			value = ValuesManager.valuesImpl.getValue(_strand, "border-color", state);
+			if (value != null)
+				borderColor = value as uint;
+			value = ValuesManager.valuesImpl.getValue(_strand, "border-thickness", state);
+			if (value != null)
+				borderThickness = value as uint;
+			var padding:Object = ValuesManager.valuesImpl.getValue(_strand, "padding", state);
+			var backgroundColor:Object = ValuesManager.valuesImpl.getValue(_strand, "background-color", state);
+			if (borderStyle == "solid")
+			{
+				SolidBorderUtil.drawBorder(sprite.graphics, 
+					0, 0, sprite.width + Number(padding) * 2, sprite.height + Number(padding) * 2,
+					borderColor, backgroundColor, borderThickness);
+			}			
+		}
+		
+        private function setupBackground(sprite:Sprite, state:String = null):void
+        {
+            var backgroundImage:Object = ValuesManager.valuesImpl.getValue(_strand, "background-image", state);
+            if (backgroundImage)
+            {
+                var loader:Loader = new Loader();
+                sprite.addChildAt(loader, 0);
+                var url:String = backgroundImage as String;
+                loader.load(new URLRequest(url));
+                loader.contentLoaderInfo.addEventListener(flash.events.Event.COMPLETE, function (e:flash.events.Event):void { 
+                    setupSkin(sprite, state);
+                    updateHitArea();
+                });
+            }
+        }
+        
+		private var upSprite:Sprite;
+		private var downSprite:Sprite;
+		private var overSprite:Sprite;
+				
+		private function updateHitArea():void
+		{
+			shape.graphics.clear();
+			shape.graphics.beginFill(0xCCCCCC);
+			shape.graphics.drawRect(0, 0, upSprite.width, upSprite.height);
+			shape.graphics.endFill();
+			
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSTextButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSTextButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSTextButtonView.as
new file mode 100644
index 0000000..991fa05
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSTextButtonView.as
@@ -0,0 +1,262 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	import flash.display.Loader;
+	import flash.display.Shape;
+	import flash.display.SimpleButton;
+	import flash.display.Sprite;
+	import flash.events.Event;
+	import flash.net.URLRequest;
+	import flash.text.TextField;
+	import flash.text.TextFieldType;
+	
+	import org.apache.flex.core.CSSTextField;
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.ITextModel;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.utils.SolidBorderUtil;
+
+    /**
+     *  The CSSTextButtonView class is the default view for
+     *  the org.apache.flex.html.staticControls.TextButton class.
+     *  It allows the look of the button to be expressed
+     *  in CSS via the background-image style and displays
+     *  a text label.  This view does not support right-to-left
+     *  text.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class CSSTextButtonView implements IBeadView
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function CSSTextButtonView()
+		{
+			upSprite = new Sprite();
+			downSprite = new Sprite();
+			overSprite = new Sprite();
+			upTextField = new CSSTextField();
+			downTextField = new CSSTextField();
+			overTextField = new CSSTextField();
+			upTextField.selectable = false;
+			upTextField.type = TextFieldType.DYNAMIC;
+			downTextField.selectable = false;
+			downTextField.type = TextFieldType.DYNAMIC;
+			overTextField.selectable = false;
+			overTextField.type = TextFieldType.DYNAMIC;
+			upTextField.autoSize = "left";
+			downTextField.autoSize = "left";
+			overTextField.autoSize = "left";
+			upSprite.addChild(upTextField);
+			downSprite.addChild(downTextField);
+			overSprite.addChild(overTextField);
+		}
+		
+		private var textModel:ITextModel;
+		
+		private var _strand:IStrand;
+		
+		private var shape:Shape;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			textModel = value.getBeadByType(ITextModel) as ITextModel;
+			textModel.addEventListener("textChange", textChangeHandler);
+			textModel.addEventListener("htmlChange", htmlChangeHandler);
+			shape = new Shape();
+			shape.graphics.beginFill(0xCCCCCC);
+			shape.graphics.drawRect(0, 0, 10, 10);
+			shape.graphics.endFill();
+			SimpleButton(value).upState = upSprite;
+			SimpleButton(value).downState = downSprite;
+			SimpleButton(value).overState = overSprite;
+			SimpleButton(value).hitTestState = shape;
+			if (textModel.text !== null)
+				text = textModel.text;
+			if (textModel.html !== null)
+				html = textModel.html;
+
+            setupSkin(overSprite, overTextField, "hover");
+			setupSkin(downSprite, downTextField, "active");
+			setupSkin(upSprite, upTextField);
+			
+			IEventDispatcher(_strand).addEventListener("widthChanged",sizeChangeHandler);
+			IEventDispatcher(_strand).addEventListener("heightChanged",sizeChangeHandler);
+		}
+	
+		private function setupSkin(sprite:Sprite, textField:TextField, state:String = null):void
+		{
+			var sw:uint = DisplayObject(_strand).width;
+			var sh:uint = DisplayObject(_strand).height;
+			
+			var borderColor:uint;
+			var borderThickness:uint;
+			var borderStyle:String;
+			var borderStyles:Object = ValuesManager.valuesImpl.getValue(_strand, "border", state);
+			if (borderStyles is Array)
+			{
+				borderColor = borderStyles[2];
+				borderStyle = borderStyles[1];
+				borderThickness = borderStyles[0];
+			}
+			var value:Object = ValuesManager.valuesImpl.getValue(_strand, "border-style", state);
+			if (value != null)
+				borderStyle = value as String;
+			value = ValuesManager.valuesImpl.getValue(_strand, "border-color", state);
+			if (value != null)
+				borderColor = value as uint;
+			value = ValuesManager.valuesImpl.getValue(_strand, "border-thickness", state);
+			if (value != null)
+				borderThickness = value as uint;
+			var padding:Object = ValuesManager.valuesImpl.getValue(_strand, "padding", state);
+			var backgroundColor:Object = ValuesManager.valuesImpl.getValue(_strand, "background-color", state);
+			if (borderStyle == "solid")
+			{
+				SolidBorderUtil.drawBorder(sprite.graphics, 
+					0, 0, sw, textField.textHeight + Number(padding) * 2,
+					borderColor, backgroundColor, borderThickness);
+				textField.y = (sprite.height - textField.height) / 2;
+				textField.x = (sprite.width - textField.width) / 2;
+			}			
+			var backgroundImage:Object = ValuesManager.valuesImpl.getValue(_strand, "background-image", state);
+			if (backgroundImage)
+			{
+				var loader:Loader = new Loader();
+				sprite.addChildAt(loader, 0);
+				var url:String = backgroundImage as String;
+				loader.load(new URLRequest(url));
+				loader.contentLoaderInfo.addEventListener(flash.events.Event.COMPLETE, function (e:flash.events.Event):void { 
+					textField.y = (sh - textField.height) / 2;
+					textField.x = (sw - textField.width) / 2;
+					updateHitArea();
+				});
+			}
+		}
+		
+		private function drawSkin() : void
+		{
+			setupSkin(overSprite, overTextField, "hover");
+			setupSkin(downSprite, downTextField, "active");
+			setupSkin(upSprite, upTextField);
+			
+			updateHitArea();
+		}
+		
+		private function textChangeHandler(event:org.apache.flex.events.Event):void
+		{
+			text = textModel.text;
+		}
+		
+		private function htmlChangeHandler(event:org.apache.flex.events.Event):void
+		{
+			html = textModel.html;
+		}
+		
+		private function sizeChangeHandler(event:org.apache.flex.events.Event):void
+		{
+			drawSkin();
+		}
+		
+		private var upTextField:CSSTextField;
+		private var downTextField:CSSTextField;
+		private var overTextField:CSSTextField;
+		private var upSprite:Sprite;
+		private var downSprite:Sprite;
+		private var overSprite:Sprite;
+		
+        /**
+         *  The text to be displayed in the button
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get text():String
+		{
+			return upTextField.text;
+		}
+        
+        /**
+         *  @private
+         */
+		public function set text(value:String):void
+		{
+			upTextField.text = value;
+			downTextField.text = value;
+			overTextField.text = value;
+			updateHitArea();
+		}
+		
+		private function updateHitArea():void
+		{
+			shape.graphics.clear();
+			shape.graphics.beginFill(0xCCCCCC);
+			shape.graphics.drawRect(0, 0, upSprite.width, upSprite.height);
+			shape.graphics.endFill();
+			
+		}
+		
+        /**
+         *  The html-formatted text to be displayed in the button
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get html():String
+		{
+			return upTextField.htmlText;
+		}
+		
+        /**
+         *  @private
+         */
+		public function set html(value:String):void
+		{
+			upTextField.htmlText = value;
+			downTextField.htmlText = value;
+			overTextField.htmlText = value;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CheckBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CheckBoxView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CheckBoxView.as
new file mode 100644
index 0000000..14ef855
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CheckBoxView.as
@@ -0,0 +1,297 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.Shape;
+	import flash.display.SimpleButton;
+	import flash.display.Sprite;
+	import flash.text.TextFieldAutoSize;
+	import flash.text.TextFieldType;
+	
+	import org.apache.flex.core.CSSTextField;
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.IToggleButtonModel;
+	import org.apache.flex.events.Event;
+	
+    /**
+     *  The CheckBoxView class is the default view for
+     *  the org.apache.flex.html.staticControls.CheckBox class.
+     *  It displays a simple checkbox with an 'x' if checked,
+     *  and a label on the right.  There are no styles or
+     *  properties to configure the look of the 'x' or the
+     *  position of the label relative to the checkbox as
+     *  there are no equivalents in the standard HTML checkbox.
+     * 
+     *  A more complex CheckBox could implement more view
+     *  configuration.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class CheckBoxView implements IBeadView
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function CheckBoxView()
+		{
+			sprites = [ upSprite = new Sprite(),
+				        downSprite = new Sprite(),
+						overSprite = new Sprite(),
+						upAndSelectedSprite = new Sprite(),
+						downAndSelectedSprite = new Sprite(),
+						overAndSelectedSprite = new Sprite() ];
+			
+			for each( var s:Sprite in sprites )
+			{
+				var tf:CSSTextField = new CSSTextField();
+				tf.type = TextFieldType.DYNAMIC;
+				tf.autoSize = TextFieldAutoSize.LEFT;
+				tf.name = "textField";
+				var icon:Shape = new Shape();
+				icon.name = "icon";
+				s.addChild(icon);
+				s.addChild(tf);
+			}
+		}
+		
+		private var upSprite:Sprite;
+		private var downSprite:Sprite;
+		private var overSprite:Sprite;
+		private var upAndSelectedSprite:Sprite;
+		private var downAndSelectedSprite:Sprite;
+		private var overAndSelectedSprite:Sprite;
+		
+		private var sprites:Array;
+		
+		private var _toggleButtonModel:IToggleButtonModel;
+
+        // TODO: Can we remove this?
+		private function get toggleButtonModel() : IToggleButtonModel
+		{
+			return _toggleButtonModel;
+		}
+		
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+            
+			_toggleButtonModel = value.getBeadByType(IToggleButtonModel) as IToggleButtonModel;
+			_toggleButtonModel.addEventListener("textChange", textChangeHandler);
+			_toggleButtonModel.addEventListener("htmlChange", htmlChangeHandler);
+			_toggleButtonModel.addEventListener("selectedChange", selectedChangeHandler);
+			if (_toggleButtonModel.text !== null)
+				text = _toggleButtonModel.text;
+			
+			layoutControl();
+			
+			var hitArea:Shape = new Shape();
+			hitArea.graphics.beginFill(0x000000);
+			hitArea.graphics.drawRect(12,0,upSprite.width, upSprite.height);
+			hitArea.graphics.endFill();
+			
+			SimpleButton(value).upState = upSprite;
+			SimpleButton(value).downState = downSprite;
+			SimpleButton(value).overState = overSprite;
+			SimpleButton(value).hitTestState = hitArea;
+			
+			if (toggleButtonModel.text !== null)
+				text = toggleButtonModel.text;
+			if (toggleButtonModel.html !== null)
+				html = toggleButtonModel.html;
+		}
+		
+        /**
+         *  @copy org.apache.flex.html.staticControls.Label#text
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get text():String
+		{
+			var tf:CSSTextField = upSprite.getChildByName('textField') as CSSTextField;
+			return tf.text;
+		}
+		
+        /**
+         *  @private
+         */
+		public function set text(value:String):void
+		{
+			for each( var s:Sprite in sprites )
+			{
+				var tf:CSSTextField = s.getChildByName('textField') as CSSTextField;
+				tf.text = value;
+			}
+			
+			layoutControl();
+		}
+		
+        /**
+         *  @copy org.apache.flex.html.staticControls.Label#html
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get html():String
+		{
+			var tf:CSSTextField = upSprite.getChildByName('textField') as CSSTextField;
+			return tf.htmlText;
+		}
+		
+        /**
+         *  @private
+         */
+		public function set html(value:String):void
+		{
+			for each(var s:Sprite in sprites)
+			{
+				var tf:CSSTextField = s.getChildByName('textField') as CSSTextField;
+				tf.htmlText = value;
+			}
+			
+			layoutControl();
+		}
+		
+		private function textChangeHandler(event:Event):void
+		{
+			text = toggleButtonModel.text;
+		}
+		
+		private function htmlChangeHandler(event:Event):void
+		{
+			html = toggleButtonModel.html;
+		}
+		
+		private var _selected:Boolean;
+		
+        /**
+         *  @copy org.apache.flex.core.IToggleButtonModel#selected
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get selected():Boolean
+		{
+			return _selected;
+		}
+		
+        /**
+         *  @private
+         */
+		public function set selected(value:Boolean):void
+		{
+			_selected = value;
+			
+			layoutControl();
+			
+			if( value ) {
+				SimpleButton(_strand).upState = upAndSelectedSprite;
+				SimpleButton(_strand).downState = downAndSelectedSprite;
+				SimpleButton(_strand).overState = overAndSelectedSprite;
+				
+			} else {
+				SimpleButton(_strand).upState = upSprite;
+				SimpleButton(_strand).downState = downSprite;
+				SimpleButton(_strand).overState = overSprite;
+			}
+		}
+		
+		private function selectedChangeHandler(event:Event):void
+		{
+			selected = toggleButtonModel.selected;
+		}
+		
+        /**
+         *  Display the icon and text label
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		protected function layoutControl() : void
+		{
+			for each(var s:Sprite in sprites)
+			{
+				var icon:Shape = s.getChildByName("icon") as Shape;
+				var tf:CSSTextField = s.getChildByName("textField") as CSSTextField;
+				
+				drawCheckBox(icon);
+				
+				var mh:Number = Math.max(icon.height,tf.height);
+				
+				icon.x = 0;
+				icon.y = (mh - icon.height)/2;
+				
+				tf.x = icon.x + icon.width + 1;
+				tf.y = (mh - tf.height)/2;
+			}
+			
+		}
+		
+        /**
+         *  Draw the checkbox
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		protected function drawCheckBox(icon:Shape) : void
+		{
+			icon.graphics.clear();
+			icon.graphics.beginFill(0xCCCCCC);
+			icon.graphics.lineStyle(1,0x333333);
+			icon.graphics.drawRect(0,0,10,10);
+			icon.graphics.endFill();
+			
+			if( _toggleButtonModel.selected ) {
+				icon.graphics.moveTo(0,0);
+				icon.graphics.lineTo(10,10);
+				icon.graphics.moveTo(10,0);
+				icon.graphics.lineTo(0,10);
+			}
+		}
+	}
+}
\ No newline at end of file


[09/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.as
deleted file mode 100644
index 7f3ecb0..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.as
+++ /dev/null
@@ -1,141 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-    import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IDataProviderItemRendererMapper;
-    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.core.ValuesManager;
-    import org.apache.flex.events.Event;
-    import org.apache.flex.events.IEventDispatcher;
-
-    /**
-     *  The TextItemRendererFactoryForArrayData class is the 
-     *  IDataProviderItemRendererMapper for creating 
-     *  ITextItemRenderers and assigning them data from an array.
-     *  Other IDataProviderItemRendererMapper implementations
-     *  assign specific array or vector types to item
-     *  renderers expecting those types.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class TextItemRendererFactoryForArrayData implements IBead, IDataProviderItemRendererMapper
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function TextItemRendererFactoryForArrayData()
-		{
-		}
-		
-		private var selectionModel:ISelectionModel;
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			selectionModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
-			var listView:IListView = value.getBeadByType(IListView) as IListView;
-			dataGroup = listView.dataGroup;
-			selectionModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
-            
-            if (!itemRendererFactory)
-            {
-                _itemRendererFactory = new (ValuesManager.valuesImpl.getValue(_strand, "iItemRendererClassFactory")) as IItemRendererClassFactory;
-                _strand.addBead(_itemRendererFactory);
-            }
-            
-			dataProviderChangeHandler(null);
-		}
-		
-        private var _itemRendererFactory:IItemRendererClassFactory;
-        
-        /**
-         *  An IItemRendererClassFactory that should generate ITextItemRenderers
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function get itemRendererFactory():IItemRendererClassFactory
-        {
-            return _itemRendererFactory
-        }
-        
-        /**
-         *  @private
-         */
-        public function set itemRendererFactory(value:IItemRendererClassFactory):void
-        {
-            _itemRendererFactory = value;
-        }
-        
-        /**
-         *  The IItemRendererParent that should parent the ITextItemRenderers
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		protected var dataGroup:IItemRendererParent;
-		
-		private function dataProviderChangeHandler(event:Event):void
-		{
-			var dp:Array = selectionModel.dataProvider as Array;
-			if (!dp)
-				return;
-			
-			dataGroup.removeAllElements();
-			
-			var n:int = dp.length; 
-			for (var i:int = 0; i < n; i++)
-			{
-				var tf:ITextItemRenderer = itemRendererFactory.createItemRenderer(dataGroup) as ITextItemRenderer;
-                tf.index = i;
-                dataGroup.addElement(tf);
-				tf.text = dp[i];
-			}
-			
-			IEventDispatcher(_strand).dispatchEvent(new Event("itemsCreated"));
-		}
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForStringVectorData.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForStringVectorData.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForStringVectorData.as
deleted file mode 100644
index 7e5f41f..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForStringVectorData.as
+++ /dev/null
@@ -1,128 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-    
-    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;
-
-    /**
-     *  The TextItemRendererFactoryForStringVectorData class is the 
-     *  IDataProviderItemRendererMapper for creating 
-     *  ITextItemRenderers and assigning them data from an vector
-     *  of Strings.  Other IDataProviderItemRendererMapper implementations
-     *  assign specific array or vector types to item
-     *  renderers expecting those types.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class TextItemRendererFactoryForStringVectorData implements IBead
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function TextItemRendererFactoryForStringVectorData()
-		{
-		}
-		
-		private var selectionModel:ISelectionModel;
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			selectionModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
-			var listView:IListView = value.getBeadByType(IListView) as IListView;
-			dataGroup = listView.dataGroup;
-			selectionModel.addEventListener("dataProviderChange", dataProviderChangeHandler);
-			dataProviderChangeHandler(null);
-		}
-		
-        private var _itemRendererFactory:IItemRendererClassFactory;
-        
-        /**
-         *  An IItemRendererClassFactory that should generate ITextItemRenderers
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function get itemRendererFactory():IItemRendererClassFactory
-        {
-            return _itemRendererFactory
-        }
-        
-        /**
-         *  @private
-         */
-        public function set itemRendererFactory(value:IItemRendererClassFactory):void
-        {
-            _itemRendererFactory = value;
-        }
-        
-        /**
-         *  The IItemRendererParent that should parent the ITextItemRenderers
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        protected var dataGroup:IItemRendererParent;
-		
-		private function dataProviderChangeHandler(event:Event):void
-		{
-			var dp:Vector.<String> = selectionModel.dataProvider as Vector.<String>;
-			
-			dataGroup.removeAllElements();
-			
-			var n:int = dp.length; 
-			for (var i:int = 0; i < n; i++)
-			{
-				var tf:ITextItemRenderer = itemRendererFactory.createItemRenderer(dataGroup) as ITextItemRenderer;
-                tf.index = i;
-                dataGroup.addElement(tf);
-				tf.text = dp[i];
-			}			
-		}
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TitleBarMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TitleBarMeasurementBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TitleBarMeasurementBead.as
deleted file mode 100644
index 9976ea6..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TitleBarMeasurementBead.as
+++ /dev/null
@@ -1,106 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.IMeasurementBead;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.html.staticControls.TitleBar;
-	
-	/**
-	 *  The TitleBarMeasurementBead class measures the overall size of a 
-	 *  org.apache.flex.html.staticControls.TitleBar.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class TitleBarMeasurementBead implements IMeasurementBead
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function TitleBarMeasurementBead()
-		{
-		}
-		
-		/**
-		 *  The overall width of the org.apache.flex.html.staticControls.TitleBar.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get measuredWidth():Number
-		{
-			var mwidth:Number = 0;
-			var titleBar:TitleBar = _strand as TitleBar;
-			var labelMeasure:IMeasurementBead = titleBar.titleLabel.measurementBead;
-			mwidth = labelMeasure.measuredWidth;
-			if( titleBar.showCloseButton ) {
-				var buttonMeasure:IMeasurementBead = titleBar.closeButton.measurementBead;
-				mwidth += buttonMeasure.measuredWidth;
-			}
-			return mwidth;
-		}
-		
-		/**
-		 *  The overall height of the org.apache.flex.html.staticControls.TitleBar.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get measuredHeight():Number
-		{
-			var mheight:Number = 0;
-			var titleBar:TitleBar = _strand as TitleBar;
-			var labelMeasure:IMeasurementBead = titleBar.titleLabel.measurementBead;
-			mheight = labelMeasure.measuredHeight;
-			if( titleBar.showCloseButton ) {
-				var buttonMeasure:IMeasurementBead = titleBar.closeButton.measurementBead;
-				mheight = Math.max(mheight,buttonMeasure.measuredHeight);
-			}
-			return mheight;
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/UpArrowButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/UpArrowButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/UpArrowButtonView.as
deleted file mode 100644
index 6ef6efb..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/UpArrowButtonView.as
+++ /dev/null
@@ -1,103 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.Graphics;
-	import flash.display.Shape;
-	import flash.display.SimpleButton;
-
-	import org.apache.flex.core.IStrand;
-    import org.apache.flex.core.IBeadView;
-	
-    /**
-     *  The UpArrowButtonView class is the view for
-     *  the up arrow button in a ScrollBar and other controls.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class UpArrowButtonView implements IBeadView
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function UpArrowButtonView()
-		{
-			upView = new Shape();
-			downView = new Shape();
-			overView = new Shape();
-
-			drawView(upView.graphics, 0xCCCCCC);
-			drawView(downView.graphics, 0x808080);
-			drawView(overView.graphics, 0xEEEEEE);
-		}
-		
-		private function drawView(g:Graphics, bgColor:uint):void
-		{
-			g.lineStyle(1);
-			g.beginFill(bgColor);
-			g.drawRect(0, 0, 16, 16);
-			g.endFill();
-			g.lineStyle(0);
-			g.beginFill(0);
-			g.moveTo(4, 12);
-			g.lineTo(12, 12);
-			g.lineTo(8, 4);
-			g.lineTo(4, 12);
-			g.endFill();
-		}
-		
-		private var _strand:IStrand;
-		
-		private var shape:Shape;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			shape = new Shape();
-			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, 16, 16);
-			shape.graphics.endFill();
-			SimpleButton(value).upState = upView;
-			SimpleButton(value).downState = downView;
-			SimpleButton(value).overState = overView;
-			SimpleButton(value).hitTestState = shape;
-		}
-        
-		private var upView:Shape;
-		private var downView:Shape;
-		private var overView:Shape;
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/VScrollBarThumbView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/VScrollBarThumbView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/VScrollBarThumbView.as
deleted file mode 100644
index c147a50..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/VScrollBarThumbView.as
+++ /dev/null
@@ -1,127 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.Graphics;
-	import flash.display.Shape;
-	import flash.display.SimpleButton;
-    import flash.display.DisplayObject;
-
-    import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;	
-	
-    /**
-     *  The VScrollBarThumbView class is the view for
-     *  the thumb button in a Vertical ScrollBar.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class VScrollBarThumbView implements IBeadView
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function VScrollBarThumbView()
-		{
-		}
-		
-		private function drawView(g:Graphics, bgColor:uint):void
-		{
-            var hh:Number = DisplayObject(_strand).height;
-            g.clear();
-			g.lineStyle(1);
-			g.beginFill(bgColor);
-			g.drawRect(0, 0, 16, hh);
-			g.endFill();
-            hh = Math.round(hh / 2);
-			g.moveTo(4, hh);
-			g.lineTo(12, hh);
-			g.moveTo(4, hh - 4);
-			g.lineTo(12, hh - 4);
-			g.moveTo(4, hh + 4);
-			g.lineTo(12, hh + 4);
-		}
-		
-		private var _strand:IStrand;
-		
-		private var shape:Shape;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-            
-            upView = new Shape();
-            downView = new Shape();
-            overView = new Shape();
-            
-            drawView(upView.graphics, 0xCCCCCC);
-            drawView(downView.graphics, 0x808080);
-            drawView(overView.graphics, 0xEEEEEE);
-
-            shape = new Shape();
-			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, 16, 16);
-			shape.graphics.endFill();
-			SimpleButton(value).upState = upView;
-			SimpleButton(value).downState = downView;
-			SimpleButton(value).overState = overView;
-			SimpleButton(value).hitTestState = shape;
-            IEventDispatcher(_strand).addEventListener("heightChanged", heightChangedHandler);
-		}
-
-        private function heightChangedHandler(event:Event):void
-        {
-			DisplayObject(_strand).scaleY = 1.0;
-			DisplayObject(_strand).scaleX = 1.0;
-			
-            var hh:Number = DisplayObject(_strand).height;
-            drawView(upView.graphics, 0xCCCCCC);
-            drawView(downView.graphics, 0x808080);
-            drawView(overView.graphics, 0xEEEEEE);
-            
-            shape.graphics.clear();
-            shape.graphics.beginFill(0xCCCCCC);
-            shape.graphics.drawRect(0, 0, 16, hh);
-            shape.graphics.endFill();
-        }
-        
-		private var upView:Shape;
-		private var downView:Shape;
-		private var overView:Shape;
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/VScrollBarTrackView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/VScrollBarTrackView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/VScrollBarTrackView.as
deleted file mode 100644
index 7f9dc8d..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/VScrollBarTrackView.as
+++ /dev/null
@@ -1,112 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	import flash.display.Graphics;
-	import flash.display.Shape;
-	import flash.display.SimpleButton;
-	
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	
-    /**
-     *  The VScrollBarTrackView class is the view for
-     *  the track in a Vertical ScrollBar.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class VScrollBarTrackView implements IBeadView
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function VScrollBarTrackView()
-		{
-			upView = new Shape();
-			downView = new Shape();
-			overView = new Shape();
-
-		}
-		
-		private function drawView(g:Graphics, bgColor:uint, h:Number):void
-		{
-			g.clear();
-			g.lineStyle(1);
-			g.beginFill(bgColor);
-			g.drawRect(0, 0, 16, h);
-			g.endFill();
-			g.lineStyle(0);
-		}
-
-		private function heightChangeHandler(event:Event):void
-		{
-			DisplayObject(_strand).scaleY = 1.0;
-			DisplayObject(_strand).scaleX = 1.0;
-			
-			var h:Number = SimpleButton(_strand).height;
-			
-			drawView(upView.graphics, 0xCCCCCC, h);
-			drawView(downView.graphics, 0x808080, h);
-			drawView(overView.graphics, 0xEEEEEE, h);	
-			shape.graphics.clear();
-			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, 16, h);
-			shape.graphics.endFill();
-			
-		}
-		
-		private var _strand:IStrand;
-		
-		private var shape:Shape;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			SimpleButton(value).addEventListener("heightChanged", heightChangeHandler);
-			shape = new Shape();
-			SimpleButton(value).upState = upView;
-			SimpleButton(value).downState = downView;
-			SimpleButton(value).overState = overView;
-			SimpleButton(value).hitTestState = shape;
-		}
-
-		private var upView:Shape;
-		private var downView:Shape;
-		private var overView:Shape;
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/AlertController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/AlertController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/AlertController.as
deleted file mode 100644
index 7622b54..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/AlertController.as
+++ /dev/null
@@ -1,88 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.controllers
-{	
-    import flash.display.DisplayObject;
-    
-	import org.apache.flex.core.IBeadController;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-
-	/**
-	 *  The AlertControler class bead handles the close event on the org.apache.flex.html.staticControls.Alert 
-	 *  by removing the org.apache.flex.html.staticControls.Alert from the display.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-    public class AlertController implements IBeadController
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function AlertController()
-		{
-		}
-		
-        private var _strand:IStrand;
-        
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-        public function get strand():IStrand
-        {
-            return _strand;
-        }
-        
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-        public function set strand(value:IStrand):void
-        {
-            _strand = value;
-            IEventDispatcher(value).addEventListener("close",handleAlertClose);
-        }
-        
-		/**
-		 * @private
-		 */
-        private function handleAlertClose(event:Event):void
-        {
-            DisplayObject(_strand).parent.removeChild(DisplayObject(_strand));
-        }
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ButtonAutoRepeatController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ButtonAutoRepeatController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ButtonAutoRepeatController.as
deleted file mode 100644
index 70b2348..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ButtonAutoRepeatController.as
+++ /dev/null
@@ -1,147 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.controllers
-{
-	import flash.events.MouseEvent;
-	import flash.utils.clearInterval;
-	import flash.utils.clearTimeout;
-	import flash.utils.setInterval;
-	import flash.utils.setTimeout;
-	
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IBeadController;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-
-    /**
-     *  The ButtonAutoRepeatController class adds autorepeat
-     *  functionality to a button.  This version is simply waits
-     *  a specified amount of time (default is 250ms), then repeats the button
-     *  event at a specified interval, which defaults to
-     *  125 milliseconds.  Alternate implementations could
-     *  have non-linear repeat timing, look for keyboard modifiers to choose
-     *  different rates, etc.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-    public class ButtonAutoRepeatController implements IBead, IBeadController
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function ButtonAutoRepeatController()
-		{
-		}
-		
-        private var _strand:IStrand;
-        
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function set strand(value:IStrand):void
-        {
-            _strand = value;
-            IEventDispatcher(value).addEventListener(MouseEvent.MOUSE_DOWN, mouseDownHandler);
-        }
-        
-        /**
-         *  The number of milliseconds to wait before repeating the event
-         *  for the first time.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public var delay:int = 250;
-        
-        /**
-         *  The number of milliseconds to wait before repeating the event
-         *  after the first time.  This value is not checked for
-         *  changes after the events start repeating.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public var interval:int = 100;
-        
-        private var timeout:uint;
-        private var repeater:uint;
-        
-        private function mouseDownHandler(event:MouseEvent):void
-        {
-            event.target.addEventListener(MouseEvent.MOUSE_OUT, mouseOutHandler);   
-            event.target.addEventListener(MouseEvent.MOUSE_UP, mouseUpHandler);
-            timeout = setTimeout(sendFirstRepeat, delay); 
-        }
-        
-        private function mouseOutHandler(event:MouseEvent):void
-        {
-            event.target.removeEventListener(MouseEvent.MOUSE_OUT, mouseOutHandler);   
-            event.target.removeEventListener(MouseEvent.MOUSE_UP, mouseUpHandler); 
-            if (repeater > 0)
-                clearInterval(repeater);
-            repeater = 0;
-            if (timeout > 0)
-                clearTimeout(timeout);
-            timeout = 0;
-        }
-        
-        private function mouseUpHandler(event:MouseEvent):void
-        {
-            event.target.removeEventListener(MouseEvent.MOUSE_OUT, mouseOutHandler);   
-            event.target.removeEventListener(MouseEvent.MOUSE_UP, mouseUpHandler);  
-            if (repeater > 0)
-                clearInterval(repeater);
-            repeater = 0;
-            if (timeout > 0)
-                clearTimeout(timeout);
-            timeout = 0;
-        }
-        
-        private function sendFirstRepeat():void
-        {
-            clearTimeout(timeout);
-            timeout = 0;
-        	repeater = setInterval(sendRepeats, interval);
-        	IEventDispatcher(_strand).dispatchEvent(new Event("buttonRepeat"));
-        }
-        
-        private function sendRepeats():void
-        {
-       	    IEventDispatcher(_strand).dispatchEvent(new Event("buttonRepeat"));
-        }
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ComboBoxController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ComboBoxController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ComboBoxController.as
deleted file mode 100644
index 1f333ef..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ComboBoxController.as
+++ /dev/null
@@ -1,104 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.controllers
-{
-	import flash.display.DisplayObject;
-	import flash.events.MouseEvent;
-	
-	import org.apache.flex.core.IBeadController;
-	import org.apache.flex.core.ISelectionModel;
-	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.IComboBoxView;
-
-	/**
-	 *  The ComboBoxController class bead handles mouse events on the elements of
-	 *  the org.apache.flex.html.staticControls.ComboBox. This includes selecting the 
-	 *  button to display the selection list pop-up as well as selecting an item from the 
-	 *  pop-up list.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ComboBoxController implements IBeadController
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ComboBoxController()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-            IEventDispatcher(value).addEventListener(MouseEvent.CLICK, clickHandler);
-		}
-		
-		/**
-		 * @private
-		 */
-        private function clickHandler(event:MouseEvent):void
-        {
-            var viewBead:IComboBoxView = _strand.getBeadByType(IComboBoxView) as IComboBoxView;
-            viewBead.popUpVisible = true;
-            var selectionModel:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
-            var popUpModel:ISelectionModel = viewBead.popUp.getBeadByType(ISelectionModel) as ISelectionModel;
-            popUpModel.dataProvider = selectionModel.dataProvider;
-            popUpModel.selectedIndex = selectionModel.selectedIndex;
-			DisplayObject(viewBead.popUp).width = DisplayObject(_strand).width;
-			DisplayObject(viewBead.popUp).height = 200;
-			DisplayObject(viewBead.popUp).x = DisplayObject(_strand).x;
-			DisplayObject(viewBead.popUp).y = DisplayObject(_strand).y;
-            IEventDispatcher(viewBead.popUp).addEventListener("change", changeHandler);
-        }
-        
-		/**
-		 * @private
-		 */
-        private function changeHandler(event:Event):void
-        {
-            var viewBead:IComboBoxView = _strand.getBeadByType(IComboBoxView) as IComboBoxView;
-            viewBead.popUpVisible = false;
-            var selectionModel:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
-            var popUpModel:ISelectionModel = viewBead.popUp.getBeadByType(ISelectionModel) as ISelectionModel;
-            selectionModel.selectedIndex = popUpModel.selectedIndex;
-			IEventDispatcher(_strand).dispatchEvent(new Event("change"));
-        }
-	
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/DropDownListController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/DropDownListController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/DropDownListController.as
deleted file mode 100644
index 47287be..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/DropDownListController.as
+++ /dev/null
@@ -1,104 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.controllers
-{
-	import flash.display.DisplayObject;
-	import flash.geom.Point;
-	
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IBeadController;
-	import org.apache.flex.core.ISelectionModel;
-	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.IDropDownListView;
-
-    /**
-     *  The DropDownListController class is the controller for
-     *  org.apache.flex.html.staticControls.DropDownList.  Controllers
-     *  watch for events from the interactive portions of a View and
-     *  update the data model or dispatch a semantic event.
-     *  This controller watches for the click event and displays the
-     *  dropdown/popup, and watches the dropdown/popup for change events
-     *  and updates the selection model accordingly.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class DropDownListController implements IBead, IBeadController
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function DropDownListController()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-            IEventDispatcher(value).addEventListener("click", clickHandler);
-		}
-		
-        private function clickHandler(event:Event):void
-        {
-            var viewBead:IDropDownListView = _strand.getBeadByType(IDropDownListView) as IDropDownListView;
-            viewBead.popUpVisible = true;
-            var selectionModel:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
-            var popUpModel:ISelectionModel = viewBead.popUp.getBeadByType(ISelectionModel) as ISelectionModel;
-            popUpModel.dataProvider = selectionModel.dataProvider;
-            popUpModel.selectedIndex = selectionModel.selectedIndex;
-			DisplayObject(viewBead.popUp).width = DisplayObject(_strand).width;
-			DisplayObject(viewBead.popUp).height = 200;
-            var pt:Point = new Point(DisplayObject(_strand).x, DisplayObject(_strand).y);
-            pt = DisplayObject(_strand).parent.localToGlobal(pt);
-			DisplayObject(viewBead.popUp).x = pt.x;
-			DisplayObject(viewBead.popUp).y = pt.y;
-            IEventDispatcher(viewBead.popUp).addEventListener("change", changeHandler);
-        }
-        
-        private function changeHandler(event:Event):void
-        {
-            var viewBead:IDropDownListView = _strand.getBeadByType(IDropDownListView) as IDropDownListView;
-            viewBead.popUpVisible = false;
-            var selectionModel:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
-            var popUpModel:ISelectionModel = viewBead.popUp.getBeadByType(ISelectionModel) as ISelectionModel;
-            selectionModel.selectedIndex = popUpModel.selectedIndex;
-			IEventDispatcher(_strand).dispatchEvent(new Event("change"));
-        }
-	
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/EditableTextKeyboardController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/EditableTextKeyboardController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/EditableTextKeyboardController.as
deleted file mode 100644
index 01f8e9f..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/EditableTextKeyboardController.as
+++ /dev/null
@@ -1,86 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.controllers
-{
-	import org.apache.flex.core.CSSTextField;
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IBeadController;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.ITextModel;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.html.staticControls.beads.ITextFieldView;
-	
-	/**
-	 *  The EditableTextKeyboardController class bead intercepts keyboard events on the
-	 *  component's text field and emits change events.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class EditableTextKeyboardController implements IBead, IBeadController
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function EditableTextKeyboardController()
-		{
-		}
-		
-		private var model:ITextModel;
-		private var textField:CSSTextField;
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			model = UIBase(_strand).model as ITextModel;
-			
-			var viewBead:ITextFieldView = _strand.getBeadByType(ITextFieldView) as ITextFieldView;
-			textField = viewBead.textField;
-			textField.addEventListener("change", inputChangeHandler);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function inputChangeHandler( event:Object ) : void
-		{
-            // this will otherwise bubble an event of flash.events.Event
-            event.stopImmediatePropagation();
-			model.text = textField.text;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.as
deleted file mode 100644
index d72bbdb..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.as
+++ /dev/null
@@ -1,126 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.controllers
-{
-	import flash.events.MouseEvent;
-	
-	import org.apache.flex.core.IBeadController;
-	import org.apache.flex.core.IItemRenderer;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-
-	/**
-	 *  The ItemRendererMouseController class bead handles mouse events in itemRenderers. This
-	 *  includes roll-overs, mouse down, and mouse up. These platform-specific events are then
-	 *  re-dispatched as FlexJS events.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ItemRendererMouseController implements IBeadController
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ItemRendererMouseController()
-		{
-		}
-		
-        private var renderer:IItemRenderer;
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-            renderer = value as IItemRenderer;
-            renderer.addEventListener(MouseEvent.ROLL_OVER, rollOverHandler);
-            renderer.addEventListener(MouseEvent.ROLL_OUT, rollOutHandler);
-            renderer.addEventListener(MouseEvent.MOUSE_DOWN, mouseDownHandler);
-		}
-		
-		/**
-		 * @private
-		 */
-		protected function rollOverHandler(event:MouseEvent):void
-		{
-			var target:IItemRenderer = event.target as IItemRenderer;
-			if (target)
-			{
-                target.hovered = true;
-				target.dispatchEvent(new Event("rollover",true));
-			}
-		}
-		
-		/**
-		 * @private
-		 */
-		protected function rollOutHandler(event:MouseEvent):void
-		{
-			var target:IItemRenderer = event.target as IItemRenderer;
-			if (target)
-			{
-                target.hovered = false;
-                target.down = false;
-			}
-		}
-
-		/**
-		 * @private
-		 */
-		protected function mouseDownHandler(event:MouseEvent):void
-		{
-			var target:IItemRenderer = event.currentTarget as IItemRenderer;
-			if (target)
-			{
-                target.down = true;
-				target.addEventListener(MouseEvent.MOUSE_UP, mouseUpHandler);
-			}
-		}
-		
-		/**
-		 * @private
-		 */
-		protected function mouseUpHandler(event:MouseEvent):void
-		{
-			var target:IItemRenderer = event.currentTarget as IItemRenderer;
-			if (target)
-			{
-                target.removeEventListener(MouseEvent.MOUSE_UP, mouseUpHandler);                
-				target.selected = true;
-				target.dispatchEvent(new Event("selected"));
-			}			
-		}
-	
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.as
deleted file mode 100644
index fe5dfa1..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.as
+++ /dev/null
@@ -1,124 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.controllers
-{
-	import org.apache.flex.core.IBeadController;
-	import org.apache.flex.core.IItemRenderer;
-	import org.apache.flex.core.IItemRendererParent;
-	import org.apache.flex.core.IRollOverModel;
-	import org.apache.flex.core.ISelectionModel;
-	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.IListView;
-	
-
-    /**
-     *  The ListSingleSelectionMouseController class is a controller for
-     *  org.apache.flex.html.staticControls.List.  Controllers
-     *  watch for events from the interactive portions of a View and
-     *  update the data model or dispatch a semantic event.
-     *  This controller watches for events from the item renderers
-     *  and updates an ISelectionModel (which only supports single
-     *  selection).  Other controller/model pairs would support
-     *  various kinds of multiple selection.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class ListSingleSelectionMouseController implements IBeadController
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function ListSingleSelectionMouseController()
-		{
-		}
-		
-        /**
-         *  The model.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		protected var listModel:ISelectionModel;
-
-        /**
-         *  The view.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        protected var listView:IListView;
-
-        /**
-         *  The parent of the item renderers.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        protected var dataGroup:IItemRendererParent;
-
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			listModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
-			listView = value.getBeadByType(IListView) as IListView;
-			dataGroup = listView.dataGroup;
-            dataGroup.addEventListener("selected", selectedHandler, true);
-            dataGroup.addEventListener("rollover", rolloverHandler, true);
-		}
-		
-        private function selectedHandler(event:Event):void
-        {
-            listModel.selectedIndex = IItemRenderer(event.target).index;
-            IEventDispatcher(listView.strand).dispatchEvent(new Event("change"));
-        }
-		
-        private function rolloverHandler(event:Event):void
-        {
-            IRollOverModel(listModel).rollOverIndex = IItemRenderer(event.target).index;
-            IEventDispatcher(listView.strand).dispatchEvent(new Event("rollover"));
-        }
-	
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ScrollBarMouseControllerBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ScrollBarMouseControllerBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ScrollBarMouseControllerBase.as
deleted file mode 100644
index de4f73c..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/ScrollBarMouseControllerBase.as
+++ /dev/null
@@ -1,185 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.controllers
-{
-	import flash.events.MouseEvent;
-	
-	import org.apache.flex.core.IBeadController;
-	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.IScrollBarView;
-
-    /**
-     *  The ScrollBarMouseControllerBase class is the base class
-     *  for ScrollBarMouseControllers such as VScrollBarMouseController.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class ScrollBarMouseControllerBase implements IBeadController
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function ScrollBarMouseControllerBase()
-		{
-		}
-		
-        /**
-         *  The data model
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		protected var sbModel:IScrollBarModel;
-
-        /**
-         *  The view
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		protected var sbView:IScrollBarView;
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  @private
-         */
-		public function get strand():IStrand
-		{
-			return _strand;
-		}
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			sbModel = value.getBeadByType(IScrollBarModel) as IScrollBarModel;
-			sbView = value.getBeadByType(IScrollBarView) as IScrollBarView;
-			sbView.decrement.addEventListener(MouseEvent.CLICK, decrementClickHandler);
-			sbView.increment.addEventListener(MouseEvent.CLICK, incrementClickHandler);
-            sbView.decrement.addEventListener("buttonRepeat", decrementClickHandler);
-            sbView.increment.addEventListener("buttonRepeat", incrementClickHandler);
-			sbView.track.addEventListener(MouseEvent.CLICK, trackClickHandler);
-			sbView.thumb.addEventListener(MouseEvent.MOUSE_DOWN, thumbMouseDownHandler);
-		}
-		
-        /**
-         *  Force the input number to be "snapped" to the snapInterval.
-         *  
-         *  @param value The input number.
-         *  @return The input number "snapped" to the snapInterval.
-         * 
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */	
-		protected function snap(value:Number):Number
-		{
-			var si:Number = sbModel.snapInterval;
-			var n:Number = Math.round((value - sbModel.minimum) / si) * si + sbModel.minimum;
-			if (value > 0)
-			{
-				if (value - n < n + si - value)
-					return n;
-				return n + si;
-				
-			}
-			if (value - n > n + si - value)
-				return n + si;
-			return n;
-		}
-		
-        /**
-         *  Updates the model when the decrement button is clicked.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */	
-		protected function decrementClickHandler(event:Event):void
-		{
-			sbModel.value = snap(Math.max(sbModel.minimum, sbModel.value - sbModel.stepSize));
-			IEventDispatcher(_strand).dispatchEvent(new Event("scroll"));
-		}
-		
-        /**
-         *  Updates the model when the increment button is clicked.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */	
-		protected function incrementClickHandler(event:Event):void
-		{
-			sbModel.value = snap(Math.min(sbModel.maximum - sbModel.pageSize, sbModel.value + sbModel.stepSize));	
-			IEventDispatcher(_strand).dispatchEvent(new Event("scroll"));
-		}
-		
-        /**
-         *  Handles a click in the track.  Must be overridden.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */	
-		protected function trackClickHandler(event:MouseEvent):void
-		{
-		}
-		
-        /**
-         *  Handles a mouse down on the thumb.  Must be overridden.
-         *  Subclasses process the mouseMove and mouseUp events.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */	
-		protected function thumbMouseDownHandler(event:MouseEvent):void
-		{
-		}
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/SliderMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/SliderMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/SliderMouseController.as
deleted file mode 100644
index 3b6e295..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/SliderMouseController.as
+++ /dev/null
@@ -1,148 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.controllers
-{
-	import flash.events.MouseEvent;
-	import flash.geom.Point;
-	
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IBeadController;
-	import org.apache.flex.core.IRangeModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.beads.ISliderView;
-	
-	/**
-	 *  The SliderMouseController class bead handles mouse events on the 
-	 *  org.apache.flex.html.staticControls.Slider's component parts (thumb and track) and 
-	 *  dispatches change events on behalf of the Slider (as well as co-ordinating visual 
-	 *  changes (such as moving the thumb when the track has been tapped or clicked).
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class SliderMouseController implements IBead, IBeadController
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function SliderMouseController()
-		{
-		}
-		
-		private var rangeModel:IRangeModel;
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			rangeModel = UIBase(value).model as IRangeModel;
-			
-			var sliderView:ISliderView = value.getBeadByType(ISliderView) as ISliderView;
-			sliderView.thumb.addEventListener(MouseEvent.MOUSE_DOWN, thumbDownHandler);
-			
-			// add handler to detect click on track
-			sliderView.track.addEventListener(MouseEvent.CLICK, trackClickHandler, false, 99999);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function thumbDownHandler( event:MouseEvent ) : void
-		{
-			UIBase(_strand).stage.addEventListener(MouseEvent.MOUSE_MOVE, thumbMoveHandler);
-			UIBase(_strand).stage.addEventListener(MouseEvent.MOUSE_UP, thumbUpHandler);
-			
-			var sliderView:ISliderView = _strand.getBeadByType(ISliderView) as ISliderView;
-			
-			origin = new Point(event.stageX, event.stageY);
-			thumb = new Point(sliderView.thumb.x,sliderView.thumb.y);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function thumbUpHandler( event:MouseEvent ) : void
-		{
-			UIBase(_strand).stage.removeEventListener(MouseEvent.MOUSE_MOVE, thumbMoveHandler);
-			UIBase(_strand).stage.removeEventListener(MouseEvent.MOUSE_UP, thumbUpHandler);
-			
-			IEventDispatcher(_strand).dispatchEvent(new Event("valueChanged"));
-		}
-		
-		private var origin:Point;
-		private var thumb:Point;
-		
-		/**
-		 * @private
-		 */
-		private function thumbMoveHandler( event:MouseEvent ) : void
-		{
-			var sliderView:ISliderView = _strand.getBeadByType(ISliderView) as ISliderView;
-			
-			var deltaX:Number = event.stageX - origin.x;
-			var thumbW:Number = sliderView.thumb.width/2;
-			var newX:Number = thumb.x + deltaX;
-			
-			var p:Number = newX/UIBase(_strand).width;
-			var n:Number = p*(rangeModel.maximum - rangeModel.minimum) + rangeModel.minimum;
-		
-			rangeModel.value = n;
-			
-			IEventDispatcher(_strand).dispatchEvent(new Event("valueChanged"));
-		}
-		
-		/**
-		 * @private
-		 */
-		private function trackClickHandler( event:MouseEvent ) : void
-		{
-			event.stopImmediatePropagation();
-			
-			var sliderView:ISliderView = _strand.getBeadByType(ISliderView) as ISliderView;
-			
-			var xloc:Number = event.localX;
-			var p:Number = xloc/UIBase(_strand).width;
-			var n:Number = p*(rangeModel.maximum - rangeModel.minimum) + rangeModel.minimum;
-			
-			rangeModel.value = n;
-			
-			IEventDispatcher(_strand).dispatchEvent(new Event("valueChanged"));
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/SpinnerMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/SpinnerMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/SpinnerMouseController.as
deleted file mode 100644
index 9823184..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/SpinnerMouseController.as
+++ /dev/null
@@ -1,98 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.controllers
-{
-	import flash.events.MouseEvent;
-	
-	import org.apache.flex.core.IBeadController;
-	import org.apache.flex.core.IRangeModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.beads.ISpinnerView;
-	
-	/**
-	 *  The SpinnerMouseController class bead handles mouse events on the 
-	 *  org.apache.flex.html.staticControls.Spinner's component buttons, changing the 
-	 *  value of the Spinner.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class SpinnerMouseController implements IBeadController
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function SpinnerMouseController()
-		{
-		}
-		
-		private var rangeModel:IRangeModel;
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			rangeModel = UIBase(value).model as IRangeModel;
-			
-			var spinnerBead:ISpinnerView = value.getBeadByType(ISpinnerView) as ISpinnerView;
-			spinnerBead.decrement.addEventListener(MouseEvent.CLICK, decrementClickHandler);
-			spinnerBead.decrement.addEventListener("buttonRepeat", decrementClickHandler);
-			spinnerBead.increment.addEventListener(MouseEvent.CLICK, incrementClickHandler);
-			spinnerBead.increment.addEventListener("buttonRepeat", incrementClickHandler);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function decrementClickHandler( event:Event ) : void
-		{
-			rangeModel.value = Math.max(rangeModel.minimum, rangeModel.value - rangeModel.stepSize);
-			IEventDispatcher(_strand).dispatchEvent(new Event("valueChanged"));
-		}
-		
-		/**
-		 * @private
-		 */
-		private function incrementClickHandler( event:Event ) : void
-		{
-			rangeModel.value = Math.min(rangeModel.maximum, rangeModel.value + rangeModel.stepSize);	
-			IEventDispatcher(_strand).dispatchEvent(new Event("valueChanged"));
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/VScrollBarMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/VScrollBarMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/VScrollBarMouseController.as
deleted file mode 100644
index cc8d29f..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/controllers/VScrollBarMouseController.as
+++ /dev/null
@@ -1,101 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.controllers
-{
-	import flash.display.DisplayObject;
-	import flash.events.MouseEvent;
-	
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	
-    /**
-     *  The VScrollBarMouseController class is the controller for
-     *  org.apache.flex.html.staticControls.supportClasses.ScrollBar
-     *  that acts as the Vertical ScrollBar.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class VScrollBarMouseController extends ScrollBarMouseControllerBase
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function VScrollBarMouseController()
-		{
-		}
-		
-        /**
-         *  @private
-         */
-		override protected function trackClickHandler(event:MouseEvent):void
-		{
-			if (sbView.thumb.visible)
-			{
-				if (event.localY < sbView.thumb.y)
-				{
-					sbModel.value = snap(Math.max(sbModel.minimum, sbModel.value - sbModel.pageStepSize));						
-					IEventDispatcher(strand).dispatchEvent(new Event("scroll"));
-				}
-				else
-				{
-					sbModel.value = snap(Math.min(sbModel.maximum - sbModel.pageSize, sbModel.value + sbModel.pageStepSize));
-					IEventDispatcher(strand).dispatchEvent(new Event("scroll"));
-				}
-			}
-		}
-		
-		private var thumbDownY:Number;
-		private var lastThumbY:Number;
-		
-        /**
-         *  @private
-         */
-		override protected function thumbMouseDownHandler(event:MouseEvent):void
-		{
-			sbView.thumb.stage.addEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler);
-			sbView.thumb.stage.addEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler);
-			thumbDownY = event.stageY;
-			lastThumbY = sbView.thumb.y;
-		}
-		
-		private function thumbMouseMoveHandler(event:MouseEvent):void
-		{
-			var thumb:DisplayObject = sbView.thumb;
-			var track:DisplayObject = sbView.track;
-			thumb.y = Math.max(track.y, Math.min(lastThumbY + (event.stageY - thumbDownY), track.y + track.height - thumb.height));
-			var newValue:Number = snap((thumb.y - track.y) / (track.height - thumb.height) * (sbModel.maximum - sbModel.minimum - sbModel.pageSize));
-			sbModel.value = newValue;
-			IEventDispatcher(strand).dispatchEvent(new Event("scroll"));
-		}
-		
-		private function thumbMouseUpHandler(event:MouseEvent):void
-		{
-			sbView.thumb.stage.removeEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler);
-			sbView.thumb.stage.removeEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler);			
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.as
deleted file mode 100644
index d27b2dd..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.as
+++ /dev/null
@@ -1,121 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.layouts
-{
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	
-	import org.apache.flex.core.IBeadLayout;
-	import org.apache.flex.core.ILayoutParent;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	
-	/**
-	 *  The ButtonBarLayout class bead sizes and positions the org.apache.flex.html.staticControls.Button 
-	 *  elements that make up a org.apache.flex.html.staticControls.ButtonBar. This bead arranges the Buttons 
-	 *  horizontally and makes them all the same width unless the buttonWidths property has been set in which case
-	 *  the values stored in that array are used.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ButtonBarLayout implements IBeadLayout
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ButtonBarLayout()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			IEventDispatcher(value).addEventListener("widthChanged", changeHandler);
-			IEventDispatcher(value).addEventListener("childrenAdded", changeHandler);
-			IEventDispatcher(value).addEventListener("itemsCreated", changeHandler);
-		}
-		
-		private var _buttonWidths:Array = null;
-		
-		/**
-		 *  An array of widths (Number), one per button. These values supersede the
-		 *  default of equally-sized buttons.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get buttonWidths():Array
-		{
-			return _buttonWidths;
-		}
-		public function set buttonWidths(value:Array):void
-		{
-			_buttonWidths = value;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function changeHandler(event:Event):void
-		{
-			var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
-			var contentView:DisplayObjectContainer = layoutParent.contentView;
-			
-			var n:int = contentView.numChildren;
-			var xpos:Number = 0;
-			var useWidth:Number = DisplayObject(_strand).width / n;
-			var useHeight:Number = DisplayObject(_strand).height;
-			
-			for (var i:int = 0; i < n; i++)
-			{
-				var child:DisplayObject = contentView.getChildAt(i);
-				
-				child.y = 0;
-				child.height = useHeight;
-				child.x = xpos;
-				
-				if (buttonWidths) child.width = Number(buttonWidths[i]);
-				else child.width = useWidth;
-				xpos += child.width;
-			}
-		}
-	}
-}
\ No newline at end of file


[19/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DateChooserModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DateChooserModel.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DateChooserModel.as
deleted file mode 100644
index 245e3cb..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DateChooserModel.as
+++ /dev/null
@@ -1,189 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{	
-	import org.apache.flex.core.IDateChooserModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.EventDispatcher;
-	
-	/**
-	 *  The DateChooserModel is a bead class that manages the data for a DataChooser. 
-	 *  This includes arrays of names for the months and days of the week as well the
-	 *  currently selected date.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DateChooserModel extends EventDispatcher implements IDateChooserModel
-	{
-		public function DateChooserModel()
-		{
-			// default displayed year and month to "today"
-			var today:Date = new Date();
-			displayedYear = today.getFullYear();
-			displayedMonth = today.getMonth();
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-		
-		private var _dayNames:Array   = ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"];
-		private var _monthNames:Array = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
-		private var _displayedYear:Number;
-		private var _displayedMonth:Number;
-		private var _firstDayOfWeek:Number = 0;
-		private var _selectedDate:Date;
-		
-		/**
-		 *  An array of strings used to name the days of the week with Sunday being the
-		 *  first element of the array.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get dayNames():Array
-		{
-			return _dayNames;
-		}
-		public function set dayNames(value:Array):void
-		{
-			_dayNames = value;
-			dispatchEvent( new Event("dayNamesChanged") );
-		}
-		
-		/**
-		 *  An array of strings used to name the months of the year with January being
-		 *  the first element of the array.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get monthNames():Array
-		{
-			return _monthNames;
-		}
-		public function set monthNames(value:Array):void
-		{
-			_monthNames = value;
-			dispatchEvent( new Event("monthNames") );
-		}
-		
-		/**
-		 *  The year currently displayed by the DateChooser.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get displayedYear():Number
-		{
-			return _displayedYear;
-		}
-		public function set displayedYear(value:Number):void
-		{
-			if (value != _displayedYear) {
-				_displayedYear = value;
-				dispatchEvent( new Event("displayedYearChanged") );
-			}
-		}
-		
-		/**
-		 *  The month currently displayed by the DateChooser.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get displayedMonth():Number
-		{
-			return _displayedMonth;
-		}
-		public function set displayedMonth(value:Number):void
-		{
-			if (_displayedMonth != value) {
-				_displayedMonth = value;
-				dispatchEvent( new Event("displayedMonthChanged") );
-			}
-		}
-		
-		/**
-		 *  The index of the first day of the week, Sunday = 0.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get firstDayOfWeek():Number
-		{
-			return _firstDayOfWeek;
-		}
-		public function set firstDayOfWeek(value:Number):void
-		{
-			if (value != _firstDayOfWeek) {
-				_firstDayOfWeek = value;
-				dispatchEvent( new Event("firstDayOfWeekChanged") );
-			}
-		}
-		
-		/**
-		 *  The currently selected date or null if no date has been selected.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get selectedDate():Date
-		{
-			return _selectedDate;
-		}
-		public function set selectedDate(value:Date):void
-		{
-			if (value != _selectedDate) {
-				_selectedDate = value;
-				dispatchEvent( new Event("selectedDateChanged") );
-				
-				displayedMonth = value.getMonth();
-				displayedYear  = value.getFullYear();
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.as
deleted file mode 100644
index e999f89..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.as
+++ /dev/null
@@ -1,127 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.supportClasses
-{
-	import mx.core.IFactory;
-
-	/**
-	 *  The DataGridColumn class is the collection of properties that describe
-	 *  a column of the org.apache.flex.html.staticControls.DataGrid: which renderer 
-	 *  to use for each cell in the column, the width of the column, the label for the 
-	 *  column, and the name of the field in the data containing the value to display 
-	 *  in the column. 
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DataGridColumn
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DataGridColumn()
-		{
-		}
-		
-		private var _itemRenderer:IFactory;
-		
-		/**
-		 *  The itemRenderer class or factory to use to make instances of itemRenderers for
-		 *  display of data.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get itemRenderer():IFactory
-		{
-			return _itemRenderer;
-		}
-		public function set itemRenderer(value:IFactory):void
-		{
-			_itemRenderer = value;
-		}
-		
-		private var _columnWidth:Number = 100;
-		
-		/**
-		 *  The width of the column (default is 100 pixels).
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get columnWidth():Number
-		{
-			return _columnWidth;
-		}
-		public function set columnWidth(value:Number):void
-		{
-			_columnWidth = value;
-		}
-		
-		private var _label:String;
-		
-		/**
-		 *  The label for the column (appears in the header area).
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get label():String
-		{
-			return _label;
-		}
-		public function set label(value:String):void
-		{
-			_label = value;
-		}
-		
-		private var _dataField:String;
-		
-		/**
-		 *  The name of the field containing the data value presented by the column. This value is used
-		 *  by the itemRenderer is select the property from the data.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get dataField():String
-		{
-			return _dataField;
-		}
-		public function set dataField(value:String):void
-		{
-			_dataField = value;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/supportClasses/DateChooserButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/supportClasses/DateChooserButton.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/supportClasses/DateChooserButton.as
deleted file mode 100644
index 70c7606..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/supportClasses/DateChooserButton.as
+++ /dev/null
@@ -1,67 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.supportClasses
-{
-	import org.apache.flex.html.staticControls.TextButton;
-	
-	/**
-	 *  The DateChooserButton class is used for each button in the DateChooser. The
-	 *  button holds the day of the month the button is representing.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DateChooserButton extends TextButton
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DateChooserButton()
-		{
-			super();
-			className = "DateChooserButton";
-		}
-		
-		private var _dayOfMonth:int;
-		
-		/**
-		 *  The day of the month the button represents.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get dayOfMonth():int
-		{
-			return _dayOfMonth;
-		}
-		public function set dayOfMonth(value:int):void
-		{
-			_dayOfMonth = value;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DataGridColumn.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DataGridColumn.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DataGridColumn.as
new file mode 100644
index 0000000..e999f89
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DataGridColumn.as
@@ -0,0 +1,127 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.supportClasses
+{
+	import mx.core.IFactory;
+
+	/**
+	 *  The DataGridColumn class is the collection of properties that describe
+	 *  a column of the org.apache.flex.html.staticControls.DataGrid: which renderer 
+	 *  to use for each cell in the column, the width of the column, the label for the 
+	 *  column, and the name of the field in the data containing the value to display 
+	 *  in the column. 
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DataGridColumn
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DataGridColumn()
+		{
+		}
+		
+		private var _itemRenderer:IFactory;
+		
+		/**
+		 *  The itemRenderer class or factory to use to make instances of itemRenderers for
+		 *  display of data.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get itemRenderer():IFactory
+		{
+			return _itemRenderer;
+		}
+		public function set itemRenderer(value:IFactory):void
+		{
+			_itemRenderer = value;
+		}
+		
+		private var _columnWidth:Number = 100;
+		
+		/**
+		 *  The width of the column (default is 100 pixels).
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get columnWidth():Number
+		{
+			return _columnWidth;
+		}
+		public function set columnWidth(value:Number):void
+		{
+			_columnWidth = value;
+		}
+		
+		private var _label:String;
+		
+		/**
+		 *  The label for the column (appears in the header area).
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get label():String
+		{
+			return _label;
+		}
+		public function set label(value:String):void
+		{
+			_label = value;
+		}
+		
+		private var _dataField:String;
+		
+		/**
+		 *  The name of the field containing the data value presented by the column. This value is used
+		 *  by the itemRenderer is select the property from the data.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get dataField():String
+		{
+			return _dataField;
+		}
+		public function set dataField(value:String):void
+		{
+			_dataField = value;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DateChooserButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DateChooserButton.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DateChooserButton.as
new file mode 100644
index 0000000..70c7606
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DateChooserButton.as
@@ -0,0 +1,67 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.supportClasses
+{
+	import org.apache.flex.html.staticControls.TextButton;
+	
+	/**
+	 *  The DateChooserButton class is used for each button in the DateChooser. The
+	 *  button holds the day of the month the button is representing.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DateChooserButton extends TextButton
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DateChooserButton()
+		{
+			super();
+			className = "DateChooserButton";
+		}
+		
+		private var _dayOfMonth:int;
+		
+		/**
+		 *  The day of the month the button represents.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get dayOfMonth():int
+		{
+			return _dayOfMonth;
+		}
+		public function set dayOfMonth(value:int):void
+		{
+			_dayOfMonth = value;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Alert.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Alert.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Alert.as
new file mode 100644
index 0000000..7a04fe7
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Alert.as
@@ -0,0 +1,195 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import org.apache.flex.core.IAlertModel;
+	import org.apache.flex.core.IPopUp;
+	import org.apache.flex.core.UIBase;
+	
+	/**
+	 *  The Alert class is a component that displays a message and one or more buttons
+	 *  in a view that pops up over all other controls and views. The Alert component
+	 *  uses the AlertView bead to display a modal dialog with a title and a variety
+	 *  of buttons configured through the flag property of its show() static function.
+	 *  The Alert component uses the following beads:
+	 * 
+	 *  org.apache.flex.core.IBeadModel: the data model for the Alert.
+	 *  org.apache.flex.core.IBeadView: the bead used to create the parts of the Alert.
+	 *  org.apache.flex.core.IBeadController: the bead used to handle input events.
+	 *  org.apache.flex.core.IBorderBead: if present, draws a border around the Alert.
+	 *  org.apache.flex.core.IBackgroundBead: if present, places a solid color background below the Alert.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class Alert extends UIBase implements IPopUp
+	{
+		/**
+		 *  The bitmask button flag to show the YES button.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public static const YES:uint    = 0x000001;
+		
+		/**
+		 *  The bitmask button flag to show the NO button.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public static const NO:uint     = 0x000002;
+		
+		/**
+		 *  The bitmask button flag to show the OK button.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public static const OK:uint     = 0x000004;
+		
+		/**
+		 *  The bitmask button flag to show the Cancel button.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public static const CANCEL:uint = 0x000008;
+		
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function Alert()
+		{
+			super();
+			
+			className = "Alert";
+		}
+		
+		// note: only passing parent to this function as I don't see a way to identify
+		// the 'application' or top level view without supplying a place to start to
+		// look for it.
+		/**
+		 *  This static method is a convenience function to quickly create and display an Alert. The
+		 *  text and parent paramters are required, the others will default.
+		 * 
+		 *  @param String text The message content of the Alert.
+		 *  @param Object parent The object that hosts the pop-up.
+		 *  @param String title An optional title for the Alert.
+		 *  @param uint flags Identifies which buttons to display in the alert.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		static public function show( text:String, parent:Object, title:String="", flags:uint=Alert.OK ) : void
+		{
+			var alert:Alert = new Alert();
+			alert.message = text;
+			alert.title  = title;
+			alert.flags = flags;
+			
+			alert.show(parent);
+		}
+		
+		/**
+		 *  Shows the Alert anchored to the given parent object which is usally a root component such
+		 *  as a UIView..
+		 * 
+		 *  @param Object parent The object that hosts the pop-up.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function show(parent:Object) : void
+		{
+			parent.addElement(this);
+		}
+		
+		/**
+		 *  The tile of the Alert.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get title():String
+		{
+			return IAlertModel(model).title;
+		}
+		public function set title(value:String):void
+		{
+			IAlertModel(model).title = value;
+		}
+		
+		/**
+		 *  The message to display in the Alert body.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get message():String
+		{
+			return IAlertModel(model).message;
+		}
+		public function set message(value:String):void
+		{
+			IAlertModel(model).message = value;
+		}
+		
+		/**
+		 *  The buttons to display on the Alert as bit-mask values.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get flags():uint
+		{
+			return IAlertModel(model).flags;
+		}
+		public function set flags(value:uint):void
+		{
+			IAlertModel(model).flags = value;
+		}
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Button.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Button.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Button.as
new file mode 100644
index 0000000..8770153
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Button.as
@@ -0,0 +1,74 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.IUIBase;
+    import org.apache.flex.core.UIButtonBase;
+	import org.apache.flex.events.IEventDispatcher;
+	
+    //--------------------------------------
+    //  Events
+    //--------------------------------------
+    
+    /**
+     *  Dispatched when the user clicks on a button.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	[Event(name="click", type="org.apache.flex.events.Event")]
+
+    /**
+     *  The Button class is a simple button.  Use TextButton for
+     *  buttons that should show text.  This is the lightest weight
+     *  button used for non-text buttons like the arrow buttons
+     *  in a Scrollbar or NumericStepper.
+     * 
+     *  The most common view for this button is CSSButtonView that
+     *  allows you to specify a backgroundImage in CSS that defines
+     *  the look of the button.
+     * 
+     *  However, when used in ScrollBar and when composed in many
+     *  other components, it is more common to assign a custom view
+     *  to the button.  
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class Button extends UIButtonBase implements IStrand, IEventDispatcher, IUIBase
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function Button()
+		{
+			super();
+		}		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ButtonBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ButtonBar.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ButtonBar.as
new file mode 100644
index 0000000..06da973
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ButtonBar.as
@@ -0,0 +1,53 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	/**
+	 *  The ButtonBar class is a component that displays a set of Buttons. The ButtonBar
+	 *  is actually a List with a default horizontal layout and an itemRenderer that 
+	 *  produces Buttons. The ButtonBar uses the following beads:
+	 * 
+	 *  org.apache.flex.core.IBeadModel: the data model for the ButtonBar, including the dataProvider.
+	 *  org.apache.flex.core.IBeadView: constructs the parts of the component.
+	 *  org.apache.flex.core.IBeadController: handles input events.
+	 *  org.apache.flex.core.IBeadLayout: sizes and positions the component parts.
+	 *  org.apache.flex.core.IDataProviderItemRendererMapper: produces itemRenderers.
+	 *  org.apache.flex.core.IItemRenderer: the class or class factory to use.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ButtonBar extends List
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ButtonBar()
+		{
+			super();
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/CheckBox.as
new file mode 100644
index 0000000..175d411
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/CheckBox.as
@@ -0,0 +1,116 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+    import flash.events.MouseEvent;
+	
+	import org.apache.flex.core.IToggleButtonModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.UIButtonBase;
+	import org.apache.flex.events.Event;
+	
+    //--------------------------------------
+    //  Events
+    //--------------------------------------
+    
+    /**
+     *  Dispatched when the user checks or un-checks the CheckBox.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	[Event(name="change", type="org.apache.flex.events.Event")]
+
+    /**
+     *  The CheckBox class implements the common user interface
+     *  control.  The CheckBox includes its text label.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class CheckBox extends UIButtonBase implements IStrand
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function CheckBox()
+		{
+			super();
+			
+			addEventListener(MouseEvent.CLICK, internalMouseHandler);
+		}
+		
+        /**
+         *  The text label for the CheckBox.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get text():String
+		{
+			return IToggleButtonModel(model).text;
+		}
+        
+        /**
+         *  @private
+         */
+		public function set text(value:String):void
+		{
+			IToggleButtonModel(model).text = value;
+		}
+		
+        /**
+         *  <code>true</code> if the check mark is displayed.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get selected():Boolean
+		{
+			return IToggleButtonModel(model).selected;
+		}
+		
+        /**
+         *  @private
+         */
+		public function set selected(value:Boolean):void
+		{
+			IToggleButtonModel(model).selected = value;
+		}
+				
+		private function internalMouseHandler(event:Event) : void
+		{
+			selected = !selected;
+			dispatchEvent(new Event("change"));
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ComboBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ComboBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ComboBox.as
new file mode 100644
index 0000000..7fdebc1
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ComboBox.as
@@ -0,0 +1,114 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import org.apache.flex.core.IComboBoxModel;
+	import org.apache.flex.core.UIBase;
+	
+	[Event(name="change", type="org.apache.flex.events.Event")]
+	
+	/**
+	 *  The ComboBox class is a component that displays an input field and
+	 *  pop-up List with selections. Selecting an item from the pop-up List
+	 *  places that item into the input field of the ComboBox. The ComboBox
+	 *  uses the following bead types:
+	 * 
+	 *  org.apache.flex.core.IBeadModel: the data model, which includes the dataProvider, selectedItem, and
+	 *  so forth.
+	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the component.
+	 *  org.apache.flex.core.IBeadController: the bead that handles input and output.
+	 *  org.apache.flex.core.IPopUp: the bead responsible for displaying the selection list.
+	 *  org.apache.flex.core.IDataProviderItemRendererMapper: the bead responsible for creating the itemRenders.
+	 *  org.apache.flex.core.IItemRenderer: the class or factory used to display an item in the component.
+	 * 
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ComboBox extends UIBase
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ComboBox()
+		{
+			super();
+		}
+		
+		/**
+		 *  The data for display by the ComboBox.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get dataProvider():Object
+		{
+			return IComboBoxModel(model).dataProvider;
+		}
+		public function set dataProvider(value:Object):void
+		{
+			IComboBoxModel(model).dataProvider = value;
+		}
+		
+		/**
+		 *  The index of the currently selected item. Changing this item changes
+		 *  the selectedItem value.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get selectedIndex():int
+		{
+			return IComboBoxModel(model).selectedIndex;
+		}
+		public function set selectedIndex(value:int):void
+		{
+			IComboBoxModel(model).selectedIndex = value;
+		}
+		
+		/**
+		 *  The item that is currently selected. Changing this item changes
+		 *  the selectedIndex.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get selectedItem():Object
+		{
+			return IComboBoxModel(model).selectedItem;
+		}
+		public function set selectedItem(value:Object):void
+		{
+			IComboBoxModel(model).selectedItem = value;
+		}
+				
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Container.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Container.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Container.as
new file mode 100644
index 0000000..f9450b1
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Container.as
@@ -0,0 +1,188 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import flash.display.DisplayObject;
+	import flash.display.DisplayObjectContainer;
+	
+	import org.apache.flex.core.IChrome;
+	import org.apache.flex.core.IContainer;
+	import org.apache.flex.core.IUIBase;
+	import org.apache.flex.core.ContainerBase;
+	import org.apache.flex.events.Event;
+	
+	[DefaultProperty("mxmlContent")]
+    
+    /**
+     *  The Container class implements a basic container of
+     *  other controls and containers.  The position and size
+     *  of the children are determined by a layout or by
+     *  absolute positioning and sizing.  This Container does
+     *  not have a built-in scrollbar or clipping of content
+     *  exceeds its boundaries.
+     * 
+     *  While the container is relatively lightweight, it should
+     *  generally not be used as the base class for other controls,
+     *  even if those controls are composed of children.  That's
+     *  because the fundamental API of Container is to support
+     *  an arbitrary set of children, and most controls only
+     *  support a specific set of children.
+     * 
+     *  And that's one of the advantages of beads: that functionality
+     *  used in a Container can also be used in a Control as long
+     *  as that bead doesn't assume that its strand is a Container.
+     * 
+     *  For example, even though you can use a Panel to create the
+     *  equivalent of an Alert control, the Alert is a 
+     *  control and not a Container because the Alert does not
+     *  support an arbitrary set of children.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */    
+	public class Container extends ContainerBase implements IContainer
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function Container()
+		{
+			super();
+			actualParent = this;
+		}
+		
+		private var actualParent:DisplayObjectContainer;
+		
+        /**
+         *  Set a platform-specific object as the actual parent for 
+         *  children.  This must be public so it can be accessed
+         *  by beads.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function setActualParent(parent:DisplayObjectContainer):void
+		{
+			actualParent = parent;	
+		}
+		
+        /**
+         *  @private
+         */
+        override public function getElementIndex(c:Object):int
+        {
+            if (c is IUIBase)
+                return actualParent.getChildIndex(IUIBase(c).element as DisplayObject);
+            else
+                return actualParent.getChildIndex(c as DisplayObject);
+        }
+
+        /**
+         *  @private
+         */
+        override public function addElement(c:Object):void
+        {
+            if (c is IUIBase)
+            {
+				if (c is IChrome ) {
+					addChild(IUIBase(c).element as DisplayObject);
+					IUIBase(c).addedToParent();
+				}
+				else {
+                	actualParent.addChild(IUIBase(c).element as DisplayObject);
+                	IUIBase(c).addedToParent();
+				}
+            }
+            else {
+				if (c is IChrome) {
+					addChild(c as DisplayObject);
+				}
+				else {
+					actualParent.addChild(c as DisplayObject);
+				}
+			}
+        }
+        
+        /**
+         *  @private
+         */
+        override public function addElementAt(c:Object, index:int):void
+        {
+            if (c is IUIBase)
+            {
+				if (c is IChrome) {
+					addChildAt(IUIBase(c).element as DisplayObject, index);
+					IUIBase(c).addedToParent();
+				}
+				else {
+                	actualParent.addChildAt(IUIBase(c).element as DisplayObject, index);
+                	IUIBase(c).addedToParent();
+				}
+            }
+            else {
+				if (c is IChrome) {
+					addChildAt(c as DisplayObject, index);
+				} else {
+                	actualParent.addChildAt(c as DisplayObject, index);
+				}
+			}
+        }
+        
+        /**
+         *  @private
+         */
+        override public function removeElement(c:Object):void
+        {
+            if (c is IUIBase)
+                actualParent.removeChild(IUIBase(c).element as DisplayObject);
+            else
+                actualParent.removeChild(c as DisplayObject);
+        }
+        
+        /**
+         *  Get the array of children.  To change the children use
+         *  addElement, removeElement.
+         */
+        public function getChildren():Array
+		{
+			var children:Array = [];
+			var n:int = actualParent.numChildren;
+			for (var i:int = 0; i < n; i++)
+				children.push(actualParent.getChildAt(i));
+			return children;
+		}
+
+        /**
+         *  @private
+         */
+		public function childrenAdded():void
+		{
+			dispatchEvent(new Event("childrenAdded"));
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ControlBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ControlBar.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ControlBar.as
new file mode 100644
index 0000000..75456d7
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ControlBar.as
@@ -0,0 +1,76 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	
+	import org.apache.flex.core.IBeadLayout;
+	import org.apache.flex.core.IChrome;
+	import org.apache.flex.core.IContainer;
+	import org.apache.flex.core.ValuesManager;
+
+	/**
+	 *  The ControlBar class is used within a Panel as a place to position
+	 *  additional controls. The ControlBar appears at the bottom of the 
+	 *  org.apache.flex.html.staticControls.Panel
+	 *  and is not part of the Panel's scrollable content area. The ControlBar
+	 *  is a Container and implements the org.apache.flex.core.IChrome interface, indicating that is
+	 *  outside of the Container's content area. The ControlBar uses the following
+	 *  beads:
+	 * 
+	 *  org.apache.flex.core.IBeadModel: the data model for the component.
+	 *  org.apache.flex.core.IMeasurementBead: helps determine the overlay size of the ControlBar for layout.
+	 *  org.apache.flex.core.IBorderBead: if present, displays a border around the component.
+	 *  org.apache.flex.core.IBackgroundBead: if present, displays a solid background below the ControlBar.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ControlBar extends Container implements IContainer, IChrome
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ControlBar()
+		{
+			super();
+			
+			className = "ControlBar";
+		}
+		
+		/**
+		 * @private
+		 */
+		override public function addedToParent():void
+		{
+			super.addedToParent();	
+			
+			if( getBeadByType(IBeadLayout) == null ) {
+				var layout:IBeadLayout = new (ValuesManager.valuesImpl.getValue(this, "iBeadLayout")) as IBeadLayout;
+				addBead(layout);
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/DropDownList.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/DropDownList.as
new file mode 100644
index 0000000..4ae7405
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/DropDownList.as
@@ -0,0 +1,137 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+    import org.apache.flex.core.ISelectionModel;
+    
+    //--------------------------------------
+    //  Events
+    //--------------------------------------
+    
+    /**
+     *  Dispatched when the user selects an item.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+    [Event(name="change", type="org.apache.flex.events.Event")]
+    
+    /**
+     *  The DropDownList class implements the basic equivalent of
+     *  the <code>&lt;select&gt;</code> tag in HTML.
+     *  The default implementation only lets the user see and
+     *  choose from an array of strings.  More complex controls
+     *  would display icons as well as strings, or colors instead
+     *  of strings or just about anything.
+     * 
+     *  The default behavior only lets the user choose one and 
+     *  only one item.  More complex controls would allow
+     *  mutiple selection by not dismissing the dropdown as soon
+     *  as a selection is made.
+     * 
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */    
+	public class DropDownList extends Button
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function DropDownList()
+		{
+		}
+		
+        /**
+         *  The data set to be displayed.  Usually a simple
+         *  array of strings.  A more complex component
+         *  would allow more complex data and data sets.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        public function get dataProvider():Object
+        {
+            return ISelectionModel(model).dataProvider;
+        }
+
+        /**
+         *  @private
+         */
+        public function set dataProvider(value:Object):void
+        {
+            ISelectionModel(model).dataProvider = value;
+        }
+        
+        /**
+         *  @copy org.apache.flex.core.ISelectionModel#selectedIndex
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        public function get selectedIndex():int
+        {
+            return ISelectionModel(model).selectedIndex;
+        }
+
+        /**
+         *  @private
+         */
+        public function set selectedIndex(value:int):void
+        {
+            ISelectionModel(model).selectedIndex = value;
+        }
+        
+
+        /**
+         *  @copy org.apache.flex.core.ISelectionModel#selectedItem
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        public function get selectedItem():Object
+        {
+            return ISelectionModel(model).selectedItem;
+        }
+
+        /**
+         *  @private
+         */
+        public function set selectedItem(value:Object):void
+        {
+            ISelectionModel(model).selectedItem = value;
+        }
+                        
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Image.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Image.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Image.as
new file mode 100644
index 0000000..adda24b
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Image.as
@@ -0,0 +1,68 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import org.apache.flex.core.IImageModel;
+	import org.apache.flex.core.UIBase;
+	
+	/**
+	 *  The Image class is a component that displays a bitmap. The Image uses
+	 *  the following beads:
+	 * 
+	 *  org.apache.flex.core.IBeadModel: the data model for the Image, including the source property.
+	 *  org.apache.flex.core.IBeadView: constructs the visual elements of the component.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class Image extends UIBase
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function Image()
+		{
+			super();
+		}
+		
+		/**
+		 *  The location of the bitmap, usually a URL.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get source():String
+		{
+			return IImageModel(model).source;
+		}
+		public function set source(value:String):void
+		{
+			IImageModel(model).source = value;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Label.as
new file mode 100644
index 0000000..4702274
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Label.as
@@ -0,0 +1,118 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import org.apache.flex.core.ITextModel;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	
+	/*
+	 *  Label probably should extend TextField directly,
+	 *  but the player's APIs for TextLine do not allow
+	 *  direct instantiation, and we might want to allow
+	 *  Labels to be declared and have their actual
+	 *  view be swapped out.
+	 */
+
+    /**
+     *  The Label class implements the basic control for labeling
+     *  other controls.  
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */    
+    public class Label extends UIBase
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function Label()
+		{
+			super();
+		}
+		
+        /**
+         *  The text to display in the label.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get text():String
+		{
+			return ITextModel(model).text;
+		}
+
+        /**
+         *  @private
+         */
+		public function set text(value:String):void
+		{
+			ITextModel(model).text = value;
+		}
+		
+        /**
+         *  The html-formatted text to display in the label.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get html():String
+		{
+			return ITextModel(model).html;
+		}
+
+        /**
+         *  @private
+         */
+		public function set html(value:String):void
+		{
+			ITextModel(model).html = value;
+		}
+				
+        /**
+         *  @private
+         */
+		override public function set width(value:Number):void
+		{
+			super.width = value;
+			IEventDispatcher(model).dispatchEvent( new Event("widthChanged") );
+		}
+		
+        /**
+         *  @private
+         */
+		override public function set height(value:Number):void
+		{
+			super.height = value;
+			IEventDispatcher(model).dispatchEvent( new Event("heightChanged") );
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/List.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/List.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/List.as
new file mode 100644
index 0000000..1f93e24
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/List.as
@@ -0,0 +1,185 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import mx.core.IFactory;
+	
+	import org.apache.flex.core.IDataProviderItemRendererMapper;
+	import org.apache.flex.core.IRollOverModel;
+	import org.apache.flex.core.ISelectionModel;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.ValuesManager;
+	
+    [Event(name="change", type="org.apache.flex.events.Event")]
+    
+	/**
+	 *  The List class is a component that displays multiple data items. The List uses
+	 *  the following bead types:
+	 * 
+	 *  org.apache.flex.core.IBeadModel: the data model, which includes the dataProvider, selectedItem, and
+	 *  so forth.
+	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the list.
+	 *  org.apache.flex.core.IBeadController: the bead that handles input and output.
+	 *  org.apache.flex.core.IBeadLayout: the bead responsible for the size and position of the itemRenderers.
+	 *  org.apache.flex.core.IDataProviderItemRendererMapper: the bead responsible for creating the itemRenders.
+	 *  org.apache.flex.core.IItemRenderer: the class or factory used to display an item in the list.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class List extends UIBase
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function List()
+		{
+			super();
+		}
+		
+		/**
+		 *  The name of field within the data used for display. Each item of the
+		 *  data should have a property with this name.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get labelField():String
+		{
+			return ISelectionModel(model).labelField;
+		}
+		public function set labelField(value:String):void
+		{
+			ISelectionModel(model).labelField = value;
+		}
+		
+		/**
+		 *  The data being display by the List.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get dataProvider():Object
+        {
+            return ISelectionModel(model).dataProvider;
+        }
+        public function set dataProvider(value:Object):void
+        {
+            ISelectionModel(model).dataProvider = value;
+        }
+
+		/**
+		 *  The index of the currently selected item. Changing this value
+		 *  also changes the selectedItem property.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get selectedIndex():int
+		{
+			return ISelectionModel(model).selectedIndex;
+		}
+		public function set selectedIndex(value:int):void
+		{
+			ISelectionModel(model).selectedIndex = value;
+		}
+
+		/**
+		 *  The index of the item currently below the pointer.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get rollOverIndex():int
+		{
+			return IRollOverModel(model).rollOverIndex;
+		}
+		public function set rollOverIndex(value:int):void
+		{
+			IRollOverModel(model).rollOverIndex = value;
+		}
+		
+		/**
+		 *  The item currently selected. Changing this value also 
+		 *  changes the selectedIndex property.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get selectedItem():Object
+		{
+			return ISelectionModel(model).selectedItem;
+		}
+		public function set selectedItem(value:Object):void
+		{
+			ISelectionModel(model).selectedItem = value;
+		}
+		
+		private var _itemRenderer:IFactory;
+		
+		/**
+		 *  The class or factory used to display each item.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get itemRenderer():IFactory
+		{
+			return _itemRenderer;
+		}
+		public function set itemRenderer(value:IFactory):void
+		{
+			_itemRenderer = value;
+		}
+		
+		/**
+		 * @private
+		 */
+		override public function addedToParent():void
+		{
+            super.addedToParent();
+            
+            if (getBeadByType(IDataProviderItemRendererMapper) == null)
+            {
+                var mapper:IDataProviderItemRendererMapper = new (ValuesManager.valuesImpl.getValue(this, "iDataProviderItemRendererMapper")) as IDataProviderItemRendererMapper;
+                addBead(mapper);
+            }
+		}
+        
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/NumericStepper.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/NumericStepper.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/NumericStepper.as
new file mode 100644
index 0000000..f588d7c
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/NumericStepper.as
@@ -0,0 +1,143 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import org.apache.flex.core.IRangeModel;
+
+	[Event(name="valueChanged", type="org.apache.flex.events.Event")]
+	
+	/**
+	 *  The NumericStepper class is a component that displays a numeric
+	 *  value and up/down controls (using a org.apache.flex.html.staticControls.Spinner) to 
+	 *  increase and decrease the value by specific amounts. The NumericStepper uses the following beads:
+	 * 
+	 *  org.apache.flex.core.IBeadModel: the data model for the component of type org.apache.flex.core.IRangeModel.
+	 *  org.apache.flex.core.IBeadView: constructs the parts of the component.
+	 *  org.apache.flex.core.IBeadController: handles the input events.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class NumericStepper extends Container
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function NumericStepper()
+		{
+			super();
+		}
+		
+		/**
+		 *  The current value of the control.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get value():Number
+		{
+			return IRangeModel(model).value;
+		}
+		public function set value(newValue:Number):void
+		{
+			IRangeModel(model).value = newValue;
+		}
+		
+		/**
+		 *  The minimum value the control will display.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get minimum():Number
+		{
+			return IRangeModel(model).minimum;
+		}
+		public function set minimum(value:Number):void
+		{
+			IRangeModel(model).minimum = value;
+		}
+		
+		/**
+		 *  The maximum value the control will display.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get maximum():Number
+		{
+			return IRangeModel(model).maximum;
+		}
+		public function set maximum(value:Number):void
+		{
+			IRangeModel(model).maximum = value;
+		}
+		
+		/**
+		 *  The amount to increase or descrease the value. The value
+		 *  will not exceed the minimum or maximum value. The final
+		 *  value is affected by the snapInterval.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get stepSize():Number
+		{
+			return IRangeModel(model).stepSize;
+		}
+		public function set stepSize(value:Number):void
+		{
+			IRangeModel(model).stepSize = value;
+		}
+		
+		/**
+		 *  The modulus for the value. If this property is set,
+		 *  the value displayed with a muliple of the snapInterval.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get snapInterval():Number
+		{
+			return IRangeModel(model).snapInterval;
+		}
+		public function set snapInterval(value:Number):void
+		{
+			IRangeModel(model).snapInterval = value;
+		}
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Panel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Panel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Panel.as
new file mode 100644
index 0000000..ff7afed
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Panel.as
@@ -0,0 +1,123 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import org.apache.flex.core.IPanelModel;
+
+	[Event(name="close", type="org.apache.flex.events.Event")]
+	
+	/**
+	 *  The Panel class is a Container component capable of parenting other
+	 *  components. The Panel has a TitleBar and an optional org.apache.flex.html.staticControls.ControlBar. 
+	 *  The Panel uses the following bead types:
+	 * 
+	 *  org.apache.flex.core.IBeadModel: the data model for the Panel that includes the title and whether
+	 *  or not to display the close button.
+	 *  org.apache.flex.core.IBeadView: creates the parts of the Panel.
+	 *  org.apache.flex.core.IBorderBead: if present, draws a border around the Panel.
+	 *  org.apache.flex.core.IBackgroundBead: if present, provides a colored background for the Panel.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class Panel extends Container
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function Panel()
+		{
+			super();
+		}
+		
+		/**
+		 *  The string to display in the org.apache.flex.html.staticControls.TitleBar.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get title():String
+		{
+			return IPanelModel(model).title;
+		}
+		public function set title(value:String):void
+		{
+			IPanelModel(model).title = value;
+		}
+		
+		/**
+		 *  The HTML string to display in the org.apache.flex.html.staticControls.TitleBar.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get htmlTitle():String
+		{
+			return IPanelModel(model).htmlTitle;
+		}
+		public function set htmlTitle(value:String):void
+		{
+			IPanelModel(model).htmlTitle = value;
+		}
+		
+		/**
+		 * Whether or not to show a Close button in the org.apache.flex.html.staticControls.TitleBar.
+		 */
+		public function get showCloseButton():Boolean
+		{
+			return IPanelModel(model).showCloseButton;
+		}
+		public function set showCloseButton(value:Boolean):void
+		{
+			IPanelModel(model).showCloseButton = value;
+		}
+		
+		private var _controlBar:Array;
+		
+		/**
+		 *  The items in the org.apache.flex.html.staticControls.ControlBar. Setting this property automatically
+		 *  causes the ControlBar to display.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get controlBar():Array
+		{
+			return _controlBar;
+		}
+		public function set controlBar(value:Array):void
+		{
+			_controlBar = value;
+		}
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/RadioButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/RadioButton.as
new file mode 100644
index 0000000..0a1add5
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/RadioButton.as
@@ -0,0 +1,208 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import flash.display.DisplayObject;
+	import flash.events.MouseEvent;
+	import flash.utils.Dictionary;
+	
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.IValueToggleButtonModel;
+	import org.apache.flex.core.UIButtonBase;
+	import org.apache.flex.events.Event;
+	
+	[Event(name="change", type="org.apache.flex.events.Event")]
+
+	/**
+	 *  The RadioButton class is a component that displays a selectable Button. RadioButtons
+	 *  are typically used in groups, identified by the groupName property. RadioButton use
+	 *  the following beads:
+	 * 
+	 *  org.apache.flex.core.IBeadModel: the data model, which includes the groupName.
+	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the RadioButton..
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class RadioButton extends UIButtonBase implements IStrand
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function RadioButton(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null)
+		{
+			super(upState, overState, downState, hitTestState);
+			
+			addEventListener(MouseEvent.CLICK, internalMouseHandler);
+		}
+		
+		protected static var dict:Dictionary = new Dictionary(true);
+		
+		private var _groupName:String;
+		
+		/**
+		 *  The name of the group. Only one RadioButton in a group is selected.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get groupName() : String
+		{
+			return IValueToggleButtonModel(model).groupName;
+		}
+		public function set groupName(value:String) : void
+		{
+			IValueToggleButtonModel(model).groupName = value;
+		}
+		
+		/**
+		 *  The string used as a label for the RadioButton.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get text():String
+		{
+			return IValueToggleButtonModel(model).text;
+		}
+		public function set text(value:String):void
+		{
+			IValueToggleButtonModel(model).text = value;
+		}
+		
+		/**
+		 *  Whether or not the RadioButton instance is selected. Setting this property
+		 *  causes the currently selected RadioButton in the same group to lose the
+		 *  selection.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get selected():Boolean
+		{
+			return IValueToggleButtonModel(model).selected;
+		}
+		public function set selected(selValue:Boolean):void
+		{
+			IValueToggleButtonModel(model).selected = selValue;
+			
+			// if this button is being selected, its value should become
+			// its group's selectedValue
+			if( selValue ) {
+				for each(var rb:RadioButton in dict)
+				{
+					if( rb.groupName == groupName )
+					{
+						rb.selectedValue = value;
+					}
+				}
+			}
+		}
+		
+		/**
+		 *  The value associated with the RadioButton. For example, RadioButtons with labels,
+		 *  "Red", "Green", and "Blue" might have the values 0, 1, and 2 respectively.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get value():Object
+		{
+			return IValueToggleButtonModel(model).value;
+		}
+		public function set value(newValue:Object):void
+		{
+			IValueToggleButtonModel(model).value = newValue;
+		}
+		
+		/**
+		 *  The group's currently selected value.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get selectedValue():Object 
+		{
+			return IValueToggleButtonModel(model).selectedValue;
+		}
+		public function set selectedValue(newValue:Object):void 
+		{
+			// a radio button is really selected when its value matches that of the group's value
+			IValueToggleButtonModel(model).selected = (newValue == value);
+			IValueToggleButtonModel(model).selectedValue = newValue;
+		}
+				
+		/**
+		 * @private
+		 */
+		override public function addedToParent():void
+		{
+            super.addedToParent();
+
+            // if this instance is selected, set the local selectedValue to
+			// this instance's value
+			if( selected ) selectedValue = value;
+			
+			else {
+			
+				// make sure this button's selectedValue is set from its group's selectedValue
+				// to keep it in sync with the rest of the buttons in its group.
+				for each(var rb:RadioButton in dict)
+				{
+					if( rb.groupName == groupName )
+					{
+						selectedValue = rb.selectedValue;
+						break;
+					}
+				}
+			}
+			
+			dict[this] = this;
+		}
+			
+		/**
+		 * @private
+		 */
+		private function internalMouseHandler(event:Event) : void
+		{
+			// prevent radiobutton from being turned off by a click
+			if( !selected ) {
+				selected = !selected;
+				dispatchEvent(new Event("change"));
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleAlert.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleAlert.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleAlert.as
new file mode 100644
index 0000000..ccf73ea
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleAlert.as
@@ -0,0 +1,132 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{	
+	import org.apache.flex.core.IAlertModel;
+	import org.apache.flex.core.IPopUp;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.events.Event;
+	
+	[Event(name="close", type="org.apache.flex.events.Event")]
+	
+	/**
+	 *  The SimpleAlert class is a component that displays a message and an OK button. The
+	 *  SimpleAlert converts directly to window.alert() for HTML. SimpleAlert uses
+	 *  the following beads:
+	 * 
+	 *  org.apache.flex.core.IBeadModel: the data model, which includes the message.
+	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the Alert.
+	 *  org.apache.flex.core.IBeadController: the bead responsible for handling input events.
+	 *  org.apache.flex.core.IBorderBead: a bead, if present, that draws a border around the control.
+	 *  org.apache.flex.core.IBackgroundBead: a bead, if present, that creates a solid-color background.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class SimpleAlert extends UIBase implements IPopUp
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function SimpleAlert()
+		{
+			super();
+			
+			className = "SimpleAlert";
+		}
+		
+		/**
+		 *  The message to display.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		private function get message():String
+		{
+			return IAlertModel(model).message;
+		}
+		private function set message(value:String):void
+		{
+			IAlertModel(model).message = value;
+		}
+		
+		/**
+		 *  The HTML message to display.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		private function get htmlMessage():String
+		{
+			return IAlertModel(model).htmlMessage;
+		}
+		private function set htmlMessage(value:String):void
+		{
+			IAlertModel(model).htmlMessage = value;
+		}
+		
+		/**
+		 *  This function causes the SimpleAlert to appear. The parent is used for ActionScript and
+		 *  identifies the IPopUpParent that manages the alert.
+		 * 
+		 *  @param Object parent The object that hosts the pop-up.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function show(parent:Object) : void
+		{
+			parent.addElement(this);
+		}
+		
+		/**
+		 *  A convenience function to compose and display the alert.
+		 * 
+		 *  @param String message The content to display in the SimpleAlert.
+		 *  @param Object parent The object that hosts the pop-up.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		static public function show(message:String, parent:Object):SimpleAlert
+		{
+			var alert:SimpleAlert = new SimpleAlert();
+			alert.message = message;
+			alert.show(parent);
+			
+			return alert;
+		}
+		
+	}
+}
\ No newline at end of file


[03/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Image.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Image.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Image.js
deleted file mode 100644
index 4446917..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Image.js
+++ /dev/null
@@ -1,86 +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('org.apache.flex.html.staticControls.Image');
-
-goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.beads.ImageView');
-goog.require('org.apache.flex.html.staticControls.beads.models.ImageModel');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html.staticControls.Image = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html.staticControls.Image,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.Image.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'Image',
-                qName: 'org.apache.flex.html.staticControls.Image' }] };
-
-
-/**
- * @override
- * @protected
- * @return {Object} The actual element to be parented.
- */
-org.apache.flex.html.staticControls.Image.prototype.createElement =
-    function() {
-
-  this.element = document.createElement('img');
-
-  this.positioner = this.element;
-  this.element.flexjs_wrapper = this;
-
-  this.model = new
-          org.apache.flex.html.staticControls.beads.models.ImageModel();
-
-  this.addBead(this.model);
-
-  this.addBead(new
-      org.apache.flex.html.staticControls.beads.ImageView());
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @return {String} The source identifier for the Image.
- */
-org.apache.flex.html.staticControls.Image.prototype.
-    get_source = function() {
-  return this.model.get_source();
-};
-
-
-/**
- * @expose
- * @param {String} value The source identifier for the Image.
- */
-org.apache.flex.html.staticControls.Image.prototype.
-    set_source = function(value) {
-  this.model.set_source(value);
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Label.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Label.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Label.js
deleted file mode 100644
index ec25864..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Label.js
+++ /dev/null
@@ -1,61 +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('org.apache.flex.html.staticControls.Label');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html.staticControls.Label = function() {
-  goog.base(this);
-
-  this.element = document.createElement('div');
-  this.positioner = this.element;
-  this.element.flexjs_wrapper = this;
-};
-goog.inherits(org.apache.flex.html.staticControls.Label,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.Label.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'Label',
-                qName: 'org.apache.flex.html.staticControls.Label' }] };
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.html.staticControls.Label.prototype.get_text = function() {
-  return this.element.innerHTML;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.html.staticControls.Label.prototype.set_text = function(value) {
-  this.element.innerHTML = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/List.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/List.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/List.js
deleted file mode 100644
index c554129..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/List.js
+++ /dev/null
@@ -1,176 +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('org.apache.flex.html.staticControls.List');
-
-goog.require('mx.core.IFactory');
-goog.require('org.apache.flex.core.IDataProviderItemRendererMapper');
-goog.require('org.apache.flex.core.IItemRendererClassFactory');
-goog.require('org.apache.flex.core.ItemRendererClassFactory');
-goog.require('org.apache.flex.core.ListBase');
-goog.require('org.apache.flex.core.ValuesManager');
-goog.require('org.apache.flex.html.staticControls.beads.ListView');
-goog.require('org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData');
-goog.require('org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
-goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.ListBase}
- */
-org.apache.flex.html.staticControls.List = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html.staticControls.List,
-    org.apache.flex.core.ListBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.List.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'List',
-                qName: 'org.apache.flex.html.staticControls.List' }] };
-
-
-/**
- * @expose
- * @return {mx.core.IFactory} The itemRenderer generator.
- */
-org.apache.flex.html.staticControls.List.prototype.get_itemRenderer =
-function() {
-  return this.itemRenderer_;
-};
-
-
-/**
- * @expose
- * @param {mx.core.IFactory} value The itemRenderer generator.
- */
-org.apache.flex.html.staticControls.List.prototype.set_itemRenderer =
-function(value) {
-  this.itemRenderer_ = value;
-};
-
-
-/**
- * @expose
- * @return {String} The name of the field to use as a label.
- */
-org.apache.flex.html.staticControls.List.prototype.get_labelField =
-function() {
-  return this.get_model().get_labelField();
-};
-
-
-/**
- * @expose
- * @param {String} value The name of the field to use as a label.
- */
-org.apache.flex.html.staticControls.List.prototype.set_labelField =
-function(value) {
-  this.get_model().set_labelField(value);
-};
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.List.prototype.createElement =
-    function() {
-  goog.base(this, 'createElement');
-  this.set_className('List');
-
-  return this.element;
-};
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.List.prototype.addedToParent =
-    function() {
-  goog.base(this, 'addedToParent');
-
-  var b = this.getBeadByType(org.apache.flex.core.IDataProviderItemRendererMapper);
-  if (org.apache.flex.core.ValuesManager.valuesImpl.getValue && !b) {
-    /**
-     * @type {Function}
-     */
-    var c;
-    c = /** @type {Function} */ (org.apache.flex.core.ValuesManager.valuesImpl.getValue(this,
-                            'iDataProviderItemRendererMapper'));
-    if (c) {
-      var bead = new c();
-      this.addBead(bead);
-    }
-  }
-//  var c = this.getBeadByType(org.apache.flex.core.IItemRenderer);
-//  if (c == null) {
-//    c = this.getBeadByType(
-//          org.apache.flex.html.staticControls.supportClasses.DataItemRenderer);
-//    if (c == null) {
-//      this.addBead(new
-//                   org.apache.flex.html.staticControls.beads.
-//                   TextItemRendererFactoryForArrayData());
-//    }
-//  }
-};
-
-
-/**
- * @expose
- * @return {Array.<Object>} An array of objects that make up the actual
- *                          list (most likely itemRenderers).
- */
-org.apache.flex.html.staticControls.List.prototype.internalChildren =
-    function() {
-  var listView =
-      this.getBeadByType(org.apache.flex.html.staticControls.beads.ListView);
-  var dg = listView.get_dataGroup();
-  var items = null;
-  if (dg.renderers) {
-    items = dg.renderers;
-  }
-  return items;
-};
-
-
-/**
- * @expose
- * @param {Object} event The event that triggered the selection.
- */
-org.apache.flex.html.staticControls.List.prototype.selectedHandler =
-    function(event) {
-  var itemRenderer = event.currentTarget;
-  if (this.renderers) {
-    var n = this.renderers.length;
-    var i;
-    for (i = 0; i < n; i++) {
-      var test = this.renderers[i];
-      if (test == itemRenderer) {
-        this.model.set_selectedIndex(i);
-        itemRenderer.set_selected(true);
-      }
-      else {
-        test.set_selected(false);
-      }
-    }
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/NumericStepper.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/NumericStepper.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/NumericStepper.js
deleted file mode 100644
index 66926ef..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/NumericStepper.js
+++ /dev/null
@@ -1,185 +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('org.apache.flex.html.staticControls.NumericStepper');
-
-goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.Spinner');
-goog.require('org.apache.flex.html.staticControls.TextInput');
-goog.require('org.apache.flex.html.staticControls.beads.models.RangeModel');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html.staticControls.NumericStepper = function() {
-  this.model =
-      new org.apache.flex.html.staticControls.beads.models.RangeModel();
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html.staticControls.NumericStepper,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.NumericStepper.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'NumericStepper',
-                qName: 'org.apache.flex.html.staticControls.NumericStepper' }] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.NumericStepper.prototype.createElement =
-    function() {
-  this.element = document.createElement('div');
-  this.positioner = this.element;
-
-  this.input = new org.apache.flex.html.staticControls.TextInput();
-  this.addElement(this.input);
-  this.input.positioner.style.display = 'inline-block';
-
-  this.spinner = new org.apache.flex.html.staticControls.Spinner();
-  this.addElement(this.spinner);
-  this.spinner.positioner.style.display = 'inline-block';
-  goog.events.listen(this.spinner, 'valueChanged',
-      goog.bind(this.spinnerChange, this));
-
-  this.element.flexjs_wrapper = this;
-  this.set_className('NumericStepper');
-
-  this.input.set_text(String(this.spinner.get_value()));
-
-  return this.element;
-};
-
-
-/**
- * @param {Object} event The input event.
- */
-org.apache.flex.html.staticControls.NumericStepper.prototype.spinnerChange =
-    function(event)
-    {
-  var newValue = this.spinner.get_value();
-  this.set_value(newValue);
-  this.input.set_text(String(this.spinner.get_value()));
-  this.dispatchEvent(new org.apache.flex.events.Event('valueChanged'));
-};
-
-
-/**
- * @expose
- * @return {Number} The current minimum value.
- */
-org.apache.flex.html.staticControls.NumericStepper.prototype.get_minimum =
-    function() {
-  return this.model.get_minimum();
-};
-
-
-/**
- * @expose
- * @param {Number} value The new minimum value.
- */
-org.apache.flex.html.staticControls.NumericStepper.prototype.set_minimum =
-    function(value) {
-  this.model.set_minimum(value);
-};
-
-
-/**
- * @expose
- * @return {Number} The current maximum value.
- */
-org.apache.flex.html.staticControls.NumericStepper.prototype.get_maximum =
-    function() {
-  return this.model.get_maximum();
-};
-
-
-/**
- * @expose
- * @param {Number} value The new maximum value.
- */
-org.apache.flex.html.staticControls.NumericStepper.prototype.set_maximum =
-    function(value) {
-  this.model.set_maximum(value);
-};
-
-
-/**
- * @expose
- * @return {Number} The current value.
- */
-org.apache.flex.html.staticControls.NumericStepper.prototype.get_value =
-    function() {
-  return this.model.get_value();
-};
-
-
-/**
- * @expose
- * @param {Number} newValue The new value.
- */
-org.apache.flex.html.staticControls.NumericStepper.prototype.set_value =
-    function(newValue) {
-  this.model.set_value(newValue);
-};
-
-
-/**
- * @expose
- * @return {Number} The current snapInterval value.
- */
-org.apache.flex.html.staticControls.NumericStepper.prototype.get_snapInterval =
-    function() {
-  return this.model.get_snapInterval();
-};
-
-
-/**
- * @expose
- * @param {Number} value The new snapInterval value.
- */
-org.apache.flex.html.staticControls.NumericStepper.prototype.set_snapInterval =
-    function(value) {
-  this.model.set_snapInterval(value);
-};
-
-
-/**
- * @expose
- * @return {Number} The current stepSize value.
- */
-org.apache.flex.html.staticControls.NumericStepper.prototype.get_stepSize =
-    function() {
-  return this.model.get_stepSize();
-};
-
-
-/**
- * @expose
- * @param {Number} value The new stepSize value.
- */
-org.apache.flex.html.staticControls.NumericStepper.prototype.set_stepSize =
-    function(value) {
-  this.model.set_stepSize(value);
-};
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Panel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Panel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Panel.js
deleted file mode 100644
index 88a22b5..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Panel.js
+++ /dev/null
@@ -1,186 +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('org.apache.flex.html.staticControls.Panel');
-
-goog.require('org.apache.flex.html.staticControls.Container');
-goog.require('org.apache.flex.html.staticControls.ControlBar');
-goog.require('org.apache.flex.html.staticControls.TitleBar');
-goog.require('org.apache.flex.html.staticControls.beads.PanelView');
-goog.require('org.apache.flex.html.staticControls.beads.models.PanelModel');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.html.staticControls.Container}
- */
-org.apache.flex.html.staticControls.Panel = function() {
-  this.model =
-      new org.apache.flex.html.staticControls.beads.models.PanelModel();
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html.staticControls.Panel,
-    org.apache.flex.html.staticControls.Container);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.Panel.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'Panel',
-                qName: 'org.apache.flex.html.staticControls.Panel' }] };
-
-
-/**
- * @override
- * @param {Object} c Element being added.
- */
-org.apache.flex.html.staticControls.Panel.prototype.addElement = function(c) {
-  if (c == this.titleBar) {
-    this.element.insertBefore(this.titleBar.element, this.contentArea);
-  }
-  else if (c == this.controlBar) {
-    this.element.appendChild(c.element);
-  }
-  else {
-    this.contentArea.appendChild(c.element);
-  }
-  c.addedToParent();
-};
-
-
-/**
- * @override
- * @param {Object} c The child element.
- * @param {number} index The index.
- */
-org.apache.flex.html.staticControls.Panel.prototype.addElementAt =
-    function(c, index) {
-  var children = this.internalChildren();
-  if (index >= children.length)
-    this.addElement(c);
-  else
-  {
-    this.contentArea.insertBefore(c.element,
-        children[index]);
-    c.addedToParent();
-  }
-};
-
-
-/**
- * @override
- * @param {Object} c The child element.
- * @return {number} The index in parent.
- */
-org.apache.flex.html.staticControls.Panel.prototype.getElementIndex =
-    function(c) {
-  var children = this.internalChildren();
-  var n = children.length;
-  for (var i = 0; i < n; i++)
-  {
-    if (children[i] == c.element)
-      return i;
-  }
-  return -1;
-};
-
-
-/**
- * @override
- * @param {Object} c The child element.
- */
-org.apache.flex.html.staticControls.Panel.prototype.removeElement =
-    function(c) {
-  this.contentArea.removeChild(c.element);
-};
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.Panel.prototype.createElement =
-    function() {
-
-  this.element = document.createElement('div');
-  this.element.className = 'Panel';
-
-  this.contentArea = document.createElement('div');
-  this.contentArea.flexjs_wrapper = this;
-  this.element.appendChild(this.contentArea);
-
-  this.panelView = new org.apache.flex.html.staticControls.beads.PanelView();
-  this.panelView.set_strand(this);
-
-  this.positioner = this.element;
-  this.element.flexjs_wrapper = this;
-
-  return this.element;
-};
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.Panel.prototype.addedToParent =
-    function() {
-  goog.base(this, 'addedToParent');
-};
-
-
-/**
- * @expose
- * @return {string} The title getter.
- */
-org.apache.flex.html.staticControls.Panel.prototype.get_title = function() {
-  return this.model.get_title();
-};
-
-
-/**
- * @expose
- * @param {string} value The title setter.
- */
-org.apache.flex.html.staticControls.Panel.prototype.set_title =
-    function(value) {
-  this.model.set_title(value);
-};
-
-
-/**
- * @expose
- * @return {Array} The controlBar getter.
- */
-org.apache.flex.html.staticControls.Panel.prototype.get_controlBar =
-    function() {
-  return this.controlBarChildren;
-};
-
-
-/**
- * @expose
- * @param {Array} value The controlBar setter.
- */
-org.apache.flex.html.staticControls.Panel.prototype.set_controlBar =
-    function(value) {
-  this.controlBarChildren = value;
-
-  for (var i = 0; i < value.length; i++) {
-    var item = value[i];
-    this.controlBar.addElement(item);
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/RadioButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/RadioButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/RadioButton.js
deleted file mode 100644
index 5713e3d..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/RadioButton.js
+++ /dev/null
@@ -1,197 +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('org.apache.flex.html.staticControls.RadioButton');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html.staticControls.RadioButton = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html.staticControls.RadioButton,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.RadioButton.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'RadioButton',
-                qName: 'org.apache.flex.html.staticControls.RadioButton'}] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.RadioButton.prototype.createElement =
-    function() {
-  var rb;
-
-  this.element = document.createElement('label');
-
-  rb = document.createElement('input');
-  rb.type = 'radio';
-  this.element.appendChild(rb);
-  this.element.appendChild(document.createTextNode('radio button'));
-
-  this.positioner = this.element;
-  rb.flexjs_wrapper = this;
-
-  return this.element;
-};
-
-
-/**
- * @expose
- */
-org.apache.flex.html.staticControls.RadioButton.prototype.initModel =
-    function() {
-};
-
-
-/**
- * @expose
- */
-org.apache.flex.html.staticControls.RadioButton.prototype.initSkin =
-    function() {
-};
-
-
-/**
- * @expose
- * @return {string} The groupName getter.
- */
-org.apache.flex.html.staticControls.RadioButton.prototype.get_groupName =
-    function() {
-  return this.element.childNodes.item(0).name;
-};
-
-
-/**
- * @expose
- * @param {string} value The groupName setter.
- */
-org.apache.flex.html.staticControls.RadioButton.prototype.set_groupName =
-    function(value) {
-  this.element.childNodes.item(0).name = value;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.html.staticControls.RadioButton.prototype.get_text =
-    function() {
-  return this.element.childNodes.item(1).nodeValue;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.html.staticControls.RadioButton.prototype.set_text =
-    function(value) {
-  this.element.childNodes.item(1).nodeValue = value;
-};
-
-
-/**
- * @expose
- * @return {boolean} The selected getter.
- */
-org.apache.flex.html.staticControls.RadioButton.prototype.get_selected =
-    function() {
-  return this.element.childNodes.item(0).checked;
-};
-
-
-/**
- * @expose
- * @param {boolean} value The selected setter.
- */
-org.apache.flex.html.staticControls.RadioButton.prototype.set_selected =
-    function(value) {
-  this.element.childNodes.item(0).checked = value;
-};
-
-
-/**
- * @expose
- * @return {Object} The value getter.
- */
-org.apache.flex.html.staticControls.RadioButton.prototype.get_value =
-    function() {
-  return this.element.childNodes.item(0).value;
-};
-
-
-/**
- * @expose
- * @param {Object} value The value setter.
- */
-org.apache.flex.html.staticControls.RadioButton.prototype.set_value =
-    function(value) {
-  this.element.childNodes.item(0).value = value;
-};
-
-
-/**
- * @expose
- * @return {Object} The value of the selected RadioButton.
- */
-org.apache.flex.html.staticControls.RadioButton.prototype.get_selectedValue =
-    function() {
-  var buttons, groupName, i, n;
-
-  groupName = this.element.childNodes.item(0).name;
-  buttons = document.getElementsByName(groupName);
-  n = buttons.length;
-
-  for (i = 0; i < n; i++) {
-    if (buttons[i].checked) {
-      return buttons[i].value;
-    }
-  }
-  return null;
-};
-
-
-/**
- * @expose
- * @param {Object} value The value of the selected RadioButton.
- */
-org.apache.flex.html.staticControls.RadioButton.prototype.set_selectedValue =
-    function(value) {
-  var buttons, groupName, i, n;
-
-  groupName = this.element.childNodes.item(0).name;
-  buttons = document.getElementsByName(groupName);
-  n = buttons.length;
-  for (i = 0; i < n; i++) {
-    if (buttons[i].value === value) {
-      buttons[i].checked = true;
-      break;
-    }
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/SimpleAlert.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/SimpleAlert.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/SimpleAlert.js
deleted file mode 100644
index 5fc3530..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/SimpleAlert.js
+++ /dev/null
@@ -1,51 +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('org.apache.flex.html.staticControls.SimpleAlert');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html.staticControls.SimpleAlert = function() {
-  goog.base(this);
-
-};
-goog.inherits(org.apache.flex.html.staticControls.SimpleAlert,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.SimpleAlert.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'SimpleAlert',
-                qName: 'org.apache.flex.html.staticControls.SimpleAlert'}] };
-
-
-/**
- * @param {string} message The message to display in the alert.
- * @param {Object} host The host that should display the alert.
- */
-org.apache.flex.html.staticControls.SimpleAlert.show =
-    function(message, host) {
-
-  alert(message);
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/SimpleList.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/SimpleList.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/SimpleList.js
deleted file mode 100644
index 79e40ef..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/SimpleList.js
+++ /dev/null
@@ -1,129 +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('org.apache.flex.html.staticControls.SimpleList');
-
-goog.require('org.apache.flex.core.ListBase');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.ListBase}
- */
-org.apache.flex.html.staticControls.SimpleList = function() {
-  goog.base(this);
-  this.model = new org.apache.flex.html.staticControls.
-      beads.models.ArraySelectionModel();
-};
-goog.inherits(org.apache.flex.html.staticControls.SimpleList,
-    org.apache.flex.core.ListBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.SimpleList.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'SimpleList',
-                qName: 'org.apache.flex.html.staticControls.SimpleList'}] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.SimpleList.prototype.
-    createElement = function() {
-  this.element = document.createElement('select');
-  this.element.size = 5;
-  goog.events.listen(this.element, 'change',
-      goog.bind(this.changeHandler, this));
-  this.positioner = this.element;
-  this.set_className('SimpleList');
-
-  return this.element;
-};
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.SimpleList.prototype.
-    get_dataProvider = function() {
-  return this.model.get_dataProvider();
-};
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.SimpleList.prototype.
-    set_dataProvider = function(value) {
-  var dp, i, n, opt;
-
-  this.model.set_dataProvider(value);
-
-  dp = this.element.options;
-  n = dp.length;
-  for (i = 0; i < n; i++) {
-    dp.remove(0);
-  }
-
-  n = value.length;
-  for (i = 0; i < n; i++) {
-    opt = document.createElement('option');
-    opt.text = value[i].toString();
-    dp.add(opt);
-  }
-
-};
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.SimpleList.prototype.
-    get_selectedIndex = function() {
-  return this.model.get_selectedIndex();
-};
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.SimpleList.prototype.
-    set_selectedIndex = function(value) {
-  this.model.set_selectedIndex(value);
-};
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.SimpleList.prototype.
-    get_selectedItem = function() {
-  return this.model.get_selectedItem();
-};
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.SimpleList.prototype.
-    set_selectedItem = function(value) {
-  this.model.set_selectedItem(value);
-};
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Slider.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Slider.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Slider.js
deleted file mode 100644
index 6a19bd4..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Slider.js
+++ /dev/null
@@ -1,219 +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('org.apache.flex.html.staticControls.Slider');
-
-goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.beads.SliderThumbView');
-goog.require('org.apache.flex.html.staticControls.beads.SliderTrackView');
-goog.require('org.apache.flex.html.staticControls.beads.controllers.SliderMouseController');
-goog.require('org.apache.flex.html.staticControls.beads.models.RangeModel');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html.staticControls.Slider = function() {
-  this.model =
-      new org.apache.flex.html.staticControls.beads.models.RangeModel();
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html.staticControls.Slider,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.Slider.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'Slider',
-                qName: 'org.apache.flex.html.staticControls.Slider'}] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.Slider.prototype.createElement =
-    function() {
-
-  this.element = document.createElement('div');
-  this.element.style.width = '200px';
-  this.element.style.height = '30px';
-
-  this.track = new org.apache.flex.html.staticControls.beads.SliderTrackView();
-  this.addBead(this.track);
-
-  this.thumb = new org.apache.flex.html.staticControls.beads.SliderThumbView();
-  this.addBead(this.thumb);
-
-  this.controller = new org.apache.flex.html.staticControls.beads.controllers.
-                    SliderMouseController();
-  this.addBead(this.controller);
-
-  this.positioner = this.element;
-  this.element.flexjs_wrapper = this;
-
-  this.set_className('Slider');
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @return {number} The value getter.
- */
-org.apache.flex.html.staticControls.Slider.prototype.get_value =
-    function() {
-  return this.model.get_value();
-};
-
-
-/**
- * @expose
- * @param {Object} newValue The new value.
- * @return {void} The value setter.
- */
-org.apache.flex.html.staticControls.Slider.prototype.set_value =
-    function(newValue) {
-  this.model.set_value(newValue);
-  this.setThumbFromValue(this.model.get_value());
-};
-
-
-/**
- * @expose
- * @return {number} The minimum getter.
- */
-org.apache.flex.html.staticControls.Slider.prototype.get_minimum =
-    function() {
-  return this.model.get_minimum();
-};
-
-
-/**
- * @expose
- * @param {Object} value The new minimum value.
- * @return {void} The minimum setter.
- */
-org.apache.flex.html.staticControls.Slider.prototype.set_minimum =
-    function(value) {
-  this.model.set_minimum(value);
-};
-
-
-/**
- * @expose
- * @return {number} The maximum getter.
- */
-org.apache.flex.html.staticControls.Slider.prototype.get_maximum =
-    function() {
-  return this.model.get_maximum();
-};
-
-
-/**
- * @expose
- * @param {Object} value The new maximum value.
- * @return {void} The maximum setter.
- */
-org.apache.flex.html.staticControls.Slider.prototype.set_maximum =
-    function(value) {
-  this.model.set_maximum(value);
-};
-
-
-/**
- * @expose
- * @return {number} The snapInterval getter.
- */
-org.apache.flex.html.staticControls.Slider.prototype.get_snapInterval =
-    function() {
-  return this.model.get_snapInterval();
-};
-
-
-/**
- * @expose
- * @param {Object} value The new snapInterval value.
- * @return {void} The snapInterval setter.
- */
-org.apache.flex.html.staticControls.Slider.prototype.set_snapInterval =
-    function(value) {
-  this.model.set_snapInterval(value);
-};
-
-
-/**
- * @expose
- * @return {number} The stepSize getter.
- */
-org.apache.flex.html.staticControls.Slider.prototype.get_stepSize =
-    function() {
-  return this.model.get_stepSize();
-};
-
-
-/**
- * @expose
- * @param {Object} value The new stepSize value.
- * @return {void} The stepSize setter.
- */
-org.apache.flex.html.staticControls.Slider.prototype.set_stepSize =
-    function(value) {
-  this.model.set_stepSize(value);
-};
-
-
-/**
- * @param {Object} value The current value.
- * @return {number} Calculates the new value based snapInterval and stepSize.
- */
-org.apache.flex.html.staticControls.Slider.prototype.snap = function(value)
-    {
-  var si = this.get_snapInterval();
-  var n = Math.round((value - this.get_minimum()) / si) *
-      si + this.get_minimum();
-  if (value > 0)
-  {
-    if (value - n < n + si - value)
-      return n;
-    return n + si;
-  }
-  if (value - n > n + si - value)
-    return n + si;
-  return n;
-};
-
-
-/**
- * @param {number} value The value used to calculate new position of the thumb.
- * @return {void} Moves the thumb to the corresponding position.
- */
-org.apache.flex.html.staticControls.Slider.prototype.setThumbFromValue =
-    function(value)
-    {
-  var min = this.model.get_minimum();
-  var max = this.model.get_maximum();
-  var p = (value - min) / (max - min);
-  var xloc = p * (parseInt(this.track.element.style.width, 10) -
-             parseInt(this.thumb.element.style.width, 10));
-
-  this.thumb.element.style.left = String(xloc) + 'px';
-};
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Spinner.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Spinner.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Spinner.js
deleted file mode 100644
index 8911105..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Spinner.js
+++ /dev/null
@@ -1,211 +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('org.apache.flex.html.staticControls.Spinner');
-
-goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.TextButton');
-goog.require('org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html.staticControls.Spinner = function() {
-  goog.base(this);
-
-  this.minimum_ = 0;
-  this.maximum_ = 100;
-  this.value_ = 1;
-  this.stepSize_ = 1;
-  this.snapInterval_ = 1;
-};
-goog.inherits(org.apache.flex.html.staticControls.Spinner,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.Spinner.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'Spinner',
-                qName: 'org.apache.flex.html.staticControls.Spinner'}] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.Spinner.prototype.createElement =
-    function() {
-  this.element = document.createElement('div');
-  this.positioner = this.element;
-
-  this.element.style.verticalAlign = 'middle';
-
-  this.incrementButton = new org.apache.flex.html.staticControls.TextButton();
-  this.incrementButton.set_text('\u2191');
-  this.addElement(this.incrementButton);
-
-  this.decrementButton = new org.apache.flex.html.staticControls.TextButton();
-  this.decrementButton.set_text('\u2193');
-  this.addElement(this.decrementButton);
-
-  this.controller = new org.apache.flex.html.staticControls.
-      beads.controllers.SpinnerMouseController();
-  this.addBead(this.controller);
-
-  this.element.flexjs_wrapper = this;
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @return {number} The current value.
- */
-org.apache.flex.html.staticControls.Spinner.prototype.get_value =
-    function() {
-  return this.value_;
-};
-
-
-/**
- * @expose
- * @param {number} value The new value.
- */
-org.apache.flex.html.staticControls.Spinner.prototype.set_value =
-    function(value) {
-  if (value != this.value_) {
-    this.value_ = value;
-    this.dispatchEvent('valueChanged');
-  }
-};
-
-
-/**
- * @expose
- * @return {number} The minimum value.
- */
-org.apache.flex.html.staticControls.Spinner.prototype.get_minimum = function() {
-  return this.minimum_;
-};
-
-
-/**
- * @expose
- * @param {number} value The new minimum value.
- */
-org.apache.flex.html.staticControls.Spinner.prototype.set_minimum =
-    function(value) {
-  if (value != this.minimum_) {
-    this.minimum_ = value;
-    this.dispatchEvent('minimumChanged');
-  }
-};
-
-
-/**
- * @expose
- * @return {number} The maximum value.
- */
-org.apache.flex.html.staticControls.Spinner.prototype.get_maximum =
-    function() {
-  return this.maximum_;
-};
-
-
-/**
- * @expose
- * @param {number} value The new maximum setter.
- */
-org.apache.flex.html.staticControls.Spinner.prototype.set_maximum =
-    function(value) {
-  if (value != this.maximum_) {
-    this.maximum_ = value;
-    this.dispatchEvent('maximumChanged');
-  }
-};
-
-
-/**
- * @expose
- * @return {number} The snapInterval.
- */
-org.apache.flex.html.staticControls.Spinner.prototype.get_snapInterval =
-    function() {
-  return this.snapInterval_;
-};
-
-
-/**
- * @expose
- * @param {number} value The new snapInterval value.
- */
-org.apache.flex.html.staticControls.Spinner.prototype.set_snapInterval =
-    function(value) {
-  if (value != this.snapInterval_) {
-    this.snapInterval_ = value;
-    this.dispatchEvent('snapIntervalChanged');
-  }
-};
-
-
-/**
- * @expose
- * @return {number} The stepSize.
- */
-org.apache.flex.html.staticControls.Spinner.prototype.get_stepSize =
-    function() {
-  return this.stepSize_;
-};
-
-
-/**
- * @expose
- * @param {number} value The new stepSize value.
- */
-org.apache.flex.html.staticControls.Spinner.prototype.set_stepSize =
-    function(value) {
-  if (value != this.stepSize_) {
-    this.stepSize_ = value;
-    this.dispatchEvent('stepSizeChanged');
-  }
-};
-
-
-/**
- * @param {number} value The proposed value.
- * @return {number} The new value based on snapInterval
- * and stepSize.
- */
-org.apache.flex.html.staticControls.Spinner.prototype.snap = function(value)
-    {
-  var si = this.snapInterval_;
-  var n = Math.round((value - this.minimum_) / si) * si + this.minimum_;
-  if (value > 0)
-  {
-    if (value - n < n + si - value)
-      return n;
-    return n + si;
-  }
-  if (value - n > n + si - value)
-    return n + si;
-  return n;
-};
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TextArea.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TextArea.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TextArea.js
deleted file mode 100644
index 2e018e5..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TextArea.js
+++ /dev/null
@@ -1,72 +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('org.apache.flex.html.staticControls.TextArea');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html.staticControls.TextArea = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html.staticControls.TextArea,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.TextArea.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'TextArea',
-                qName: 'org.apache.flex.html.staticControls.TextArea'}] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.TextArea.prototype.createElement =
-    function() {
-
-  this.element = document.createElement('textarea');
-  this.positioner = this.element;
-  this.element.flexjs_wrapper = this;
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.html.staticControls.TextArea.prototype.get_text = function() {
-  return this.element.value;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.html.staticControls.TextArea.prototype.set_text =
-    function(value) {
-  this.element.value = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TextButton.js
deleted file mode 100644
index 882b178..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TextButton.js
+++ /dev/null
@@ -1,58 +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('org.apache.flex.html.staticControls.TextButton');
-
-goog.require('org.apache.flex.html.staticControls.Button');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.html.staticControls.Button}
- */
-org.apache.flex.html.staticControls.TextButton = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html.staticControls.TextButton,
-    org.apache.flex.html.staticControls.Button);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.TextButton.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'TextButton',
-                qName: 'org.apache.flex.html.staticControls.TextButton'}] };
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.html.staticControls.TextButton.prototype.get_text = function() {
-  return this.element.innerHTML;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.html.staticControls.TextButton.prototype.set_text =
-    function(value) {
-  this.element.innerHTML = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TextInput.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TextInput.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TextInput.js
deleted file mode 100644
index 48cccab..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TextInput.js
+++ /dev/null
@@ -1,95 +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('org.apache.flex.html.staticControls.TextInput');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html.staticControls.TextInput = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html.staticControls.TextInput,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.TextInput.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'TextInput',
-                qName: 'org.apache.flex.html.staticControls.TextInput'}] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.TextInput.prototype.createElement = function() {
-  this.element = document.createElement('input');
-  this.element.setAttribute('type', 'input');
-
-  //attach input handler to dispatch flexjs change event when user write in textinput
-  //goog.events.listen(this.element, 'change', goog.bind(this.killChangeHandler, this));
-  goog.events.listen(this.element, 'input', goog.bind(this.inputChangeHandler_, this));
-
-  this.positioner = this.element;
-  this.element.flexjs_wrapper = this;
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.html.staticControls.TextInput.prototype.get_text = function() {
-  return this.element.value;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.html.staticControls.TextInput.prototype.set_text = function(value) {
-  this.element.value = value;
-};
-
-
-/**
- * @expose
- * @param {Object} event The event.
- */
-/*org.apache.flex.html.staticControls.TextInput.prototype.killChangeHandler = function(event) {
-    //event.preventDefault();
-};*/
-
-
-/**
- * @private
- * @param {Object} event The event.
- */
-org.apache.flex.html.staticControls.TextInput.prototype.inputChangeHandler_ = function(event) {
-  event.stopPropagation();
-
-  this.dispatchEvent(new org.apache.flex.events.Event(org.apache.flex.events.Event.EventType.CHANGE));
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TitleBar.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TitleBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TitleBar.js
deleted file mode 100644
index 36f9322..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/TitleBar.js
+++ /dev/null
@@ -1,150 +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('org.apache.flex.html.staticControls.TitleBar');
-
-goog.require('org.apache.flex.html.staticControls.Container');
-goog.require('org.apache.flex.html.staticControls.Label');
-goog.require('org.apache.flex.html.staticControls.TextButton');
-goog.require('org.apache.flex.html.staticControls.beads.models.TitleBarModel');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.html.staticControls.Container}
- */
-org.apache.flex.html.staticControls.TitleBar = function() {
-
-  this.model =
-      new org.apache.flex.html.staticControls.beads.models.TitleBarModel();
-
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html.staticControls.TitleBar,
-    org.apache.flex.html.staticControls.Container);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.TitleBar.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'TitleBar',
-                qName: 'org.apache.flex.html.staticControls.TitleBar'}] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.TitleBar.prototype.createElement =
-    function() {
-
-  this.element = document.createElement('div');
-
-  this.titleLabel = new org.apache.flex.html.staticControls.Label();
-  this.addElement(this.titleLabel);
-  this.titleLabel.element.id = 'title';
-  this.titleLabel.positioner.style.display = 'inline-block';
-  this.titleLabel.set_className('TitleBarLabel');
-
-  this.titleButton = new org.apache.flex.html.staticControls.TextButton();
-  this.addElement(this.titleButton);
-  this.titleButton.element.id = 'closeButton';
-  this.titleButton.text = 'Close';
-  this.titleButton.positioner.style.position = 'absolute';
-  this.titleButton.positioner.style.right = '0px';
-
-  this.positioner = this.element;
-  this.element.flexjs_wrapper = this;
-
-  this.set_className('TitleBar');
-
-  // listen for changes to the model so items can be changed in the view
-  this.model.addEventListener('titleChange',
-      goog.bind(this.changeHandler, this));
-
-  return this.element;
-};
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.TitleBar.prototype.addedToParent =
-    function() {
-
-  this.titleLabel.set_text(this.model.get_title());
-
-  if (this.model.showCloseButton) {
-    this.titleButton.positioner.style.display = 'inline-block';
-  } else {
-    this.titleButton.positioner.style.display = 'none';
-  }
-};
-
-
-/**
- * @param {Object} event The event that triggered this handler.
- */
-org.apache.flex.html.staticControls.TitleBar.prototype.changeHandler =
-    function(event) {
-  if (event.type == 'titleChange') {
-    this.titleLabel.set_text(this.model.get_title());
-  }
-  else if (event.type == 'htmlTitleChange') {
-    this.titleLabel.set_text(this.model.get_htmlTitle());
-  }
-};
-
-
-/**
- * @expose
- * @return {string} The title getter.
- */
-org.apache.flex.html.staticControls.TitleBar.prototype.get_title =
-    function() {
-  return this.model.get_title();
-};
-
-
-/**
- * @expose
- * @param {string} value The title setter.
- */
-org.apache.flex.html.staticControls.TitleBar.prototype.set_title =
-    function(value) {
-  this.model.set_title(value);
-};
-
-
-/**
- * @expose
- * @return {string} The showCloseButton getter.
- */
-org.apache.flex.html.staticControls.TitleBar.prototype.get_showCloseButton =
-    function() {
-  return this.model.get_showCloseButton();
-};
-
-
-/**
- * @expose
- * @param {string} value The title setter.
- */
-org.apache.flex.html.staticControls.TitleBar.prototype.set_showCloseButton =
-    function(value) {
-  this.model.set_showCloseButton(value);
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/accessories/NumericOnlyTextInputBead.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/accessories/NumericOnlyTextInputBead.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/accessories/NumericOnlyTextInputBead.js
deleted file mode 100644
index 13a5ae9..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/accessories/NumericOnlyTextInputBead.js
+++ /dev/null
@@ -1,91 +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('org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead');
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead =
-    function() {
-
-  /**
-   * @protected
-   * @type {Object}
-   */
-  this.promptElement = null;
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'NumericOnlyTextInputBead',
-                qName: 'org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead' }] };
-
-
-/**
- * @expose
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead.
-    prototype.set_strand = function(value) {
-  if (this.strand_ !== value) {
-    this.strand_ = value;
-    value.addEventListener('keypress', goog.bind(this.validateInput, this));
-  }
-};
-
-
-/**
- * @expose
- * @param {Object} event The input to validate?
- */
-org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead.
-    prototype.validateInput = function(event) {
-
-  var code = event.charCode;
-
-  // backspace or delete
-  if (event.keyCode == 8 || event.keyCode == 46) return;
-
-  // tab or return/enter
-  if (event.keyCode == 9 || event.keyCode == 13) return;
-
-  // left or right cursor arrow
-  if (event.keyCode == 37 || event.keyCode == 39) return;
-
-  var key = String.fromCharCode(code);
-
-  var regex = /[0-9]|\./;
-  if (!regex.test(key)) {
-    event.returnValue = false;
-    if (event.preventDefault) event.preventDefault();
-    return;
-  }
-  var cursorStart = event.target.selectionStart;
-  var cursorEnd = event.target.selectionEnd;
-  var left = event.target.value.substring(0, cursorStart);
-  var right = event.target.value.substr(cursorEnd);
-  var complete = left + key + right;
-  if (isNaN(complete)) {
-    event.returnValue = false;
-    if (event.preventDefault) event.preventDefault();
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/accessories/PasswordInputBead.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/accessories/PasswordInputBead.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/accessories/PasswordInputBead.js
deleted file mode 100644
index cd5baf7..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/accessories/PasswordInputBead.js
+++ /dev/null
@@ -1,53 +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('org.apache.flex.html.staticControls.accessories.PasswordInputBead');
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.html.staticControls.accessories.PasswordInputBead =
-    function() {
-
-  /**
-   * @protected
-   * @type {Object}
-   */
-  this.promptElement = null;
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.accessories.PasswordInputBead.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'PasswordInputBead',
-                qName: 'org.apache.flex.html.staticControls.accessories.PasswordInputBead' }] };
-
-
-/**
- * @expose
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.accessories.PasswordInputBead.
-    prototype.set_strand = function(value) {
-  if (this.strand_ !== value) {
-    this.strand_ = value;
-    value.element.type = 'password';
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/accessories/TextPromptBead.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/accessories/TextPromptBead.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/accessories/TextPromptBead.js
deleted file mode 100644
index 444f370..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/accessories/TextPromptBead.js
+++ /dev/null
@@ -1,72 +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('org.apache.flex.html.staticControls.accessories.TextPromptBead');
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.html.staticControls.accessories.TextPromptBead = function() {
-
-  /**
-   * @protected
-   * @type {Object}
-   */
-  this.promptElement = null;
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.accessories.TextPromptBead.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'TextPromptBead',
-                qName: 'org.apache.flex.html.staticControls.accessories.TextPromptBead' }] };
-
-
-/**
- * @expose
- * @return {string} value The new prompt.
- */
-org.apache.flex.html.staticControls.accessories.TextPromptBead.prototype.
-    get_prompt = function() {
-  return this.prompt;
-};
-
-
-/**
- * @expose
- * @param {string} value The new prompt.
- */
-org.apache.flex.html.staticControls.accessories.TextPromptBead.prototype.
-    set_prompt = function(value) {
-  this.prompt = value;
-};
-
-
-/**
- * @expose
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.accessories.TextPromptBead.prototype.
-    set_strand = function(value) {
-  if (this.strand_ !== value) {
-    this.strand_ = value;
-    value.element.placeholder = this.prompt;
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ButtonBarView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ButtonBarView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ButtonBarView.js
deleted file mode 100644
index 2801b9f..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ButtonBarView.js
+++ /dev/null
@@ -1,55 +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('org.apache.flex.html.staticControls.beads.ButtonBarView');
-
-goog.require('org.apache.flex.html.staticControls.beads.ListView');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.html.staticControls.beads.ListView}
- */
-org.apache.flex.html.staticControls.beads.ButtonBarView = function() {
-  this.lastSelectedIndex = -1;
-  goog.base(this);
-
-  this.className = 'ButtonBarView';
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.beads.ButtonBarView,
-    org.apache.flex.html.staticControls.beads.ListView);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.ButtonBarView.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ButtonBarView',
-                qName: 'org.apache.flex.html.staticControls.beads.ButtonBarView' }] };
-
-
-/**
- * @expose
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.beads.ButtonBarView.prototype.set_strand =
-    function(value) {
-
-  goog.base(this, 'set_strand', value);
-  this.strand_ = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.js
deleted file mode 100644
index f461ef7..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.js
+++ /dev/null
@@ -1,137 +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('org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData');
-
-goog.require('org.apache.flex.core.IDataProviderItemRendererMapper');
-goog.require('org.apache.flex.events.EventDispatcher');
-goog.require('org.apache.flex.html.staticControls.beads.ListView');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
-goog.require('org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.IDataProviderItemRendererMapper}
- */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData =
-    function() {
-};
-
-
-/**
- * @expose
- */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.prototype.itemRendererFactory = null;
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
-    prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'DataItemRendererFactoryForArrayData',
-                qName: 'org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData' }],
-      interfaces: [org.apache.flex.core.IDataProviderItemRendererMapper] };
-
-
-/**
- * @private
- * @type {Object}
- */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
-    prototype.itemRendererClass_ = null;
-
-
-/**
- * @expose
- * @param {Object} value The component strand.
- */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
-    prototype.set_strand = function(value) {
-  this.strand_ = value;
-
-  this.model = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
-
-  this.listView = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.ListView);
-  this.dataGroup = this.listView.get_dataGroup();
-
-  this.model.addEventListener('dataProviderChanged',
-      goog.bind(this.dataProviderChangedHandler, this));
-
-  if (org.apache.flex.core.ValuesManager.valuesImpl.getValue && !this.itemRendererFactory_) {
-    /**
-     * @type {Function}
-     */
-    var c = /** @type {Function} */ (org.apache.flex.core.ValuesManager.valuesImpl.getValue(this.strand_,
-            'iItemRendererClassFactory'));
-    this.itemRendererFactory_ = new c();
-    this.strand_.addBead(this.itemRendererFactory_);
-  }
-
-  this.dataProviderChangedHandler(null);
-};
-
-
-/**
- * @expose
- * @return {Object} The itemRenderer.
- */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
-    prototype.get_itemRendererClass = function() {
-  if (org.apache.flex.core.ValuesManager.valuesImpl.getValue && !this.itemRendererClass_) {
-    var c = org.apache.flex.core.ValuesManager.valuesImpl.getValue(this.strand_, 'iItemRenderer');
-    if (c) {
-      this.itemRendererClass_ = c;
-    }
-  }
-  return this.itemRendererClass_;
-};
-
-
-/**
- * @expose
- * @param {Object} value class to use for the item renderer.
- */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
-    prototype.set_itemRendererClass = function(value) {
-  this.itemRendererClass_ = value;
-};
-
-
-/**
- * @expose
- * @param {Object} event The event that triggered the dataProvider change.
- */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
-    prototype.dataProviderChangedHandler = function(event) {
-  var dp, i, n, opt;
-
-  dp = this.model.get_dataProvider();
-  n = dp.length;
-  for (i = 0; i < n; i++) {
-    var ir = this.itemRendererFactory_.createItemRenderer(this.dataGroup);
-    ir.set_index(i);
-    ir.set_labelField(this.model.get_labelField());
-    ir.set_data(dp[i]);
-  }
-
-  var newEvent = new org.apache.flex.events.Event('itemsCreated');
-  this.strand_.dispatchEvent(newEvent);
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/IListView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/IListView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/IListView.js
deleted file mode 100644
index 9f4cb33..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/IListView.js
+++ /dev/null
@@ -1,43 +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.
- */
-
-/**
- * @fileoverview
- * @suppress {checkTypes}
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.IListView');
-
-goog.require('org.apache.flex.core.IBeadView');
-
-
-
-/**
- * IListView
- *
- * @interface
- */
-org.apache.flex.html.staticControls.beads.IListView = function() {
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.IListView.prototype.FLEXJS_CLASS_INFO =
-{ names: [{ name: 'IListView',
-            qName: 'org.apache.flex.html.staticControls.beads.IListView'}],
-  interfaces: [org.apache.flex.core.IBeadView] };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ImageView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ImageView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ImageView.js
deleted file mode 100644
index d63cf23..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ImageView.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('org.apache.flex.html.staticControls.beads.ImageView');
-
-
-goog.require('org.apache.flex.html.staticControls.beads.models.ImageModel');
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.html.staticControls.beads.ImageView = function() {
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.ImageView
-  .prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ImageView',
-                qName: 'org.apache.flex.html.staticControls.beads.ImageView'}] };
-
-
-/**
- * @expose
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.beads.ImageView.prototype.set_strand =
-    function(value) {
-
-  this.strand_ = value;
-
-  this.model = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.models.ImageModel);
-  this.model.addEventListener('sourceChanged',
-      goog.bind(this.sourceChangeHandler, this));
-};
-
-
-/**
- * @expose
- * @param {Object} event The event triggered by the source change.
- */
-org.apache.flex.html.staticControls.beads.ImageView.prototype.
-    sourceChangeHandler = function(event) {
-  this.strand_.element.src = this.model.get_source();
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ListView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ListView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ListView.js
deleted file mode 100644
index 862b94c..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/ListView.js
+++ /dev/null
@@ -1,168 +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('org.apache.flex.html.staticControls.beads.ListView');
-
-goog.require('org.apache.flex.core.IBeadLayout');
-goog.require('org.apache.flex.core.IBeadView');
-goog.require('org.apache.flex.core.IItemRendererParent');
-goog.require('org.apache.flex.core.ILayoutParent');
-goog.require('org.apache.flex.core.ValuesManager');
-goog.require('org.apache.flex.html.staticControls.beads.IListView');
-goog.require('org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
-goog.require('org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.ILayoutParent}
- * @implements {org.apache.flex.html.staticControls.beads.IListView}
- */
-org.apache.flex.html.staticControls.beads.ListView = function() {
-  this.lastSelectedIndex = -1;
-
-  this.className = 'ListView';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.ListView.prototype.
-    FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ListView',
-                qName: 'org.apache.flex.html.staticControls.beads.ListView' }],
-      interfaces: [org.apache.flex.html.staticControls.beads.IListView, org.apache.flex.core.ILayoutParent] };
-
-
-/**
- * @expose
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.beads.ListView.prototype.set_strand =
-    function(value) {
-
-  this.strand_ = value;
-
-  this.strand_.addEventListener('widthChanged',
-      goog.bind(this.handleSizeChange, this));
-  this.strand_.addEventListener('heightChanged',
-      goog.bind(this.handleSizeChange, this));
-
-  /*if (this.strand_.getBeadByType(org.apache.flex.core.IBeadLayout) == null) {
-    var m = org.apache.flex.core.ValuesManager.valuesImpl.
-        getValue(this.strand_,'iBeadLayout');
-    var c = new m();
-    this.strand_.addBead(c);
-  }*/
-
-  this.model = this.strand_.get_model();
-  this.model.addEventListener('selectedIndexChanged',
-      goog.bind(this.selectionChangeHandler, this));
-
-  this.dataGroup_ = new
-      org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup();
-  this.dataGroup_.set_strand(this);
-  this.strand_.addElement(this.dataGroup_);
-
-  this.handleSizeChange(null);
-};
-
-
-/**
- * @expose
- * @return {Object} The DataGroup instance.
- */
-org.apache.flex.html.staticControls.beads.ListView.prototype.get_dataGroup =
-    function() {
-  return this.dataGroup_;
-};
-
-
-/**
- * @expose
- * @param {Object} value The event that triggered the selection.
- */
-org.apache.flex.html.staticControls.beads.ListView.prototype.
-    selectionChangeHandler = function(value) {
-  var ir;
-  if (this.lastSelectedIndex != -1) {
-    ir = this.dataGroup_.getItemRendererForIndex(this.lastSelectedIndex);
-    if (ir) ir.set_selected(false);
-  }
-  if (this.model.get_selectedIndex() != -1) {
-    ir = this.dataGroup_.getItemRendererForIndex(
-        this.model.get_selectedIndex());
-    if (ir) ir.set_selected(true);
-  }
-  this.lastSelectedIndex = this.model.get_selectedIndex();
-};
-
-
-/**
- * @expose
- * @return {Object} The view that contains the layout objects.
- */
-org.apache.flex.html.staticControls.beads.ListView.prototype.get_contentView = function() {
-  return this;
-};
-
-
-/**
- * @expose
- * @return {Object} The border for the layout area.
- */
-org.apache.flex.html.staticControls.beads.ListView.prototype.get_border = function() {
-  return null;
-};
-
-
-/**
- * @expose
- * @return {Object} The vertical scrollbar.
- */
-org.apache.flex.html.staticControls.beads.ListView.prototype.get_vScrollBar = function() {
-  return null;
-};
-
-
-/**
- * @expose
- * @param {Object} value The vertical scrollbar.
- */
-org.apache.flex.html.staticControls.beads.ListView.prototype.set_vScrollBar = function(value) {
-};
-
-
-/**
- * @expose
- * @return {Object} The view that can be resized.
- */
-org.apache.flex.html.staticControls.beads.ListView.prototype.get_resizeableView = function() {
-  return this;
-};
-
-
-/**
- * @expose
- * @param {Object} event The event that triggered the resize.
- */
-org.apache.flex.html.staticControls.beads.ListView.prototype.handleSizeChange = function(event) {
-  this.dataGroup_.set_width(this.strand_.get_width());
-  this.dataGroup_.set_height(this.strand_.get_height());
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/PanelView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/PanelView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/PanelView.js
deleted file mode 100644
index e19e6a0..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/PanelView.js
+++ /dev/null
@@ -1,72 +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('org.apache.flex.html.staticControls.beads.PanelView');
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.html.staticControls.beads.PanelView = function() {
-
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.PanelView
-  .prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'PanelView',
-                qName: 'org.apache.flex.html.staticControls.beads.PanelView'}] };
-
-
-/**
- * @expose
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.beads.PanelView.prototype.set_strand =
-    function(value) {
-
-  this.strand_ = value;
-
-  this.strand_.titleBar = new org.apache.flex.html.staticControls.TitleBar();
-  this.strand_.titleBar.addedToParent();
-  this.strand_.titleBar.element.id = 'titleBar';
-  this.strand_.addElement(this.strand_.titleBar);
-
-  this.strand_.controlBar =
-      new org.apache.flex.html.staticControls.ControlBar();
-  this.strand_.addElement(this.strand_.controlBar);
-
-  // listen for changes to the strand's model so items can be changed
-  // in the view
-  this.strand_.model.addEventListener('titleChange',
-      goog.bind(this.changeHandler, this));
-
-};
-
-
-/**
- * @param {Object} event The event that triggered this handler.
- */
-org.apache.flex.html.staticControls.beads.PanelView.prototype.changeHandler =
-    function(event) {
-  if (event.type == 'titleChange') {
-    this.strand_.titleBar.set_title(this.strand_.model.get_title());
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/SliderThumbView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/SliderThumbView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/SliderThumbView.js
deleted file mode 100644
index 9afc551..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/SliderThumbView.js
+++ /dev/null
@@ -1,61 +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('org.apache.flex.html.staticControls.beads.SliderThumbView');
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.html.staticControls.beads.SliderThumbView = function() {
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.SliderThumbView
-  .prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'SliderThumbView',
-                qName: 'org.apache.flex.html.staticControls.beads.SliderThumbView'}] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.SliderThumbView.prototype.
-    set_strand = function(value) {
-  this.strand_ = value;
-
-  this.element = document.createElement('div');
-  this.element.className = 'SliderThumb';
-  this.element.id = 'thumb';
-  this.element.style.backgroundColor = '#949494';
-  this.element.style.border = 'thin solid #747474';
-  this.element.style.position = 'relative';
-  this.element.style.height = '30px';
-  this.element.style.width = '10px';
-  this.element.style.zIndex = '2';
-  this.element.style.top = '-10px';
-  this.element.style.left = '20px';
-
-  this.strand_.element.appendChild(this.element);
-
-  this.positioner = this.element;
-  this.element.flexjs_wrapper = this;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/SliderTrackView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/SliderTrackView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/SliderTrackView.js
deleted file mode 100644
index f1a4152..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/SliderTrackView.js
+++ /dev/null
@@ -1,61 +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('org.apache.flex.html.staticControls.beads.SliderTrackView');
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.html.staticControls.beads.SliderTrackView = function() {
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.SliderTrackView
-  .prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'SliderTrackView',
-                qName: 'org.apache.flex.html.staticControls.beads.SliderTrackView'}] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.SliderTrackView.prototype.
-    set_strand = function(value) {
-  this.strand_ = value;
-
-  this.element = document.createElement('div');
-  this.element.className = 'SliderTrack';
-  this.element.id = 'track';
-  this.element.style.backgroundColor = '#E4E4E4';
-  this.element.style.height = '10px';
-  this.element.style.width = '200px';
-  this.element.style.border = 'thin solid #C4C4C4';
-  this.element.style.position = 'relative';
-  this.element.style.left = '0px';
-  this.element.style.top = '10px';
-  this.element.style.zIndex = '1';
-
-  this.strand_.element.appendChild(this.element);
-
-  this.positioner = this.element;
-  this.element.flexjs_wrapper = this;
-};


[35/35] git commit: [flex-asjs] [refs/heads/develop] - how did this not break sooner?

Posted by ah...@apache.org.
how did this not break sooner?


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

Branch: refs/heads/develop
Commit: 5e7bde8f053721e02c288bfa59804851c9d21080
Parents: f43a7b6
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 25 14:02:34 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 25 14:02:34 2014 -0700

----------------------------------------------------------------------
 examples/FlexJSTest_HTML5/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5e7bde8f/examples/FlexJSTest_HTML5/build.xml
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_HTML5/build.xml b/examples/FlexJSTest_HTML5/build.xml
index becc1ff..0c3b57e 100644
--- a/examples/FlexJSTest_HTML5/build.xml
+++ b/examples/FlexJSTest_HTML5/build.xml
@@ -21,7 +21,7 @@
 
 <project name="flexjstest_HTML5" default="main" basedir=".">
     <property name="FLEXJS_HOME" location="../.."/>
-    <property name="example" value="FlexJSTest_again" />
+    <property name="example" value="FlexJSTest_HTML5" />
     
     <property file="${FLEXJS_HOME}/env.properties"/>
     <property environment="env"/>


[20/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateFieldMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateFieldMouseController.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateFieldMouseController.as
new file mode 100644
index 0000000..e603b04
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateFieldMouseController.as
@@ -0,0 +1,97 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.controllers
+{	
+	import org.apache.flex.core.IBeadController;
+	import org.apache.flex.core.IDateChooserModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.html.staticControls.beads.DateFieldView;
+	
+	/**
+	 * The DateFieldMouseController class is responsible for monitoring
+	 * the mouse events on the elements of the DateField. A click on the
+	 * DateField's menu button triggers the pop-up, for example.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DateFieldMouseController implements IBeadController
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DateFieldMouseController()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			var viewBead:DateFieldView = _strand.getBeadByType(DateFieldView) as DateFieldView;			
+			IEventDispatcher(viewBead.menuButton).addEventListener("click", clickHandler);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function clickHandler(event:Event):void
+		{
+			var viewBead:DateFieldView = _strand.getBeadByType(DateFieldView) as DateFieldView;
+			viewBead.popUpVisible = true;
+			UIBase(viewBead.popUp).x = UIBase(_strand).x + UIBase(_strand).width - 20;
+			UIBase(viewBead.popUp).y = UIBase(_strand).y + UIBase(_strand).height;			
+			IEventDispatcher(viewBead.popUp).addEventListener("change", changeHandler);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function changeHandler(event:Event):void
+		{
+			var viewBead:DateFieldView = _strand.getBeadByType(DateFieldView) as DateFieldView;
+			
+			var model:IDateChooserModel = _strand.getBeadByType(IDateChooserModel) as IDateChooserModel;
+			model.selectedDate = IDateChooserModel(viewBead.popUp.getBeadByType(IDateChooserModel)).selectedDate;
+
+			viewBead.popUpVisible = false;
+			IEventDispatcher(_strand).dispatchEvent(new Event("change"));
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridModel.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridModel.as
new file mode 100644
index 0000000..7af27d6
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridModel.as
@@ -0,0 +1,72 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{
+	import org.apache.flex.core.IDataGridModel;
+	import org.apache.flex.events.Event;
+	
+	/**
+	 *  The DataGridModel class bead extends org.apache.flex.html.staticControls.beads.modelsArraySelectionModel 
+	 *  and adds the array of org.apache.flex.html.staticControls.supportClasses.DataGridColumns used to define 
+	 *  each of the column in the DataGrid.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DataGridModel extends ArraySelectionModel implements IDataGridModel
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DataGridModel()
+		{
+			super();
+		}
+		
+		private var _columns:Array;
+		
+		/**
+		 *  The array of org.apache.flex.html.staticControls.supportClasses.DataGridColumns used to 
+		 *  define each column of the org.apache.flex.html.staticControls.DataGrid.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get columns():Array
+		{
+			return _columns;
+		}
+		public function set columns(value:Array):void
+		{
+			if (_columns != value) {
+				_columns = value;
+				dispatchEvent( new Event("columnsChanged"));
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridPresentationModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridPresentationModel.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridPresentationModel.as
new file mode 100644
index 0000000..a630caf
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridPresentationModel.as
@@ -0,0 +1,109 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{
+	import org.apache.flex.core.IDataGridPresentationModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.EventDispatcher;
+	
+	/**
+	 *  The DataGridPresentationModel class contains the data to label the columns
+	 *  of the org.apache.flex.html.staticControls.DataGrid along with the height of the rows. 
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DataGridPresentationModel extends EventDispatcher implements IDataGridPresentationModel
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DataGridPresentationModel()
+		{
+			super();
+		}
+		
+		private var _columnLabels:Array;
+		
+		/**
+		 *  The labels for each column.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get columnLabels():Array
+		{
+			return _columnLabels;
+		}
+		public function set columnLabels(value:Array):void
+		{
+			if (value != _columnLabels) {
+				_columnLabels = value;
+				dispatchEvent(new Event("columnsChanged"));
+			}
+		}
+		
+		private var _rowHeight:Number = 30;
+		
+		/**
+		 *  The height of the rows (default is 30 pixels).
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get rowHeight():Number
+		{
+			return _rowHeight;
+		}
+		public function set rowHeight(value:Number):void
+		{
+			if (value != _rowHeight) {
+				_rowHeight = value;
+				dispatchEvent(new Event("rowHeightChanged"));
+			}
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DateChooserModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DateChooserModel.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DateChooserModel.as
new file mode 100644
index 0000000..245e3cb
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DateChooserModel.as
@@ -0,0 +1,189 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{	
+	import org.apache.flex.core.IDateChooserModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.EventDispatcher;
+	
+	/**
+	 *  The DateChooserModel is a bead class that manages the data for a DataChooser. 
+	 *  This includes arrays of names for the months and days of the week as well the
+	 *  currently selected date.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DateChooserModel extends EventDispatcher implements IDateChooserModel
+	{
+		public function DateChooserModel()
+		{
+			// default displayed year and month to "today"
+			var today:Date = new Date();
+			displayedYear = today.getFullYear();
+			displayedMonth = today.getMonth();
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+		
+		private var _dayNames:Array   = ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"];
+		private var _monthNames:Array = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
+		private var _displayedYear:Number;
+		private var _displayedMonth:Number;
+		private var _firstDayOfWeek:Number = 0;
+		private var _selectedDate:Date;
+		
+		/**
+		 *  An array of strings used to name the days of the week with Sunday being the
+		 *  first element of the array.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get dayNames():Array
+		{
+			return _dayNames;
+		}
+		public function set dayNames(value:Array):void
+		{
+			_dayNames = value;
+			dispatchEvent( new Event("dayNamesChanged") );
+		}
+		
+		/**
+		 *  An array of strings used to name the months of the year with January being
+		 *  the first element of the array.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get monthNames():Array
+		{
+			return _monthNames;
+		}
+		public function set monthNames(value:Array):void
+		{
+			_monthNames = value;
+			dispatchEvent( new Event("monthNames") );
+		}
+		
+		/**
+		 *  The year currently displayed by the DateChooser.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get displayedYear():Number
+		{
+			return _displayedYear;
+		}
+		public function set displayedYear(value:Number):void
+		{
+			if (value != _displayedYear) {
+				_displayedYear = value;
+				dispatchEvent( new Event("displayedYearChanged") );
+			}
+		}
+		
+		/**
+		 *  The month currently displayed by the DateChooser.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get displayedMonth():Number
+		{
+			return _displayedMonth;
+		}
+		public function set displayedMonth(value:Number):void
+		{
+			if (_displayedMonth != value) {
+				_displayedMonth = value;
+				dispatchEvent( new Event("displayedMonthChanged") );
+			}
+		}
+		
+		/**
+		 *  The index of the first day of the week, Sunday = 0.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get firstDayOfWeek():Number
+		{
+			return _firstDayOfWeek;
+		}
+		public function set firstDayOfWeek(value:Number):void
+		{
+			if (value != _firstDayOfWeek) {
+				_firstDayOfWeek = value;
+				dispatchEvent( new Event("firstDayOfWeekChanged") );
+			}
+		}
+		
+		/**
+		 *  The currently selected date or null if no date has been selected.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get selectedDate():Date
+		{
+			return _selectedDate;
+		}
+		public function set selectedDate(value:Date):void
+		{
+			if (value != _selectedDate) {
+				_selectedDate = value;
+				dispatchEvent( new Event("selectedDateChanged") );
+				
+				displayedMonth = value.getMonth();
+				displayedYear  = value.getFullYear();
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/DataGrid.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/DataGrid.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/DataGrid.as
deleted file mode 100644
index 0bc5281..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/DataGrid.as
+++ /dev/null
@@ -1,102 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import org.apache.flex.core.IDataGridModel;
-	import org.apache.flex.core.UIBase;
-	
-	[Event(name="change", type="org.apache.flex.events.Event")]
-	
-	/**
-	 *  The DataGrid class displays a collection of data using columns and rows. Each
-	 *  column represents a specific field in the data set; each row represents a specific
-	 *  datum. The DataGrid is a composite component built with a org.apache.flex.html.staticControls.ButtonBar 
-	 *  for the column headers and a org.apache.flex.html.staticControls.List for each column. The DataGrid's 
-	 *  view bead (usually org.apache.flex.html.staticControls.beads.DataGridView) constructs these parts while 
-	 *  itemRenderer factories contruct the elements to display the data in each cell.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DataGrid extends UIBase
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DataGrid()
-		{
-			super();
-		}
-		
-		/**
-		 *  The array of org.apache.flex.html.staticControls.supportClasses.DataGridColumns used to 
-		 *  describe each column.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get columns():Array
-		{
-			return IDataGridModel(model).columns;
-		}
-		public function set columns(value:Array):void
-		{
-			IDataGridModel(model).columns = value;
-		}
-		
-		/**
-		 *  The object used to provide data to the org.apache.flex.html.staticControls.DataGrid.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get dataProvider():Object
-		{
-			return IDataGridModel(model).dataProvider;
-		}
-		public function set dataProvider(value:Object):void
-		{
-			IDataGridModel(model).dataProvider = value;
-		}
-		
-		/**
-		 *  The currently selected row.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get selectedIndex():int
-		{
-			return IDataGridModel(model).selectedIndex;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/DateChooser.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/DateChooser.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/DateChooser.as
deleted file mode 100644
index 6f36af7..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/DateChooser.as
+++ /dev/null
@@ -1,74 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import org.apache.flex.core.IDateChooserModel;
-	import org.apache.flex.core.UIBase;
-	
-	/**
-	 * The change event is dispatched when the selectedDate is changed.
-	 */
-	[Event(name="change", type="org.apache.flex.events.Event")]
-	
-	/**
-	 *  The DateChooser class is a component that displays a calendar.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DateChooser extends UIBase
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DateChooser()
-		{
-			super();
-			className = "DateChooser";
-			
-			// fix the DateChooser's size
-//			width = 280;
-//			height = 240;
-		}
-		
-		/**
-		 *  The currently selected date (or null if no date has been selected).
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get selectedDate():Date
-		{
-			return IDateChooserModel(model).selectedDate;
-		}
-		public function set selectedDate(value:Date):void
-		{
-			IDateChooserModel(model).selectedDate = value;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/DateField.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/DateField.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/DateField.as
deleted file mode 100644
index f5c77f4..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/DateField.as
+++ /dev/null
@@ -1,90 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IDateChooserModel;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.ValuesManager;
-	
-	/**
-	 * The DateField class provides an input field where a date can be entered
-	 * and a pop-up calendar control for picking a date as an alternative to
-	 * the text field.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DateField extends UIBase
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DateField()
-		{
-			super();
-			
-			className = "DateField";
-		}
-		
-		/**
-		 * The method called when added to a parent. The DateField class uses
-		 * this opportunity to install additional beads.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		override public function addedToParent():void
-		{
-			super.addedToParent();
-			
-			var klass:* = ValuesManager.valuesImpl.getValue(this,"iFormatBead");
-			var bead:IBead = new klass() as IBead;
-			if (bead) {
-				addBead(bead);
-			}
-		}
-		
-		/**
-		 *  The currently selected date (or null if no date has been selected).
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get selectedDate():Date
-		{
-			return IDateChooserModel(model).selectedDate;
-		}
-		public function set selectedDate(value:Date):void
-		{
-			IDateChooserModel(model).selectedDate = value;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/accessories/DateFormatMMDDYYYYBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/accessories/DateFormatMMDDYYYYBead.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/accessories/DateFormatMMDDYYYYBead.as
deleted file mode 100644
index 3b52c40..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/accessories/DateFormatMMDDYYYYBead.as
+++ /dev/null
@@ -1,151 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.accessories
-{
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IDateChooserModel;
-	import org.apache.flex.core.IFormatBead;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.EventDispatcher;
-	import org.apache.flex.html.staticControls.TextInput;
-	import org.apache.flex.html.staticControls.beads.DateFieldView;
-	
-	/**
-	 * The DateFormatBead class formats the display of a DateField using MM/DD/YYYY format.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DateFormatMMDDYYYYBead extends EventDispatcher implements IBead, IFormatBead
-	{
-		/**
-		 * constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DateFormatMMDDYYYYBead()
-		{
-		}
-		
-		private var _propertyName:String;
-		private var _eventName:String;
-		private var _formattedResult:String;
-		
-		/**
-		 *  The name of the property on the model holding the value to be formatted.
-		 *  The default is selectedDate.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get propertyName():String
-		{
-			if (_propertyName == null) {
-				return "selectedDate";
-			}
-			return _propertyName;
-		}
-		public function set propertyName(value:String):void
-		{
-			_propertyName = value;
-		}
-		
-		/**
-		 *  The name of the event dispatched when the property changes. The
-		 *  default is selectedDateChanged.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get eventName():String
-		{
-			if (_eventName == null) {
-				return _propertyName+"Changed";
-			}
-			return _eventName;
-		}
-		public function set eventName(value:String):void
-		{
-			_eventName = value;
-		}
-		
-		/**
-		 *  The formatted result.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get formattedString():String
-		{
-			return _formattedResult;
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			var model:IDateChooserModel = _strand.getBeadByType(IDateChooserModel) as IDateChooserModel;
-			model.addEventListener("selectedDateChanged",handleTextChange);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleTextChange(event:Event):void
-		{
-			var model:IDateChooserModel = _strand.getBeadByType(IDateChooserModel) as IDateChooserModel;
-			/*var view:DateFieldView = _strand.getBeadByType(DateFieldView) as DateFieldView;
-			var input:TextInput = view.textInput;*/
-			
-			var d:Date = model.selectedDate;
-			var month:String = String(d.getMonth()+1);
-			if (Number(month)<10) month = "0"+month;
-			var date:String = String(d.getDate());
-			if (Number(date)<10) date = "0"+date;
-			var fmt:String = month+"/"+date+"/"+String(d.getFullYear());
-			/*input.text = fmt;*/
-			_formattedResult = month+"/"+date+"/"+String(d.getFullYear());
-			
-			dispatchEvent( new Event("formatChanged") );
-		}
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridColumnView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridColumnView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridColumnView.as
deleted file mode 100644
index 91f81ef..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridColumnView.as
+++ /dev/null
@@ -1,104 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.html.staticControls.supportClasses.DataGridColumn;
-	
-	/**
-	 *  The DataGridColumnView class extends org.apache.flex.html.staticControls.beads.ListView and 
-	 *  provides properties to the org.apache.flex.html.staticControls.List that makes a column in 
-	 *  the org.apache.flex.html.staticControls.DataGrid.  
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DataGridColumnView extends ListView
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DataGridColumnView()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		override public function set strand(value:IStrand):void
-		{
-			super.strand = value;
-			_strand = value;
-		}
-		
-		private var _columnIndex:uint;
-		
-		/**
-		 *  The zero-based index for the column.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get columnIndex():uint
-		{
-			return _columnIndex;
-		}
-		public function set columnIndex(value:uint):void
-		{
-			_columnIndex = value;
-		}
-		
-		private var _column:DataGridColumn;
-		
-		/**
-		 *  The org.apache.flex.html.staticControls.support.DataGridColumn containing information used to 
-		 *  present the org.apache.flex.html.staticControls.List as a column in the 
-		 *  org.apache.flex.html.staticControls.DataGrid.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get column():DataGridColumn
-		{
-			return _column;
-		}
-		public function set column(value:DataGridColumn):void
-		{
-			_column = value;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridView.as
deleted file mode 100644
index b1c8205..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridView.as
+++ /dev/null
@@ -1,213 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{	
-	import org.apache.flex.core.IBeadModel;
-	import org.apache.flex.core.IDataGridModel;
-	import org.apache.flex.core.ISelectionModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.ButtonBar;
-	import org.apache.flex.html.staticControls.Container;
-	import org.apache.flex.html.staticControls.List;
-	import org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout;
-	import org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout;
-	import org.apache.flex.html.staticControls.beads.models.ArraySelectionModel;
-	import org.apache.flex.html.staticControls.supportClasses.DataGridColumn;
-	
-	/**
-	 *  The DataGridView class is the visual bead for the org.apache.flex.html.staticControls.DataGrid. 
-	 *  This class constructs the items that make the DataGrid: Lists for each column and a 
-	 *  org.apache.flex.html.staticControls.ButtonBar for the column headers.  
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DataGridView implements IDataGridView
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DataGridView()
-		{
-		}
-		
-		//private var background:Shape;
-		private var buttonBar:ButtonBar;
-		private var buttonBarModel:ArraySelectionModel;
-		private var columnContainer:Container;
-		private var columns:Array;
-		
-		/**
-		 *  The array of org.apache.flex.html.staticControls.supportClasses.DataGridColumn instances.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function getColumnLists():Array
-		{
-			return columns;
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel;
-			
-			// create an array of columnLabels for use by the ButtonBar/DataGrid header.
-			var columnLabels:Array = new Array();
-			var buttonWidths:Array = new Array();
-			for(var i:int=0; i < sharedModel.columns.length; i++) {
-				var dgc:DataGridColumn = sharedModel.columns[i] as DataGridColumn;
-				columnLabels.push(dgc.label);
-				buttonWidths.push(dgc.columnWidth);
-			}
-			var bblayout:ButtonBarLayout = new ButtonBarLayout();
-			bblayout.buttonWidths = buttonWidths;
-			
-			buttonBarModel = new ArraySelectionModel();
-			buttonBarModel.dataProvider = columnLabels;
-			
-			buttonBar = new ButtonBar();
-			buttonBar.addBead(buttonBarModel);
-			buttonBar.addBead(bblayout);
-			UIBase(_strand).addElement(buttonBar);
-			
-			columnContainer = new Container();
-			var layout:NonVirtualHorizontalLayout = new NonVirtualHorizontalLayout();
-			columnContainer.addBead(layout);
-			UIBase(_strand).addElement(columnContainer);
-			
-			columns = new Array();
-			for(i=0; i < sharedModel.columns.length; i++) {
-				var listModel:ISelectionModel = new ArraySelectionModel();
-				listModel.dataProvider = sharedModel.dataProvider;
-				
-				var dataGridColumn:DataGridColumn = sharedModel.columns[i] as DataGridColumn;
-				
-				var list:List = new List();
-				list.addBead(listModel);
-				list.itemRenderer = dataGridColumn.itemRenderer;
-				list.labelField = dataGridColumn.dataField;
-				
-				var colWidth:Number = dataGridColumn.columnWidth;
-				if (!isNaN(colWidth)) list.width = colWidth;
-
-				columnContainer.addElement(list);
-				columns.push(list);
-				list.addEventListener('change',columnListChangeHandler);
-				list.addEventListener('rollover',columnListRollOverHandler);
-			}
-			
-			IEventDispatcher(_strand).addEventListener("widthChanged",handleSizeChange);
-			IEventDispatcher(_strand).addEventListener("heightChanged",handleSizeChange);
-			
-			handleSizeChange(null); // initial sizing
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleSizeChange(event:Event):void
-		{
-			var sw:Number = UIBase(_strand).width;
-			var sh:Number = UIBase(_strand).height;
-			
-			var backgroundColor:Number = 0xDDDDDD;
-			var value:Object = ValuesManager.valuesImpl.getValue(_strand, "background-color");
-			if (value != null) backgroundColor = Number(value);
-			
-			buttonBar.x = 0;
-			buttonBar.y = 0;
-			buttonBar.width = sw + (2*columns.length-1);
-			buttonBar.height = 25;
-			
-			columnContainer.x = 0;
-			columnContainer.y = 30;
-			columnContainer.width = sw + columns.length*2;
-			columnContainer.height = sh - 25;
-			
-			for(var i:int=0; i < columns.length; i++) {
-				var column:List = columns[i];
-				column.height = columnContainer.height; // this will actually be Nitem*rowHeight eventually
-			}
-			
-			IEventDispatcher(_strand).dispatchEvent(new Event("layoutComplete"));
-		}
-		
-		/**
-		 * @private
-		 */
-		private function columnListChangeHandler(event:Event):void
-		{
-			var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel;
-			var list:List = event.target as List;
-			sharedModel.selectedIndex = list.selectedIndex;
-			
-			for(var i:int=0; i < columns.length; i++) {
-				if (list != columns[i]) {
-					var otherList:List = columns[i] as List;
-					otherList.selectedIndex = list.selectedIndex;
-				}
-			}
-			
-			IEventDispatcher(_strand).dispatchEvent(new Event('change'));
-		}
-		
-		/**
-		 * @private
-		 */
-		private function columnListRollOverHandler(event:Event):void
-		{
-			var list:List = event.target as List;
-			if (list == null) return;
-			for(var i:int=0; i < columns.length; i++) {
-				if (list != columns[i]) {
-					var otherList:List = columns[i] as List;
-					otherList.rollOverIndex = list.rollOverIndex;
-				}
-			}
-			
-			IEventDispatcher(_strand).dispatchEvent(new Event('rollOver'));
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.as
deleted file mode 100644
index c33e153..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.as
+++ /dev/null
@@ -1,142 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IDataGridModel;
-	import org.apache.flex.core.IDataProviderItemRendererMapper;
-	import org.apache.flex.core.IItemRendererClassFactory;
-	import org.apache.flex.core.IItemRendererParent;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.supportClasses.DataItemRenderer;
-	
-	/**
-	 *  The DataItemRendererFactoryForColumnData class implents the 
-	 *  org.apache.flex.core.IDataProviderItemRendererMapper interface and creates the itemRenderers 
-	 *  for each cell in the org.apache.flex.html.staticControls.DataGrid.  
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DataItemRendererFactoryForColumnData implements IBead, IDataProviderItemRendererMapper
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DataItemRendererFactoryForColumnData()
-		{
-		}
-		
-		private var selectionModel:IDataGridModel;
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			selectionModel = value.getBeadByType(IDataGridModel) as IDataGridModel;
-			var listView:IListView = value.getBeadByType(IListView) as IListView;
-			dataGroup = listView.dataGroup;
-			selectionModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
-			
-			if (!itemRendererFactory)
-			{
-				_itemRendererFactory = new (ValuesManager.valuesImpl.getValue(_strand, "iItemRendererClassFactory")) as IItemRendererClassFactory;
-				_strand.addBead(_itemRendererFactory);
-			}
-			
-			dataProviderChangeHandler(null);
-		}
-		
-		private var _itemRendererFactory:IItemRendererClassFactory;
-		
-		/**
-		 *  The factory used to create the itemRenderers.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get itemRendererFactory():IItemRendererClassFactory
-		{
-			return _itemRendererFactory
-		}
-		public function set itemRendererFactory(value:IItemRendererClassFactory):void
-		{
-			_itemRendererFactory = value;
-		}
-		
-		/**
-		 *  The dataGroup that is the pareent for the itemRenderers
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		protected var dataGroup:IItemRendererParent;
-		
-		/**
-		 * @private
-		 */
-		private function dataProviderChangeHandler(event:Event):void
-		{
-			var dp:Array = selectionModel.dataProvider as Array;
-			if (!dp)
-				return;
-			
-			dataGroup.removeAllElements();
-			
-			var view:DataGridColumnView = _strand.getBeadByType(IBeadView) as DataGridColumnView;
-			if (view == null) return;
-						
-			var n:int = dp.length; 
-			for (var i:int = 0; i < n; i++)
-			{
-				var tf:DataItemRenderer = itemRendererFactory.createItemRenderer(dataGroup) as DataItemRenderer;
-				tf.index = i;
-				tf.labelField = view.column.dataField;
-				dataGroup.addElement(tf);
-				tf.data = dp[i];
-			}
-			
-			IEventDispatcher(_strand).dispatchEvent(new Event("itemsCreated"));
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DateChooserView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DateChooserView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DateChooserView.as
deleted file mode 100644
index 12cc8f5..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DateChooserView.as
+++ /dev/null
@@ -1,257 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{	
-	import org.apache.flex.html.staticControls.beads.models.DateChooserModel;
-	import org.apache.flex.html.staticControls.supportClasses.DateChooserButton;
-	
-	import org.apache.flex.core.IBeadModel;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.beads.layouts.TileLayout;
-	import org.apache.flex.html.staticControls.Container;
-	import org.apache.flex.html.staticControls.TextButton;
-	
-	/**
-	 * The DateChooserView class is a view bead for the DateChooser. This class
-	 * creates the elements for the DateChooser: the buttons to move between
-	 * months, the labels for the days of the week, and the buttons for each day
-	 * of the month.
-	 */
-	public class DateChooserView implements IBeadView
-	{
-		/**
-		 *  constructor
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DateChooserView()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			// make sure there is a model.
-			model = _strand.getBeadByType(IBeadModel) as DateChooserModel;
-			if (model == null) {
-				model = new (ValuesManager.valuesImpl.getValue(_strand,"iBeadModel")) as DateChooserModel;
-			}
-			model.addEventListener("displayedMonthChanged",handleModelChange);
-			model.addEventListener("displayedYearChanged",handleModelChange);
-			
-			createChildren();
-		}
-		
-		private var _prevMonthButton:TextButton;
-		private var _nextMonthButton:TextButton;
-		private var _dayButtons:Array;
-		private var monthLabel:TextButton;
-		private var dayContainer:Container;
-		
-		private var model:DateChooserModel;
-		
-		/**
-		 *  The button that causes the previous month to be displayed by the DateChooser.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get prevMonthButton():TextButton
-		{
-			return _prevMonthButton;
-		}
-		
-		/**
-		 *  The button that causes the next month to be displayed by the DateChooser.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get nextMonthButton():TextButton
-		{
-			return _nextMonthButton;
-		}
-		
-		/**
-		 * The array of DateChooserButton instances that represent each day of the month.
-		 */
-		public function get dayButtons():Array
-		{
-			return _dayButtons;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function createChildren():void
-		{
-			_prevMonthButton = new TextButton();
-			_prevMonthButton.width = 40;
-			_prevMonthButton.height = 20;
-			_prevMonthButton.x = 0;
-			_prevMonthButton.y = 0;
-			_prevMonthButton.text = "<";
-			UIBase(_strand).addElement(_prevMonthButton);
-			
-			_nextMonthButton = new TextButton();
-			_nextMonthButton.width = 40;
-			_nextMonthButton.height = 20;
-			_nextMonthButton.x = UIBase(_strand).width - _nextMonthButton.width;
-			_nextMonthButton.y = 0;
-			_nextMonthButton.text = ">";
-			UIBase(_strand).addElement(_nextMonthButton);
-			
-			monthLabel = new TextButton();
-			monthLabel.text = "Month Here";
-			monthLabel.width = 100;
-			monthLabel.height = 20;
-			monthLabel.x = (UIBase(_strand).width - monthLabel.width)/2;
-			monthLabel.y = 0;
-			UIBase(_strand).addElement(monthLabel);
-			
-			dayContainer = new Container();
-			var tileLayout:TileLayout = new TileLayout();
-			dayContainer.addBead(tileLayout);
-			tileLayout.numColumns = 7;
-			dayContainer.x = 0;
-			dayContainer.y = monthLabel.y + monthLabel.height + 5;
-			
-			var sw:Number = UIBase(_strand).width;
-			var sh:Number = UIBase(_strand).height;
-			trace("Strand's width x height is "+sw+" x "+sh);
-			dayContainer.width = sw;
-			dayContainer.height = sh - (monthLabel.height+5);
-			
-			// the calendar has 7 columns with 6 rows, the first row are the day names
-			for(var i:int=0; i < 7; i++) {
-				var dayName:DateChooserButton = new DateChooserButton();
-				dayName.text = model.dayNames[i];
-				dayName.dayOfMonth = 0;
-				dayContainer.addElement(dayName);
-			}
-			
-			_dayButtons = new Array();
-			
-			for(i=0; i < 42; i++) {
-				var date:DateChooserButton = new DateChooserButton();
-				date.text = String(i+1);
-				dayContainer.addElement(date);
-				dayButtons.push(date);
-			}
-			
-			UIBase(_strand).addElement(dayContainer);
-			
-			IEventDispatcher(dayContainer).dispatchEvent( new Event("itemsCreated") );			
-			IEventDispatcher(_strand).dispatchEvent( new Event("layoutNeeded") );			
-			IEventDispatcher(dayContainer).dispatchEvent( new Event("layoutNeeded") );
-			
-			updateCalendar();
-		}
-		
-		/**
-		 * @private
-		 */
-		private function updateCalendar():void
-		{
-			monthLabel.text = model.monthNames[model.displayedMonth] + " " +
-				String(model.displayedYear);
-			
-			var firstDay:Date = new Date(model.displayedYear,model.displayedMonth,1);
-			
-			// blank out the labels for the first firstDay.day-1 entries.
-			for(var i:int=0; i < firstDay.getDay(); i++) {
-				var dateButton:DateChooserButton = dayButtons[i] as DateChooserButton;
-				dateButton.dayOfMonth = -1;
-				dateButton.text = "";
-			}
-			
-			// renumber to the last day of the month
-			var dayNumber:int = 1;
-			var numDays:Number = numberOfDaysInMonth(model.displayedMonth, model.displayedYear);
-			
-			for(; i < dayButtons.length && dayNumber <= numDays; i++) {
-				dateButton = dayButtons[i] as DateChooserButton;
-				dateButton.dayOfMonth = dayNumber;
-				dateButton.text = String(dayNumber++);
-			}
-			
-			// blank out the rest
-			for(; i < dayButtons.length; i++) {
-				dateButton = dayButtons[i] as DateChooserButton;
-				dateButton.dayOfMonth = -1;
-				dateButton.text = "";
-			}
-		}
-		
-		/**
-		 * @private
-		 */
-		private function numberOfDaysInMonth(month:Number, year:Number):Number
-		{
-			var n:int;
-			
-			if (month == 1) // Feb
-			{
-				if (((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0)) // leap year
-					n = 29;
-				else
-					n = 28;
-			}
-				
-			else if (month == 3 || month == 5 || month == 8 || month == 10)
-				n = 30;
-				
-			else
-				n = 31;
-			
-			return n;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleModelChange(event:Event):void
-		{
-			updateCalendar();
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DateFieldView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DateFieldView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DateFieldView.as
deleted file mode 100644
index 6a9008d..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DateFieldView.as
+++ /dev/null
@@ -1,187 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{	
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IDateChooserModel;
-	import org.apache.flex.core.IFormatBead;
-	import org.apache.flex.core.IParent;
-	import org.apache.flex.core.IPopUpHost;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.utils.UIUtils;
-	import org.apache.flex.html.staticControls.DateChooser;
-	import org.apache.flex.html.staticControls.TextButton;
-	import org.apache.flex.html.staticControls.TextInput;
-	
-	/**
-	 * The DateFieldView class is a bead for DateField that creates the
-	 * input and button controls. This class also handles the pop-up 
-	 * mechanics.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DateFieldView implements IBeadView
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DateFieldView()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-		private var _textInput:TextInput;
-		private var _button:TextButton;
-		
-		/**
-		 *  The TextButton that triggers the display of the DateChooser pop-up.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get menuButton():TextButton
-		{
-			return _button;
-		}
-		
-		/**
-		 *  The TextInput that displays the date selected.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get textInput():TextInput
-		{
-			return _textInput;
-		}
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{	
-			_strand = value;
-			
-			_textInput = new TextInput();
-			UIBase(_strand).addElement(_textInput);
-			_textInput.width = 100;
-			_textInput.height = 18;
-			
-			_button = new TextButton();
-			_button.text = "M";
-			UIBase(_strand).addElement(_button);
-			_button.x = _textInput.width;
-			_button.y = _textInput.y;
-			
-			IEventDispatcher(_strand).addEventListener("beadsAdded",handleBeadsAdded);
-		}
-		
-		private function handleBeadsAdded(event:Event):void
-		{
-			var formatter:IFormatBead = _strand.getBeadByType(IFormatBead) as IFormatBead;
-			formatter.addEventListener("formatChanged",handleFormatChanged);
-		}
-		
-		private function handleFormatChanged(event:Event):void
-		{
-			var formatter:IFormatBead = event.target as IFormatBead;
-			_textInput.text = formatter.formattedString;
-		}
-		
-		private var _popUp:DateChooser;
-		
-		/**
-		 *  The pop-up component that holds the selection list.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get popUp():DateChooser
-		{
-			return _popUp;
-		}
-		
-		private var _popUpVisible:Boolean;
-		
-		/**
-		 *  This property is true if the pop-up selection list is currently visible.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get popUpVisible():Boolean
-		{
-			return _popUpVisible;
-		}
-		public function set popUpVisible(value:Boolean):void
-		{
-			if (value != _popUpVisible)
-			{
-				_popUpVisible = value;
-				if (value)
-				{
-					if (!_popUp)
-					{
-						_popUp = new DateChooser();
-						_popUp.width = 210;
-						_popUp.height = 220;
-						_popUp.x = UIBase(_strand).x;
-						_popUp.y = UIBase(_strand).y + 30;
-					}
-					
-					var model:IDateChooserModel = _strand.getBeadByType(IDateChooserModel) as IDateChooserModel;
-					_popUp.selectedDate = model.selectedDate;
-					
-					var host:IPopUpHost = UIUtils.findPopUpHost(UIBase(_strand));
-					host.addElement(_popUp);
-				}
-				else
-				{
-					UIUtils.removePopUp(_popUp);
-				}
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/FormatableLabelView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/FormatableLabelView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/FormatableLabelView.as
deleted file mode 100644
index 1fc8e1a..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/FormatableLabelView.as
+++ /dev/null
@@ -1,90 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.IFormatBead;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	
-	/**
-	 *  The FormatableLabelView class is a View bead that is capable of working
-	 *  with a format bead to display a formatted value. When the format bead has
-	 *  created a formatted string, it dispatches a formatChanged event that the
-	 *  FormatableLabelView class intercepts and displays in the label.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class FormatableLabelView extends TextFieldView
-	{
-		/**
-		 *  constructor
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function FormatableLabelView()
-		{
-			super();
-		}
-		
-		private var _formatter:IFormatBead;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		override public function set strand(value:IStrand):void
-		{
-			super.strand = value;
-			IEventDispatcher(value).addEventListener("beadsAdded",handleBeadsAdded);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleBeadsAdded(event:Event):void
-		{
-			_formatter = strand.getBeadByType(IFormatBead) as IFormatBead;
-			_formatter.addEventListener("formatChanged",formatReadyHandler);
-			
-			// process any text set in the label at this moment
-			text = _formatter.formattedString;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function formatReadyHandler(event:Event):void
-		{
-			if (_formatter) {
-				text = _formatter.formattedString;
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/FormatableTextInputView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/FormatableTextInputView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/FormatableTextInputView.as
deleted file mode 100644
index 66fcab4..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/FormatableTextInputView.as
+++ /dev/null
@@ -1,89 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.IFormatBead;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-
-	/**
-	 *  The FormatableTextInputView class is a View bead that extends TextInputWithBorderView
-	 *  and is capable of working with a format bead. When a format bead dispatches a
-	 *  formatChanged event, the FormatableTextInputView bead copies the formatted string to
-	 *  to the text field.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class FormatableTextInputView extends TextInputWithBorderView
-	{
-		/**
-		 *  constructor
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function FormatableTextInputView()
-		{
-			super();
-		}
-		
-		private var _formatter:IFormatBead;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		override public function set strand(value:IStrand):void
-		{
-			super.strand = value;
-			IEventDispatcher(value).addEventListener("beadsAdded",handleBeadsAdded);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleBeadsAdded(event:Event):void
-		{
-			_formatter = strand.getBeadByType(IFormatBead) as IFormatBead;
-			_formatter.addEventListener("formatChanged",formatChangedHandler);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function formatChangedHandler(event:Event):void
-		{
-			this.textField.text = _formatter.formattedString;
-			
-			// move the cursor to the end
-			var l:int = this.textField.text.length;
-			this.textField.setSelection(l,l);
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/IDataGridView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/IDataGridView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/IDataGridView.as
deleted file mode 100644
index f359337..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/IDataGridView.as
+++ /dev/null
@@ -1,36 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.IBeadView;
-	
-	/**
-	 *  The IDataGridView interface marks as a component as being the bead that
-	 *  can create the visual pieces for a org.apache.flex.html.staticControls.DataGrid. 
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public interface IDataGridView extends IBeadView
-	{
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/controllers/DateChooserMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/controllers/DateChooserMouseController.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/controllers/DateChooserMouseController.as
deleted file mode 100644
index 69343eb..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/controllers/DateChooserMouseController.as
+++ /dev/null
@@ -1,126 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.controllers
-{	
-	import org.apache.flex.html.staticControls.beads.DateChooserView;
-	import org.apache.flex.html.staticControls.beads.models.DateChooserModel;
-	import org.apache.flex.html.staticControls.supportClasses.DateChooserButton;
-	
-	import org.apache.flex.core.IBeadController;
-	import org.apache.flex.core.IBeadModel;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	
-	/**
-	 *  The DateChooserMouseController class is responsible for listening to
-	 *  mouse event related to the DateChooser. Events such as selecting a date
-	 *  or changing the calendar.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DateChooserMouseController implements IBeadController
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DateChooserMouseController()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			var view:DateChooserView = value.getBeadByType(IBeadView) as DateChooserView;
-			view.prevMonthButton.addEventListener("click", prevMonthClickHandler);
-			view.nextMonthButton.addEventListener("click", nextMonthClickHandler);
-			
-			var dayButtons:Array = view.dayButtons;
-			for(var i:int=0; i < dayButtons.length; i++) {
-				IEventDispatcher(dayButtons[i]).addEventListener("click", dayButtonClickHandler);
-			}
-		}
-		
-		/**
-		 * @private
-		 */
-		private function prevMonthClickHandler(event:Event):void
-		{
-			var model:DateChooserModel = _strand.getBeadByType(IBeadModel) as DateChooserModel;
-			var month:Number = model.displayedMonth - 1;
-			var year:Number  = model.displayedYear;
-			if (month < 0) {
-				month = 11;
-				year--;
-			}
-			model.displayedMonth = month;
-			model.displayedYear = year;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function nextMonthClickHandler(event:Event):void
-		{
-			var model:DateChooserModel = _strand.getBeadByType(IBeadModel) as DateChooserModel;
-			var month:Number = model.displayedMonth + 1;
-			var year:Number  = model.displayedYear;
-			if (month >= 12) {
-				month = 0;
-				year++;
-			}
-			model.displayedMonth = month;
-			model.displayedYear = year;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function dayButtonClickHandler(event:Event):void
-		{
-			var dateButton:DateChooserButton = event.target as DateChooserButton;
-			if (dateButton.dayOfMonth > 0) {
-				var model:DateChooserModel = _strand.getBeadByType(IBeadModel) as DateChooserModel;
-				var newDate:Date = new Date(model.displayedYear,model.displayedMonth,dateButton.dayOfMonth);
-				model.selectedDate = newDate;
-				IEventDispatcher(_strand).dispatchEvent( new Event("change") );
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/controllers/DateFieldMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/controllers/DateFieldMouseController.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/controllers/DateFieldMouseController.as
deleted file mode 100644
index e603b04..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/controllers/DateFieldMouseController.as
+++ /dev/null
@@ -1,97 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.controllers
-{	
-	import org.apache.flex.core.IBeadController;
-	import org.apache.flex.core.IDateChooserModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.beads.DateFieldView;
-	
-	/**
-	 * The DateFieldMouseController class is responsible for monitoring
-	 * the mouse events on the elements of the DateField. A click on the
-	 * DateField's menu button triggers the pop-up, for example.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DateFieldMouseController implements IBeadController
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DateFieldMouseController()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			var viewBead:DateFieldView = _strand.getBeadByType(DateFieldView) as DateFieldView;			
-			IEventDispatcher(viewBead.menuButton).addEventListener("click", clickHandler);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function clickHandler(event:Event):void
-		{
-			var viewBead:DateFieldView = _strand.getBeadByType(DateFieldView) as DateFieldView;
-			viewBead.popUpVisible = true;
-			UIBase(viewBead.popUp).x = UIBase(_strand).x + UIBase(_strand).width - 20;
-			UIBase(viewBead.popUp).y = UIBase(_strand).y + UIBase(_strand).height;			
-			IEventDispatcher(viewBead.popUp).addEventListener("change", changeHandler);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function changeHandler(event:Event):void
-		{
-			var viewBead:DateFieldView = _strand.getBeadByType(DateFieldView) as DateFieldView;
-			
-			var model:IDateChooserModel = _strand.getBeadByType(IDateChooserModel) as IDateChooserModel;
-			model.selectedDate = IDateChooserModel(viewBead.popUp.getBeadByType(IDateChooserModel)).selectedDate;
-
-			viewBead.popUpVisible = false;
-			IEventDispatcher(_strand).dispatchEvent(new Event("change"));
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.as
deleted file mode 100644
index 7af27d6..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.as
+++ /dev/null
@@ -1,72 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{
-	import org.apache.flex.core.IDataGridModel;
-	import org.apache.flex.events.Event;
-	
-	/**
-	 *  The DataGridModel class bead extends org.apache.flex.html.staticControls.beads.modelsArraySelectionModel 
-	 *  and adds the array of org.apache.flex.html.staticControls.supportClasses.DataGridColumns used to define 
-	 *  each of the column in the DataGrid.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DataGridModel extends ArraySelectionModel implements IDataGridModel
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DataGridModel()
-		{
-			super();
-		}
-		
-		private var _columns:Array;
-		
-		/**
-		 *  The array of org.apache.flex.html.staticControls.supportClasses.DataGridColumns used to 
-		 *  define each column of the org.apache.flex.html.staticControls.DataGrid.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get columns():Array
-		{
-			return _columns;
-		}
-		public function set columns(value:Array):void
-		{
-			if (_columns != value) {
-				_columns = value;
-				dispatchEvent( new Event("columnsChanged"));
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridPresentationModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridPresentationModel.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridPresentationModel.as
deleted file mode 100644
index a630caf..0000000
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridPresentationModel.as
+++ /dev/null
@@ -1,109 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{
-	import org.apache.flex.core.IDataGridPresentationModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.EventDispatcher;
-	
-	/**
-	 *  The DataGridPresentationModel class contains the data to label the columns
-	 *  of the org.apache.flex.html.staticControls.DataGrid along with the height of the rows. 
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DataGridPresentationModel extends EventDispatcher implements IDataGridPresentationModel
-	{
-		/**
-		 *  constructor.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DataGridPresentationModel()
-		{
-			super();
-		}
-		
-		private var _columnLabels:Array;
-		
-		/**
-		 *  The labels for each column.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get columnLabels():Array
-		{
-			return _columnLabels;
-		}
-		public function set columnLabels(value:Array):void
-		{
-			if (value != _columnLabels) {
-				_columnLabels = value;
-				dispatchEvent(new Event("columnsChanged"));
-			}
-		}
-		
-		private var _rowHeight:Number = 30;
-		
-		/**
-		 *  The height of the rows (default is 30 pixels).
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get rowHeight():Number
-		{
-			return _rowHeight;
-		}
-		public function set rowHeight(value:Number):void
-		{
-			if (value != _rowHeight) {
-				_rowHeight = value;
-				dispatchEvent(new Event("rowHeightChanged"));
-			}
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-	}
-}
\ No newline at end of file


[33/35] finish sed sweep of staticControls

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as b/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as
index 46102d7..cfd05db 100644
--- a/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as
+++ b/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as
@@ -28,65 +28,65 @@ package
 internal class FlexJSUIClasses
 {
 	
-	import org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead; NumericOnlyTextInputBead;
-	import org.apache.flex.html.staticControls.accessories.PasswordInputBead; PasswordInputBead;
-	import org.apache.flex.html.staticControls.accessories.TextPromptBead; TextPromptBead;
-    import org.apache.flex.html.staticControls.beads.AlertView; AlertView;
-	import org.apache.flex.html.staticControls.beads.ButtonBarView; ButtonBarView;
-	import org.apache.flex.html.staticControls.beads.CheckBoxView; CheckBoxView;
-    import org.apache.flex.html.staticControls.beads.ComboBoxView; ComboBoxView;
-    import org.apache.flex.html.staticControls.beads.ContainerView; ContainerView;
-    import org.apache.flex.html.staticControls.beads.ControlBarMeasurementBead; ControlBarMeasurementBead;
-    import org.apache.flex.html.staticControls.beads.CSSButtonView; CSSButtonView;
-	import org.apache.flex.html.staticControls.beads.CSSTextButtonView; CSSTextButtonView;
-	import org.apache.flex.html.staticControls.beads.DropDownListView; DropDownListView;
-	import org.apache.flex.html.staticControls.beads.ImageView; ImageView;
-    import org.apache.flex.html.staticControls.beads.ListView; ListView;
-    import org.apache.flex.html.staticControls.beads.NumericStepperView; NumericStepperView;
-    import org.apache.flex.html.staticControls.beads.PanelView; PanelView;
-	import org.apache.flex.html.staticControls.beads.RadioButtonView; RadioButtonView;
-    import org.apache.flex.html.staticControls.beads.ScrollBarView; ScrollBarView;
-	import org.apache.flex.html.staticControls.beads.SimpleAlertView; SimpleAlertView;
-    import org.apache.flex.html.staticControls.beads.SingleLineBorderBead; SingleLineBorderBead;
-	import org.apache.flex.html.staticControls.beads.SliderView; SliderView;
-	import org.apache.flex.html.staticControls.beads.SliderThumbView; SliderThumbView;
-	import org.apache.flex.html.staticControls.beads.SliderTrackView; SliderTrackView;
-	import org.apache.flex.html.staticControls.beads.SolidBackgroundBead; SolidBackgroundBead;
-    import org.apache.flex.html.staticControls.beads.SpinnerView; SpinnerView;
-    import org.apache.flex.html.staticControls.beads.TextButtonMeasurementBead; TextButtonMeasurementBead;
-	import org.apache.flex.html.staticControls.beads.TextFieldLabelMeasurementBead; TextFieldLabelMeasurementBead;
-    import org.apache.flex.html.staticControls.beads.TextAreaView; TextAreaView;
-    import org.apache.flex.html.staticControls.beads.TextButtonView; TextButtonView;
-    import org.apache.flex.html.staticControls.beads.TextFieldView; TextFieldView;
-    import org.apache.flex.html.staticControls.beads.TextInputView; TextInputView;
-    import org.apache.flex.html.staticControls.beads.TextInputWithBorderView; TextInputWithBorderView;
-    import org.apache.flex.html.staticControls.beads.TitleBarMeasurementBead; TitleBarMeasurementBead;
-    import org.apache.flex.html.staticControls.beads.models.AlertModel; AlertModel;
-    import org.apache.flex.html.staticControls.beads.models.ArraySelectionModel; ArraySelectionModel;
-    import org.apache.flex.html.staticControls.beads.models.ComboBoxModel; ComboBoxModel;
-	import org.apache.flex.html.staticControls.beads.models.ImageModel; ImageModel;
-	import org.apache.flex.html.staticControls.beads.models.PanelModel; PanelModel;
-    import org.apache.flex.html.staticControls.beads.models.SingleLineBorderModel; SingleLineBorderModel;
-	import org.apache.flex.html.staticControls.beads.models.TextModel; TextModel;
-    import org.apache.flex.html.staticControls.beads.models.TitleBarModel; TitleBarModel;
-	import org.apache.flex.html.staticControls.beads.models.ToggleButtonModel; ToggleButtonModel;
-	import org.apache.flex.html.staticControls.beads.models.ValueToggleButtonModel; ValueToggleButtonModel;
-    import org.apache.flex.html.staticControls.beads.controllers.AlertController; AlertController;
-	import org.apache.flex.html.staticControls.beads.controllers.ComboBoxController; ComboBoxController;
-    import org.apache.flex.html.staticControls.beads.controllers.DropDownListController; DropDownListController;
-	import org.apache.flex.html.staticControls.beads.controllers.EditableTextKeyboardController; EditableTextKeyboardController;
-    import org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController; ItemRendererMouseController;
-    import org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController; ListSingleSelectionMouseController;
-	import org.apache.flex.html.staticControls.beads.controllers.SliderMouseController; SliderMouseController;
-	import org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController; SpinnerMouseController;
-    import org.apache.flex.html.staticControls.beads.controllers.VScrollBarMouseController; VScrollBarMouseController;
-	import org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout; ButtonBarLayout;
-    import org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalScrollingLayout; NonVirtualVerticalScrollingLayout;  
-	import org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalScrollingLayout; NonVirtualHorizontalScrollingLayout;
-    import org.apache.flex.html.staticControls.beads.layouts.VScrollBarLayout; VScrollBarLayout;
-	import org.apache.flex.html.staticControls.beads.layouts.TileLayout; TileLayout;
-    import org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData; TextItemRendererFactoryForArrayData;
-	import org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData; DataItemRendererFactoryForArrayData;
+	import org.apache.flex.html.accessories.NumericOnlyTextInputBead; NumericOnlyTextInputBead;
+	import org.apache.flex.html.accessories.PasswordInputBead; PasswordInputBead;
+	import org.apache.flex.html.accessories.TextPromptBead; TextPromptBead;
+    import org.apache.flex.html.beads.AlertView; AlertView;
+	import org.apache.flex.html.beads.ButtonBarView; ButtonBarView;
+	import org.apache.flex.html.beads.CheckBoxView; CheckBoxView;
+    import org.apache.flex.html.beads.ComboBoxView; ComboBoxView;
+    import org.apache.flex.html.beads.ContainerView; ContainerView;
+    import org.apache.flex.html.beads.ControlBarMeasurementBead; ControlBarMeasurementBead;
+    import org.apache.flex.html.beads.CSSButtonView; CSSButtonView;
+	import org.apache.flex.html.beads.CSSTextButtonView; CSSTextButtonView;
+	import org.apache.flex.html.beads.DropDownListView; DropDownListView;
+	import org.apache.flex.html.beads.ImageView; ImageView;
+    import org.apache.flex.html.beads.ListView; ListView;
+    import org.apache.flex.html.beads.NumericStepperView; NumericStepperView;
+    import org.apache.flex.html.beads.PanelView; PanelView;
+	import org.apache.flex.html.beads.RadioButtonView; RadioButtonView;
+    import org.apache.flex.html.beads.ScrollBarView; ScrollBarView;
+	import org.apache.flex.html.beads.SimpleAlertView; SimpleAlertView;
+    import org.apache.flex.html.beads.SingleLineBorderBead; SingleLineBorderBead;
+	import org.apache.flex.html.beads.SliderView; SliderView;
+	import org.apache.flex.html.beads.SliderThumbView; SliderThumbView;
+	import org.apache.flex.html.beads.SliderTrackView; SliderTrackView;
+	import org.apache.flex.html.beads.SolidBackgroundBead; SolidBackgroundBead;
+    import org.apache.flex.html.beads.SpinnerView; SpinnerView;
+    import org.apache.flex.html.beads.TextButtonMeasurementBead; TextButtonMeasurementBead;
+	import org.apache.flex.html.beads.TextFieldLabelMeasurementBead; TextFieldLabelMeasurementBead;
+    import org.apache.flex.html.beads.TextAreaView; TextAreaView;
+    import org.apache.flex.html.beads.TextButtonView; TextButtonView;
+    import org.apache.flex.html.beads.TextFieldView; TextFieldView;
+    import org.apache.flex.html.beads.TextInputView; TextInputView;
+    import org.apache.flex.html.beads.TextInputWithBorderView; TextInputWithBorderView;
+    import org.apache.flex.html.beads.TitleBarMeasurementBead; TitleBarMeasurementBead;
+    import org.apache.flex.html.beads.models.AlertModel; AlertModel;
+    import org.apache.flex.html.beads.models.ArraySelectionModel; ArraySelectionModel;
+    import org.apache.flex.html.beads.models.ComboBoxModel; ComboBoxModel;
+	import org.apache.flex.html.beads.models.ImageModel; ImageModel;
+	import org.apache.flex.html.beads.models.PanelModel; PanelModel;
+    import org.apache.flex.html.beads.models.SingleLineBorderModel; SingleLineBorderModel;
+	import org.apache.flex.html.beads.models.TextModel; TextModel;
+    import org.apache.flex.html.beads.models.TitleBarModel; TitleBarModel;
+	import org.apache.flex.html.beads.models.ToggleButtonModel; ToggleButtonModel;
+	import org.apache.flex.html.beads.models.ValueToggleButtonModel; ValueToggleButtonModel;
+    import org.apache.flex.html.beads.controllers.AlertController; AlertController;
+	import org.apache.flex.html.beads.controllers.ComboBoxController; ComboBoxController;
+    import org.apache.flex.html.beads.controllers.DropDownListController; DropDownListController;
+	import org.apache.flex.html.beads.controllers.EditableTextKeyboardController; EditableTextKeyboardController;
+    import org.apache.flex.html.beads.controllers.ItemRendererMouseController; ItemRendererMouseController;
+    import org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController; ListSingleSelectionMouseController;
+	import org.apache.flex.html.beads.controllers.SliderMouseController; SliderMouseController;
+	import org.apache.flex.html.beads.controllers.SpinnerMouseController; SpinnerMouseController;
+    import org.apache.flex.html.beads.controllers.VScrollBarMouseController; VScrollBarMouseController;
+	import org.apache.flex.html.beads.layouts.ButtonBarLayout; ButtonBarLayout;
+    import org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout; NonVirtualVerticalScrollingLayout;  
+	import org.apache.flex.html.beads.layouts.NonVirtualHorizontalScrollingLayout; NonVirtualHorizontalScrollingLayout;
+    import org.apache.flex.html.beads.layouts.VScrollBarLayout; VScrollBarLayout;
+	import org.apache.flex.html.beads.layouts.TileLayout; TileLayout;
+    import org.apache.flex.html.beads.TextItemRendererFactoryForArrayData; TextItemRendererFactoryForArrayData;
+	import org.apache.flex.html.beads.DataItemRendererFactoryForArrayData; DataItemRendererFactoryForArrayData;
     import org.apache.flex.core.ItemRendererClassFactory; ItemRendererClassFactory;  
 	import org.apache.flex.core.FilledRectangle; FilledRectangle;
 	import org.apache.flex.events.CustomEvent; CustomEvent;
@@ -102,3 +102,4 @@ internal class FlexJSUIClasses
 }
 
 }
+

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/ILayoutParent.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/ILayoutParent.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/ILayoutParent.as
index 9c6fa18..7ec767f 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/ILayoutParent.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/ILayoutParent.as
@@ -21,8 +21,8 @@ package org.apache.flex.core
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
 	
-	import org.apache.flex.html.staticControls.supportClasses.Border;
-	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
+	import org.apache.flex.html.supportClasses.Border;
+	import org.apache.flex.html.supportClasses.ScrollBar;
 
     /**
      *  The ILayoutParent interface is the basic interface for the 
@@ -89,4 +89,4 @@ package org.apache.flex.core
          */
 		function get resizableView():DisplayObject;
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as
index 2a36d05..571afa9 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as
@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.createjs
 {
-	import org.apache.flex.html.staticControls.CheckBox;
+	import org.apache.flex.html.CheckBox;
 	
-	public class CheckBox extends org.apache.flex.html.staticControls.CheckBox
+	public class CheckBox extends org.apache.flex.html.CheckBox
 	{	
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as
index 099c5b0..3da881a 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as
@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.createjs
 {
-	import org.apache.flex.html.staticControls.Label;
+	import org.apache.flex.html.Label;
 	
-	public class Label extends org.apache.flex.html.staticControls.Label
+	public class Label extends org.apache.flex.html.Label
 	{
 		
 	}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as
index 6f4dc74..44c9e88 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as
@@ -19,7 +19,7 @@
 package org.apache.flex.createjs
 {
 	import org.apache.flex.core.ITextModel;
-	import org.apache.flex.html.staticControls.Button;
+	import org.apache.flex.html.Button;
 	
 	public class TextButton extends Button
 	{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as
index d5b2931..f8f9e52 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as
@@ -27,7 +27,7 @@ package org.apache.flex.html.beads
 	import org.apache.flex.core.UIBase;
 	import org.apache.flex.core.UIMetrics;
 	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.createjs.staticControls.Label;
+	import org.apache.flex.createjs.Label;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
 	import org.apache.flex.html.Alert;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
index 232feb4..bafb3f5 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
@@ -27,7 +27,7 @@ package org.apache.flex.html.beads
 	import org.apache.flex.core.IRangeModel;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.UIBase;
-	import org.apache.flex.createjs.staticControls.Label;
+	import org.apache.flex.createjs.Label;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
 	import org.apache.flex.html.Spinner;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as
index 83ca32a..9b9cb71 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as
@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.jquery
 {
-	import org.apache.flex.html.staticControls.CheckBox;
+	import org.apache.flex.html.CheckBox;
 	
-	public class CheckBox extends org.apache.flex.html.staticControls.CheckBox 
+	public class CheckBox extends org.apache.flex.html.CheckBox 
 	{
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as
index 6fc0c8f..e7b64a9 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as
@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.jquery
 {
-	import org.apache.flex.html.staticControls.RadioButton;
+	import org.apache.flex.html.RadioButton;
 	
-	public class RadioButton extends org.apache.flex.html.staticControls.RadioButton
+	public class RadioButton extends org.apache.flex.html.RadioButton
 	{
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as
index 9528f66..43d7dc8 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as
@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.jquery
 {
-	import org.apache.flex.html.staticControls.TextButton;
+	import org.apache.flex.html.TextButton;
 	
-	public class TextButton extends org.apache.flex.html.staticControls.TextButton
+	public class TextButton extends org.apache.flex.html.TextButton
 	{
 		public function TextButton()
 		{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as
index ae8af52..83a2821 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as
@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.svg
 {
-	import org.apache.flex.html.staticControls.TextButton;
+	import org.apache.flex.html.TextButton;
 	
-	public class TextButton extends org.apache.flex.html.staticControls.TextButton
+	public class TextButton extends org.apache.flex.html.TextButton
 	{
 		public function TextButton()
 		{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/svg-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/svg-manifest.xml b/frameworks/as/projects/FlexJSUI/svg-manifest.xml
index 89d7728..4bdaba1 100644
--- a/frameworks/as/projects/FlexJSUI/svg-manifest.xml
+++ b/frameworks/as/projects/FlexJSUI/svg-manifest.xml
@@ -21,6 +21,6 @@
 
 <componentPackage>
 
-    <component id="TextButton" class="org.apache.flex.svg.staticControls.TextButton"/>
+    <component id="TextButton" class="org.apache.flex.svg.TextButton"/>
 
 </componentPackage>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/js/FlexJS/src/org/apache/flex/core/IDataProviderItemRendererMapper.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/IDataProviderItemRendererMapper.js b/frameworks/js/FlexJS/src/org/apache/flex/core/IDataProviderItemRendererMapper.js
index 82f3730..d44593c 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/IDataProviderItemRendererMapper.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/IDataProviderItemRendererMapper.js
@@ -13,7 +13,7 @@
  */
 
 /**
- * org.apache.flex.html.staticControls.beads.IDataProviderItemRendererMapper
+ * org.apache.flex.html.beads.IDataProviderItemRendererMapper
  *
  * @fileoverview
  *

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js
index fe315ca..a507870 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js
@@ -15,7 +15,7 @@
 goog.provide('org.apache.flex.core.ListBase');
 
 goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.supportClasses.StringItemRenderer');
+goog.require('org.apache.flex.html.supportClasses.StringItemRenderer');
 
 
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js
index 18da0c8..a221c7d 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js
@@ -44,7 +44,7 @@ org.apache.flex.html.ButtonBar = function() {
   //        org.apache.flex.html.beads.
   //        DataItemRendererFactoryForArrayData();
   //  this.itemRendererFactory.set_itemRendererClass('org.apache.flex.html.' +
-  //        'staticControls.supportClasses.ButtonBarButtonItemRenderer');
+  //        'supportClasses.ButtonBarButtonItemRenderer');
   //  this.addBead(this.itemRendererFactory);
 
   //  this.addBead(new

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js
index d43edd9..376c5bf 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js
@@ -45,7 +45,7 @@ org.apache.flex.svg.TextButton.prototype.FLEXJS_CLASS_INFO =
 org.apache.flex.svg.TextButton.prototype.createElement =
     function() {
   this.element = document.createElement('embed');
-  this.element.setAttribute('src', 'org/apache/flex/svg/staticControls/assets/TextButton_Skin.svg');
+  this.element.setAttribute('src', 'org/apache/flex/svg/assets/TextButton_Skin.svg');
 
   this.positioner = this.element;
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/js/FlexJS/tests/MyInitialView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/tests/MyInitialView.js b/frameworks/js/FlexJS/tests/MyInitialView.js
index 88ac542..35f35d2 100644
--- a/frameworks/js/FlexJS/tests/MyInitialView.js
+++ b/frameworks/js/FlexJS/tests/MyInitialView.js
@@ -17,8 +17,8 @@ goog.provide('MyInitialView');
 goog.require('org.apache.flex.FlexGlobal');
 
 goog.require('org.apache.flex.core.ViewBase');
-goog.require('org.apache.flex.html.staticControls.Label');
-goog.require('org.apache.flex.html.staticControls.TextButton');
+goog.require('org.apache.flex.html.Label');
+goog.require('org.apache.flex.html.TextButton');
 
 /**
  * @constructor
@@ -36,14 +36,14 @@ goog.inherits(MyInitialView, org.apache.flex.core.ViewBase);
  */
 MyInitialView.prototype.get_uiDescriptors = function() {
     return [
-        org.apache.flex.html.staticControls.Label,
+        org.apache.flex.html.Label,
             null,
             'lbl',
             2, 'x', 100, 'y', 25,
             0,
             0,
             1, 'text', 0, 'model', 'labelText', 'labelTextChanged',
-        org.apache.flex.html.staticControls.TextButton,
+        org.apache.flex.html.TextButton,
             null,
             null,
             3, 'text', 'OK', 'x', 100, 'y', 75,

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/js/FlexJS/tests/MySimpleValuesImpl.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/tests/MySimpleValuesImpl.js b/frameworks/js/FlexJS/tests/MySimpleValuesImpl.js
index 9373405..8f09bd7 100644
--- a/frameworks/js/FlexJS/tests/MySimpleValuesImpl.js
+++ b/frameworks/js/FlexJS/tests/MySimpleValuesImpl.js
@@ -30,11 +30,11 @@ MySimpleValuesImpl = function() {
     this.values_ = {
         /*
         ITextButtonBead :
-            org.apache.flex.html.staticControls.beads.TextButtonBead,
+            org.apache.flex.html.beads.TextButtonBead,
         ITextBead :
-            org.apache.flex.html.staticControls.beads.TextFieldBead,
+            org.apache.flex.html.beads.TextFieldBead,
         ITextModel :
-            org.apache.flex.html.staticControls.beads.models.TextModel
+            org.apache.flex.html.beads.models.TextModel
         */
     };
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/js/FlexJS/tests/test.html
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/tests/test.html b/frameworks/js/FlexJS/tests/test.html
index 5b7bc41..60c6032 100644
--- a/frameworks/js/FlexJS/tests/test.html
+++ b/frameworks/js/FlexJS/tests/test.html
@@ -25,8 +25,8 @@
     <script type="text/javascript" src="../src/org/apache/flex/core/SimpleValuesImpl.js"></script>
     <script type="text/javascript" src="../src/org/apache/flex/core/Application.js"></script>
 
-    <script type="text/javascript" src="../src/org/apache/flex/html/staticControls/Label.js"></script>
-    <script type="text/javascript" src="../src/org/apache/flex/html/staticControls/TextButton.js"></script>
+    <script type="text/javascript" src="../src/org/apache/flex/html/Label.js"></script>
+    <script type="text/javascript" src="../src/org/apache/flex/html/TextButton.js"></script>
 
     <script type="text/javascript" src="./MySimpleValuesImpl.js"></script>
     <script type="text/javascript" src="./MyController.js"></script>
@@ -40,4 +40,4 @@
 </head>
 <body onload="new FlexJSTest().start();">
 </body>
-</html>
\ No newline at end of file
+</html>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/marmotinni/build.xml
----------------------------------------------------------------------
diff --git a/marmotinni/build.xml b/marmotinni/build.xml
index 77f10db..71b31c8 100644
--- a/marmotinni/build.xml
+++ b/marmotinni/build.xml
@@ -19,8 +19,8 @@
 -->
 <project name="marmotinni" default="main" basedir=".">
 
-	<property name="test.file" value="FlexJS/framework/org/apache/flex/html/staticControls/TextButton/TextButton.mxml" />
-	<property name="test.class" value="org.apache.flex.html.staticControls.textButton.TextButton" />
+	<property name="test.file" value="FlexJS/framework/org/apache/flex/html/TextButton/TextButton.mxml" />
+	<property name="test.class" value="org.apache.flex.html.textButton.TextButton" />
 	
 	<property file="build.properties" />
 	
@@ -152,7 +152,7 @@
     </target>
 
     <target name="test_compile" depends="test_prepare">
-        <javac srcdir="${basedir}/java/src/org/apache/flex/html/staticControls/textButton" destdir="${basedir}/java/bin" debug="off" optimize="on">
+        <javac srcdir="${basedir}/java/src/org/apache/flex/html/textButton" destdir="${basedir}/java/bin" debug="off" optimize="on">
             <classpath>
             	<pathelement location="${basedir}/java/lib/selenium/selenium-java-2.32.0.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/apache-mime4j-0.6.jar"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/marmotinni/java/src/org/apache/flex/html/staticControls/textButton/TextButton.java
----------------------------------------------------------------------
diff --git a/marmotinni/java/src/org/apache/flex/html/staticControls/textButton/TextButton.java b/marmotinni/java/src/org/apache/flex/html/staticControls/textButton/TextButton.java
index 7860de4..6e8e6fa 100644
--- a/marmotinni/java/src/org/apache/flex/html/staticControls/textButton/TextButton.java
+++ b/marmotinni/java/src/org/apache/flex/html/staticControls/textButton/TextButton.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.html.staticControls.textButton;
+package org.apache.flex.html.textButton;
 
 import java.util.HashMap;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/mustella/tests/basicTests/BasicTests.css
----------------------------------------------------------------------
diff --git a/mustella/tests/basicTests/BasicTests.css b/mustella/tests/basicTests/BasicTests.css
index 1c62545..ce61bba 100644
--- a/mustella/tests/basicTests/BasicTests.css
+++ b/mustella/tests/basicTests/BasicTests.css
@@ -155,7 +155,7 @@ TextInput {
 */
 
 my|VBox {
-    IBeadLayout: ClassReference("org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout");
+    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout");
 }
 
 /*
@@ -167,4 +167,4 @@ my|VBox {
         fontSize:9px;
     }
 }
-*/
\ No newline at end of file
+*/

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/mustella/tests/basicTests/shim/VBox.as
----------------------------------------------------------------------
diff --git a/mustella/tests/basicTests/shim/VBox.as b/mustella/tests/basicTests/shim/VBox.as
index 7192199..891ccf6 100644
--- a/mustella/tests/basicTests/shim/VBox.as
+++ b/mustella/tests/basicTests/shim/VBox.as
@@ -21,7 +21,7 @@ package shim
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
 	
-	import org.apache.flex.html.staticControls.Container;
+	import org.apache.flex.html.Container;
 	
 	[DefaultProperty("mxmlContent")]
     
@@ -44,4 +44,4 @@ package shim
 		}
 		
 	}
-}
\ No newline at end of file
+}


[10/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/RadioButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/RadioButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/RadioButtonView.as
deleted file mode 100644
index bc24661..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/RadioButtonView.as
+++ /dev/null
@@ -1,282 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.Shape;
-	import flash.display.SimpleButton;
-	import flash.display.Sprite;
-	import flash.text.TextFieldAutoSize;
-	import flash.text.TextFieldType;
-	
-	import org.apache.flex.core.CSSTextField;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.IValueToggleButtonModel;
-	import org.apache.flex.events.Event;
-	
-	/**
-	 *  The RadioButtonView class creates the visual elements of the org.apache.flex.html.staticControls.RadioButton 
-	 *  component. 
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class RadioButtonView implements IBeadView
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function RadioButtonView()
-		{
-			sprites = [ upSprite = new Sprite(),
-				        downSprite = new Sprite(),
-						overSprite = new Sprite(),
-						upAndSelectedSprite = new Sprite(),
-						downAndSelectedSprite = new Sprite(),
-						overAndSelectedSprite = new Sprite() ];
-			
-			for each( var s:Sprite in sprites )
-			{
-				var tf:CSSTextField = new CSSTextField();
-				tf.type = TextFieldType.DYNAMIC;
-				tf.autoSize = TextFieldAutoSize.LEFT;
-				tf.name = "textField";
-				var icon:Shape = new Shape();
-				icon.name = "icon";
-				s.addChild(icon);
-				s.addChild(tf);
-			}
-		}
-		
-		private var upSprite:Sprite;
-		private var downSprite:Sprite;
-		private var overSprite:Sprite;
-		private var upAndSelectedSprite:Sprite;
-		private var downAndSelectedSprite:Sprite;
-		private var overAndSelectedSprite:Sprite;
-		
-		private var sprites:Array;
-		
-		private var _toggleButtonModel:IValueToggleButtonModel;
-		
-		/**
-		 *  The model used for the RadioButton.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get toggleButtonModel() : IValueToggleButtonModel
-		{
-			return _toggleButtonModel;
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			_toggleButtonModel = value.getBeadByType(IValueToggleButtonModel) as IValueToggleButtonModel;
-			_toggleButtonModel.addEventListener("textChange", textChangeHandler);
-			_toggleButtonModel.addEventListener("htmlChange", htmlChangeHandler);
-			_toggleButtonModel.addEventListener("selectedValueChange", selectedValueChangeHandler);
-			if (_toggleButtonModel.text != null)
-				text = _toggleButtonModel.text;
-			if (_toggleButtonModel.html != null)
-				html = _toggleButtonModel.html;
-			
-			layoutControl();
-			
-			var hitArea:Shape = new Shape();
-			hitArea.graphics.beginFill(0x000000);
-			hitArea.graphics.drawRect(12,0,upSprite.width, upSprite.height);
-			hitArea.graphics.endFill();
-			
-			SimpleButton(value).upState = upSprite;
-			SimpleButton(value).downState = downSprite;
-			SimpleButton(value).overState = overSprite;
-			SimpleButton(value).hitTestState = hitArea;
-			
-			if (toggleButtonModel.text !== null)
-				text = toggleButtonModel.text;
-			if (toggleButtonModel.html !== null)
-				html = toggleButtonModel.html;
-			
-			if (toggleButtonModel.selected && toggleButtonModel.value == value) {
-				selected = true;
-			}
-		}
-		
-		/**
-		 *  The string label for the org.apache.flex.html.staticControls.RadioButton.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get text():String
-		{
-			var tf:CSSTextField = upSprite.getChildByName('textField') as CSSTextField;
-			return tf.text;
-		}
-		public function set text(value:String):void
-		{
-			for each( var s:Sprite in sprites )
-			{
-				var tf:CSSTextField = s.getChildByName('textField') as CSSTextField;
-				tf.text = value;
-			}
-			
-			layoutControl();
-		}
-		
-		/**
-		 *  The HTML string for the org.apache.flex.html.staticControls.RadioButton.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get html():String
-		{
-			var tf:CSSTextField = upSprite.getChildByName('textField') as CSSTextField;
-			return tf.htmlText;
-		}
-		public function set html(value:String):void
-		{
-			for each(var s:Sprite in sprites)
-			{
-				var tf:CSSTextField = s.getChildByName('textField') as CSSTextField;
-				tf.htmlText = value;
-			}
-			
-			layoutControl();
-		}
-		
-		/**
-		 * @private
-		 */
-		private function textChangeHandler(event:Event):void
-		{
-			text = toggleButtonModel.text;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function htmlChangeHandler(event:Event):void
-		{
-			html = toggleButtonModel.html;
-		}
-		
-		private var _selected:Boolean;
-		
-		/**
-		 * The selection state of the RadioButton
-		 */
-		public function get selected():Boolean
-		{
-			return _selected;
-		}
-		public function set selected(value:Boolean):void
-		{
-			_selected = value;
-			
-			if( value ) {
-				SimpleButton(_strand).upState = upAndSelectedSprite;
-				SimpleButton(_strand).downState = downAndSelectedSprite;
-				SimpleButton(_strand).overState = overAndSelectedSprite;
-				
-			} else {
-				SimpleButton(_strand).upState = upSprite;
-				SimpleButton(_strand).downState = downSprite;
-				SimpleButton(_strand).overState = overSprite;
-			}
-			
-			layoutControl();
-		}
-		
-		/**
-		 * @private
-		 */
-		private function selectedValueChangeHandler(event:Event):void
-		{
-			selected = _toggleButtonModel.value == _toggleButtonModel.selectedValue;
-		}
-		
-		/**
-		 * @private
-		 */
-		protected function layoutControl() : void
-		{
-			for each(var s:Sprite in sprites)
-			{
-				var icon:Shape = s.getChildByName("icon") as Shape;
-				var tf:CSSTextField = s.getChildByName("textField") as CSSTextField;
-				
-				drawRadioButton(icon);
-				
-				var mh:Number = Math.max(icon.height,tf.height);
-				
-				icon.x = 0;
-				icon.y = (mh - icon.height)/2;
-				
-				tf.x = icon.x + icon.width + 1;
-				tf.y = (mh - tf.height)/2;
-			}
-			
-		}
-		
-		/**
-		 * @private
-		 */
-		protected function drawRadioButton(icon:Shape) : void
-		{
-			icon.graphics.clear();
-			icon.graphics.beginFill(0xCCCCCC);
-			icon.graphics.lineStyle(1,0x333333);
-			icon.graphics.drawEllipse(0,0,10,10);
-			icon.graphics.endFill();
-			
-			if( selected ) {
-				icon.graphics.beginFill(0x555555);
-				icon.graphics.drawEllipse(2,2,6,6);
-				icon.graphics.endFill();
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ScrollBarView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ScrollBarView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ScrollBarView.as
deleted file mode 100644
index 5bc7723..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ScrollBarView.as
+++ /dev/null
@@ -1,158 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	
-	import org.apache.flex.core.IBeadLayout;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IScrollBarModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.Strand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.html.staticControls.Button;
-	import org.apache.flex.html.staticControls.beads.controllers.ButtonAutoRepeatController;
-
-    /**
-     *  The ScrollBarView class is the default view for
-     *  the org.apache.flex.html.staticControls.supportClasses.ScrollBar class.
-     *  It implements the classic desktop-like ScrollBar.
-     *  A different view would implement more modern scrollbars that hide themselves
-     *  until hovered over with the mouse.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class ScrollBarView extends Strand implements IBeadView, IStrand, IScrollBarView
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function ScrollBarView()
-		{
-		}
-				
-		private var sbModel:IScrollBarModel;
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			sbModel = value.getBeadByType(IScrollBarModel) as IScrollBarModel;
-            
-            // TODO: (aharui) put in values impl
-			_increment = new Button();
-			Button(_increment).addBead(new DownArrowButtonView());
-            Button(_increment).addBead(new ButtonAutoRepeatController());
-			_decrement = new Button();
-			Button(_decrement).addBead(new UpArrowButtonView());
-            Button(_decrement).addBead(new ButtonAutoRepeatController());
-			_track = new Button();				
-			Button(_track).addBead(new VScrollBarTrackView());
-			_thumb = new Button();				
-			Button(_thumb).addBead(new VScrollBarThumbView());
-            
-            UIBase(value).addChild(_decrement);
-            UIBase(value).addChild(_increment);
-            UIBase(value).addChild(_track);
-            UIBase(value).addChild(_thumb);
-            
-            if( _strand.getBeadByType(IBeadLayout) == null ) {
-                var layout:IBeadLayout = new (ValuesManager.valuesImpl.getValue(_strand, "iBeadLayout")) as IBeadLayout;
-                _strand.addBead(layout);
-            }
-            
-		}
-						
-		private var _decrement:DisplayObject;
-		private var _increment:DisplayObject;
-		private var _track:DisplayObject;
-		private var _thumb:DisplayObject;
-		
-        /**
-         *  @copy org.apache.flex.html.staticControls.beads.IScrollBarView#decrement
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get decrement():DisplayObject
-		{
-			return _decrement;
-		}
-
-        /**
-         *  @copy org.apache.flex.html.staticControls.beads.IScrollBarView#increment
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get increment():DisplayObject
-		{
-			return _increment;
-		}
-        
-        /**
-         *  @copy org.apache.flex.html.staticControls.beads.IScrollBarView#track
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get track():DisplayObject
-		{
-			return _track;
-		}
-        
-        /**
-         *  @copy org.apache.flex.html.staticControls.beads.IScrollBarView#thumb
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get thumb():DisplayObject
-		{
-			return _thumb;
-		}
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SimpleAlertView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SimpleAlertView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SimpleAlertView.as
deleted file mode 100644
index 682c2c9..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SimpleAlertView.as
+++ /dev/null
@@ -1,150 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.IAlertModel;
-	import org.apache.flex.core.IBead;
-    import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IMeasurementBead;
-	import org.apache.flex.core.IStrand;
-    import org.apache.flex.core.IParent;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.UIMetrics;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.Label;
-	import org.apache.flex.html.staticControls.TextButton;
-	import org.apache.flex.utils.BeadMetrics;
-	
-	/**
-	 *  The SimpleAlertView class creates the visual elements of the 
-	 *  org.apache.flex.html.staticControls.SimpleAlert component.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class SimpleAlertView implements IBeadView
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function SimpleAlertView()
-		{
-		}
-		
-		private var messageLabel:Label;
-		private var okButton:TextButton;
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-            
-			var backgroundColor:Object = ValuesManager.valuesImpl.getValue(value, "background-color");
-			var backgroundImage:Object = ValuesManager.valuesImpl.getValue(value, "background-image");
-			if (backgroundColor != null || backgroundImage != null)
-			{
-				if (value.getBeadByType(IBackgroundBead) == null)
-					value.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBackgroundBead")) as IBead);					
-			}
-			
-			var borderStyle:String;
-			var borderStyles:Object = ValuesManager.valuesImpl.getValue(value, "border");
-			if (borderStyles is Array)
-			{
-				borderStyle = borderStyles[1];
-			}
-			if (borderStyle == null)
-			{
-				borderStyle = ValuesManager.valuesImpl.getValue(value, "border-style") as String;
-			}
-			if (borderStyle != null && borderStyle != "none")
-			{
-				if (value.getBeadByType(IBorderBead) == null)
-					value.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBorderBead")) as IBead);	
-			}
-			
-			var model:IAlertModel = _strand.getBeadByType(IAlertModel) as IAlertModel;
-			model.addEventListener("messageChange",handleMessageChange);
-			model.addEventListener("htmlMessageChange",handleMessageChange);
-
-            messageLabel = new Label();
-			messageLabel.text = model.message;
-			messageLabel.html = model.htmlMessage;
-			IParent(_strand).addElement(messageLabel);
-			
-			okButton = new TextButton();
-			okButton.text = model.okLabel;
-			IParent(_strand).addElement(okButton);
-			okButton.addEventListener("click",handleOK);
-			
-			handleMessageChange(null);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleMessageChange(event:Event):void
-		{
-			var ruler:IMeasurementBead = messageLabel.getBeadByType(IMeasurementBead) as IMeasurementBead;
-			if( ruler == null ) {
-				messageLabel.addBead(ruler = new (ValuesManager.valuesImpl.getValue(messageLabel, "iMeasurementBead")) as IMeasurementBead);
-			}
-			var maxWidth:Number = Math.max(UIBase(_strand).width,ruler.measuredWidth);
-			
-			var metrics:UIMetrics = BeadMetrics.getMetrics(_strand);
-			
-			messageLabel.x = metrics.left;
-			messageLabel.y = metrics.top;
-			messageLabel.width = maxWidth;
-			
-			okButton.x = (maxWidth - okButton.width)/2;
-			okButton.y = messageLabel.y + messageLabel.height + 20;
-			
-			UIBase(_strand).width = maxWidth + metrics.left + metrics.right;
-			UIBase(_strand).height = okButton.y + okButton.height + metrics.bottom;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleOK(event:Event):void
-		{
-			var newEvent:Event = new Event("close");
-			IEventDispatcher(_strand).dispatchEvent(newEvent);
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SingleLineBorderBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SingleLineBorderBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SingleLineBorderBead.as
deleted file mode 100644
index fb0f679..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SingleLineBorderBead.as
+++ /dev/null
@@ -1,94 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.Graphics;
-	
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-
-    /**
-     *  The SingleLineBorderBead class draws a single line solid border.
-     *  The color and thickness can be specified in CSS.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class SingleLineBorderBead implements IBead, IBorderBead, IGraphicsDrawing
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function SingleLineBorderBead()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-            IEventDispatcher(value).addEventListener("heightChanged", changeHandler);
-            IEventDispatcher(value).addEventListener("widthChanged", changeHandler);
-		}
-		        
-		private function changeHandler(event:Event):void
-		{
-			var styleObject:* = ValuesManager.valuesImpl.getValue(_strand,"border-color");
-			var borderColor:Number = Number(styleObject);
-			if( isNaN(borderColor) ) borderColor = 0x000000;
-			styleObject = ValuesManager.valuesImpl.getValue(_strand,"border-thickness");
-			var borderThickness:Number = Number(styleObject);
-			if( isNaN(borderThickness) ) borderThickness = 1;
-			
-            var host:UIBase = UIBase(_strand);
-            var g:Graphics = host.graphics;
-            var w:Number = host.width;
-            var h:Number = host.height;
-			
-			var gd:IGraphicsDrawing = _strand.getBeadByType(IGraphicsDrawing) as IGraphicsDrawing;
-			if( this == gd ) g.clear();
-			
-			g.lineStyle();
-            g.beginFill(borderColor);
-            g.drawRect(0, 0, w, h);
-            g.drawRect(borderThickness, borderThickness, w-2*borderThickness, h-2*borderThickness);
-            g.endFill();
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SliderThumbView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SliderThumbView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SliderThumbView.as
deleted file mode 100644
index 3242274..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SliderThumbView.as
+++ /dev/null
@@ -1,114 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.Graphics;
-	import flash.display.Shape;
-	import flash.display.SimpleButton;
-	
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	
-	/**
-	 *  The SliderThumbView class creates the draggable input element for the 
-	 *  org.apache.flex.html.staticControls.Slider component.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class SliderThumbView implements IBeadView
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function SliderThumbView()
-		{
-			hitArea = new Shape();
-			upView = new Shape();
-			downView = new Shape();
-			overView = new Shape();
-		}
-		
-		/**
-		 * @private
-		 */
-		private function drawView(g:Graphics, bgColor:uint):void
-		{
-			g.clear();
-			g.lineStyle(1,0x000000);
-			g.beginFill(bgColor);
-			g.drawCircle(SimpleButton(_strand).width/2, SimpleButton(_strand).height/2, 10);
-			g.endFill();
-		}
-		
-		private var _strand:IStrand;
-		
-		private var hitArea:Shape;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			drawView(hitArea.graphics, 0xDD0000);
-			drawView(upView.graphics, 0xFFFFFF);
-			drawView(downView.graphics, 0x999999);
-			drawView(overView.graphics, 0xDDDDDD);
-			
-			SimpleButton(value).upState = upView;
-			SimpleButton(value).downState = downView;
-			SimpleButton(value).overState = overView;
-			SimpleButton(value).hitTestState = hitArea;
-			
-			IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
-			IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler);
-		}
-		
-		private var upView:Shape;
-		private var downView:Shape;
-		private var overView:Shape;
-		
-		/**
-		 * @private
-		 */
-		private function sizeChangeHandler( event:Event ) : void
-		{
-			drawView(hitArea.graphics, 0xDD0000);
-			drawView(upView.graphics, 0xFFFFFF);
-			drawView(downView.graphics, 0x999999);
-			drawView(overView.graphics, 0xDDDDDD);
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SliderTrackView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SliderTrackView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SliderTrackView.as
deleted file mode 100644
index 6fc5047..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SliderTrackView.as
+++ /dev/null
@@ -1,114 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.Graphics;
-	import flash.display.Shape;
-	import flash.display.SimpleButton;
-	
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	
-	/**
-	 *  The SliderTrackView class creates the track area for the org.apache.flex.html.staticControls.Slider
-	 *  component.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class SliderTrackView implements IBeadView
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function SliderTrackView()
-		{
-			hitArea = new Shape();
-			upView = new Shape();
-			downView = new Shape();
-			overView = new Shape();
-		}
-		
-		/**
-		 * @private
-		 */
-		private function drawView(g:Graphics, bgColor:uint):void
-		{
-			g.clear();
-			g.lineStyle(1,0x000000);
-			g.beginFill(bgColor);
-			g.drawRect(0, 0, SimpleButton(_strand).width, SimpleButton(_strand).height);
-			g.endFill();
-		}
-		
-		private var _strand:IStrand;
-		
-		private var hitArea:Shape;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			drawView(hitArea.graphics, 0xDD0000);
-			drawView(upView.graphics, 0xCCCCCC);
-			drawView(downView.graphics, 0x808080);
-			drawView(overView.graphics, 0xEEEEEE);
-			
-			SimpleButton(value).upState = upView;
-			SimpleButton(value).downState = downView;
-			SimpleButton(value).overState = overView;
-			SimpleButton(value).hitTestState = hitArea;
-			
-			IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
-			IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler);
-		}
-		
-		private var upView:Shape;
-		private var downView:Shape;
-		private var overView:Shape;
-		
-		/**
-		 * @private
-		 */
-		private function sizeChangeHandler( event:Event ) : void
-		{
-			drawView(hitArea.graphics, 0xDD0000);
-			drawView(upView.graphics, 0xCCCCCC);
-			drawView(downView.graphics, 0x808080);
-			drawView(overView.graphics, 0xEEEEEE);
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SliderView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SliderView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SliderView.as
deleted file mode 100644
index 83893dc..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SliderView.as
+++ /dev/null
@@ -1,180 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	import flash.display.Sprite;
-	
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IBeadModel;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IRangeModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.Button;
-	
-	/**
-	 *  The SliderView class creates the visual elements of the org.apache.flex.html.staticControls.Slider 
-	 *  component. The Slider has a track and a thumb control which are also created with view beads.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class SliderView implements ISliderView, IBeadView
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function SliderView()
-		{
-		}
-		
-		private var rangeModel:IRangeModel;
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			_track = new Button();
-			Button(_track).addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iTrackView")) as IBead);
-			
-			_thumb = new Button();
-			Button(_thumb).addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iThumbView")) as IBead);
-			
-			UIBase(_strand).addChild(_track);
-			UIBase(_strand).addChild(_thumb);
-			
-			IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
-			IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler);
-			
-			rangeModel = _strand.getBeadByType(IBeadModel) as IRangeModel;
-			
-			// listen for changes to the model and adjust the UI accordingly.
-			IEventDispatcher(rangeModel).addEventListener("valueChange",modelChangeHandler);
-			IEventDispatcher(rangeModel).addEventListener("minimumChange",modelChangeHandler);
-			IEventDispatcher(rangeModel).addEventListener("maximumChange",modelChangeHandler);
-			IEventDispatcher(rangeModel).addEventListener("stepSizeChange",modelChangeHandler);
-			IEventDispatcher(rangeModel).addEventListener("snapIntervalChange",modelChangeHandler);
-			
-			// set a minimum size to trigger the size change handler
-			var needsSizing:Boolean = true;
-			if( UIBase(_strand).width < 100 ) {
-				UIBase(_strand).width = 100;
-				needsSizing = false;
-			}
-			if( UIBase(_strand).height < 30 ) {
-				UIBase(_strand).height = 30;
-				needsSizing = false;
-			}
-			
-			if( needsSizing ) sizeChangeHandler(null);
-		}
-		
-		private var _track:DisplayObject;
-		private var _thumb:DisplayObject;
-		
-		/**
-		 *  The track component.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get track():DisplayObject
-		{
-			return _track;
-		}
-		
-		/**
-		 *  The thumb component.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get thumb():DisplayObject
-		{
-			return _thumb;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function sizeChangeHandler( event:Event ) : void
-		{
-			var w:Number = UIBase(_strand).width;
-			var h:Number = UIBase(_strand).height;
-			
-			_thumb.width = 20;
-			_thumb.height = UIBase(_strand).height;
-			
-			_thumb.x = 10;
-			_thumb.y = 0;
-			
-			// the track is inset 1/2 of the thumbwidth so the thumb can
-			// overlay the track on either end with the thumb center being
-			// on the track's edge
-			_track.width = UIBase(_strand).width - _thumb.width;
-			_track.height = 5;
-			_track.x = _thumb.width/2;
-			_track.y = (UIBase(_strand).height - _track.height)/2;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function modelChangeHandler( event:Event ) : void
-		{
-			setThumbPositionFromValue(rangeModel.value);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function setThumbPositionFromValue( value:Number ) : void
-		{
-			var p:Number = (value-rangeModel.minimum)/(rangeModel.maximum-rangeModel.minimum);
-			var xloc:Number = p*(UIBase(_strand).width - _thumb.width);
-			
-			_thumb.x = xloc;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SolidBackgroundBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SolidBackgroundBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SolidBackgroundBead.as
deleted file mode 100644
index 4a90b8a..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SolidBackgroundBead.as
+++ /dev/null
@@ -1,145 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.Graphics;
-	
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-
-    /**
-     *  The SolidBackgroundBead class draws a solid filled background.
-     *  The color and opacity can be specified in CSS.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class SolidBackgroundBead implements IBead, IBackgroundBead, IGraphicsDrawing
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function SolidBackgroundBead()
-		{
-		}
-				
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-            IEventDispatcher(value).addEventListener("heightChanged", changeHandler);
-            IEventDispatcher(value).addEventListener("widthChanged", changeHandler);
-			
-			var bgColor:Object = ValuesManager.valuesImpl.getValue(value, "background-color");
-			if( bgColor != null ) {
-				backgroundColor = uint(bgColor);
-			}
-			
-			var bgAlpha:Object = ValuesManager.valuesImpl.getValue(value, "opacity");
-			if( bgAlpha != null ) {
-				opacity = Number(bgAlpha);
-			}
-		}
-		
-		private var _backgroundColor:uint;
-		
-        /**
-         *  The background color
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get backgroundColor():uint
-		{
-			return _backgroundColor;
-		}
-        
-        /**
-         *  @private
-         */
-		public function set backgroundColor(value:uint):void
-		{
-			_backgroundColor = value;
-			if (_strand)
-				changeHandler(null);
-		}
-		
-		private var _opacity:Number = 1.0;
-		
-        /**
-         *  The opacity (alpha).
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get opacity():Number
-		{
-			return _opacity;
-		}
-		
-        /**
-         *  @private
-         */
-		public function set opacity(value:Number):void
-		{
-			_opacity = value;
-			if( _strand )
-				changeHandler(null);
-		}
-		
-		private function changeHandler(event:Event):void
-		{
-            var host:UIBase = UIBase(_strand);
-            var g:Graphics = host.graphics;
-            var w:Number = host.width;
-            var h:Number = host.height;
-			
-			var gd:IGraphicsDrawing = _strand.getBeadByType(IGraphicsDrawing) as IGraphicsDrawing;
-			if( this == gd ) g.clear();
-
-            g.beginFill(backgroundColor,opacity);
-            g.drawRect(0, 0, w, h);
-            g.endFill();
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SpinnerView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SpinnerView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SpinnerView.as
deleted file mode 100644
index e2ed0aa..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/SpinnerView.as
+++ /dev/null
@@ -1,134 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	
-	import org.apache.flex.core.IBeadModel;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IRangeModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.UIBase;
-	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.beads.controllers.ButtonAutoRepeatController;
-	
-	/**
-	 *  The SpinnerView class creates the visual elements of the org.apache.flex.html.staticControls.Spinner 
-	 *  component.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class SpinnerView implements ISpinnerView, IBeadView
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function SpinnerView()
-		{
-		}
-		
-		private var rangeModel:IRangeModel;
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-            
-			_increment = new Button();
-			Button(_increment).addBead(new UpArrowButtonView());
-			Button(_increment).addBead(new ButtonAutoRepeatController());
-			_decrement = new Button();
-			Button(_decrement).addBead(new DownArrowButtonView());
-			Button(_decrement).addBead(new ButtonAutoRepeatController());
-						
-			Button(_increment).x = 0;
-			Button(_increment).y = 0;
-			Button(_decrement).x = 0;
-			Button(_decrement).y = Button(_increment).height;
-			
-			UIBase(_strand).addChild(_decrement);
-			UIBase(_strand).addChild(_increment);
-			rangeModel = _strand.getBeadByType(IBeadModel) as IRangeModel;
-			
-			IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
-			IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler);
-		}
-		
-		private var _decrement:DisplayObject;
-		private var _increment:DisplayObject;
-		
-		/**
-		 *  The component for decrementing the org.apache.flex.html.staticControls.Spinner value.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get decrement():DisplayObject
-		{
-			return _decrement;
-		}
-		
-		/**
-		 *  The component for incrementing the org.apache.flex.html.staticControls.Spinner value.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get increment():DisplayObject
-		{
-			return _increment;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function sizeChangeHandler( event:Event ) : void
-		{
-			_increment.width = UIBase(_strand).width;
-			_increment.height = UIBase(_strand).height/2;
-			_increment.y      = 0;
-			_decrement.width = UIBase(_strand).width;
-			_decrement.height = UIBase(_strand).height/2;
-			_decrement.y      = _increment.height;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextAreaView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextAreaView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextAreaView.as
deleted file mode 100644
index 631466e..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextAreaView.as
+++ /dev/null
@@ -1,258 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	import flash.events.Event;
-	import flash.events.IEventDispatcher;
-	import flash.text.TextFieldType;
-	
-	import org.apache.flex.core.IBead;
-    import org.apache.flex.core.IBeadModel;
-	import org.apache.flex.core.IScrollBarModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.IParent;
-    import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.html.staticControls.beads.models.ScrollBarModel;
-	import org.apache.flex.html.staticControls.supportClasses.Border;
-	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
-
-    /**
-     *  The TextAreaView class is the default view for
-     *  the org.apache.flex.html.staticControls.TextArea class.
-     *  It implements the classic desktop-like TextArea with
-     *  a border and scrollbars.  It does not support right-to-left text.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class TextAreaView extends TextFieldViewBase implements IStrand
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function TextAreaView()
-		{
-			super();
-			
-			textField.selectable = true;
-			textField.type = TextFieldType.INPUT;
-			textField.mouseEnabled = true;
-			textField.multiline = true;
-			textField.wordWrap = true;
-		}
-		
-		private var _border:Border;
-		
-        /**
-         *  The border.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get border():Border
-		{
-			return _border;
-		}
-		
-		private var _vScrollBar:ScrollBar;
-		
-        /**
-         *  The vertical ScrollBar.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get vScrollBar():ScrollBar
-		{
-			if (!_vScrollBar)
-				_vScrollBar = createScrollBar();
-			return _vScrollBar;
-		}
-		
-        /**
-         *  @private
-         */
-		override public function set strand(value:IStrand):void
-		{
-			super.strand = value;
-			
-			// add a border to this
-			_border = new Border();
-			_border.model = new (ValuesManager.valuesImpl.getValue(value, "iBorderModel")) as IBeadModel;
-			_border.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBorderBead")) as IBead);
-            IParent(strand).addElement(border);
-			
-			var vb:ScrollBar = vScrollBar;
-			
-			// Default size
-			var ww:Number = DisplayObject(strand).width;
-			if( isNaN(ww) || ww == 0 ) DisplayObject(strand).width = 100;
-			var hh:Number = DisplayObject(strand).height;
-			if( isNaN(hh) || hh == 0 ) DisplayObject(strand).height = 42;
-			
-			// for input, listen for changes to the _textField and update
-			// the model
-			textField.addEventListener(Event.SCROLL, textScrollHandler);
-			
-			IEventDispatcher(strand).addEventListener("widthChanged", sizeChangedHandler);
-			IEventDispatcher(strand).addEventListener("heightChanged", sizeChangedHandler);
-			sizeChangedHandler(null);
-		}
-				
-		private function createScrollBar():ScrollBar
-		{
-			var vsb:ScrollBar;
-			vsb = new ScrollBar();
-			var vsbm:ScrollBarModel = new ScrollBarModel();
-			vsbm.maximum = 100;
-			vsbm.minimum = 0;
-			vsbm.pageSize = 10;
-			vsbm.pageStepSize = 10;
-			vsbm.snapInterval = 1;
-			vsbm.stepSize = 1;
-			vsbm.value = 0;
-			vsb.model = vsbm;
-			vsb.width = 16;
-            IParent(strand).addElement(vsb);
-			
-			vsb.addEventListener("scroll", scrollHandler);
-			
-			return vsb;
-		}
-		
-		private function textScrollHandler(event:Event):void
-		{
-			var visibleLines:int = textField.bottomScrollV - textField.scrollV + 1;
-			var scrollableLines:int = textField.numLines - visibleLines + 1;
-			var vsbm:ScrollBarModel = ScrollBarModel(vScrollBar.model);
-			vsbm.minimum = 0;
-			vsbm.maximum = textField.numLines+1;
-			vsbm.value = textField.scrollV;
-			vsbm.pageSize = visibleLines;
-			vsbm.pageStepSize = visibleLines;
-		}
-		
-		private function sizeChangedHandler(event:Event):void
-		{
-			var ww:Number = DisplayObject(strand).width - DisplayObject(vScrollBar).width;
-			if( !isNaN(ww) && ww > 0 ) {
-				textField.width = ww;
-				_border.width = ww;
-			}
-			
-			var hh:Number = DisplayObject(strand).height;
-			if( !isNaN(hh) && hh > 0 ) {
-				textField.height = hh;
-				_border.height = hh;
-			}
-			
-			var sb:DisplayObject = DisplayObject(vScrollBar);
-			sb.y = 0;
-			sb.x = textField.width - 1;
-			sb.height = textField.height;
-		}
-		
-		private function scrollHandler(event:Event):void
-		{
-			var vpos:Number = IScrollBarModel(vScrollBar.model).value;
-			textField.scrollV = vpos;
-		}
-		
-        /**
-         *  @copy org.apache.flex.core.UIBase#beads
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public var beads:Array;
-		
-		private var _beads:Vector.<IBead>;
-
-        /**
-         *  @copy org.apache.flex.core.UIBase#addBead()
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function addBead(bead:IBead):void
-		{
-			if (!_beads)
-				_beads = new Vector.<IBead>;
-			_beads.push(bead);
-			bead.strand = this;
-		}
-		
-        /**
-         *  @copy org.apache.flex.core.UIBase#getBeadByType()
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function getBeadByType(classOrInterface:Class):IBead
-		{
-			for each (var bead:IBead in _beads)
-			{
-				if (bead is classOrInterface)
-					return bead;
-			}
-			return null;
-		}
-		
-        /**
-         *  @copy org.apache.flex.core.UIBase#removeBead()
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function removeBead(value:IBead):IBead	
-		{
-			var n:int = _beads.length;
-			for (var i:int = 0; i < n; i++)
-			{
-				var bead:IBead = _beads[i];
-				if (bead == value)
-				{
-					_beads.splice(i, 1);
-					return bead;
-				}
-			}
-			return null;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextButtonMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextButtonMeasurementBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextButtonMeasurementBead.as
deleted file mode 100644
index e546cdd..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextButtonMeasurementBead.as
+++ /dev/null
@@ -1,86 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.IMeasurementBead;
-	import org.apache.flex.core.IStrand;
-	
-	/**
-	 *  The TextButtonMeasurementBead class helps measure a org.apache.flex.html.staticControls.TextButton.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class TextButtonMeasurementBead implements IMeasurementBead
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function TextButtonMeasurementBead()
-		{
-		}
-		
-		/**
-		 *  The overall width of the org.apache.flex.html.staticControls.TextButton.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get measuredWidth():Number
-		{
-			var view:TextButtonView = _strand.getBeadByType(TextButtonView) as TextButtonView;
-			if( view ) return Math.max(view.upTextField.textWidth,view.downTextField.textWidth,view.overTextField.textWidth);
-			else return 0;
-		}
-		
-		/**
-		 * The overall height of the org.apache.flex.html.staticControls.TextButton
-		 */
-		public function get measuredHeight():Number
-		{
-			var view:TextButtonView = _strand.getBeadByType(TextButtonView) as TextButtonView;
-			if( view ) return Math.max(view.upTextField.textHeight,view.downTextField.textHeight,view.overTextField.textHeight);
-			else return 0;
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextButtonView.as
deleted file mode 100644
index 2665d4f..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextButtonView.as
+++ /dev/null
@@ -1,218 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	import flash.display.Shape;
-	import flash.display.SimpleButton;
-	import flash.text.TextFieldType;
-	
-	import org.apache.flex.core.CSSTextField;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.ITextModel;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-
-    /**
-     *  The TextButtonView class is the default view for
-     *  the org.apache.flex.html.staticControls.TextButton class.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class TextButtonView implements IBeadView
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function TextButtonView()
-		{
-			upTextField = new CSSTextField();
-			downTextField = new CSSTextField();
-			overTextField = new CSSTextField();
-			upTextField.border = true;
-			downTextField.border = true;
-			overTextField.border = true;
-			upTextField.background = true;
-			downTextField.background = true;
-			overTextField.background = true;
-			upTextField.borderColor = 0;
-			downTextField.borderColor = 0;
-			overTextField.borderColor = 0;
-			upTextField.backgroundColor = 0xCCCCCC;
-			downTextField.backgroundColor = 0x808080;
-			overTextField.backgroundColor = 0xFFCCCC;
-			upTextField.selectable = false;
-			upTextField.type = TextFieldType.DYNAMIC;
-			downTextField.selectable = false;
-			downTextField.type = TextFieldType.DYNAMIC;
-			overTextField.selectable = false;
-			overTextField.type = TextFieldType.DYNAMIC;
-			upTextField.autoSize = "left";
-			downTextField.autoSize = "left";
-			overTextField.autoSize = "left";
-
-		}
-		
-		private var textModel:ITextModel;
-		
-		private var _strand:IStrand;
-		
-		private var shape:Shape;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			textModel = value.getBeadByType(ITextModel) as ITextModel;
-			textModel.addEventListener("textChange", textChangeHandler);
-			textModel.addEventListener("htmlChange", htmlChangeHandler);
-			shape = new Shape();
-			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, 10, 10);
-			shape.graphics.endFill();
-			SimpleButton(value).upState = upTextField;
-			SimpleButton(value).downState = downTextField;
-			SimpleButton(value).overState = overTextField;
-			SimpleButton(value).hitTestState = shape;
-			upTextField.styleParent = value;
-			downTextField.styleParent = value;
-			overTextField.styleParent = value;
-			if (textModel.text !== null)
-				text = textModel.text;
-			if (textModel.html !== null)
-				html = textModel.html;
-			
-			IEventDispatcher(_strand).addEventListener("widthChanged",sizeChangeHandler);
-			IEventDispatcher(_strand).addEventListener("heightChanged",sizeChangeHandler);
-		}
-		        
-		private function textChangeHandler(event:Event):void
-		{
-			text = textModel.text;
-		}
-		
-		private function htmlChangeHandler(event:Event):void
-		{
-			html = textModel.html;
-		}
-		
-		private function sizeChangeHandler(event:Event):void
-		{
-			upTextField.width = downTextField.width = overTextField.width = DisplayObject(_strand).width;
-			upTextField.height= downTextField.height= overTextField.height= DisplayObject(_strand).height;
-		}
-		
-        /**
-         *  The CSSTextField in the up state
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public var upTextField:CSSTextField;
-
-        /**
-         *  The CSSTextField in the down state
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public var downTextField:CSSTextField;
-
-        /**
-         *  The CSSTextField in the over state
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public var overTextField:CSSTextField;
-		
-        /**
-         *  @copy org.apache.flex.html.core.ITextModel#text
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get text():String
-		{
-			return upTextField.text;
-		}
-        
-        /**
-         *  @private
-         */
-		public function set text(value:String):void
-		{
-			upTextField.text = value;
-			downTextField.text = value;
-			overTextField.text = value;
-			shape.graphics.clear();
-			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, upTextField.textWidth, upTextField.textHeight);
-			shape.graphics.endFill();
-			
-		}
-		
-        /**
-         *  @copy org.apache.flex.html.core.ITextModel#text
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get html():String
-		{
-			return upTextField.htmlText;
-		}
-		
-        /**
-         *  @private
-         */
-		public function set html(value:String):void
-		{
-			upTextField.htmlText = value;
-			downTextField.htmlText = value;
-			overTextField.htmlText = value;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextFieldLabelMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextFieldLabelMeasurementBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextFieldLabelMeasurementBead.as
deleted file mode 100644
index 3645247..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextFieldLabelMeasurementBead.as
+++ /dev/null
@@ -1,92 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.IMeasurementBead;
-	import org.apache.flex.core.IStrand;
-	
-	/**
-	 *  The TextFieldLabelMeasurementBead class helps to measure org.apache.flex.html.staticControls.Label 
-	 *  components.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class TextFieldLabelMeasurementBead implements IMeasurementBead
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function TextFieldLabelMeasurementBead()
-		{
-		}
-		
-		/**
-		 *  The overall width of the org.apache.flex.html.staticControls.Label.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get measuredWidth():Number
-		{
-			var view:TextFieldView = _strand.getBeadByType(TextFieldView) as TextFieldView;
-			if( view ) return view.textField.textWidth;
-			else return 0;
-		}
-		
-		/**
-		 *  The overall height of the org.apache.flex.html.staticControls.Label.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get measuredHeight():Number
-		{
-			var view:TextFieldView = _strand.getBeadByType(TextFieldView) as TextFieldView;
-			if( view ) return view.textField.textHeight;
-			else return 0;
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextFieldView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextFieldView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextFieldView.as
deleted file mode 100644
index b796eda..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextFieldView.as
+++ /dev/null
@@ -1,53 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.text.TextFieldType;
-	
-    /**
-     *  The TextFieldView class is the default view for
-     *  the org.apache.flex.html.staticControls.Label class.
-     *  It displays text using a TextField, so there is no
-     *  right-to-left text support in this view.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class TextFieldView extends TextFieldViewBase
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function TextFieldView()
-		{
-			super();
-			
-			textField.selectable = false;
-			textField.type = TextFieldType.DYNAMIC;
-			textField.mouseEnabled = false;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextFieldViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextFieldViewBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextFieldViewBase.as
deleted file mode 100644
index 2f0831c..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextFieldViewBase.as
+++ /dev/null
@@ -1,167 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	
-	import org.apache.flex.core.CSSTextField;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.ITextModel;
-	import org.apache.flex.events.Event;
-	
-    /**
-     *  The TextFieldViewBase class is the base class for
-     *  the components that display text.
-     *  It displays text using a TextField, so there is no
-     *  right-to-left text support in this view.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class TextFieldViewBase implements IBeadView, ITextFieldView
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function TextFieldViewBase()
-		{
-			_textField = new CSSTextField();
-		}
-		
-		private var _textField:CSSTextField;
-		
-        /**
-         *  @copy org.apache.flex.core.ITextModel#textField
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get textField() : CSSTextField
-		{
-			return _textField;
-		}
-		
-		private var _textModel:ITextModel;
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			_textModel = value.getBeadByType(ITextModel) as ITextModel;
-            _textModel.addEventListener("textChange", textChangeHandler);
-            _textModel.addEventListener("htmlChange", htmlChangeHandler);
-            _textModel.addEventListener("widthChanged", sizeChangeHandler);
-            _textModel.addEventListener("heightChanged", sizeChangeHandler);
-			DisplayObjectContainer(value).addChild(_textField);
-			sizeChangeHandler(null);
-			if (_textModel.text !== null)
-				text = _textModel.text;
-			if (_textModel.html !== null)
-				html = _textModel.html;
-		}
-
-        /**
-         *  @private
-         */
-		public function get strand() : IStrand
-		{
-			return _strand;
-		}
-		
-        /**
-         *  @copy org.apache.flex.core.ITextModel#text
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get text():String
-		{
-			return _textField.text;
-		}
-
-        /**
-         *  @private
-         */
-        public function set text(value:String):void
-		{
-            if (value == null)
-                value = "";
-			_textField.text = value;
-		}
-		
-        /**
-         *  @copy org.apache.flex.core.ITextModel#html
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get html():String
-		{
-			return _textField.htmlText;
-		}
-		
-        /**
-         *  @private
-         */
-        public function set html(value:String):void
-		{
-			_textField.htmlText = value;
-		}
-		
-		private function textChangeHandler(event:Event):void
-		{
-			text = _textModel.text;
-		}
-		
-		private function htmlChangeHandler(event:Event):void
-		{
-			html = _textModel.html;
-		}
-		
-		private function sizeChangeHandler(event:Event):void
-		{
-			textField.width = DisplayObject(_strand).width;
-			textField.height = DisplayObject(_strand).height;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextInputView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextInputView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextInputView.as
deleted file mode 100644
index d746fe5..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextInputView.as
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	import flash.text.TextFieldType;
-	
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	
-    /**
-     *  The TextInputView class is the view for
-     *  the org.apache.flex.html.staticControls.TextInput in
-     *  a ComboBox and other controls 
-     *  because it does not display a border.
-     *  It displays text using a TextField, so there is no
-     *  right-to-left text support in this view.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class TextInputView extends TextFieldViewBase
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function TextInputView()
-		{
-			super();
-			
-			textField.selectable = true;
-			textField.type = TextFieldType.INPUT;
-			textField.mouseEnabled = true;
-			textField.multiline = false;
-			textField.wordWrap = false;
-		}
-		
-        /**
-         *  @private
-         */
-		override public function set strand(value:IStrand):void
-		{
-			super.strand = value;
-			
-			// Default size
-			var ww:Number = DisplayObject(strand).width;
-			if( isNaN(ww) || ww == 0 ) DisplayObject(strand).width = 100;
-			var hh:Number = DisplayObject(strand).height;
-			if( isNaN(hh) || hh == 0 ) DisplayObject(strand).height = 18;
-			
-			IEventDispatcher(strand).addEventListener("widthChanged", sizeChangedHandler);
-			IEventDispatcher(strand).addEventListener("heightChanged", sizeChangedHandler);
-			sizeChangedHandler(null);
-		}
-		
-		private function sizeChangedHandler(event:Event):void
-		{
-			var ww:Number = DisplayObject(strand).width;
-			if( !isNaN(ww) && ww > 0 ) textField.width = ww;
-			
-			var hh:Number = DisplayObject(strand).height;
-			if( !isNaN(hh) && hh > 0 ) textField.height = hh;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextInputWithBorderView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextInputWithBorderView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextInputWithBorderView.as
deleted file mode 100644
index 4fd1566..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/TextInputWithBorderView.as
+++ /dev/null
@@ -1,79 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	
-    import org.apache.flex.core.IBead;
-    import org.apache.flex.core.IBeadModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.IParent;
-    import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.html.staticControls.supportClasses.Border;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-
-    /**
-     *  The TextInputWithBorderView class is the default view for
-     *  the org.apache.flex.html.staticControls.TextInput.
-     *  It displays text using a TextField, so there is no
-     *  right-to-left text support in this view.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class TextInputWithBorderView extends TextInputView
-	{
-		public function TextInputWithBorderView()
-		{
-			super();
-		}
-		
-		private var _border:Border;
-				
-        /**
-         *  @private
-         */        
-		override public function set strand(value:IStrand):void
-		{
-			super.strand = value;
-			
-			// add a border to this
-			_border = new Border();
-			_border.model = new (ValuesManager.valuesImpl.getValue(value, "iBorderModel")) as IBeadModel;
-			_border.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBorderBead")) as IBead);
-            IParent(strand).addElement(_border);
-			
-			IEventDispatcher(strand).addEventListener("widthChanged", sizeChangedHandler);
-			IEventDispatcher(strand).addEventListener("heightChanged", sizeChangedHandler);
-			sizeChangedHandler(null);
-		}
-		
-		private function sizeChangedHandler(event:Event):void
-		{
-			var ww:Number = DisplayObject(strand).width;
-			_border.width = ww;
-			
-			var hh:Number = DisplayObject(strand).height;
-			_border.height = hh;
-		}
-	}
-}
\ No newline at end of file


[11/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ContainerView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ContainerView.as
deleted file mode 100644
index 67f1458..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ContainerView.as
+++ /dev/null
@@ -1,253 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.ILayoutParent;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.html.staticControls.Container;
-	import org.apache.flex.html.staticControls.supportClasses.Border;
-	import org.apache.flex.html.staticControls.supportClasses.ContainerContentArea;
-	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
-	
-    /**
-     *  The ContainerView class is the default view for
-     *  the org.apache.flex.html.staticControls.Container class.
-     *  It lets you use some CSS styles to manage the border, background
-     *  and padding around the content area.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class ContainerView implements IBeadView, ILayoutParent
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function ContainerView()
-		{
-		}
-		
-        /**
-         *  The actual parent that parents the children.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */        
-		protected var actualParent:DisplayObjectContainer;
-				
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			var backgroundColor:Object = ValuesManager.valuesImpl.getValue(value, "background-color");
-			var backgroundImage:Object = ValuesManager.valuesImpl.getValue(value, "background-image");
-			if (backgroundColor != null || backgroundImage != null)
-			{
-				if (value.getBeadByType(IBackgroundBead) == null)
-					value.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBackgroundBead")) as IBead);					
-			}
-			
-			var borderStyle:String;
-			var borderStyles:Object = ValuesManager.valuesImpl.getValue(value, "border");
-			if (borderStyles is Array)
-			{
-				borderStyle = borderStyles[1];
-			}
-			if (borderStyle == null)
-			{
-				borderStyle = ValuesManager.valuesImpl.getValue(value, "border-style") as String;
-			}
-			if (borderStyle != null && borderStyle != "none")
-			{
-				if (value.getBeadByType(IBorderBead) == null)
-					value.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBorderBead")) as IBead);	
-			}
-			
-			var padding:Object = determinePadding();
-			
-			if (contentAreaNeeded())
-			{
-				actualParent = new ContainerContentArea();
-				DisplayObjectContainer(value).addChild(actualParent);
-				Container(value).setActualParent(actualParent);
-				actualParent.x = padding.paddingLeft;
-				actualParent.y = padding.paddingTop;
-			}
-			else
-			{
-				actualParent = value as UIBase;
-			}
-		}
-		
-		/**
-		 *  Determines the top and left padding values, if any, as set by
-		 *  padding style values. This includes "padding" for all padding values
-		 *  as well as "padding-left" and "padding-top".
-		 * 
-		 *  Returns an object with paddingLeft and paddingTop properties.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		protected function determinePadding():Object
-		{
-			var paddingLeft:Object;
-			var paddingTop:Object;
-			var padding:Object = ValuesManager.valuesImpl.getValue(_strand, "padding");
-			if (padding is Array)
-			{
-				if (padding.length == 1)
-					paddingLeft = paddingTop = padding[0];
-				else if (padding.length <= 3)
-				{
-					paddingLeft = padding[1];
-					paddingTop = padding[0];
-				}
-				else if (padding.length == 4)
-				{
-					paddingLeft = padding[3];
-					paddingTop = padding[0];					
-				}
-			}
-			else if (padding == null)
-			{
-				paddingLeft = ValuesManager.valuesImpl.getValue(_strand, "padding-left");
-				paddingTop = ValuesManager.valuesImpl.getValue(_strand, "padding-top");
-			}
-			else
-			{
-				paddingLeft = paddingTop = padding;
-			}
-			var pl:Number = Number(paddingLeft);
-			var pt:Number = Number(paddingTop);
-			
-			return {paddingLeft:pl, paddingTop:pt};
-		}
-		
-		/**
-		 *  Returns true if container to create a separate ContainerContentArea.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		protected function contentAreaNeeded():Boolean
-		{
-			var padding:Object = determinePadding();
-			
-			return (!isNaN(padding.paddingLeft) && padding.paddingLeft > 0 ||
-				    !isNaN(padding.paddingTop) && padding.paddingTop > 0);
-		}
-		
-        /**
-         *  The parent of the children.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get contentView():DisplayObjectContainer
-		{
-			return actualParent;
-		}
-		
-        /**
-         *  The border.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get border():Border
-		{
-			return null;
-		}
-		
-        /**
-         *  The host component, which can resize to different slots.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get resizableView():DisplayObject
-		{
-			return _strand as DisplayObject;
-		}
-		
-        /**
-         *  The vertical ScrollBar, if it exists.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get vScrollBar():ScrollBar
-		{
-			return null;
-		}
-		
-        /**
-         *  The horizontal ScrollBar, if it exists.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get hScrollBar():ScrollBar
-		{
-			return null;
-		}
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ControlBarMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ControlBarMeasurementBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ControlBarMeasurementBead.as
deleted file mode 100644
index 8dcbf6d..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ControlBarMeasurementBead.as
+++ /dev/null
@@ -1,116 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObjectContainer;
-	
-	import org.apache.flex.core.IMeasurementBead;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.IUIBase;
-	import org.apache.flex.html.staticControls.Container;
-	
-	/**
-	 *  The ControlBarMeasurementBead class measures the size of a org.apache.flex.html.staticControls.ControlBar
-	 *  component.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ControlBarMeasurementBead implements IMeasurementBead
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ControlBarMeasurementBead()
-		{
-		}
-		
-		/**
-		 *  Returns the overall width of the ControlBar.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get measuredWidth():Number
-		{
-			// Note: the measurement should problably be done by the ControlBar's layout manager bead
-			// since it would know the arrangement of the items and how far apart they are and if
-			// there are margins and paddings and gaps involved.
-			var mwidth:Number = 0;
-			var children:Array = Container(_strand).getChildren();
-			var n:int = children.length;
-			for(var i:int=0; i < n; i++) {
-				var child:IUIBase = children[i] as IUIBase;
-				if( child == null ) continue;
-				var childMeasure:IMeasurementBead = child.getBeadByType(IMeasurementBead) as IMeasurementBead;
-                if (childMeasure)
-    				mwidth += childMeasure.measuredWidth;
-			}
-			return mwidth;
-		}
-		
-		/**
-		 *  Returns the overall height of the ControlBar.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get measuredHeight():Number
-		{
-			// Note: the measurement should problably be done by the ControlBar's layout manager bead
-			// since it would know the arrangement of the items and how far apart they are and if
-			// there are margins and paddings and gaps involved.
-			var mheight:Number = 0;
-			var n:int = DisplayObjectContainer(_strand).numChildren;
-			for(var i:int=0; i < n; i++) {
-				var child:IUIBase = DisplayObjectContainer(_strand).getChildAt(i) as IUIBase;
-				if( child == null ) continue;
-				var childMeasure:IMeasurementBead = child.getBeadByType(IMeasurementBead) as IMeasurementBead;
-				mheight += childMeasure.measuredHeight;
-			}
-			return mheight;
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.as
deleted file mode 100644
index 565c8df..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.as
+++ /dev/null
@@ -1,143 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IDataProviderItemRendererMapper;
-	import org.apache.flex.core.IItemRenderer;
-	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.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	
-    /**
-     *  The DataItemRendererFactoryForArrayData class reads an
-     *  array of data and creates an item renderer for every
-     *  item in the array.  Other implementations of
-     *  IDataProviderItemRendererMapper map different data 
-     *  structures or manage a virtual set of renderers.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class DataItemRendererFactoryForArrayData implements IBead, IDataProviderItemRendererMapper
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function DataItemRendererFactoryForArrayData()
-		{
-		}
-		
-		private var selectionModel:ISelectionModel;
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			selectionModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
-			var listView:IListView = value.getBeadByType(IListView) as IListView;
-			dataGroup = listView.dataGroup;
-			selectionModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
-			
-			if (!itemRendererFactory)
-			{
-				_itemRendererFactory = new (ValuesManager.valuesImpl.getValue(_strand, "iItemRendererClassFactory")) as IItemRendererClassFactory;
-				_strand.addBead(_itemRendererFactory);
-			}
-			
-			dataProviderChangeHandler(null);
-		}
-		
-		private var _itemRendererFactory:IItemRendererClassFactory;
-		
-        /**
-         *  The org.apache.flex.core.IItemRendererClassFactory used 
-         *  to generate instances of item renderers.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get itemRendererFactory():IItemRendererClassFactory
-		{
-			return _itemRendererFactory;
-		}
-		
-        /**
-         *  @private
-         */
-		public function set itemRendererFactory(value:IItemRendererClassFactory):void
-		{
-			_itemRendererFactory = value;
-		}
-		
-        /**
-         *  The org.apache.flex.core.IItemRendererParent that will
-         *  parent the item renderers.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		protected var dataGroup:IItemRendererParent;
-		
-		private function dataProviderChangeHandler(event:Event):void
-		{
-			var dp:Array = selectionModel.dataProvider as Array;
-			if (!dp)
-				return;
-			
-			dataGroup.removeAllElements();
-			
-			var n:int = dp.length; 
-			for (var i:int = 0; i < n; i++)
-			{
-				var ir:IItemRenderer = itemRendererFactory.createItemRenderer(dataGroup) as IItemRenderer;
-				ir.index = i;
-				ir.labelField = selectionModel.labelField;
-				dataGroup.addElement(ir);
-				ir.data = dp[i];
-			}
-			
-			IEventDispatcher(_strand).dispatchEvent(new Event("itemsCreated"));
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/DownArrowButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/DownArrowButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/DownArrowButtonView.as
deleted file mode 100644
index 3be7ed6..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/DownArrowButtonView.as
+++ /dev/null
@@ -1,103 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.Graphics;
-	import flash.display.Shape;
-	import flash.display.SimpleButton;
-
-	import org.apache.flex.core.IStrand;
-    import org.apache.flex.core.IBeadView;
-	
-    /**
-     *  The DownArrowButtonView class is the view for
-     *  the down arrow button in a ScrollBar and other controls.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class DownArrowButtonView implements IBeadView
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function DownArrowButtonView()
-		{
-			upView = new Shape();
-			downView = new Shape();
-			overView = new Shape();
-
-			drawView(upView.graphics, 0xCCCCCC);
-			drawView(downView.graphics, 0x808080);
-			drawView(overView.graphics, 0xEEEEEE);
-		}
-		
-		private function drawView(g:Graphics, bgColor:uint):void
-		{
-			g.lineStyle(1);
-			g.beginFill(bgColor);
-			g.drawRect(0, 0, 16, 16);
-			g.endFill();
-			g.lineStyle(0);
-			g.beginFill(0);
-			g.moveTo(4, 4);
-			g.lineTo(12, 4);
-			g.lineTo(8, 12);
-			g.lineTo(4, 4);
-			g.endFill();
-		}
-		
-		private var _strand:IStrand;
-		
-		private var shape:Shape;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			shape = new Shape();
-			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, 16, 16);
-			shape.graphics.endFill();
-			SimpleButton(value).upState = upView;
-			SimpleButton(value).downState = downView;
-			SimpleButton(value).overState = overView;
-			SimpleButton(value).hitTestState = shape;
-		}
-				
-		private var upView:Shape;
-		private var downView:Shape;
-		private var overView:Shape;
-        
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/DropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/DropDownListView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/DropDownListView.as
deleted file mode 100644
index 0849c7a..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/DropDownListView.as
+++ /dev/null
@@ -1,283 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	import flash.display.Graphics;
-	import flash.display.Shape;
-	import flash.display.SimpleButton;
-	import flash.display.Sprite;
-	import flash.text.TextFieldType;
-	
-	import org.apache.flex.core.CSSTextField;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IPopUpHost;
-	import org.apache.flex.core.ISelectionModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.IPopUpHost;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-
-    /**
-     *  The DropDownListView class is the default view for
-     *  the org.apache.flex.html.staticControls.DropDownList class.
-     *  It displays a simple text label with what appears to be a
-     *  down arrow button on the right, but really, the entire
-     *  view is the button that will display or dismiss the dropdown.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class DropDownListView implements IDropDownListView, IBeadView
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function DropDownListView()
-		{
-            upSprite = new Sprite();
-            downSprite = new Sprite();
-            overSprite = new Sprite();
-			upTextField = new CSSTextField();
-			downTextField = new CSSTextField();
-			overTextField = new CSSTextField();
-            upSprite.addChild(upTextField);
-            overSprite.addChild(overTextField);
-            downSprite.addChild(downTextField);
-			upTextField.border = true;
-			downTextField.border = true;
-			overTextField.border = true;
-			upTextField.background = true;
-			downTextField.background = true;
-			overTextField.background = true;
-			upTextField.borderColor = 0;
-			downTextField.borderColor = 0;
-			overTextField.borderColor = 0;
-			upTextField.backgroundColor = 0xEEEEEE;
-			downTextField.backgroundColor = 0x808080;
-			overTextField.backgroundColor = 0xFFFFFF;
-			upTextField.selectable = false;
-			upTextField.type = TextFieldType.DYNAMIC;
-			downTextField.selectable = false;
-			downTextField.type = TextFieldType.DYNAMIC;
-			overTextField.selectable = false;
-			overTextField.type = TextFieldType.DYNAMIC;
-			//upTextField.autoSize = "left";
-			//downTextField.autoSize = "left";
-			//overTextField.autoSize = "left";
-            
-            upArrows = new Shape();
-            overArrows = new Shape();
-            downArrows = new Shape();
-            upSprite.addChild(upArrows);
-			overSprite.addChild(overArrows);
-			downSprite.addChild(downArrows);
-            drawArrows(upArrows, 0xEEEEEE);
-            drawArrows(overArrows, 0xFFFFFF);
-            drawArrows(downArrows, 0x808080);
-
-		}
-
-        private function drawArrows(shape:Shape, color:uint):void
-        {
-            var g:Graphics = shape.graphics;
-            g.beginFill(color);
-            g.drawRect(0, 0, 16, 17);
-            g.endFill();
-            g.beginFill(0);
-            g.moveTo(8, 2);
-            g.lineTo(12, 6);
-            g.lineTo(4, 6);
-            g.lineTo(8, 2);
-            g.endFill();
-            g.beginFill(0);
-            g.moveTo(8, 14);
-            g.lineTo(12, 10);
-            g.lineTo(4, 10);
-            g.lineTo(8, 14);
-            g.endFill();
-            g.lineStyle(1, 0);
-            g.drawRect(0, 0, 16, 17);
-        }
-        
-		private var selectionModel:ISelectionModel;
-		
-		private var _strand:IStrand;
-		
-		private var shape:Shape;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-            selectionModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
-            selectionModel.addEventListener("selectedIndexChanged", selectionChangeHandler);
-			shape = new Shape();
-			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, 10, 10);
-			shape.graphics.endFill();
-			SimpleButton(value).upState = upSprite;
-			SimpleButton(value).downState = downSprite;
-			SimpleButton(value).overState = overSprite;
-			SimpleButton(value).hitTestState = shape;
-			if (selectionModel.selectedIndex !== -1)
-				text = selectionModel.selectedItem.toString();
-            IEventDispatcher(value).addEventListener("heightChanged", changeHandler);
-            IEventDispatcher(value).addEventListener("widthChanged", changeHandler);
-			changeHandler(null);
-		}
-		
-		private function selectionChangeHandler(event:Event):void
-		{
-			text = selectionModel.selectedItem.toString();
-		}
-		
-        private function changeHandler(event:Event):void
-        {
-            var ww:Number = DisplayObject(_strand).width;
-            var hh:Number = DisplayObject(_strand).height;
-            upArrows.x = ww - upArrows.width;            
-            overArrows.x = ww - overArrows.width;            
-            downArrows.x = ww - downArrows.width;
-			upTextField.width = upArrows.x;
-			downTextField.width = downArrows.x;
-			overTextField.width = overArrows.x;
-			upTextField.height = hh;
-			downTextField.height = hh;
-			overTextField.height = hh;
-			shape.graphics.clear();
-			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, ww, hh);
-			shape.graphics.endFill();
-        }
-        
-		private var upTextField:CSSTextField;
-		private var downTextField:CSSTextField;
-		private var overTextField:CSSTextField;
-        private var upSprite:Sprite;
-        private var downSprite:Sprite;
-        private var overSprite:Sprite;
-        private var upArrows:Shape;
-        private var downArrows:Shape;
-        private var overArrows:Shape;
-		
-        /**
-         *  The text that is displayed in the view.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get text():String
-		{
-			return upTextField.text;
-		}
-        
-        /**
-         *  @private
-         */
-		public function set text(value:String):void
-		{
-            var ww:Number = DisplayObject(_strand).width;
-            var hh:Number = DisplayObject(_strand).height;
-			upTextField.text = value;
-			downTextField.text = value;
-			overTextField.text = value;
-			
-		}
-		
-        private var _popUp:IStrand;
-        
-        /**
-         *  The dropdown/popup that displays the set of choices.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function get popUp():IStrand
-        {
-            return _popUp;
-        }
-        
-        private var _popUpVisible:Boolean;
-        
-        /**
-         *  A flag that indicates whether the dropdown/popup is
-         *  visible.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function get popUpVisible():Boolean
-        {
-            return _popUpVisible;
-        }
-        
-        /**
-         *  @private
-         */
-        public function set popUpVisible(value:Boolean):void
-        {
-            if (value != _popUpVisible)
-            {
-                _popUpVisible = value;
-                if (value)
-                {
-                    if (!_popUp)
-                    {
-                        var popUpClass:Class = ValuesManager.valuesImpl.getValue(_strand, "iPopUp") as Class;
-                        _popUp = new popUpClass() as IStrand;
-                    }
-					var root:Object = DisplayObject(_strand).root;
-					var host:DisplayObjectContainer = DisplayObject(_strand).parent;
-                    while (host && !(host is IPopUpHost))
-                        host = host.parent;
-                    if (host)
-                        IPopUpHost(host).addElement(popUp);
-                }
-                else
-                {
-                    DisplayObject(_popUp).parent.removeChild(_popUp as DisplayObject);                    
-                }
-            }
-        }
-        
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IBackgroundBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IBackgroundBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IBackgroundBead.as
deleted file mode 100644
index 921bc8a..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IBackgroundBead.as
+++ /dev/null
@@ -1,35 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.IBead;
-
-    /**
-     *  The IBackgroundBead interface is a marker interface for beads
-     *  that draw backgrounds.
-     * 
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public interface IBackgroundBead extends IBead
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IBorderBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IBorderBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IBorderBead.as
deleted file mode 100644
index 66115c8..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IBorderBead.as
+++ /dev/null
@@ -1,35 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.IBead;
-
-    /**
-     *  The IBackgroundBead interface is a marker interface for beads
-     *  that draw backgrounds.
-     * 
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public interface IBorderBead extends IBead
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IComboBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IComboBoxView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IComboBoxView.as
deleted file mode 100644
index dc4ceb7..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IComboBoxView.as
+++ /dev/null
@@ -1,78 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-    import org.apache.flex.core.IBeadView;
-    import org.apache.flex.core.IStrand;
-    
-	/**
-	 *  The IComboBoxView interface provides the protocol for any bead that
-	 *  creates the visual parts for a org.apache.flex.html.staticControls.ComboBox control.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public interface IComboBoxView extends IBeadView
-	{
-		/**
-		 *  The string appearing in the input area for the ComboBox.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		function get text():String;
-		function set text(value:String):void;
-		
-		/**
-		 *  The HTML string appearing in the input area for the ComboBox.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		function get html():String;
-		function set html(value:String):void;
-		
-		/**
-		 *  The component housing the selection list.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		function get popUp():IStrand;
-		
-		/**
-		 *  Determines whether or not the pop-up with the selection list is visible or not.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		function get popUpVisible():Boolean;
-		function set popUpVisible(value:Boolean):void;
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IDropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IDropDownListView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IDropDownListView.as
deleted file mode 100644
index ca865bc..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IDropDownListView.as
+++ /dev/null
@@ -1,57 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-    import org.apache.flex.core.IBeadView;
-    import org.apache.flex.core.IStrand;
-
-    /**
-     *  The IDropDownListView interface is the interface for views for
-     *  the org.apache.flex.html.staticControls.DropDownList.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public interface IDropDownListView extends IBeadView
-	{
-        
-        /**
-         *  @copy org.apache.flex.html.staticControls.beads.DropDownListView#popup
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        function get popUp():IStrand;
-        
-        /**
-         *  @copy org.apache.flex.html.staticControls.beads.DropDownListView#popupVisible
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        function get popUpVisible():Boolean;
-        function set popUpVisible(value:Boolean):void;
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IGraphicsDrawing.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IGraphicsDrawing.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IGraphicsDrawing.as
deleted file mode 100644
index e19f7f6..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IGraphicsDrawing.as
+++ /dev/null
@@ -1,36 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-    /**
-     *  The IGraphicsDrawing interface is a marker interface for beads
-     *  that draw into the graphics layer.  This helps a bead determine
-     *  if it is the first of many graphics drawing beads so it can
-     *  know whether or not to clear the graphics layer before drawing.
-     * 
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public interface IGraphicsDrawing
-	{
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IListView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IListView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IListView.as
deleted file mode 100644
index 6b53e18..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IListView.as
+++ /dev/null
@@ -1,56 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{	
-	import org.apache.flex.core.IItemRendererParent;
-	import org.apache.flex.core.IStrand;
-
-	/**
-	 *  The IListView interface provides the protocol for any bead that
-	 *  creates the visual parts for a org.apache.flex.html.staticControls.List control.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public interface IListView
-	{
-		/**
-		 *  The component which parents all of the itemRenderers for each
-		 *  datum being displayed by the List component.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		function get dataGroup():IItemRendererParent;
-		
-		/**
-		 *  The host component.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		function get strand():IStrand;
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IScrollBarView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IScrollBarView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IScrollBarView.as
deleted file mode 100644
index 0ccfac2..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/IScrollBarView.as
+++ /dev/null
@@ -1,80 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	
-	import org.apache.flex.core.IScrollBarModel;
-	import org.apache.flex.core.IStrand;
-
-    /**
-     *  The IScrollBarView interface is the interface for views for
-     *  the org.apache.flex.html.staticControls.supportClasses.ScrollBar.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public interface IScrollBarView
-	{
-        /**
-         *  The down arrow button in a vertical ScrollBar or right arrow
-         *  button in a horizontal ScrollBar
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		function get increment():DisplayObject;
-        
-        /**
-         *  The up arrow button in a vertical ScrollBar or left arrow
-         *  button in a horizontal ScrollBar
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		function get decrement():DisplayObject;
-
-        /**
-         *  The track in a ScrollBar
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		function get track():DisplayObject;
-        
-        /**
-         *  The thumb in a ScrollBar
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		function get thumb():DisplayObject;
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ISliderView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ISliderView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ISliderView.as
deleted file mode 100644
index aa2b912..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ISliderView.as
+++ /dev/null
@@ -1,56 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	
-	import org.apache.flex.core.IBead;
-	
-	/**
-	 *  The ISliderView interface provides the protocol for any bead that
-	 *  creates the visual parts for a org.apache.flex.html.staticControls.Slider control.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public interface ISliderView extends IBead
-	{
-		/**
-		 *  The component used for the track area of the org.apache.flex.html.staticControls.Slider.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		function get track():DisplayObject;
-		
-		/**
-		 *  The component used for the thumb button of the org.apache.flex.html.staticControls.Slider.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		function get thumb():DisplayObject;
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ISpinnerView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ISpinnerView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ISpinnerView.as
deleted file mode 100644
index 4ef5f81..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ISpinnerView.as
+++ /dev/null
@@ -1,56 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	
-	import org.apache.flex.core.IBead;
-	
-	/**
-	 *  The ISpinnerView interface provides the protocol for any bead that
-	 *  creates the visual parts for a org.apache.flex.html.staticControls.Spinner control.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public interface ISpinnerView extends IBead
-	{
-		/**
-		 *  The component used to increment the org.apache.flex.html.staticControls.Spinner value.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		function get increment():DisplayObject;
-		
-		/**
-		 *  The component used to decrement the org.apache.flex.html.staticControls.Spinner value.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		function get decrement():DisplayObject;
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ITextFieldView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ITextFieldView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ITextFieldView.as
deleted file mode 100644
index f9bff0b..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ITextFieldView.as
+++ /dev/null
@@ -1,44 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.CSSTextField;
-
-    /**
-     *  The ITextFieldView interface is the interface for views for
-     *  the use a CSSTextField to display text.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public interface ITextFieldView
-	{
-        /**
-         *  The org.apache.flex.core.CSSTextField used to display text.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		function get textField():CSSTextField;
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ITextItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ITextItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ITextItemRenderer.as
deleted file mode 100644
index 0e86593..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ITextItemRenderer.as
+++ /dev/null
@@ -1,45 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.IItemRenderer;
-
-    /**
-     *  The ITextItemRenderer interface is the interface for
-     *  for org.apache.flex.core.IItemRenderer that display text.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public interface ITextItemRenderer extends IItemRenderer
-	{
-        /**
-         *  The text to be displayed in the item renderer.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        function get text():String;
-        function set text(value:String):void;
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ImageView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ImageView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ImageView.as
deleted file mode 100644
index 3b12779..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ImageView.as
+++ /dev/null
@@ -1,121 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.Bitmap;
-	import flash.display.Loader;
-	import flash.display.LoaderInfo;
-	import flash.net.URLRequest;
-	
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IImageModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	
-	/**
-	 *  The ImageView class creates the visual elements of the org.apache.flex.html.staticControls.Image component.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ImageView implements IBeadView
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ImageView()
-		{
-		}
-		
-		private var bitmap:Bitmap;
-		private var loader:Loader;
-		
-		private var _strand:IStrand;
-		private var _model:IImageModel;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			IEventDispatcher(_strand).addEventListener("widthChanged",handleSizeChange);
-			IEventDispatcher(_strand).addEventListener("heightChanged",handleSizeChange);
-			
-			_model = value.getBeadByType(IImageModel) as IImageModel;
-			_model.addEventListener("urlChanged",handleUrlChange);
-			
-			handleUrlChange(null);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleUrlChange(event:Event):void
-		{
-			if (_model.source) {
-				loader = new Loader();
-				loader.contentLoaderInfo.addEventListener("complete",onComplete);
-				loader.load(new URLRequest(_model.source));
-			}
-		}
-		
-		/**
-		 * @private
-		 */
-		private function onComplete(event:Object):void
-		{
-			if (bitmap) {
-				UIBase(_strand).removeChild(bitmap);
-			}
-			
-			bitmap = Bitmap(LoaderInfo(event.target).content);
-			
-			UIBase(_strand).addChild(bitmap);
-			
-			handleSizeChange(null);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleSizeChange(event:Object):void
-		{
-			if (bitmap) {
-				bitmap.width = UIBase(_strand).width;
-				bitmap.height = UIBase(_strand).height;
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ListView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ListView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ListView.as
deleted file mode 100644
index ff86d64..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ListView.as
+++ /dev/null
@@ -1,260 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{	
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IBeadLayout;
-	import org.apache.flex.core.IBeadModel;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IItemRenderer;
-	import org.apache.flex.core.IItemRendererParent;
-	import org.apache.flex.core.ILayoutParent;
-	import org.apache.flex.core.IParent;
-	import org.apache.flex.core.IRollOverModel;
-	import org.apache.flex.core.ISelectionModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.Strand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.beads.models.ScrollBarModel;
-	import org.apache.flex.html.staticControls.beads.models.SingleLineBorderModel;
-	import org.apache.flex.html.staticControls.supportClasses.Border;
-	import org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup;
-	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
-
-	/**
-	 *  The List class creates the visual elements of the org.apache.flex.html.staticControls.List 
-	 *  component. A List consists of the area to display the data (in the dataGroup), any 
-	 *  scrollbars, and so forth.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ListView extends Strand implements IBeadView, IStrand, IListView, ILayoutParent
-	{
-		public function ListView()
-		{
-		}
-						
-		private var listModel:ISelectionModel;
-		
-		private var _border:Border;
-		
-		/**
-		 *  The border surrounding the org.apache.flex.html.staticControls.List.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-        public function get border():Border
-        {
-            return _border;
-        }
-		
-		private var _dataGroup:IItemRendererParent;
-		
-		/**
-		 *  The area holding the itemRenderers.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get dataGroup():IItemRendererParent
-		{
-			return _dataGroup;
-		}
-		
-		private var _vScrollBar:ScrollBar;
-		
-		/**
-		 *  The vertical org.apache.flex.html.staticControls.ScrollBar, if needed.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get vScrollBar():ScrollBar
-		{
-            if (!_vScrollBar)
-                _vScrollBar = createScrollBar();
-			return _vScrollBar;
-		}
-		
-		/**
-		 *  The horizontal org.apache.flex.html.staticControls.ScrollBar, currently null.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get hScrollBar():ScrollBar
-		{
-			return null;
-		}
-		
-		/**
-		 *  The contentArea includes the dataGroup and scrollBars.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get contentView():DisplayObjectContainer
-		{
-			return _dataGroup as DisplayObjectContainer;
-		}
-		
-		/**
-		 * @private
-		 */
-		public function get resizableView():DisplayObject
-		{
-			return _strand as DisplayObject;
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get strand():IStrand
-		{
-			return _strand;
-		}
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			IEventDispatcher(_strand).addEventListener("widthChanged", handleSizeChange);
-			IEventDispatcher(_strand).addEventListener("heightChanged",handleSizeChange);
-            
-            listModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
-            listModel.addEventListener("selectedIndexChanged", selectionChangeHandler);
-            listModel.addEventListener("rollOverIndexChanged", rollOverIndexChangeHandler);
-
-            _border = new Border();
-            _border.model = new (ValuesManager.valuesImpl.getValue(value, "iBorderModel")) as IBeadModel;
-            _border.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBorderBead")) as IBead);
-            IParent(_strand).addElement(_border);
-            
-			_dataGroup = new NonVirtualDataGroup();
-			IParent(_strand).addElement(_dataGroup);
-            
-            if (_strand.getBeadByType(IBeadLayout) == null)
-            {
-                var mapper:IBeadLayout = new (ValuesManager.valuesImpl.getValue(_strand, "iBeadLayout")) as IBeadLayout;
-				strand.addBead(mapper);
-            }  
-			
-			handleSizeChange(null);
-		}
-		
-		private var lastSelectedIndex:int = -1;
-		
-		/**
-		 * @private
-		 */
-		private function selectionChangeHandler(event:Event):void
-		{
-			if (lastSelectedIndex != -1)
-			{
-				var ir:IItemRenderer = dataGroup.getItemRendererForIndex(lastSelectedIndex) as IItemRenderer;
-                ir.selected = false;
-			}
-			if (listModel.selectedIndex != -1)
-			{
-	            ir = dataGroup.getItemRendererForIndex(listModel.selectedIndex);
-	            ir.selected = true;
-			}
-            lastSelectedIndex = listModel.selectedIndex;
-		}
-		
-		private var lastRollOverIndex:int = -1;
-		
-		/**
-		 * @private
-		 */
-		private function rollOverIndexChangeHandler(event:Event):void
-		{
-			if (lastRollOverIndex != -1)
-			{
-				var ir:IItemRenderer = dataGroup.getItemRendererForIndex(lastRollOverIndex) as IItemRenderer;
-                ir.hovered = false;
-			}
-			if (IRollOverModel(listModel).rollOverIndex != -1)
-			{
-	            ir = dataGroup.getItemRendererForIndex(IRollOverModel(listModel).rollOverIndex);
-	            ir.hovered = true;
-			}
-			lastRollOverIndex = IRollOverModel(listModel).rollOverIndex;
-		}
-			
-		/**
-		 * @private
-		 */
-		private function createScrollBar():ScrollBar
-		{
-			var vsb:ScrollBar;
-			vsb = new ScrollBar();
-			var vsbm:ScrollBarModel = new ScrollBarModel();
-			vsbm.maximum = 100;
-			vsbm.minimum = 0;
-			vsbm.pageSize = 10;
-			vsbm.pageStepSize = 10;
-			vsbm.snapInterval = 1;
-			vsbm.stepSize = 1;
-			vsbm.value = 0;
-			vsb.model = vsbm;
-			vsb.width = 16;
-            IParent(_strand).addElement(vsb);
-			return vsb;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleSizeChange(event:Event):void
-		{
-			UIBase(_dataGroup).x = 0;
-			UIBase(_dataGroup).y = 0;
-			UIBase(_dataGroup).width = UIBase(_strand).width;
-			UIBase(_dataGroup).height = UIBase(_strand).height;
-		}
-				
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/NumericStepperView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/NumericStepperView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/NumericStepperView.as
deleted file mode 100644
index 600e50c..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/NumericStepperView.as
+++ /dev/null
@@ -1,216 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.ILayoutParent;
-	import org.apache.flex.core.IParent;
-	import org.apache.flex.core.IRangeModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.createjs.staticControls.Label;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.Spinner;
-	import org.apache.flex.html.staticControls.TextInput;
-	import org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout;
-	import org.apache.flex.html.staticControls.supportClasses.Border;
-	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
-	
-	/**
-	 *  The NumericStepperView class creates the visual elements of the 
-	 *  org.apache.flex.html.staticControls.NumericStepper component. A NumberStepper consists of a 
-	 *  org.apache.flex.html.staticControls.TextInput component to display the value and a 
-	 *  org.apache.flex.html.staticControls.Spinner to change the value.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class NumericStepperView implements IBeadView, ILayoutParent
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function NumericStepperView()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-		private var label:Label;
-		private var input:TextInput;
-		private var spinner:Spinner;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			// add a horizontal layout bead
-			value.addBead(new NonVirtualHorizontalLayout());
-            
-			// add an input field
-			input = new TextInput();
-			IParent(value).addElement(input);
-			
-			// add a spinner
-			spinner = new Spinner();
-			spinner.addBead( UIBase(value).model );
-			IParent(value).addElement(spinner);
-			spinner.width = 17;
-			input.height = spinner.height; // should be spinner.height = input.height but the spinner buttons won't get small enough
-			
-			// listen for changes to the text input field which will reset the
-			// value. ideally, we should either set the input to accept only
-			// numeric values or, barring that, reject non-numeric entries. we
-			// cannot do that right now however.
-			input.model.addEventListener("textChange",inputChangeHandler);
-			
-			// listen for change events on the spinner so the value can be updated as
-			// as resizing the component
-			spinner.addEventListener("valueChanged",spinnerValueChanged);
-			IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
-			IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler);
-			
-			// listen for changes to the model itself and update the UI accordingly
-			IEventDispatcher(UIBase(value).model).addEventListener("valueChange",modelChangeHandler);
-			IEventDispatcher(UIBase(value).model).addEventListener("minimumChange",modelChangeHandler);
-			IEventDispatcher(UIBase(value).model).addEventListener("maximumChange",modelChangeHandler);
-			IEventDispatcher(UIBase(value).model).addEventListener("stepSizeChange",modelChangeHandler);
-			IEventDispatcher(UIBase(value).model).addEventListener("snapIntervalChange",modelChangeHandler);
-			
-			input.text = String(spinner.value);
-			
-			// set a default size which will trigger the sizeChangeHandler
-			var minWidth:Number = Math.max(50+spinner.width,UIBase(value).width);
-			
-			UIBase(value).width = minWidth;
-			UIBase(value).height = spinner.height;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function sizeChangeHandler(event:Event) : void
-		{
-			input.x = 2;
-			input.y = (UIBase(_strand).height - input.height)/2;
-			input.width = UIBase(_strand).width-spinner.width-2;
-			spinner.x = input.width+2;
-			spinner.y = 0;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function spinnerValueChanged(event:Event) : void
-		{
-			input.text = String(spinner.value);
-			
-			var newEvent:Event = new Event(event.type,event.bubbles);
-			IEventDispatcher(_strand).dispatchEvent(newEvent);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function inputChangeHandler(event:Event) : void
-		{
-			var newValue:Number = Number(input.text);
-
-			if( !isNaN(newValue) ) {
-				spinner.value = newValue;
-			}
-			else {
-				input.text = String(spinner.value);
-			}
-		}
-		
-		/**
-		 * @private
-		 */
-		private function modelChangeHandler( event:Event ) : void
-		{
-			var n:Number = IRangeModel(UIBase(_strand).model).value;
-			input.text = String(IRangeModel(UIBase(_strand).model).value);
-		}
-		
-		/**
-		 *  The area containing the TextInput and Spinner controls.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get contentView():DisplayObjectContainer
-		{
-			return _strand as DisplayObjectContainer;
-		}
-		
-		/**
-		 *  @private
-		 */
-		public function get border():Border
-		{
-			return null;
-		}
-		
-		/**
-		 * @private
-		 */
-		public function get vScrollBar():ScrollBar
-		{
-			return null;
-		}
-		
-		/**
-		 * @private
-		 */
-		public function get hScrollBar():ScrollBar
-		{
-			return null;
-		}
-		
-		/**
-		 * @private
-		 */
-		public function get resizableView():DisplayObject
-		{
-			return _strand as DisplayObject;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/PanelView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/PanelView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/PanelView.as
deleted file mode 100644
index 2108ea1..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/PanelView.as
+++ /dev/null
@@ -1,180 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.Sprite;
-	
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.IUIBase;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.UIMetrics;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.Container;
-	import org.apache.flex.html.staticControls.ControlBar;
-	import org.apache.flex.html.staticControls.Panel;
-	import org.apache.flex.html.staticControls.TitleBar;
-	import org.apache.flex.utils.BeadMetrics;
-	
-	/**
-	 *  The Panel class creates the visual elements of the org.apache.flex.html.staticControls.Panel 
-	 *  component. A Panel has a org.apache.flex.html.staticControls.TitleBar, content, and an 
-	 *  optional org.apache.flex.html.staticControls.ControlBar.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class PanelView extends ContainerView implements IBeadView
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function PanelView()
-		{
-			_titleBar = new TitleBar();
-		}
-		
-		private var _titleBar:TitleBar;
-		
-		/**
-		 *  The org.apache.flex.html.staticControls.TitleBar component of the 
-		 *  org.apache.flex.html.staticControls.Panel.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get titleBar():TitleBar
-		{
-			return _titleBar;
-		}
-		
-		private var _controlBar:ControlBar;
-		
-		/**
-		 *  The org.apache.flex.html.staticControls.ControlBar for the Panel; may be null.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get controlBar():ControlBar
-		{
-			return _controlBar;
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		override public function set strand(value:IStrand):void
-		{
-			super.strand = value;
-			_strand = value;
-			
-			// replace the TitleBar's model with the Panel's model (it implements ITitleBarModel) so that
-			// any changes to values in the Panel's model that correspond values in the TitleBar will 
-			// be picked up automatically by the TitleBar.
-			titleBar.model = Panel(_strand).model;
-			Container(_strand).addElement(titleBar);
-			
-			var controlBarItems:Array = Panel(_strand).controlBar;
-			if( controlBarItems && controlBarItems.length > 0 ) {
-				_controlBar = new ControlBar();
-				
-				for each(var comp:IUIBase in controlBarItems) {
-					_controlBar.addElement(comp);
-				}
-				
-				Container(_strand).addElement(controlBar);
-			}
-			
-			IEventDispatcher(_strand).addEventListener("childrenAdded", changeHandler);            
-		}
-		
-		/**
-		 *  Always returns true because Panel's content is separate from its chrome
-		 *  elements such as the title bar and optional control bar.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		override protected function contentAreaNeeded():Boolean
-		{
-			return true;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function changeHandler(event:Event):void
-		{
-			var metrics:UIMetrics = BeadMetrics.getMetrics(_strand);
-			
-			var w:Number = UIBase(_strand).explicitWidth;
-			if (isNaN(w)) w = Math.max(titleBar.width,actualParent.width+metrics.left+metrics.right,controlBar?controlBar.width:0);
-			
-			var h:Number = UIBase(_strand).explicitHeight;
-			if (isNaN(h)) h = titleBar.height + actualParent.height + (controlBar ? controlBar.height : 0) +
-				metrics.top + metrics.bottom;
-			
-			titleBar.x = 0;
-			titleBar.y = 0;
-			titleBar.width = w;
-			
-			var remainingHeight:Number = h - titleBar.height;
-			
-			if( controlBar ) {
-				controlBar.x = 0;
-				controlBar.y = h - controlBar.height;
-				//controlBar.y = actualParent.y + actualParent.height + metrics.bottom;
-				controlBar.width = w;
-				
-				remainingHeight -= controlBar.height;
-			}
-			
-			actualParent.x = metrics.left;
-			actualParent.y = titleBar.y + titleBar.height + metrics.top;
-			actualParent.width = w;
-			actualParent.height = remainingHeight - metrics.top - metrics.bottom;
-			
-			UIBase(_strand).width = w;
-			UIBase(_strand).height = h;
-		}
-        
-	}
-}
\ No newline at end of file


[22/35] sed removal of staticControls. Now to see what I missed

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/UIItemRendererBase.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/UIItemRendererBase.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/UIItemRendererBase.js
index 8651da0..5c0d129 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/UIItemRendererBase.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/UIItemRendererBase.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase');
+goog.provide('org.apache.flex.html.supportClasses.UIItemRendererBase');
 
 goog.require('org.apache.flex.core.IItemRenderer');
 goog.require('org.apache.flex.core.IItemRendererFactory');
@@ -26,12 +26,12 @@ goog.require('org.apache.flex.events.Event');
  * @extends {org.apache.flex.core.UIBase}
  * @implements {org.apache.flex.core.IItemRenderer}
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase =
+org.apache.flex.html.supportClasses.UIItemRendererBase =
 function() {
   goog.base(this);
 };
 goog.inherits(
-    org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase,
+    org.apache.flex.html.supportClasses.UIItemRendererBase,
     org.apache.flex.core.UIBase);
 
 
@@ -40,16 +40,16 @@ goog.inherits(
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'UIItemRendererBase',
-                qName: 'org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase' }],
+                qName: 'org.apache.flex.html.supportClasses.UIItemRendererBase' }],
       interfaces: ['org.apache.flex.core.IItemRenderer, org.apache.flex.core.IItemRendererFactory']};
 
 
 /**
  * @expose
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.addedToParent =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.addedToParent =
 function() {
   goog.base(this, 'addedToParent');
 };
@@ -59,7 +59,7 @@ function() {
  * @expose
  * @return {Object} The data being used for the itemRenderer.
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_data =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.get_data =
 function() {
   return this.data_;
 };
@@ -69,7 +69,7 @@ function() {
  * @expose
  * @param {Object} value The data to use for the itemRenderer.
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_data =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.set_data =
 function(value) {
   this.data_ = value;
 };
@@ -79,7 +79,7 @@ function(value) {
  * @expose
  * @return {String} The name of the field being used to display the label.
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_labelField =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.get_labelField =
 function() {
   return this.labelField_;
 };
@@ -89,7 +89,7 @@ function() {
  * @expose
  * @param {String} value The name of the field to use for the label.
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_labelField =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.set_labelField =
 function(value) {
   this.labelField_ = value;
 };
@@ -99,7 +99,7 @@ function(value) {
  * @expose
  * @return {Number} The index value set for this itemRenderer.
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_index =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.get_index =
 function() {
   return this.index_;
 };
@@ -109,7 +109,7 @@ function() {
  * @expose
  * @param {Number} value The row index for this itemRenderer.
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_index =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.set_index =
 function(value) {
   this.index_ = value;
 };
@@ -119,7 +119,7 @@ function(value) {
  * @expose
  * @return {Boolean} The current value of the hovered state.
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_hovered =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.get_hovered =
 function() {
   return this.hovered_;
 };
@@ -129,7 +129,7 @@ function() {
  * @expose
  * @param {Boolean} value Set to true if the itemRenderer should go into hovered state.
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_hovered =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.set_hovered =
 function(value) {
   this.hovered_ = value;
 };
@@ -139,7 +139,7 @@ function(value) {
  * @expose
  * @return {Boolean} Whether or not the itemRenderer is selected.
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_selected =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.get_selected =
 function() {
   return this.selected_;
 };
@@ -149,7 +149,7 @@ function() {
  * @expose
  * @param {Boolean} value True if this itemRenderer instance is selected.
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_selected =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.set_selected =
 function(value) {
   this.selected_ = value;
 };
@@ -159,7 +159,7 @@ function(value) {
  * @expose
  * @return {Boolean} The value of the down selection.
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.get_down =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.get_down =
 function() {
   return this.down_;
 };
@@ -169,7 +169,7 @@ function() {
  * @expose
  * @param {Boolean} value True if the mouse is in the down position.
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.set_down =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.set_down =
 function(value) {
   this.down_ = value;
 };
@@ -178,7 +178,7 @@ function(value) {
 /**
  * @expose
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.updateRenderer =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.updateRenderer =
 function() {
   if (this.get_down()) {
   }
@@ -193,7 +193,7 @@ function() {
  * @expose
  * @param {Event} value The event that triggered the size change.
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.sizeChangeHandler =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.sizeChangeHandler =
 function(value) {
   //this.adjustSize();
 };
@@ -202,7 +202,7 @@ function(value) {
 /**
  * @expose
  */
-org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase.prototype.adjustSize =
+org.apache.flex.html.supportClasses.UIItemRendererBase.prototype.adjustSize =
 function() {
   // handle in sub-class
 };


[27/35] git commit: [flex-asjs] [refs/heads/develop] - sed removal of staticControls. Now to see what I missed

Posted by ah...@apache.org.
sed removal of staticControls.  Now to see what I missed


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

Branch: refs/heads/develop
Commit: daa3dabce2528398362ee4ed73e8eab4c4893586
Parents: 5759d50
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 25 11:00:01 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 25 11:00:01 2014 -0700

----------------------------------------------------------------------
 .../src/org/apache/flex/html/DataGrid.as        | 14 ++--
 .../src/org/apache/flex/html/DateChooser.as     |  4 +-
 .../src/org/apache/flex/html/DateField.as       |  4 +-
 .../html/accessories/DateFormatMMDDYYYYBead.as  |  8 +--
 .../flex/html/beads/DataGridColumnView.as       | 18 ++---
 .../org/apache/flex/html/beads/DataGridView.as  | 24 +++----
 .../DataItemRendererFactoryForColumnData.as     |  8 +--
 .../apache/flex/html/beads/DateChooserView.as   | 14 ++--
 .../org/apache/flex/html/beads/DateFieldView.as | 10 +--
 .../flex/html/beads/FormatableLabelView.as      |  4 +-
 .../flex/html/beads/FormatableTextInputView.as  |  4 +-
 .../org/apache/flex/html/beads/IDataGridView.as |  6 +-
 .../controllers/DateChooserMouseController.as   | 10 +--
 .../controllers/DateFieldMouseController.as     |  6 +-
 .../flex/html/beads/models/DataGridModel.as     | 12 ++--
 .../beads/models/DataGridPresentationModel.as   |  6 +-
 .../flex/html/beads/models/DateChooserModel.as  |  4 +-
 .../flex/html/supportClasses/DataGridColumn.as  |  6 +-
 .../html/supportClasses/DateChooserButton.as    |  6 +-
 .../FlexJSUI/src/org/apache/flex/html/Alert.as  |  4 +-
 .../FlexJSUI/src/org/apache/flex/html/Button.as |  4 +-
 .../src/org/apache/flex/html/ButtonBar.as       |  4 +-
 .../src/org/apache/flex/html/CheckBox.as        |  4 +-
 .../src/org/apache/flex/html/ComboBox.as        |  4 +-
 .../src/org/apache/flex/html/Container.as       |  4 +-
 .../src/org/apache/flex/html/ControlBar.as      |  6 +-
 .../src/org/apache/flex/html/DropDownList.as    |  4 +-
 .../FlexJSUI/src/org/apache/flex/html/Image.as  |  4 +-
 .../FlexJSUI/src/org/apache/flex/html/Label.as  |  4 +-
 .../FlexJSUI/src/org/apache/flex/html/List.as   |  4 +-
 .../src/org/apache/flex/html/NumericStepper.as  |  6 +-
 .../FlexJSUI/src/org/apache/flex/html/Panel.as  | 14 ++--
 .../src/org/apache/flex/html/RadioButton.as     |  4 +-
 .../src/org/apache/flex/html/SimpleAlert.as     |  4 +-
 .../src/org/apache/flex/html/SimpleList.as      |  6 +-
 .../FlexJSUI/src/org/apache/flex/html/Slider.as |  4 +-
 .../src/org/apache/flex/html/Spinner.as         |  6 +-
 .../src/org/apache/flex/html/TextArea.as        |  8 +--
 .../src/org/apache/flex/html/TextButton.as      |  8 +--
 .../src/org/apache/flex/html/TextInput.as       |  8 +--
 .../src/org/apache/flex/html/TitleBar.as        | 12 ++--
 .../accessories/NumericOnlyTextInputBead.as     |  6 +-
 .../flex/html/accessories/PasswordInputBead.as  |  6 +-
 .../flex/html/accessories/TextPromptBead.as     |  4 +-
 .../flex/html/beads/AlertMeasurementBead.as     | 10 +--
 .../src/org/apache/flex/html/beads/AlertView.as | 14 ++--
 .../org/apache/flex/html/beads/ButtonBarView.as |  8 +--
 .../org/apache/flex/html/beads/CSSButtonView.as |  6 +-
 .../apache/flex/html/beads/CSSTextButtonView.as |  6 +-
 .../org/apache/flex/html/beads/CheckBoxView.as  | 10 +--
 .../org/apache/flex/html/beads/ComboBoxView.as  | 16 ++---
 .../org/apache/flex/html/beads/ContainerView.as | 14 ++--
 .../html/beads/ControlBarMeasurementBead.as     |  8 +--
 .../DataItemRendererFactoryForArrayData.as      |  4 +-
 .../flex/html/beads/DownArrowButtonView.as      |  4 +-
 .../apache/flex/html/beads/DropDownListView.as  |  6 +-
 .../apache/flex/html/beads/IBackgroundBead.as   |  4 +-
 .../org/apache/flex/html/beads/IBorderBead.as   |  4 +-
 .../org/apache/flex/html/beads/IComboBoxView.as |  6 +-
 .../apache/flex/html/beads/IDropDownListView.as | 10 +--
 .../apache/flex/html/beads/IGraphicsDrawing.as  |  4 +-
 .../src/org/apache/flex/html/beads/IListView.as |  6 +-
 .../apache/flex/html/beads/IScrollBarView.as    |  6 +-
 .../org/apache/flex/html/beads/ISliderView.as   | 10 +--
 .../org/apache/flex/html/beads/ISpinnerView.as  | 10 +--
 .../apache/flex/html/beads/ITextFieldView.as    |  4 +-
 .../apache/flex/html/beads/ITextItemRenderer.as |  4 +-
 .../src/org/apache/flex/html/beads/ImageView.as |  6 +-
 .../src/org/apache/flex/html/beads/ListView.as  | 22 +++---
 .../flex/html/beads/NumericStepperView.as       | 20 +++---
 .../src/org/apache/flex/html/beads/PanelView.as | 24 +++----
 .../apache/flex/html/beads/RadioButtonView.as   | 10 +--
 .../org/apache/flex/html/beads/ScrollBarView.as | 18 ++---
 .../apache/flex/html/beads/SimpleAlertView.as   | 10 +--
 .../flex/html/beads/SingleLineBorderBead.as     |  4 +-
 .../apache/flex/html/beads/SliderThumbView.as   |  6 +-
 .../apache/flex/html/beads/SliderTrackView.as   |  6 +-
 .../org/apache/flex/html/beads/SliderView.as    |  8 +--
 .../flex/html/beads/SolidBackgroundBead.as      |  4 +-
 .../org/apache/flex/html/beads/SpinnerView.as   | 14 ++--
 .../org/apache/flex/html/beads/TextAreaView.as  | 12 ++--
 .../html/beads/TextButtonMeasurementBead.as     | 10 +--
 .../apache/flex/html/beads/TextButtonView.as    |  6 +-
 .../html/beads/TextFieldLabelMeasurementBead.as | 10 +--
 .../org/apache/flex/html/beads/TextFieldView.as |  6 +-
 .../apache/flex/html/beads/TextFieldViewBase.as |  4 +-
 .../org/apache/flex/html/beads/TextInputView.as |  6 +-
 .../flex/html/beads/TextInputWithBorderView.as  |  8 +--
 .../TextItemRendererFactoryForArrayData.as      |  4 +-
 ...extItemRendererFactoryForStringVectorData.as |  4 +-
 .../flex/html/beads/TitleBarMeasurementBead.as  | 12 ++--
 .../apache/flex/html/beads/UpArrowButtonView.as |  4 +-
 .../flex/html/beads/VScrollBarThumbView.as      |  4 +-
 .../flex/html/beads/VScrollBarTrackView.as      |  4 +-
 .../html/beads/controllers/AlertController.as   |  8 +--
 .../controllers/ButtonAutoRepeatController.as   |  4 +-
 .../beads/controllers/ComboBoxController.as     |  8 +--
 .../beads/controllers/DropDownListController.as |  8 +--
 .../EditableTextKeyboardController.as           |  6 +-
 .../controllers/ItemRendererMouseController.as  |  4 +-
 .../ListSingleSelectionMouseController.as       |  8 +--
 .../controllers/ScrollBarMouseControllerBase.as |  6 +-
 .../beads/controllers/SliderMouseController.as  |  8 +--
 .../beads/controllers/SpinnerMouseController.as |  8 +--
 .../controllers/VScrollBarMouseController.as    |  6 +-
 .../flex/html/beads/layouts/ButtonBarLayout.as  |  8 +--
 .../beads/layouts/NonVirtualHorizontalLayout.as |  4 +-
 .../NonVirtualHorizontalScrollingLayout.as      |  8 +--
 .../beads/layouts/NonVirtualVerticalLayout.as   |  4 +-
 .../NonVirtualVerticalScrollingLayout.as        |  8 +--
 .../flex/html/beads/layouts/TileLayout.as       |  4 +-
 .../flex/html/beads/layouts/VScrollBarLayout.as |  6 +-
 .../apache/flex/html/beads/models/AlertModel.as |  6 +-
 .../html/beads/models/ArraySelectionModel.as    |  4 +-
 .../flex/html/beads/models/ComboBoxModel.as     | 12 ++--
 .../apache/flex/html/beads/models/ImageModel.as |  6 +-
 .../apache/flex/html/beads/models/PanelModel.as | 10 +--
 .../apache/flex/html/beads/models/RangeModel.as |  4 +-
 .../flex/html/beads/models/ScrollBarModel.as    | 10 +--
 .../html/beads/models/SingleLineBorderModel.as  |  4 +-
 .../html/beads/models/StringSelectionModel.as   |  4 +-
 .../apache/flex/html/beads/models/TextModel.as  |  4 +-
 .../flex/html/beads/models/TitleBarModel.as     |  8 +--
 .../flex/html/beads/models/ToggleButtonModel.as | 10 +--
 .../html/beads/models/ValueToggleButtonModel.as | 10 +--
 .../apache/flex/html/supportClasses/Border.as   |  4 +-
 .../ButtonBarButtonItemRenderer.as              | 12 ++--
 .../html/supportClasses/ContainerContentArea.as |  4 +-
 .../html/supportClasses/DataItemRenderer.as     |  6 +-
 .../html/supportClasses/DropDownListList.as     |  8 +--
 .../html/supportClasses/NonVirtualDataGroup.as  |  6 +-
 .../flex/html/supportClasses/ScrollBar.as       |  4 +-
 .../html/supportClasses/StringItemRenderer.as   |  6 +-
 .../supportClasses/TextFieldItemRenderer.as     |  8 +--
 .../html/supportClasses/UIItemRendererBase.as   |  4 +-
 .../src/org/apache/flex/html5/Button.as         |  6 +-
 .../src/org/apache/flex/html5/CheckBox.as       |  6 +-
 .../src/org/apache/flex/html5/ComboBox.as       |  6 +-
 .../src/org/apache/flex/html5/DropDownList.as   |  6 +-
 .../FlexJSUI/src/org/apache/flex/html5/Label.as |  6 +-
 .../FlexJSUI/src/org/apache/flex/html5/List.as  |  6 +-
 .../src/org/apache/flex/html5/RadioButton.as    |  6 +-
 .../src/org/apache/flex/html5/TextArea.as       |  6 +-
 .../src/org/apache/flex/html5/TextButton.as     |  6 +-
 .../src/org/apache/flex/html5/TextInput.as      |  6 +-
 .../js/FlexJS/src/org/apache/flex/html/Alert.js | 72 ++++++++++----------
 .../FlexJS/src/org/apache/flex/html/Button.js   | 12 ++--
 .../src/org/apache/flex/html/ButtonBar.js       | 34 ++++-----
 .../FlexJS/src/org/apache/flex/html/CheckBox.js | 20 +++---
 .../FlexJS/src/org/apache/flex/html/ComboBox.js | 24 +++----
 .../src/org/apache/flex/html/Container.js       | 18 ++---
 .../src/org/apache/flex/html/ControlBar.js      | 18 ++---
 .../src/org/apache/flex/html/DropDownList.js    | 22 +++---
 .../js/FlexJS/src/org/apache/flex/html/Image.js | 24 +++----
 .../js/FlexJS/src/org/apache/flex/html/Label.js | 14 ++--
 .../js/FlexJS/src/org/apache/flex/html/List.js  | 42 ++++++------
 .../src/org/apache/flex/html/NumericStepper.js  | 46 ++++++-------
 .../js/FlexJS/src/org/apache/flex/html/Panel.js | 48 ++++++-------
 .../src/org/apache/flex/html/RadioButton.js     | 36 +++++-----
 .../src/org/apache/flex/html/SimpleAlert.js     | 12 ++--
 .../src/org/apache/flex/html/SimpleList.js      | 28 ++++----
 .../FlexJS/src/org/apache/flex/html/Slider.js   | 52 +++++++-------
 .../FlexJS/src/org/apache/flex/html/Spinner.js  | 44 ++++++------
 .../FlexJS/src/org/apache/flex/html/TextArea.js | 16 ++---
 .../src/org/apache/flex/html/TextButton.js      | 20 +++---
 .../src/org/apache/flex/html/TextInput.js       | 20 +++---
 .../FlexJS/src/org/apache/flex/html/TitleBar.js | 42 ++++++------
 .../accessories/NumericOnlyTextInputBead.js     | 12 ++--
 .../flex/html/accessories/PasswordInputBead.js  | 10 +--
 .../flex/html/accessories/TextPromptBead.js     | 14 ++--
 .../org/apache/flex/html/beads/ButtonBarView.js | 18 ++---
 .../DataItemRendererFactoryForArrayData.js      | 30 ++++----
 .../src/org/apache/flex/html/beads/IListView.js |  8 +--
 .../src/org/apache/flex/html/beads/ImageView.js | 16 ++---
 .../src/org/apache/flex/html/beads/ListView.js  | 40 +++++------
 .../src/org/apache/flex/html/beads/PanelView.js | 16 ++---
 .../apache/flex/html/beads/SliderThumbView.js   | 10 +--
 .../apache/flex/html/beads/SliderTrackView.js   | 10 +--
 .../TextItemRendererFactoryForArrayData.js      | 22 +++---
 .../controllers/ItemRendererMouseController.js  | 18 ++---
 .../ListSingleSelectionMouseController.js       | 20 +++---
 .../beads/controllers/SliderMouseController.js  | 28 ++++----
 .../beads/controllers/SpinnerMouseController.js | 16 ++---
 .../flex/html/beads/layouts/ButtonBarLayout.js  | 18 ++---
 .../beads/layouts/NonVirtualHorizontalLayout.js | 14 ++--
 .../beads/layouts/NonVirtualVerticalLayout.js   | 12 ++--
 .../NonVirtualVerticalScrollingLayout.js        | 12 ++--
 .../flex/html/beads/layouts/TileLayout.js       | 24 +++----
 .../html/beads/models/ArraySelectionModel.js    | 28 ++++----
 .../flex/html/beads/models/DataGridModel.js     | 22 +++---
 .../apache/flex/html/beads/models/ImageModel.js | 16 ++---
 .../apache/flex/html/beads/models/PanelModel.js | 24 +++----
 .../apache/flex/html/beads/models/RangeModel.js | 34 ++++-----
 .../flex/html/beads/models/TitleBarModel.js     | 24 +++----
 .../ButtonBarButtonItemRenderer.js              | 28 ++++----
 .../flex/html/supportClasses/DataGridColumn.js  | 20 +++---
 .../html/supportClasses/DataItemRenderer.js     | 36 +++++-----
 .../html/supportClasses/NonVirtualDataGroup.js  | 24 +++----
 .../html/supportClasses/StringItemRenderer.js   | 40 +++++------
 .../html/supportClasses/UIItemRendererBase.js   | 42 ++++++------
 200 files changed, 1215 insertions(+), 1215 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DataGrid.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DataGrid.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DataGrid.as
index 0bc5281..c608555 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DataGrid.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DataGrid.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import org.apache.flex.core.IDataGridModel;
 	import org.apache.flex.core.UIBase;
@@ -26,9 +26,9 @@ package org.apache.flex.html.staticControls
 	/**
 	 *  The DataGrid class displays a collection of data using columns and rows. Each
 	 *  column represents a specific field in the data set; each row represents a specific
-	 *  datum. The DataGrid is a composite component built with a org.apache.flex.html.staticControls.ButtonBar 
-	 *  for the column headers and a org.apache.flex.html.staticControls.List for each column. The DataGrid's 
-	 *  view bead (usually org.apache.flex.html.staticControls.beads.DataGridView) constructs these parts while 
+	 *  datum. The DataGrid is a composite component built with a org.apache.flex.html.ButtonBar 
+	 *  for the column headers and a org.apache.flex.html.List for each column. The DataGrid's 
+	 *  view bead (usually org.apache.flex.html.beads.DataGridView) constructs these parts while 
 	 *  itemRenderer factories contruct the elements to display the data in each cell.
 	 *  
 	 *  @langversion 3.0
@@ -52,7 +52,7 @@ package org.apache.flex.html.staticControls
 		}
 		
 		/**
-		 *  The array of org.apache.flex.html.staticControls.supportClasses.DataGridColumns used to 
+		 *  The array of org.apache.flex.html.supportClasses.DataGridColumns used to 
 		 *  describe each column.
 		 *
 		 *  @langversion 3.0
@@ -70,7 +70,7 @@ package org.apache.flex.html.staticControls
 		}
 		
 		/**
-		 *  The object used to provide data to the org.apache.flex.html.staticControls.DataGrid.
+		 *  The object used to provide data to the org.apache.flex.html.DataGrid.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -99,4 +99,4 @@ package org.apache.flex.html.staticControls
 			return IDataGridModel(model).selectedIndex;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateChooser.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateChooser.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateChooser.as
index 6f36af7..33615ea 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateChooser.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateChooser.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import org.apache.flex.core.IDateChooserModel;
 	import org.apache.flex.core.UIBase;
@@ -71,4 +71,4 @@ package org.apache.flex.html.staticControls
 			IDateChooserModel(model).selectedDate = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateField.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateField.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateField.as
index f5c77f4..d1cf5f8 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateField.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateField.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IDateChooserModel;
@@ -87,4 +87,4 @@ package org.apache.flex.html.staticControls
 			IDateChooserModel(model).selectedDate = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/accessories/DateFormatMMDDYYYYBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/accessories/DateFormatMMDDYYYYBead.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/accessories/DateFormatMMDDYYYYBead.as
index 3b52c40..c3e7c7e 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/accessories/DateFormatMMDDYYYYBead.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/accessories/DateFormatMMDDYYYYBead.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.accessories
+package org.apache.flex.html.accessories
 {
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IDateChooserModel;
@@ -24,8 +24,8 @@ package org.apache.flex.html.staticControls.accessories
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.EventDispatcher;
-	import org.apache.flex.html.staticControls.TextInput;
-	import org.apache.flex.html.staticControls.beads.DateFieldView;
+	import org.apache.flex.html.TextInput;
+	import org.apache.flex.html.beads.DateFieldView;
 	
 	/**
 	 * The DateFormatBead class formats the display of a DateField using MM/DD/YYYY format.
@@ -148,4 +148,4 @@ package org.apache.flex.html.staticControls.accessories
 		}
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridColumnView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridColumnView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridColumnView.as
index 91f81ef..4266148 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridColumnView.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridColumnView.as
@@ -16,15 +16,15 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IStrand;
-	import org.apache.flex.html.staticControls.supportClasses.DataGridColumn;
+	import org.apache.flex.html.supportClasses.DataGridColumn;
 	
 	/**
-	 *  The DataGridColumnView class extends org.apache.flex.html.staticControls.beads.ListView and 
-	 *  provides properties to the org.apache.flex.html.staticControls.List that makes a column in 
-	 *  the org.apache.flex.html.staticControls.DataGrid.  
+	 *  The DataGridColumnView class extends org.apache.flex.html.beads.ListView and 
+	 *  provides properties to the org.apache.flex.html.List that makes a column in 
+	 *  the org.apache.flex.html.DataGrid.  
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -83,9 +83,9 @@ package org.apache.flex.html.staticControls.beads
 		private var _column:DataGridColumn;
 		
 		/**
-		 *  The org.apache.flex.html.staticControls.support.DataGridColumn containing information used to 
-		 *  present the org.apache.flex.html.staticControls.List as a column in the 
-		 *  org.apache.flex.html.staticControls.DataGrid.
+		 *  The org.apache.flex.html.support.DataGridColumn containing information used to 
+		 *  present the org.apache.flex.html.List as a column in the 
+		 *  org.apache.flex.html.DataGrid.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -101,4 +101,4 @@ package org.apache.flex.html.staticControls.beads
 			_column = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridView.as
index b1c8205..6a5a9bd 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridView.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {	
 	import org.apache.flex.core.IBeadModel;
 	import org.apache.flex.core.IDataGridModel;
@@ -26,18 +26,18 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.ValuesManager;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.ButtonBar;
-	import org.apache.flex.html.staticControls.Container;
-	import org.apache.flex.html.staticControls.List;
-	import org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout;
-	import org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout;
-	import org.apache.flex.html.staticControls.beads.models.ArraySelectionModel;
-	import org.apache.flex.html.staticControls.supportClasses.DataGridColumn;
+	import org.apache.flex.html.ButtonBar;
+	import org.apache.flex.html.Container;
+	import org.apache.flex.html.List;
+	import org.apache.flex.html.beads.layouts.ButtonBarLayout;
+	import org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout;
+	import org.apache.flex.html.beads.models.ArraySelectionModel;
+	import org.apache.flex.html.supportClasses.DataGridColumn;
 	
 	/**
-	 *  The DataGridView class is the visual bead for the org.apache.flex.html.staticControls.DataGrid. 
+	 *  The DataGridView class is the visual bead for the org.apache.flex.html.DataGrid. 
 	 *  This class constructs the items that make the DataGrid: Lists for each column and a 
-	 *  org.apache.flex.html.staticControls.ButtonBar for the column headers.  
+	 *  org.apache.flex.html.ButtonBar for the column headers.  
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -65,7 +65,7 @@ package org.apache.flex.html.staticControls.beads
 		private var columns:Array;
 		
 		/**
-		 *  The array of org.apache.flex.html.staticControls.supportClasses.DataGridColumn instances.
+		 *  The array of org.apache.flex.html.supportClasses.DataGridColumn instances.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -210,4 +210,4 @@ package org.apache.flex.html.staticControls.beads
 			IEventDispatcher(_strand).dispatchEvent(new Event('rollOver'));
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataItemRendererFactoryForColumnData.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataItemRendererFactoryForColumnData.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataItemRendererFactoryForColumnData.as
index c33e153..d399cfb 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataItemRendererFactoryForColumnData.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataItemRendererFactoryForColumnData.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IBeadView;
@@ -28,12 +28,12 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.ValuesManager;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.supportClasses.DataItemRenderer;
+	import org.apache.flex.html.supportClasses.DataItemRenderer;
 	
 	/**
 	 *  The DataItemRendererFactoryForColumnData class implents the 
 	 *  org.apache.flex.core.IDataProviderItemRendererMapper interface and creates the itemRenderers 
-	 *  for each cell in the org.apache.flex.html.staticControls.DataGrid.  
+	 *  for each cell in the org.apache.flex.html.DataGrid.  
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -139,4 +139,4 @@ package org.apache.flex.html.staticControls.beads
 			IEventDispatcher(_strand).dispatchEvent(new Event("itemsCreated"));
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateChooserView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateChooserView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateChooserView.as
index 12cc8f5..34d422e 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateChooserView.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateChooserView.as
@@ -16,10 +16,10 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {	
-	import org.apache.flex.html.staticControls.beads.models.DateChooserModel;
-	import org.apache.flex.html.staticControls.supportClasses.DateChooserButton;
+	import org.apache.flex.html.beads.models.DateChooserModel;
+	import org.apache.flex.html.supportClasses.DateChooserButton;
 	
 	import org.apache.flex.core.IBeadModel;
 	import org.apache.flex.core.IBeadView;
@@ -28,9 +28,9 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.ValuesManager;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.beads.layouts.TileLayout;
-	import org.apache.flex.html.staticControls.Container;
-	import org.apache.flex.html.staticControls.TextButton;
+	import org.apache.flex.html.beads.layouts.TileLayout;
+	import org.apache.flex.html.Container;
+	import org.apache.flex.html.TextButton;
 	
 	/**
 	 * The DateChooserView class is a view bead for the DateChooser. This class
@@ -254,4 +254,4 @@ package org.apache.flex.html.staticControls.beads
 			updateCalendar();
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateFieldView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateFieldView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateFieldView.as
index 6a9008d..7ead1ab 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateFieldView.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateFieldView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {	
 	import org.apache.flex.core.IBeadView;
 	import org.apache.flex.core.IDateChooserModel;
@@ -29,9 +29,9 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
 	import org.apache.flex.utils.UIUtils;
-	import org.apache.flex.html.staticControls.DateChooser;
-	import org.apache.flex.html.staticControls.TextButton;
-	import org.apache.flex.html.staticControls.TextInput;
+	import org.apache.flex.html.DateChooser;
+	import org.apache.flex.html.TextButton;
+	import org.apache.flex.html.TextInput;
 	
 	/**
 	 * The DateFieldView class is a bead for DateField that creates the
@@ -184,4 +184,4 @@ package org.apache.flex.html.staticControls.beads
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableLabelView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableLabelView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableLabelView.as
index 1fc8e1a..51e2ec9 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableLabelView.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableLabelView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IFormatBead;
 	import org.apache.flex.core.IStrand;
@@ -87,4 +87,4 @@ package org.apache.flex.html.staticControls.beads
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableTextInputView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableTextInputView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableTextInputView.as
index 66fcab4..f6a5d57 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableTextInputView.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableTextInputView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IFormatBead;
 	import org.apache.flex.core.IStrand;
@@ -86,4 +86,4 @@ package org.apache.flex.html.staticControls.beads
 			this.textField.setSelection(l,l);
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/IDataGridView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/IDataGridView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/IDataGridView.as
index f359337..8f04d11 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/IDataGridView.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/IDataGridView.as
@@ -16,13 +16,13 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IBeadView;
 	
 	/**
 	 *  The IDataGridView interface marks as a component as being the bead that
-	 *  can create the visual pieces for a org.apache.flex.html.staticControls.DataGrid. 
+	 *  can create the visual pieces for a org.apache.flex.html.DataGrid. 
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -33,4 +33,4 @@ package org.apache.flex.html.staticControls.beads
 	{
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateChooserMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateChooserMouseController.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateChooserMouseController.as
index 69343eb..0aaa052 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateChooserMouseController.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateChooserMouseController.as
@@ -16,11 +16,11 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.controllers
+package org.apache.flex.html.beads.controllers
 {	
-	import org.apache.flex.html.staticControls.beads.DateChooserView;
-	import org.apache.flex.html.staticControls.beads.models.DateChooserModel;
-	import org.apache.flex.html.staticControls.supportClasses.DateChooserButton;
+	import org.apache.flex.html.beads.DateChooserView;
+	import org.apache.flex.html.beads.models.DateChooserModel;
+	import org.apache.flex.html.supportClasses.DateChooserButton;
 	
 	import org.apache.flex.core.IBeadController;
 	import org.apache.flex.core.IBeadModel;
@@ -123,4 +123,4 @@ package org.apache.flex.html.staticControls.beads.controllers
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateFieldMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateFieldMouseController.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateFieldMouseController.as
index e603b04..d1213cb 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateFieldMouseController.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateFieldMouseController.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.controllers
+package org.apache.flex.html.beads.controllers
 {	
 	import org.apache.flex.core.IBeadController;
 	import org.apache.flex.core.IDateChooserModel;
@@ -24,7 +24,7 @@ package org.apache.flex.html.staticControls.beads.controllers
 	import org.apache.flex.core.UIBase;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.beads.DateFieldView;
+	import org.apache.flex.html.beads.DateFieldView;
 	
 	/**
 	 * The DateFieldMouseController class is responsible for monitoring
@@ -94,4 +94,4 @@ package org.apache.flex.html.staticControls.beads.controllers
 			IEventDispatcher(_strand).dispatchEvent(new Event("change"));
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridModel.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridModel.as
index 7af27d6..f50b36a 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridModel.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridModel.as
@@ -16,14 +16,14 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {
 	import org.apache.flex.core.IDataGridModel;
 	import org.apache.flex.events.Event;
 	
 	/**
-	 *  The DataGridModel class bead extends org.apache.flex.html.staticControls.beads.modelsArraySelectionModel 
-	 *  and adds the array of org.apache.flex.html.staticControls.supportClasses.DataGridColumns used to define 
+	 *  The DataGridModel class bead extends org.apache.flex.html.beads.modelsArraySelectionModel 
+	 *  and adds the array of org.apache.flex.html.supportClasses.DataGridColumns used to define 
 	 *  each of the column in the DataGrid.
 	 *  
 	 *  @langversion 3.0
@@ -49,8 +49,8 @@ package org.apache.flex.html.staticControls.beads.models
 		private var _columns:Array;
 		
 		/**
-		 *  The array of org.apache.flex.html.staticControls.supportClasses.DataGridColumns used to 
-		 *  define each column of the org.apache.flex.html.staticControls.DataGrid.
+		 *  The array of org.apache.flex.html.supportClasses.DataGridColumns used to 
+		 *  define each column of the org.apache.flex.html.DataGrid.
 		 *  
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -69,4 +69,4 @@ package org.apache.flex.html.staticControls.beads.models
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridPresentationModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridPresentationModel.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridPresentationModel.as
index a630caf..e05dc0b 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridPresentationModel.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DataGridPresentationModel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {
 	import org.apache.flex.core.IDataGridPresentationModel;
 	import org.apache.flex.core.IStrand;
@@ -25,7 +25,7 @@ package org.apache.flex.html.staticControls.beads.models
 	
 	/**
 	 *  The DataGridPresentationModel class contains the data to label the columns
-	 *  of the org.apache.flex.html.staticControls.DataGrid along with the height of the rows. 
+	 *  of the org.apache.flex.html.DataGrid along with the height of the rows. 
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -106,4 +106,4 @@ package org.apache.flex.html.staticControls.beads.models
 			_strand = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DateChooserModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DateChooserModel.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DateChooserModel.as
index 245e3cb..4b6fc18 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DateChooserModel.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/models/DateChooserModel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {	
 	import org.apache.flex.core.IDateChooserModel;
 	import org.apache.flex.core.IStrand;
@@ -186,4 +186,4 @@ package org.apache.flex.html.staticControls.beads.models
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DataGridColumn.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DataGridColumn.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DataGridColumn.as
index e999f89..be18319 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DataGridColumn.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DataGridColumn.as
@@ -16,13 +16,13 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.supportClasses
+package org.apache.flex.html.supportClasses
 {
 	import mx.core.IFactory;
 
 	/**
 	 *  The DataGridColumn class is the collection of properties that describe
-	 *  a column of the org.apache.flex.html.staticControls.DataGrid: which renderer 
+	 *  a column of the org.apache.flex.html.DataGrid: which renderer 
 	 *  to use for each cell in the column, the width of the column, the label for the 
 	 *  column, and the name of the field in the data containing the value to display 
 	 *  in the column. 
@@ -124,4 +124,4 @@ package org.apache.flex.html.staticControls.supportClasses
 			_dataField = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DateChooserButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DateChooserButton.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DateChooserButton.as
index 70c7606..2d80b2f 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DateChooserButton.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/supportClasses/DateChooserButton.as
@@ -16,9 +16,9 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.supportClasses
+package org.apache.flex.html.supportClasses
 {
-	import org.apache.flex.html.staticControls.TextButton;
+	import org.apache.flex.html.TextButton;
 	
 	/**
 	 *  The DateChooserButton class is used for each button in the DateChooser. The
@@ -64,4 +64,4 @@ package org.apache.flex.html.staticControls.supportClasses
 			_dayOfMonth = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Alert.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Alert.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Alert.as
index 7a04fe7..62c7ec6 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Alert.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Alert.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import org.apache.flex.core.IAlertModel;
 	import org.apache.flex.core.IPopUp;
@@ -192,4 +192,4 @@ package org.apache.flex.html.staticControls
 		}
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Button.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Button.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Button.as
index 8770153..4ef4bc8 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Button.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Button.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.IUIBase;
@@ -71,4 +71,4 @@ package org.apache.flex.html.staticControls
 			super();
 		}		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ButtonBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ButtonBar.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ButtonBar.as
index 06da973..4b3c7a9 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ButtonBar.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ButtonBar.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	/**
 	 *  The ButtonBar class is a component that displays a set of Buttons. The ButtonBar
@@ -50,4 +50,4 @@ package org.apache.flex.html.staticControls
 			super();
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/CheckBox.as
index 175d411..7fa5601 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/CheckBox.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/CheckBox.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
     import flash.events.MouseEvent;
 	
@@ -113,4 +113,4 @@ package org.apache.flex.html.staticControls
 			dispatchEvent(new Event("change"));
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ComboBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ComboBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ComboBox.as
index 7fdebc1..2b2919d 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ComboBox.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ComboBox.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import org.apache.flex.core.IComboBoxModel;
 	import org.apache.flex.core.UIBase;
@@ -111,4 +111,4 @@ package org.apache.flex.html.staticControls
 		}
 				
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Container.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Container.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Container.as
index f9450b1..d4ed27b 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Container.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Container.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
@@ -185,4 +185,4 @@ package org.apache.flex.html.staticControls
 			dispatchEvent(new Event("childrenAdded"));
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ControlBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ControlBar.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ControlBar.as
index 75456d7..1ba9f37 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ControlBar.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/ControlBar.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	
 	import org.apache.flex.core.IBeadLayout;
@@ -27,7 +27,7 @@ package org.apache.flex.html.staticControls
 	/**
 	 *  The ControlBar class is used within a Panel as a place to position
 	 *  additional controls. The ControlBar appears at the bottom of the 
-	 *  org.apache.flex.html.staticControls.Panel
+	 *  org.apache.flex.html.Panel
 	 *  and is not part of the Panel's scrollable content area. The ControlBar
 	 *  is a Container and implements the org.apache.flex.core.IChrome interface, indicating that is
 	 *  outside of the Container's content area. The ControlBar uses the following
@@ -73,4 +73,4 @@ package org.apache.flex.html.staticControls
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/DropDownList.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/DropDownList.as
index 4ae7405..9c60f85 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/DropDownList.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/DropDownList.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
     import org.apache.flex.core.ISelectionModel;
     
@@ -134,4 +134,4 @@ package org.apache.flex.html.staticControls
         }
                         
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Image.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Image.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Image.as
index adda24b..8bf2f98 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Image.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Image.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import org.apache.flex.core.IImageModel;
 	import org.apache.flex.core.UIBase;
@@ -65,4 +65,4 @@ package org.apache.flex.html.staticControls
 			IImageModel(model).source = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Label.as
index 4702274..a18b1d1 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Label.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Label.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import org.apache.flex.core.ITextModel;
 	import org.apache.flex.core.UIBase;
@@ -115,4 +115,4 @@ package org.apache.flex.html.staticControls
 			IEventDispatcher(model).dispatchEvent( new Event("heightChanged") );
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/List.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/List.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/List.as
index 1f93e24..59fb793 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/List.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/List.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import mx.core.IFactory;
 	
@@ -182,4 +182,4 @@ package org.apache.flex.html.staticControls
 		}
         
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/NumericStepper.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/NumericStepper.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/NumericStepper.as
index f588d7c..ef8de09 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/NumericStepper.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/NumericStepper.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import org.apache.flex.core.IRangeModel;
 
@@ -24,7 +24,7 @@ package org.apache.flex.html.staticControls
 	
 	/**
 	 *  The NumericStepper class is a component that displays a numeric
-	 *  value and up/down controls (using a org.apache.flex.html.staticControls.Spinner) to 
+	 *  value and up/down controls (using a org.apache.flex.html.Spinner) to 
 	 *  increase and decrease the value by specific amounts. The NumericStepper uses the following beads:
 	 * 
 	 *  org.apache.flex.core.IBeadModel: the data model for the component of type org.apache.flex.core.IRangeModel.
@@ -140,4 +140,4 @@ package org.apache.flex.html.staticControls
 		}
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Panel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Panel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Panel.as
index ff7afed..0117699 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Panel.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Panel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import org.apache.flex.core.IPanelModel;
 
@@ -24,7 +24,7 @@ package org.apache.flex.html.staticControls
 	
 	/**
 	 *  The Panel class is a Container component capable of parenting other
-	 *  components. The Panel has a TitleBar and an optional org.apache.flex.html.staticControls.ControlBar. 
+	 *  components. The Panel has a TitleBar and an optional org.apache.flex.html.ControlBar. 
 	 *  The Panel uses the following bead types:
 	 * 
 	 *  org.apache.flex.core.IBeadModel: the data model for the Panel that includes the title and whether
@@ -54,7 +54,7 @@ package org.apache.flex.html.staticControls
 		}
 		
 		/**
-		 *  The string to display in the org.apache.flex.html.staticControls.TitleBar.
+		 *  The string to display in the org.apache.flex.html.TitleBar.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -71,7 +71,7 @@ package org.apache.flex.html.staticControls
 		}
 		
 		/**
-		 *  The HTML string to display in the org.apache.flex.html.staticControls.TitleBar.
+		 *  The HTML string to display in the org.apache.flex.html.TitleBar.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -88,7 +88,7 @@ package org.apache.flex.html.staticControls
 		}
 		
 		/**
-		 * Whether or not to show a Close button in the org.apache.flex.html.staticControls.TitleBar.
+		 * Whether or not to show a Close button in the org.apache.flex.html.TitleBar.
 		 */
 		public function get showCloseButton():Boolean
 		{
@@ -102,7 +102,7 @@ package org.apache.flex.html.staticControls
 		private var _controlBar:Array;
 		
 		/**
-		 *  The items in the org.apache.flex.html.staticControls.ControlBar. Setting this property automatically
+		 *  The items in the org.apache.flex.html.ControlBar. Setting this property automatically
 		 *  causes the ControlBar to display.
 		 *
 		 *  @langversion 3.0
@@ -120,4 +120,4 @@ package org.apache.flex.html.staticControls
 		}
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/RadioButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/RadioButton.as
index 0a1add5..8b53bac 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/RadioButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/RadioButton.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import flash.display.DisplayObject;
 	import flash.events.MouseEvent;
@@ -205,4 +205,4 @@ package org.apache.flex.html.staticControls
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleAlert.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleAlert.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleAlert.as
index ccf73ea..c368b11 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleAlert.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleAlert.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {	
 	import org.apache.flex.core.IAlertModel;
 	import org.apache.flex.core.IPopUp;
@@ -129,4 +129,4 @@ package org.apache.flex.html.staticControls
 		}
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleList.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleList.as
index ba096c6..4c6fc90 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleList.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/SimpleList.as
@@ -16,11 +16,11 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	/**
 	 *  The SimpleList class is a component that displays data in a vertical column. This
-	 *  component differs from org.apache.flex.html.staticControls.List in that it displays 
+	 *  component differs from org.apache.flex.html.List in that it displays 
 	 *  only string values and maps to the &lt;select&gt; HTML element.
 	 *  
 	 *  @langversion 3.0
@@ -43,4 +43,4 @@ package org.apache.flex.html.staticControls
 			super();
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Slider.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Slider.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Slider.as
index 07717a5..0445011 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Slider.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Slider.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import org.apache.flex.core.IRangeModel;
 	import org.apache.flex.core.UIBase;
@@ -149,4 +149,4 @@ package org.apache.flex.html.staticControls
         }
 
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Spinner.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Spinner.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Spinner.as
index fb77659..e43e0bc 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Spinner.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Spinner.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import org.apache.flex.core.IRangeModel;
 	import org.apache.flex.core.UIBase;
@@ -25,7 +25,7 @@ package org.apache.flex.html.staticControls
 	
 	/**
 	 *  The Spinner class is a component that displays a control for incrementing a value
-	 *  and a control for decrementing a value. The org.apache.flex.html.staticControls.NumericStepper 
+	 *  and a control for decrementing a value. The org.apache.flex.html.NumericStepper 
 	 *  uses a Spinner as part of the component. Spinner uses the following beads:
 	 * 
 	 *  org.apache.flex.core.IBeadModel: an IRangeModel to hold the properties.
@@ -143,4 +143,4 @@ package org.apache.flex.html.staticControls
 		}
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextArea.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextArea.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextArea.as
index b1cd581..c3c8fcb 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextArea.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextArea.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import org.apache.flex.core.ITextModel;
 	import org.apache.flex.core.UIBase;
@@ -46,7 +46,7 @@ package org.apache.flex.html.staticControls
 		}
 		
         /**
-         *  @copy org.apache.flex.html.staticControls.Label#text
+         *  @copy org.apache.flex.html.Label#text
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
@@ -67,7 +67,7 @@ package org.apache.flex.html.staticControls
 		}
 		
         /**
-         *  @copy org.apache.flex.html.staticControls.Label#html
+         *  @copy org.apache.flex.html.Label#html
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
@@ -88,4 +88,4 @@ package org.apache.flex.html.staticControls
 		}
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextButton.as
index 3658005..90db23e 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextButton.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import org.apache.flex.core.ITextModel;
 	
@@ -45,7 +45,7 @@ package org.apache.flex.html.staticControls
 		}
 		
         /**
-         *  @copy org.apache.flex.html.staticControls.Label#text
+         *  @copy org.apache.flex.html.Label#text
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
@@ -66,7 +66,7 @@ package org.apache.flex.html.staticControls
 		}
 		
         /**
-         *  @copy org.apache.flex.html.staticControls.Label#html
+         *  @copy org.apache.flex.html.Label#html
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
@@ -87,4 +87,4 @@ package org.apache.flex.html.staticControls
 		}
 
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextInput.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextInput.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextInput.as
index ce85fa4..8b937e7 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextInput.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TextInput.as
@@ -15,7 +15,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import org.apache.flex.core.ITextModel;
 	import org.apache.flex.core.UIBase;
@@ -58,7 +58,7 @@ package org.apache.flex.html.staticControls
 		}
 		
         /**
-         *  @copy org.apache.flex.html.staticControls.Label#text
+         *  @copy org.apache.flex.html.Label#text
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
@@ -79,7 +79,7 @@ package org.apache.flex.html.staticControls
 		}
 		
         /**
-         *  @copy org.apache.flex.html.staticControls.Label#html
+         *  @copy org.apache.flex.html.Label#html
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
@@ -112,4 +112,4 @@ package org.apache.flex.html.staticControls
             dispatchEvent(new Event(Event.CHANGE));
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TitleBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TitleBar.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TitleBar.as
index 1b1ec40..e217b2b 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TitleBar.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/TitleBar.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls
+package org.apache.flex.html
 {
 	import flash.display.Shape;
 	
@@ -26,7 +26,7 @@ package org.apache.flex.html.staticControls
 	import org.apache.flex.core.ITitleBarModel;
 	import org.apache.flex.core.ValuesManager;
 	import org.apache.flex.events.Event;
-	import org.apache.flex.html.staticControls.Label;
+	import org.apache.flex.html.Label;
 	
 	/**
 	 *  The TitleBar class is a Container component that displays a title and an
@@ -35,9 +35,9 @@ package org.apache.flex.html.staticControls
 	 *  org.apache.flex.core.IBeadModel: the data model, which includes the title and showCloseButton values.
 	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the component.
 	 *  org.apache.flex.core.IBeadLayout: the bead that handles size and position of the component parts 
-	 *  (org.apache.flex.html.staticControls.Label and org.apache.flex.html.staticControls.Button).
+	 *  (org.apache.flex.html.Label and org.apache.flex.html.Button).
 	 *  org.apache.flex.core.IMeasurementBead: a bead that helps determine the size of the 
-	 *  org.apache.flex.html.staticControls.TitleBar for layout.
+	 *  org.apache.flex.html.TitleBar for layout.
 	 * 
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -96,7 +96,7 @@ package org.apache.flex.html.staticControls
 		}
 		
 		/**
-		 *  Whether or not to show a org.apache.flex.html.staticControls.Button that indicates the component
+		 *  Whether or not to show a org.apache.flex.html.Button that indicates the component
 		 *  may be closed.
 		 *
 		 *  @langversion 3.0
@@ -244,4 +244,4 @@ package org.apache.flex.html.staticControls
 			dispatchEvent(newEvent);
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as
index b0c7322..4614294 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.accessories
+package org.apache.flex.html.accessories
 {
 	import flash.events.TextEvent;
 	
@@ -25,7 +25,7 @@ package org.apache.flex.html.staticControls.accessories
 	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.ITextFieldView;
+	import org.apache.flex.html.beads.ITextFieldView;
 	
 	/**
 	 *  The NumericOnlyTextInputBead class is a specialty bead that can be used with
@@ -122,4 +122,4 @@ package org.apache.flex.html.staticControls.accessories
 			if (isNaN(n)) event.preventDefault();
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/PasswordInputBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/PasswordInputBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/PasswordInputBead.as
index 268ceea..55ef7d2 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/PasswordInputBead.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/PasswordInputBead.as
@@ -16,14 +16,14 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.accessories
+package org.apache.flex.html.accessories
 {
 	import org.apache.flex.core.CSSTextField;
 	import org.apache.flex.core.IBead;
 	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.ITextFieldView;
+	import org.apache.flex.html.beads.ITextFieldView;
 	
 	/**
 	 *  The PasswordInput class is a specialty bead that can be used with
@@ -82,4 +82,4 @@ package org.apache.flex.html.staticControls.accessories
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/TextPromptBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/TextPromptBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/TextPromptBead.as
index 4f41a67..36bf732 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/TextPromptBead.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/accessories/TextPromptBead.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.accessories
+package org.apache.flex.html.accessories
 {
 	import flash.text.TextFieldType;
 	
@@ -128,4 +128,4 @@ package org.apache.flex.html.staticControls.accessories
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertMeasurementBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertMeasurementBead.as
index f0d315b..dbe6c05 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertMeasurementBead.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertMeasurementBead.as
@@ -16,14 +16,14 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IMeasurementBead;
 	import org.apache.flex.core.IStrand;
 	
 	/**
 	 *  The AlertMeasureBead class provides boundary measurements for an 
-	 *  org.apache.flex.html.staticControls.Alert component.
+	 *  org.apache.flex.html.Alert component.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -45,7 +45,7 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 		/**
-		 *  Returns the overall width of the org.apache.flex.html.staticControls.Alert component.
+		 *  Returns the overall width of the org.apache.flex.html.Alert component.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -58,7 +58,7 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
 		/**
-		 *  Returns the overall height of the org.apache.flex.html.staticControls.Alert component.
+		 *  Returns the overall height of the org.apache.flex.html.Alert component.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -85,4 +85,4 @@ package org.apache.flex.html.staticControls.beads
 			_strand = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as
index c43149b..d5b2931 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IAlertModel;
 	import org.apache.flex.core.IBead;
@@ -30,14 +30,14 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.createjs.staticControls.Label;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.Alert;
-	import org.apache.flex.html.staticControls.ControlBar;
-	import org.apache.flex.html.staticControls.TextButton;
-	import org.apache.flex.html.staticControls.TitleBar;
+	import org.apache.flex.html.Alert;
+	import org.apache.flex.html.ControlBar;
+	import org.apache.flex.html.TextButton;
+	import org.apache.flex.html.TitleBar;
 	import org.apache.flex.utils.BeadMetrics;
 	
 	/**
-	 *  The AlertView class creates the visual elements of the org.apache.flex.html.staticControls.Alert
+	 *  The AlertView class creates the visual elements of the org.apache.flex.html.Alert
 	 *  component. The job of the view bead is to put together the parts of the Alert, such as the 
 	 *  title bar, message, and various buttons, within the space of the Alert component strand.
 	 *  
@@ -220,4 +220,4 @@ package org.apache.flex.html.staticControls.beads
 			IEventDispatcher(_strand).dispatchEvent(newEvent);
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ButtonBarView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ButtonBarView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ButtonBarView.as
index 873d4eb..8259c25 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ButtonBarView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ButtonBarView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
@@ -29,10 +29,10 @@ package org.apache.flex.html.staticControls.beads
 	import org.apache.flex.core.ValuesManager;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.supportClasses.Border;
+	import org.apache.flex.html.supportClasses.Border;
 
 	/**
-	 *  The ButtonBarView class creates the visual elements of the org.apache.flex.html.staticControls.ButtonBar 
+	 *  The ButtonBarView class creates the visual elements of the org.apache.flex.html.ButtonBar 
 	 *  component. A ButtonBar is a type of List and ButtonBarView extends the ListView bead, adding a border.
 	 *  
 	 *  @langversion 3.0
@@ -91,4 +91,4 @@ package org.apache.flex.html.staticControls.beads
 			IParent(_strand).addElement(_border);
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSButtonView.as
index 22f7c84..d91f8c9 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSButtonView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSButtonView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.Loader;
 	import flash.display.Shape;
@@ -33,7 +33,7 @@ package org.apache.flex.html.staticControls.beads
 
     /**
      *  The CSSButtonView class is the default view for
-     *  the org.apache.flex.html.staticControls.Button class.
+     *  the org.apache.flex.html.Button class.
      *  It allows the look of the button to be expressed
      *  in CSS via the background-image style.  This view
      *  does not display text.  Use CSSTextButtonView and
@@ -152,4 +152,4 @@ package org.apache.flex.html.staticControls.beads
 			
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSTextButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSTextButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSTextButtonView.as
index 991fa05..2e09efe 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSTextButtonView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CSSTextButtonView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	import flash.display.Loader;
@@ -39,7 +39,7 @@ package org.apache.flex.html.staticControls.beads
 
     /**
      *  The CSSTextButtonView class is the default view for
-     *  the org.apache.flex.html.staticControls.TextButton class.
+     *  the org.apache.flex.html.TextButton class.
      *  It allows the look of the button to be expressed
      *  in CSS via the background-image style and displays
      *  a text label.  This view does not support right-to-left
@@ -259,4 +259,4 @@ package org.apache.flex.html.staticControls.beads
 			overTextField.htmlText = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CheckBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CheckBoxView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CheckBoxView.as
index 14ef855..f92f857 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CheckBoxView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/CheckBoxView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.Shape;
 	import flash.display.SimpleButton;
@@ -32,7 +32,7 @@ package org.apache.flex.html.staticControls.beads
 	
     /**
      *  The CheckBoxView class is the default view for
-     *  the org.apache.flex.html.staticControls.CheckBox class.
+     *  the org.apache.flex.html.CheckBox class.
      *  It displays a simple checkbox with an 'x' if checked,
      *  and a label on the right.  There are no styles or
      *  properties to configure the look of the 'x' or the
@@ -136,7 +136,7 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
         /**
-         *  @copy org.apache.flex.html.staticControls.Label#text
+         *  @copy org.apache.flex.html.Label#text
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
@@ -164,7 +164,7 @@ package org.apache.flex.html.staticControls.beads
 		}
 		
         /**
-         *  @copy org.apache.flex.html.staticControls.Label#html
+         *  @copy org.apache.flex.html.Label#html
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
@@ -294,4 +294,4 @@ package org.apache.flex.html.staticControls.beads
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ComboBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ComboBoxView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ComboBoxView.as
index f959cd4..65527d4 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ComboBoxView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ComboBoxView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
@@ -30,13 +30,13 @@ package org.apache.flex.html.staticControls.beads
     import org.apache.flex.core.IParent;
 	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.TextInput;
+	import org.apache.flex.html.Button;
+	import org.apache.flex.html.TextInput;
 	
 	/**
-	 *  The ComboBoxView class creates the visual elements of the org.apache.flex.html.staticControls.ComboBox 
+	 *  The ComboBoxView class creates the visual elements of the org.apache.flex.html.ComboBox 
 	 *  component. The job of the view bead is to put together the parts of the ComboBox such as the TextInput
-	 *  control and org.apache.flex.html.staticControls.Button to trigger the pop-up.
+	 *  control and org.apache.flex.html.Button to trigger the pop-up.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -64,7 +64,7 @@ package org.apache.flex.html.staticControls.beads
 		/**
 		 *  The value of the TextInput component of the ComboBox.
 		 * 
-		 *  @copy org.apache.flex.html.staticControls.beads.IComboBoxView#text
+		 *  @copy org.apache.flex.html.beads.IComboBoxView#text
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -83,7 +83,7 @@ package org.apache.flex.html.staticControls.beads
 		/**
 		 *  The HTML value of the TextInput component of the ComboBox.
 		 * 
-		 *  @copy org.apache.flex.html.staticControls.beads.IComboBoxView#html
+		 *  @copy org.apache.flex.html.beads.IComboBoxView#html
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -245,4 +245,4 @@ package org.apache.flex.html.staticControls.beads
 			IEventDispatcher(strand).dispatchEvent(newEvent);
 		}
 	}
-}
\ No newline at end of file
+}


[04/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js
new file mode 100644
index 0000000..8893383
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js
@@ -0,0 +1,124 @@
+/**
+ * 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.html.staticControls.beads.controllers.ItemRendererMouseController');
+
+goog.require('org.apache.flex.core.IBeadController');
+
+
+
+/**
+ * @constructor
+ * @implements {org.apache.flex.core.IBeadController}
+ */
+org.apache.flex.html.staticControls.beads.controllers.
+    ItemRendererMouseController = function() {
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.controllers.
+    ItemRendererMouseController.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'ItemRendererMouseController',
+                qName: 'org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController' }],
+      interfaces: [org.apache.flex.core.IBeadController] };
+
+
+/**
+ * @expose
+ * @param {Object} value The strand for this component.
+ */
+org.apache.flex.html.staticControls.beads.controllers.
+    ItemRendererMouseController.prototype.set_strand = function(value) {
+  this.strand_ = value;
+
+  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEOVER,
+      goog.bind(this.handleMouseOver, this));
+
+  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEOUT,
+      goog.bind(this.handleMouseOut, this));
+
+  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEDOWN,
+      goog.bind(this.handleMouseDown, this));
+
+  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEUP,
+      goog.bind(this.handleMouseUp, this));
+};
+
+
+/**
+ * @expose
+ * @param {Object} event The mouse event that triggered the hover.
+ */
+org.apache.flex.html.staticControls.beads.controllers.
+    ItemRendererMouseController.prototype.handleMouseOver = function(event) {
+
+  this.strand_.set_hovered(true);
+
+  var newEvent = new goog.events.Event('rollover');
+  newEvent.target = this.strand_;
+  this.strand_.get_itemRendererParent().dispatchEvent(newEvent);
+};
+
+
+/**
+ * @expose
+ * @param {Object} event The mouse-out event.
+ */
+org.apache.flex.html.staticControls.beads.controllers.
+    ItemRendererMouseController.prototype.handleMouseOut = function(event) {
+
+  this.strand_.set_hovered(false);
+
+  var newEvent = new goog.events.Event('rollout');
+  newEvent.target = this.strand_;
+  this.strand_.get_itemRendererParent().dispatchEvent(newEvent);
+};
+
+
+/**
+ * @expose
+ * @param {Object} event The mouse-down event.
+ */
+org.apache.flex.html.staticControls.beads.controllers.
+    ItemRendererMouseController.prototype.handleMouseDown = function(event) {
+
+  // ??
+};
+
+
+/**
+ * @expose
+ * @param {Object} event The mouse-up event that triggers the selection.
+ */
+org.apache.flex.html.staticControls.beads.controllers.
+    ItemRendererMouseController.prototype.handleMouseUp = function(event) {
+
+  var newEvent = new goog.events.Event('selected');
+
+  // normally you do not - and should not - change the target of an event,
+  // but these events do not propagate nor bubble up the object tree, so
+  // we have to force the event's target to be this item renderer instance.
+
+  newEvent.target = this.strand_;
+
+  // since the event is not going to up the chain, we also have to dispatch
+  // it against its final destination.
+
+  this.strand_.get_itemRendererParent().dispatchEvent(newEvent);
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js
new file mode 100644
index 0000000..42025b3
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js
@@ -0,0 +1,77 @@
+/**
+ * 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.html.staticControls.beads.controllers.ListSingleSelectionMouseController');
+
+goog.require('org.apache.flex.core.IBeadController');
+goog.require('org.apache.flex.html.staticControls.beads.ListView');
+goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
+
+
+
+/**
+ * @constructor
+ * @implements {org.apache.flex.core.IBeadController}
+ */
+org.apache.flex.html.staticControls.beads.controllers.
+    ListSingleSelectionMouseController = function() {
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'ListSingleSelectionMouseController',
+                qName: 'org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController' }],
+      interfaces: [org.apache.flex.core.IBeadController] };
+
+
+/**
+ * @expose
+ *        ListSingleSelectionMouseController}
+ * @param {Object} value The strand for this component.
+ */
+org.apache.flex.html.staticControls.beads.controllers.
+    ListSingleSelectionMouseController.prototype.set_strand = function(value) {
+  this.strand_ = value;
+
+  this.model = value.getBeadByType(
+      org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
+  this.listView = value.getBeadByType(
+      org.apache.flex.html.staticControls.beads.ListView);
+
+  this.dataGroup = this.listView.get_dataGroup();
+  this.dataGroup.addEventListener('selected',
+      goog.bind(this.selectedHandler, this));
+};
+
+
+/**
+ * @expose
+ *        ListSingleSelectionMouseController}
+ * @param {Object} event The event that triggered the selection.
+ */
+org.apache.flex.html.staticControls.beads.controllers.
+    ListSingleSelectionMouseController.prototype.selectedHandler =
+        function(event) {
+
+  var index = event.target.get_index();
+  this.model.set_selectedIndex(index);
+
+  var newEvent = new org.apache.flex.events.Event('change');
+  this.strand_.dispatchEvent(newEvent);
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js
new file mode 100644
index 0000000..afa6c29
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js
@@ -0,0 +1,173 @@
+/**
+ * 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.html.staticControls.beads.controllers.SliderMouseController');
+
+goog.require('org.apache.flex.html.staticControls.beads.SliderThumbView');
+goog.require('org.apache.flex.html.staticControls.beads.SliderTrackView');
+
+
+
+/**
+ * @constructor
+ */
+org.apache.flex.html.staticControls.beads.controllers.SliderMouseController =
+    function() {
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.controllers.
+    SliderMouseController.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'SliderMouseController',
+                qName: 'org.apache.flex.html.staticControls.beads.controllers.SliderMouseController' }] };
+
+
+/**
+ * @expose
+ *        SliderMouseController}
+ * @param {Object} value The strand.
+ */
+org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
+    prototype.set_strand = function(value) {
+  this.strand_ = value;
+
+  this.track = this.strand_.getBeadByType(
+      org.apache.flex.html.staticControls.beads.SliderTrackView);
+  this.thumb = this.strand_.getBeadByType(
+      org.apache.flex.html.staticControls.beads.SliderThumbView);
+
+  goog.events.listen(this.track.element, goog.events.EventType.CLICK,
+                     this.handleTrackClick, false, this);
+
+  goog.events.listen(this.thumb.element, goog.events.EventType.MOUSEDOWN,
+                     this.handleThumbDown, false, this);
+};
+
+
+/**
+ *        SliderMouseController}
+ * @param {Event} event The event triggering the function.
+ * @return {void} Handles click on track.
+ */
+org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
+    prototype.handleTrackClick =
+    function(event)
+    {
+  var xloc = event.clientX;
+  var p = Math.min(1, xloc / parseInt(this.track.element.style.width, 10));
+  var n = p * (this.strand_.get_maximum() - this.strand_.get_minimum()) +
+          this.strand_.get_minimum();
+
+  this.strand_.set_value(n);
+
+  this.origin = parseInt(this.thumb.element.style.left, 10);
+  this.position = parseInt(this.thumb.element.style.left, 10);
+
+  this.calcValFromMousePosition(event, true);
+
+  this.strand_.dispatchEvent(new org.apache.flex.events.Event('valueChanged'));
+};
+
+
+/**
+ *        SliderMouseController}
+ * @param {Event} event The event triggering the function.
+ * @return {void} Handles mouse-down on the thumb.
+ */
+org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
+    prototype.handleThumbDown =
+    function(event)
+    {
+  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEUP,
+                     this.handleThumbUp, false, this);
+  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEMOVE,
+                     this.handleThumbMove, false, this);
+
+  this.origin = event.clientX;
+  this.position = parseInt(this.thumb.element.style.left, 10);
+};
+
+
+/**
+ *        SliderMouseController}
+ * @param {Event} event The event triggering the function.
+ * @return {void} Handles mouse-up on the thumb.
+ */
+org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
+    prototype.handleThumbUp =
+    function(event)
+    {
+  goog.events.unlisten(this.strand_.element, goog.events.EventType.MOUSEUP,
+                       this.handleThumbUp, false, this);
+  goog.events.unlisten(this.strand_.element, goog.events.EventType.MOUSEMOVE,
+                       this.handleThumbMove, false, this);
+
+  this.calcValFromMousePosition(event, false);
+
+  this.strand_.dispatchEvent(new org.apache.flex.events.Event('valueChanged'));
+};
+
+
+/**
+ *        SliderMouseController}
+ * @param {Event} event The event triggering the function.
+ * @return {void} Handles mouse-move on the thumb.
+ */
+org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
+    prototype.handleThumbMove =
+    function(event)
+    {
+  this.calcValFromMousePosition(event, false);
+
+  this.strand_.dispatchEvent(new org.apache.flex.events.Event('valueChanged'));
+};
+
+
+/**
+ *        SliderMouseController}
+ * @param {Event} event The event triggering the function.
+ * @param {boolean} useOffset If true, event.offsetX is used in the calculation.
+ * @return {void} Determines the new value based on the movement of the mouse
+ * along the slider.
+ */
+org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
+    prototype.calcValFromMousePosition =
+    function(event, useOffset)
+    {
+  var deltaX = (useOffset ? event.offsetX : event.clientX) - this.origin;
+  var thumbW = parseInt(this.thumb.element.style.width, 10) / 2;
+  var newX = this.position + deltaX;
+
+  var p = newX / parseInt(this.track.element.style.width, 10);
+  var n = p * (this.strand_.get_maximum() - this.strand_.get_minimum()) +
+          this.strand_.get_minimum();
+  n = this.strand_.snap(n);
+  if (n < this.strand_.get_minimum()) n = this.strand_.get_minimum();
+  else if (n > this.strand_.get_maximum()) n = this.strand_.get_maximum();
+
+  p = (n - this.strand_.get_minimum()) / (this.strand_.get_maximum() -
+      this.strand_.get_minimum());
+  newX = p * parseInt(this.track.element.style.width, 10);
+
+  this.thumb.element.style.left = String(newX -
+      parseInt(this.thumb.element.style.width, 10) / 2) + 'px';
+
+  this.strand_.set_value(n);
+};
+

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js
new file mode 100644
index 0000000..4549d09
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js
@@ -0,0 +1,86 @@
+/**
+ * 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.html.staticControls.beads.controllers.SpinnerMouseController');
+
+goog.require('org.apache.flex.html.staticControls.TextButton');
+
+
+
+/**
+ * @constructor
+ */
+org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController =
+    function() {
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.controllers.
+    SpinnerMouseController.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'SpinnerMouseController',
+                qName: 'org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController' }] };
+
+
+/**
+ * @expose
+ *        SpinnerMouseController}
+ * @param {Object} value The strand.
+ */
+org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController.
+    prototype.set_strand = function(value) {
+  this.strand_ = value;
+
+  this.incrementButton = this.strand_.incrementButton;
+  this.decrementButton = this.strand_.decrementButton;
+
+  goog.events.listen(this.incrementButton.element, goog.events.EventType.CLICK,
+      goog.bind(this.handleIncrementClick, this));
+
+  goog.events.listen(this.decrementButton.element, goog.events.EventType.CLICK,
+      goog.bind(this.handleDecrementClick, this));
+};
+
+
+/**
+ *        SpinnerMouseController}
+ * @param {Object} event The event object.
+ */
+org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController.
+    prototype.handleIncrementClick = function(event)
+    {
+  var newValue = this.strand_.snap(Math.min(this.strand_.get_maximum(),
+      this.strand_.get_value() +
+      this.strand_.get_stepSize()));
+  this.strand_.set_value(newValue);
+};
+
+
+/**
+ *        SpinnerMouseController}
+ * @param {Event} event The event object.
+ */
+org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController.
+    prototype.handleDecrementClick =
+    function(event)
+    {
+  var newValue = this.strand_.snap(Math.max(this.strand_.get_minimum(),
+      this.strand_.get_value() -
+      this.strand_.get_stepSize()));
+  this.strand_.set_value(newValue);
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js
new file mode 100644
index 0000000..6e1c0cf
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js
@@ -0,0 +1,113 @@
+/**
+ * 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.html.staticControls.beads.layouts.ButtonBarLayout');
+
+goog.require('org.apache.flex.core.IBeadLayout');
+goog.require('org.apache.flex.html.staticControls.beads.ListView');
+
+
+
+/**
+ * @constructor
+ * @implements {org.apache.flex.core.IBeadLayout}
+ */
+org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout =
+    function() {
+  this.strand_ = null;
+
+  this.className = 'ButtonBarLayout';
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout
+    .prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'ButtonBarLayout',
+                qName: 'org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout' }],
+      interfaces: [org.apache.flex.core.IBeadLayout] };
+
+
+/**
+ * @expose
+ * @param {Array} value A set of widths to use for each button (optional).
+ */
+org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.prototype.set_buttonWidths =
+function(value) {
+  this.buttonWidths_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {Array} A set of widths to use for each button.
+ */
+org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.prototype.get_buttonWidths =
+function() {
+  return this.buttonWidths_;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The new host.
+ */
+org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.
+    prototype.set_strand =
+    function(value) {
+  if (this.strand_ !== value) {
+    this.strand_ = value;
+    this.strand_.addEventListener('childrenAdded',
+        goog.bind(this.changeHandler, this));
+    this.strand_.addEventListener('itemsCreated',
+        goog.bind(this.changeHandler, this));
+    this.strand_.element.style.display = 'block';
+  }
+};
+
+
+/**
+ * @param {org.apache.flex.events.Event} event The text getter.
+ */
+org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.
+    prototype.changeHandler = function(event) {
+  var children, i, n, xpos, useWidth, useHeight;
+
+  children = this.strand_.internalChildren();
+  n = children.length;
+
+  xpos = 0;
+  useWidth = this.strand_.get_width() / n;
+  useHeight = this.strand_.get_height();
+
+  for (i = 0; i < n; i++)
+  {
+    children[i].set_height(useHeight);
+    if (this.buttonWidths_) children[i].set_width(this.buttonWidths_[i]);
+    else children[i].set_width(useWidth);
+    children[i].element.style['vertical-align'] = 'middle';
+    children[i].element.style['text-align'] = 'center';
+    children[i].element.style['left-margin'] = 'auto';
+    children[i].element.style['right-margin'] = 'auto';
+
+    if (children[i].element.style.display == 'none')
+      children[i].lastDisplay_ = 'inline-block';
+    else
+      children[i].element.style.display = 'inline-block';
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js
new file mode 100644
index 0000000..d649698
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js
@@ -0,0 +1,85 @@
+/**
+ * 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.html.staticControls.beads.layouts.NonVirtualHorizontalLayout');
+
+goog.require('org.apache.flex.core.IBeadLayout');
+goog.require('org.apache.flex.html.staticControls.beads.ListView');
+
+
+
+/**
+ * @constructor
+ * @implements {org.apache.flex.core.IBeadLayout}
+ */
+org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout =
+    function() {
+  this.strand_ = null;
+  this.className = 'NonVirtualHorizontalLayout';
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout.
+    prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'NonVirtualHorizontalLayout',
+                qName: 'org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout' }],
+      interfaces: [org.apache.flex.core.IBeadLayout] };
+
+
+/**
+ * @expose
+          NonVirtualHorizontalLayout}
+ * @param {Object} value The new host.
+ */
+org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout.
+    prototype.set_strand =
+    function(value) {
+  if (this.strand_ !== value) {
+    this.strand_ = value;
+    this.strand_.addEventListener('childrenAdded',
+        goog.bind(this.changeHandler, this));
+    this.strand_.addEventListener('itemsCreated',
+                                  goog.bind(this.changeHandler, this));
+    this.strand_.addEventListener('elementAdded',
+                                  goog.bind(this.changeHandler, this));
+    this.strand_.element.style.display = 'block';
+
+    this.changeHandler(null);
+  }
+};
+
+
+/**
+          NonVirtualHorizontalLayout}
+ * @param {org.apache.flex.events.Event} event The text getter.
+ */
+org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout.
+    prototype.changeHandler = function(event) {
+  var children, i, n;
+
+  children = this.strand_.internalChildren();
+  n = children.length;
+  for (i = 0; i < n; i++)
+  {
+    if (children[i].style.display == 'none')
+      children[i].lastDisplay_ = 'inline-block';
+    else
+      children[i].style.display = 'inline-block';
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js
new file mode 100644
index 0000000..23269b1
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js
@@ -0,0 +1,76 @@
+/**
+ * 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.html.staticControls.beads.layouts.NonVirtualVerticalLayout');
+
+goog.require('org.apache.flex.core.IBeadLayout');
+
+
+
+/**
+ * @constructor
+ * @implements {org.apache.flex.core.IBeadLayout}
+ */
+org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout =
+    function() {
+  this.strand_ = null;
+  this.className = 'NonVirtualVerticalLayout';
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'NonVirtualVerticalLayout',
+                qName: 'org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout'}],
+      interfaces: [org.apache.flex.core.IBeadLayout] };
+
+
+/**
+ * @expose
+ * @param {Object} value The new host.
+ */
+org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout.
+    prototype.set_strand = function(value) {
+  if (this.strand_ !== value) {
+    this.strand_ = value;
+    this.strand_.addEventListener('childrenAdded',
+        goog.bind(this.changeHandler, this));
+    this.strand_.addEventListener('layoutNeeded',
+        goog.bind(this.changeHandler, this));
+  }
+};
+
+
+/**
+ * @param {org.apache.flex.events.Event} event The text getter.
+ */
+org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout.
+    prototype.changeHandler = function(event) {
+  var children, i, n;
+
+  children = this.strand_.internalChildren();
+  n = children.length;
+  for (i = 0; i < n; i++)
+  {
+    if (children[i].style.display === 'none') {
+      children[i].lastDisplay_ = 'block';
+    } else {
+      children[i].style.display = 'block';
+    }
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.js
new file mode 100644
index 0000000..87073c3
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.js
@@ -0,0 +1,80 @@
+/**
+ * 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.html.staticControls.beads.layouts.NonVirtualVerticalScrollingLayout');
+
+goog.require('org.apache.flex.core.IBeadLayout');
+
+
+
+/**
+ * @constructor
+ * @implements {org.apache.flex.core.IBeadLayout}
+ */
+org.apache.flex.html.staticControls.beads.layouts.
+    NonVirtualVerticalScrollingLayout = function() {
+  this.strand_ = null;
+  this.className = 'NonVirtualVerticalScrollingLayout';
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.layouts.
+    NonVirtualVerticalScrollingLayout.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'NonVirtualVerticalScrollingLayout',
+                qName: 'org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalScrollingLayout' }],
+      interfaces: [org.apache.flex.core.IBeadLayout] };
+
+
+/**
+ * @expose
+ * @param {Object} value The new host.
+ */
+org.apache.flex.html.staticControls.beads.layouts.
+    NonVirtualVerticalScrollingLayout.prototype.set_strand = function(value) {
+  if (this.strand_ !== value) {
+    this.strand_ = value;
+    this.strand_.addEventListener('childrenAdded',
+        goog.bind(this.changeHandler, this));
+    this.strand_.addEventListener('layoutNeeded',
+        goog.bind(this.changeHandler, this));
+  }
+};
+
+
+/**
+ * @param {org.apache.flex.events.Event} event The text getter.
+ */
+org.apache.flex.html.staticControls.beads.layouts.
+    NonVirtualVerticalScrollingLayout.prototype.changeHandler =
+        function(event) {
+  var children, i, n;
+
+  children = this.strand_.internalChildren();
+  n = children.length;
+
+  for (i = 0; i < n; i++)
+  {
+    if (children[i].element.style.display == 'none')
+      children[i].lastDisplay_ = 'block';
+    else {
+      children[i].element.style.display = 'inline-block';
+      children[i].set_width(this.strand_.get_width());
+    }
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js
new file mode 100644
index 0000000..c9b42f2
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js
@@ -0,0 +1,158 @@
+/**
+ * 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.html.staticControls.beads.layouts.TileLayout');
+
+goog.require('org.apache.flex.core.IBeadLayout');
+
+
+
+/**
+ * @constructor
+ * @implements {org.apache.flex.core.IBeadLayout}
+ */
+org.apache.flex.html.staticControls.beads.layouts.TileLayout =
+    function() {
+  this.strand_ = null;
+  this.className = 'TileLayout';
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'TileLayout',
+                qName: 'org.apache.flex.html.staticControls.beads.layouts.TileLayout'}],
+      interfaces: [org.apache.flex.core.IBeadLayout] };
+
+
+/**
+ * @expose
+ * @return {number} The number of columns wide for the layout.
+ */
+org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
+  get_numColumns = function() {
+  return this._numColumns;
+};
+
+
+/**
+ * @expose
+ * @param {number} value The number of columns wide for the layout.
+ */
+org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
+  set_numColumns = function(value) {
+  this._numColumns = value;
+};
+
+
+/**
+ * @expose
+ * @return {number} The width of each column in the layout.
+ */
+org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
+  get_columnWidth = function() {
+  return this._columnWidth;
+};
+
+
+/**
+ * @expose
+ * @param {number} value The width of each column in the layout.
+ */
+org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
+  set_columnWidth = function(value) {
+  this._columnWidth = value;
+};
+
+
+/**
+ * @expose
+ * @return {number} The height of each row of the layout.
+ */
+org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
+  get_rowHeight = function() {
+  return this._rowHeight;
+};
+
+
+/**
+ * @expose
+ * @param {number} value The height of each row of the Tile layout.
+ */
+org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
+  set_rowHeight = function(value) {
+  this._rowHeight = value;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The new host.
+ */
+org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
+  set_strand = function(value) {
+  if (this.strand_ !== value) {
+    this.strand_ = value;
+    this.strand_.addEventListener('childrenAdded',
+        goog.bind(this.changeHandler, this));
+    this.strand_.addEventListener('layoutNeeded',
+        goog.bind(this.changeHandler, this));
+  }
+};
+
+
+/**
+ * @param {org.apache.flex.events.Event} event The text getter.
+ */
+org.apache.flex.html.staticControls.beads.layouts.TileLayout.
+    prototype.changeHandler = function(event) {
+  var children, i, n;
+  var xpos, ypos, useWidth, useHeight;
+
+  children = this.strand_.internalChildren();
+  n = children.length;
+  if (n === 0) return;
+
+  xpos = 0;
+  ypos = 0;
+  useWidth = this.get_columnWidth();
+  useHeight = this.get_rowHeight();
+
+  if (isNaN(useWidth)) useWidth = Math.floor(this.strand_.get_width() / this.get_numColumns()); // + gap
+  if (isNaN(useHeight)) {
+    // given the width and total number of items, how many rows?
+    var numRows = Math.floor(n / this.get_numColumns());
+    useHeight = Math.floor(this.strand_.get_height() / numRows);
+  }
+
+  for (i = 0; i < n; i++)
+  {
+    var child = children[i].flexjs_wrapper;
+    child.set_width(useWidth);
+    child.set_height(useHeight);
+    child.set_x(xpos);
+    child.set_y(ypos);
+
+    xpos += useWidth;
+
+    if (((i + 1) % this.get_numColumns()) === 0) {
+      xpos = 0;
+      ypos += useHeight;
+    }
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ArraySelectionModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ArraySelectionModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ArraySelectionModel.js
new file mode 100644
index 0000000..8d3c0f6
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ArraySelectionModel.js
@@ -0,0 +1,160 @@
+/**
+ * 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.html.staticControls.beads.models.ArraySelectionModel');
+
+goog.require('org.apache.flex.core.ISelectionModel');
+goog.require('org.apache.flex.events.EventDispatcher');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.events.EventDispatcher}
+ * @implements {org.apache.flex.core.ISelectionModel}
+ */
+org.apache.flex.html.staticControls.beads.models.ArraySelectionModel =
+    function() {
+  goog.base(this);
+  this.className = 'ArraySelectionModel';
+};
+goog.inherits(
+    org.apache.flex.html.staticControls.beads.models.ArraySelectionModel,
+    org.apache.flex.events.EventDispatcher);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'ArraySelectionModel',
+                qName: 'org.apache.flex.html.staticControls.beads.models.ArraySelectionModel' }],
+      interfaces: [org.apache.flex.core.ISelectionModel] };
+
+
+/**
+ * @expose
+ * @param {Object} value The strand.
+ */
+org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
+    set_strand = function(value) {
+  this.strand_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {Object} value The dataProvider.
+ */
+org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
+    get_dataProvider = function() {
+  return this.dataProvider_;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The dataProvider.
+ */
+org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
+    set_dataProvider = function(value) {
+  this.dataProvider_ = value;
+  this.dispatchEvent('dataProviderChanged');
+};
+
+
+/**
+ * @expose
+ * @return {number} value The selected index.
+ */
+org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
+    get_selectedIndex = function() {
+  return this.selectedIndex_;
+};
+
+
+/**
+ * @expose
+ * @param {number} value The selected index.
+ */
+org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
+    set_selectedIndex = function(value) {
+  this.selectedIndex_ = value;
+  this.dispatchEvent('selectedIndexChanged');
+};
+
+
+/**
+ * @expose
+ * @return {Object} value The selected item.
+ */
+org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
+    get_selectedItem = function() {
+  var si;
+
+  si = this.selectedIndex_;
+
+  if (!this.dataProvider_ || si < 0 ||
+      si >= this.dataProvider_.length) {
+    return null;
+  }
+
+  return this.dataProvider_[si];
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The selected item.
+ */
+org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
+    set_selectedItem = function(value) {
+  // find item in dataProvider and set selectedIndex or -1 if not exists
+
+  this.selectedIndex_ = -1;
+  var n = this.dataProvider_.length;
+  for (var i = 0; i < n; i++) {
+    var item = this.dataProvider_[i];
+    if (item == value) {
+      this.selectedIndex_ = i;
+      break;
+    }
+  }
+
+  this.dispatchEvent('selectedItemChanged');
+  this.dispatchEvent('selectedIndexChanged');
+};
+
+
+/**
+ * @expose
+ * @return {String} The name of the field to use as a label.
+ */
+org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.get_labelField =
+function() {
+  return this.labelField_;
+};
+
+
+/**
+ * @expose
+ * @param {String} value The name of the field to use as a label.
+ */
+org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.set_labelField =
+function(value) {
+  this.labelField_ = value;
+  this.dispatchEvent('labelFieldChanged');
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/DataGridModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/DataGridModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/DataGridModel.js
new file mode 100644
index 0000000..15c0f9a
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/DataGridModel.js
@@ -0,0 +1,79 @@
+/**
+ * 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.html.staticControls.beads.models.DataGridModel');
+
+goog.require('org.apache.flex.core.IDataGridModel');
+goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.html.staticControls.beads.models.ArraySelectionModel}
+ * @implements {org.apache.flex.core.IDataGridModel}
+ */
+org.apache.flex.html.staticControls.beads.models.DataGridModel =
+    function() {
+  goog.base(this);
+
+  this.labelFields_ = [];
+
+  this.className = 'DataGridModel';
+};
+goog.inherits(
+    org.apache.flex.html.staticControls.beads.models.DataGridModel,
+    org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'DataGridModel',
+                qName: 'org.apache.flex.html.staticControls.beads.models.DataGridModel' }],
+      interfaces: [org.apache.flex.core.IDataGridModel] };
+
+
+/**
+ * @expose
+ * @param {Object} value The strand.
+ */
+org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.
+    set_strand = function(value) {
+  goog.base(this, 'set_strand', value);
+  this.strand_ = value;
+};
+
+
+/**
+ * @expose
+ * @param {Array} value Array of DataGridColumn instances.
+ */
+org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.
+    set_columns = function(value) {
+  this.columns_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {Array} Array of DataGridColumn instances.
+ */
+org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.
+    get_columns = function() {
+  return this.columns_;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ImageModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ImageModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ImageModel.js
new file mode 100644
index 0000000..889a6b7
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ImageModel.js
@@ -0,0 +1,72 @@
+/**
+ * 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.html.staticControls.beads.models.ImageModel');
+
+goog.require('org.apache.flex.events.EventDispatcher');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.events.EventDispatcher}
+ */
+org.apache.flex.html.staticControls.beads.models.ImageModel =
+    function() {
+  goog.base(this);
+};
+goog.inherits(
+    org.apache.flex.html.staticControls.beads.models.ImageModel,
+    org.apache.flex.events.EventDispatcher);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'ImageModel',
+                qName: 'org.apache.flex.html.staticControls.beads.models.ImageModel'}] };
+
+
+/**
+ * @expose
+ * @param {Object} value The strand.
+ */
+org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.
+    set_strand = function(value) {
+  this.strand_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {Object} value The image source.
+ */
+org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.
+    get_source = function() {
+  return this.source;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The image source.
+ */
+org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.
+    set_source = function(value) {
+  this.source = value;
+  this.dispatchEvent('sourceChanged');
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/PanelModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/PanelModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/PanelModel.js
new file mode 100644
index 0000000..04c735d
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/PanelModel.js
@@ -0,0 +1,136 @@
+/**
+ * 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.html.staticControls.beads.models.PanelModel');
+
+goog.require('org.apache.flex.events.EventDispatcher');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.events.EventDispatcher}
+ */
+org.apache.flex.html.staticControls.beads.models.PanelModel = function() {
+  goog.base(this);
+
+  /**
+   * @private
+   * @type {string}
+   */
+  this.title_ = '';
+  /**
+   * @private
+   * @type {string}
+   */
+  this.htmlTitle_ = '';
+  /**
+   * @private
+   * @type {boolean}
+   */
+  this.showCloseButton_ = false;
+};
+goog.inherits(org.apache.flex.html.staticControls.beads.models.PanelModel,
+    org.apache.flex.events.EventDispatcher);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'PanelModel',
+                qName: 'org.apache.flex.html.staticControls.beads.models.PanelModel'}] };
+
+
+/**
+ * @expose
+ * @param {Object} value The strand.
+ */
+org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
+    set_strand = function(value) {
+  this.strand_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {string} The title.
+ */
+org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
+    get_title = function() {
+  return this.title_;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The title to set.
+ */
+org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
+    set_title = function(value) {
+  if (this.title_ != value) {
+    this.title_ = value;
+    this.dispatchEvent('titleChange');
+  }
+};
+
+
+/**
+ * @expose
+ * @return {string} The HTML title.
+ */
+org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
+    get_htmlTitle = function() {
+  return this.htmlTitle_;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The new HTML title.
+ */
+org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
+    set_htmlTitle = function(value) {
+  if (this.htmlTitle_ != value) {
+    this.htmlTitle_ = value;
+    this.dispatchEvent('htmlTitleChange');
+  }
+};
+
+
+/**
+ * @expose
+ * @return {boolean} Returns true if the close button should appear in
+ * the TitleBar.
+ */
+org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
+    get_showCloseButton = function() {
+  return this.showCloseButton_;
+};
+
+
+/**
+ * @expose
+ * @param {boolean} value Determines if the close button shows (true) or
+ * not (false).
+ */
+org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
+    set_showCloseButton = function(value) {
+  if (this.showCloseButton_ != value) {
+    this.showCloseButton_ = value;
+    this.dispatchEvent('showCloseButtonChange');
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/RangeModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/RangeModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/RangeModel.js
new file mode 100644
index 0000000..eeb391b
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/RangeModel.js
@@ -0,0 +1,200 @@
+/**
+ * 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.html.staticControls.beads.models.RangeModel');
+
+goog.require('org.apache.flex.events.EventDispatcher');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.events.EventDispatcher}
+ */
+org.apache.flex.html.staticControls.beads.models.RangeModel = function() {
+  goog.base(this);
+
+  this.minimum_ = 0;
+  this.maximum_ = 100;
+  this.value_ = 0;
+  this.snapInterval_ = 1;
+  this.stepSize_ = 1;
+};
+goog.inherits(org.apache.flex.html.staticControls.beads.models.RangeModel,
+    org.apache.flex.events.EventDispatcher);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'RangeModel',
+                qName: 'org.apache.flex.html.staticControls.beads.models.RangeModel'}] };
+
+
+/**
+ * @expose
+ * @param {Object} value The strand.
+ */
+org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+    set_strand = function(value) {
+  this.strand_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {number} The current minimum value.
+ */
+org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+    get_minimum = function() {
+  return this.minimum_;
+};
+
+
+/**
+ * @expose
+ * @param {number} value The new minimum value.
+ */
+org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+    set_minimum = function(value) {
+  if (this.minimum_ != value) {
+    this.minimum_ = value;
+    this.dispatchEvent('minimumChange');
+  }
+};
+
+
+/**
+ * @expose
+ * @return {number} The current maximu value.
+ */
+org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+    get_maximum = function() {
+  return this.maximum_;
+};
+
+
+/**
+ * @expose
+ * @param {number} value The new maximum value.
+ */
+org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+    set_maximum = function(value) {
+  if (this.maximum_ != value) {
+    this.maximum_ = value;
+    this.dispatchEvent('maximumChange');
+  }
+};
+
+
+/**
+ * @expose
+ * @return {number} The current value.
+ */
+org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+    get_value = function() {
+  return this.value_;
+};
+
+
+/**
+ * @expose
+ * @param {number} newValue The new value.
+ */
+org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+    set_value = function(newValue) {
+  if (this.value_ != newValue) {
+
+    // value must lie within the boundaries of minimum & maximum
+    // and be on a step interval, so the value is adjusted to
+    // what is coming in.
+    newValue = Math.max(this.minimum_, newValue - this.stepSize_);
+    newValue = Math.min(this.maximum_, newValue + this.stepSize_);
+    this.value_ = this.snap(newValue);
+
+    this.dispatchEvent('valueChange');
+  }
+};
+
+
+/**
+ * @expose
+ * @return {number} The current snapInterval value.
+ */
+org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+    get_snapInterval = function() {
+  return this.snapInterval_;
+};
+
+
+/**
+ * @expose
+ * @param {number} value The new snapInterval value.
+ */
+org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+    set_snapInterval = function(value) {
+  if (this.snapInterval_ != value) {
+    this.snapInterval_ = value;
+    this.dispatchEvent('snapIntervalChange');
+  }
+};
+
+
+/**
+ * @expose
+ * @return {number} The current stepSize value.
+ */
+org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+    get_stepSize = function() {
+  return this.stepSize_;
+};
+
+
+/**
+ * @expose
+ * @param {number} value The new stepSize value.
+ */
+org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+    set_stepSize = function(value) {
+  if (this.stepSize_ != value) {
+    this.stepSize_ = value;
+    this.dispatchEvent('stepSizeChange');
+  }
+};
+
+
+/**
+ * @expose
+ * @param {number} value The candidate number.
+ * @return {number} Adjusted value.
+ */
+org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+    snap = function(value) {
+  var si = this.snapInterval_;
+  var n = Math.round((value - this.minimum_) / si) *
+                 si + this.minimum_;
+  if (value > 0)
+  {
+    if (value - n < n + si - value)
+      return n;
+    return n + si;
+  }
+  if (value - n > n + si - value)
+    return n + si;
+  return n;
+};
+

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/TitleBarModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/TitleBarModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/TitleBarModel.js
new file mode 100644
index 0000000..8d9b64d
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/TitleBarModel.js
@@ -0,0 +1,136 @@
+/**
+ * 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.html.staticControls.beads.models.TitleBarModel');
+
+goog.require('org.apache.flex.events.EventDispatcher');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.events.EventDispatcher}
+ */
+org.apache.flex.html.staticControls.beads.models.TitleBarModel = function() {
+  goog.base(this);
+
+  /**
+   * @private
+   * @type {string}
+   */
+  this.title_ = '';
+  /**
+   * @private
+   * @type {string}
+   */
+  this.htmlTitle_ = '';
+  /**
+   * @private
+   * @type {boolean}
+   */
+  this.showCloseButton_ = false;
+};
+goog.inherits(org.apache.flex.html.staticControls.beads.models.TitleBarModel,
+    org.apache.flex.events.EventDispatcher);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'RangeModel',
+                qName: 'org.apache.flex.html.staticControls.beads.models.TitleBarModel'}] };
+
+
+/**
+ * @expose
+ * @param {Object} value The strand.
+ */
+org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
+    set_strand = function(value) {
+  this.strand_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {string} The title.
+ */
+org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
+    get_title = function() {
+  return this.title_;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The title to set.
+ */
+org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
+    set_title = function(value) {
+  if (this.title_ != value) {
+    this.title_ = value;
+    this.dispatchEvent('titleChange');
+  }
+};
+
+
+/**
+ * @expose
+ * @return {string} The HTML title.
+ */
+org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
+    get_htmlTitle = function() {
+  return this.htmlTitle_;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The new HTML title.
+ */
+org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
+    set_htmlTitle = function(value) {
+  if (this.htmlTitle_ != value) {
+    this.htmlTitle_ = value;
+    this.dispatchEvent('htmlTitleChange');
+  }
+};
+
+
+/**
+ * @expose
+ * @return {boolean} Returns true if the close button should appear in
+ * the TitleBar.
+ */
+org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
+    get_showCloseButton = function() {
+  return this.showCloseButton_;
+};
+
+
+/**
+ * @expose
+ * @param {boolean} value Determines if the close button shows (true) or
+ * not (false).
+ */
+org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
+    set_showCloseButton = function(value) {
+  if (this.showCloseButton_ != value) {
+    this.showCloseButton_ = value;
+    this.dispatchEvent('showCloseButtonChange');
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Alert.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Alert.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Alert.js
deleted file mode 100644
index 8f27c76..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Alert.js
+++ /dev/null
@@ -1,213 +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('org.apache.flex.html.staticControls.Alert');
-
-goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.Container');
-goog.require('org.apache.flex.html.staticControls.Label');
-goog.require('org.apache.flex.html.staticControls.TextButton');
-goog.require('org.apache.flex.html.staticControls.TitleBar');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.html.staticControls.Container}
- */
-org.apache.flex.html.staticControls.Alert = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html.staticControls.Alert,
-    org.apache.flex.html.staticControls.Container);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.Alert.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'Alert',
-                qName: 'org.apache.flex.html.staticControls.Alert'}] };
-
-
-/**
- * @type {number} The value for the Yes button option.
- */
-org.apache.flex.html.staticControls.Alert.YES = 0x000001;
-
-
-/**
- * @type {number} The value for the No button option.
- */
-org.apache.flex.html.staticControls.Alert.NO = 0x000002;
-
-
-/**
- * @type {number} The value for the OK button option.
- */
-org.apache.flex.html.staticControls.Alert.OK = 0x000004;
-
-
-/**
- * @type {number} The value for the Cancel button option.
- */
-org.apache.flex.html.staticControls.Alert.CANCEL = 0x000008;
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.Alert.prototype.createElement =
-    function() {
-  goog.base(this, 'createElement');
-
-  this.element.className = 'Alert';
-
-  // add in a title bar
-  this.titleBar = new org.apache.flex.html.staticControls.TitleBar();
-  this.addElement(this.titleBar);
-  this.titleBar.element.id = 'titleBar';
-
-  this.message = new org.apache.flex.html.staticControls.Label();
-  this.addElement(this.message);
-  this.message.element.id = 'message';
-
-  // add a place for the buttons
-  this.buttonArea = new org.apache.flex.html.staticControls.Container();
-  this.addElement(this.buttonArea);
-  this.buttonArea.element.id = 'buttonArea';
-
-  return this.element;
-};
-
-
-/**
- * @param {string} message The message to be displayed.
- * @param {Object} host The object to display the alert.
- * @param {string} title The message to be displayed in the title bar.
- * @param {number} flags The options for the buttons.
- */
-org.apache.flex.html.staticControls.Alert.show =
-    function(message, host, title, flags) {
-
-  var a = new org.apache.flex.html.staticControls.Alert();
-  host.addElement(a);
-  a.set_title(title);
-  a.set_text(message);
-  a.set_flags(flags);
-
-  a.positioner.style.position = 'relative';
-  a.positioner.style.width = '200px';
-  a.positioner.style.margin = 'auto';
-  a.positioner.style.top = '100px';
-};
-
-
-/**
- * @return {string} The message to be displayed in the title bar.
- */
-org.apache.flex.html.staticControls.Alert.prototype.get_title = function()
-    {
-  return this.titleBar.get_title();
-};
-
-
-/**
- * @param {string} value The message to be displayed in the title bar.
- */
-org.apache.flex.html.staticControls.Alert.prototype.set_title =
-    function(value)
-    {
-  this.titleBar.set_title(value);
-};
-
-
-/**
- * @return {string} The message to be displayed.
- */
-org.apache.flex.html.staticControls.Alert.prototype.get_text = function()
-    {
-  return this.message.get_text();
-};
-
-
-/**
- * @param {string} value The message to be displayed.
- */
-org.apache.flex.html.staticControls.Alert.prototype.set_text =
-    function(value)
-    {
-  this.message.set_text(value);
-};
-
-
-/**
- * @return {number} The button options.
- */
-org.apache.flex.html.staticControls.Alert.prototype.get_flags = function()
-    {
-  return this.flags;
-};
-
-
-/**
- * @param {number} value The button options.
- */
-org.apache.flex.html.staticControls.Alert.prototype.set_flags =
-    function(value)
-    {
-  this.flags = value;
-
-  // add buttons based on flags
-  if (this.flags & org.apache.flex.html.staticControls.Alert.OK) {
-    var ok = new org.apache.flex.html.staticControls.TextButton();
-    this.buttonArea.addElement(ok);
-    ok.set_text('OK');
-    goog.events.listen(/** @type {EventTarget} */ (ok.element), 'click',
-        goog.bind(this.dismissAlert, this));
-  }
-  if (this.flags & org.apache.flex.html.staticControls.Alert.CANCEL) {
-    var cancel = new org.apache.flex.html.staticControls.TextButton();
-    this.buttonArea.addElement(cancel);
-    cancel.set_text('Cancel');
-    goog.events.listen(/** @type {EventTarget} */ (cancel.element), 'click',
-        goog.bind(this.dismissAlert, this));
-  }
-  if (this.flags & org.apache.flex.html.staticControls.Alert.YES) {
-    var yes = new org.apache.flex.html.staticControls.TextButton();
-    this.buttonArea.addElement(yes);
-    yes.set_text('YES');
-    goog.events.listen(/** @type {EventTarget} */ (yes.element), 'click',
-        goog.bind(this.dismissAlert, this));
-  }
-  if (this.flags & org.apache.flex.html.staticControls.Alert.NO) {
-    var nob = new org.apache.flex.html.staticControls.TextButton();
-    this.buttonArea.addElement(nob);
-    nob.set_text('NO');
-    goog.events.listen(/** @type {EventTarget} */ (nob.element), 'click',
-        goog.bind(this.dismissAlert, this));
-  }
-};
-
-
-/**
- * @param {Object} event The event object.
- */
-org.apache.flex.html.staticControls.Alert.prototype.dismissAlert =
-    function(event)
-    {
-  this.element.parentElement.removeChild(this.element);
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Button.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Button.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Button.js
deleted file mode 100644
index 5f64d56..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Button.js
+++ /dev/null
@@ -1,60 +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('org.apache.flex.html.staticControls.Button');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html.staticControls.Button = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html.staticControls.Button,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.Button.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'Button',
-                qName: 'org.apache.flex.html.staticControls.Button'}] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.Button.prototype.createElement =
-    function() {
-  this.element = document.createElement('button');
-  this.element.setAttribute('type', 'button');
-
-  this.positioner = this.element;
-  this.element.flexjs_wrapper = this;
-
-  if (org.apache.flex.core.ValuesManager.valuesImpl.getValue) {
-    var impl = org.apache.flex.core.ValuesManager.valuesImpl.
-        getValue(this, 'iStatesImpl');
-  }
-
-  return this.element;
-};
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ButtonBar.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ButtonBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ButtonBar.js
deleted file mode 100644
index 3181aaa..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ButtonBar.js
+++ /dev/null
@@ -1,85 +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('org.apache.flex.html.staticControls.ButtonBar');
-
-goog.require('org.apache.flex.core.ListBase');
-goog.require('org.apache.flex.html.staticControls.List');
-goog.require('org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData');
-goog.require('org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout');
-goog.require('org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.html.staticControls.List}
- */
-org.apache.flex.html.staticControls.ButtonBar = function() {
-
-  //  this.model = new
-  //        org.apache.flex.html.staticControls.beads.models.ArraySelectionModel();
-  //  this.addBead(this.model);
-
-  goog.base(this);
-
-  //  this.addBead(new
-  //        org.apache.flex.html.staticControls.beads.ListView());
-
-  //  this.addBead(new
-  //org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout());
-
-  //  this.itemRendererFactory = new
-  //        org.apache.flex.html.staticControls.beads.
-  //        DataItemRendererFactoryForArrayData();
-  //  this.itemRendererFactory.set_itemRendererClass('org.apache.flex.html.' +
-  //        'staticControls.supportClasses.ButtonBarButtonItemRenderer');
-  //  this.addBead(this.itemRendererFactory);
-
-  //  this.addBead(new
-  //        org.apache.flex.html.staticControls.beads.controllers.
-  //        ListSingleSelectionMouseController());
-};
-goog.inherits(org.apache.flex.html.staticControls.ButtonBar,
-    org.apache.flex.html.staticControls.List);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.ButtonBar.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ButtonBar',
-                qName: 'org.apache.flex.html.staticControls.ButtonBar'}] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.ButtonBar.prototype.createElement =
-    function() {
-  //goog.base(this, 'createElement');
-
-  this.element = document.createElement('div');
-  this.element.style.overflow = 'auto';
-  this.element.style.border = 'solid';
-  this.element.style.borderWidth = '1px';
-  this.element.style.borderColor = '#333333';
-  this.positioner = this.element;
-
-  this.set_className('ButtonBar');
-
-  return this.element;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/CheckBox.js
deleted file mode 100644
index 0f63f39..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/CheckBox.js
+++ /dev/null
@@ -1,99 +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('org.apache.flex.html.staticControls.CheckBox');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html.staticControls.CheckBox = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html.staticControls.CheckBox,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.CheckBox.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'CheckBox',
-                qName: 'org.apache.flex.html.staticControls.CheckBox'}] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.CheckBox.prototype.createElement =
-    function() {
-  var cb;
-
-  this.element = document.createElement('label');
-
-  cb = document.createElement('input');
-  cb.type = 'checkbox';
-  this.element.appendChild(cb);
-  this.element.appendChild(document.createTextNode(''));
-
-  this.positioner = this.element;
-  cb.flexjs_wrapper = this;
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.html.staticControls.CheckBox.prototype.get_text = function() {
-  return this.element.childNodes.item(1).nodeValue;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.html.staticControls.CheckBox.prototype.set_text =
-    function(value) {
-  this.element.childNodes.item(1).nodeValue = value;
-};
-
-
-/**
- * @expose
- * @return {boolean} The selected getter.
- */
-org.apache.flex.html.staticControls.CheckBox.prototype.get_selected =
-    function() {
-  return this.element.childNodes.item(0).checked;
-};
-
-
-/**
- * @expose
- * @param {boolean} value The selected setter.
- */
-org.apache.flex.html.staticControls.CheckBox.prototype.set_selected =
-    function(value) {
-  this.element.childNodes.item(0).checked = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ComboBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ComboBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ComboBox.js
deleted file mode 100644
index b469b04..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ComboBox.js
+++ /dev/null
@@ -1,210 +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('org.apache.flex.html.staticControls.ComboBox');
-
-goog.require('org.apache.flex.core.ListBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.ListBase}
- */
-org.apache.flex.html.staticControls.ComboBox = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html.staticControls.ComboBox,
-    org.apache.flex.core.ListBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.ComboBox.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ComboBox',
-                qName: 'org.apache.flex.html.staticControls.ComboBox'}] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.ComboBox.prototype.createElement =
-    function() {
-  var button, input;
-
-  this.element = document.createElement('div');
-
-  input = document.createElement('input');
-  input.style.position = 'absolute';
-  input.style.width = '80px';
-  this.element.appendChild(input);
-
-  button = document.createElement('div');
-  button.style.position = 'absolute';
-  button.style.top = '0px';
-  button.style.right = '0px';
-  button.style.background = '#bbb';
-  button.style.width = '16px';
-  button.style.height = '20px';
-  button.style.margin = '0';
-  button.style.border = 'solid #609 1px';
-  goog.events.listen(button, 'click', goog.bind(this.buttonClicked, this));
-  this.element.appendChild(button);
-
-  this.element.style.position = 'relative';
-
-  this.positioner = this.element;
-
-  // add a click handler so that a click outside of the combo box can
-  // dismiss the pop-up should it be visible.
-  goog.events.listen(document, 'click',
-      goog.bind(this.dismissPopup, this));
-
-  input.flexjs_wrapper = this;
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @param {Object} event The event.
- */
-org.apache.flex.html.staticControls.ComboBox.prototype.selectChanged =
-    function(event) {
-  var select;
-
-  select = event.currentTarget;
-
-  this.set_selectedItem(select.options[select.selectedIndex].value);
-
-  this.popup.parentNode.removeChild(this.popup);
-  this.popup = null;
-
-  this.dispatchEvent(event);
-};
-
-
-/**
- * @expose
- * @param {Object=} opt_event The event.
- */
-org.apache.flex.html.staticControls.ComboBox.prototype.dismissPopup =
-    function(opt_event) {
-  // remove the popup if it already exists
-  if (this.popup) {
-    this.popup.parentNode.removeChild(this.popup);
-    this.popup = null;
-  }
-};
-
-
-/**
- * @expose
- * @param {Object} event The event.
- */
-org.apache.flex.html.staticControls.ComboBox.prototype.buttonClicked =
-    function(event) {
-  /**
-   * @type {Array.<string>}
-   */
-  var dp;
-  var i, input, left, n, opt, opts, pn, popup, select, si, top, width;
-
-  event.stopPropagation();
-
-  if (this.popup) {
-    this.dismissPopup();
-
-    return;
-  }
-
-  input = this.element.childNodes.item(0);
-
-  pn = this.element;
-  top = pn.offsetTop + input.offsetHeight;
-  left = pn.offsetLeft;
-  width = pn.offsetWidth;
-
-  popup = document.createElement('div');
-  popup.className = 'popup';
-  popup.id = 'test';
-  popup.style.position = 'absolute';
-  popup.style.top = top.toString() + 'px';
-  popup.style.left = left.toString() + 'px';
-  popup.style.width = width.toString() + 'px';
-  popup.style.margin = '0px auto';
-  popup.style.padding = '0px';
-  popup.style.zIndex = '10000';
-
-  select = document.createElement('select');
-  select.style.width = width.toString() + 'px';
-  goog.events.listen(select, 'change', goog.bind(this.selectChanged, this));
-  opts = select.options;
-
-  dp = /** @type {Array.<string>} */ (this.get_dataProvider());
-  n = dp.length;
-  for (i = 0; i < n; i++) {
-    opt = document.createElement('option');
-    opt.text = dp[i];
-    opts.add(opt);
-  }
-
-  select.size = n;
-
-  si = this.get_selectedIndex();
-  if (si < 0) {
-    select.value = null;
-  } else {
-    select.value = dp[si];
-  }
-
-  this.popup = popup;
-
-  popup.appendChild(select);
-  document.body.appendChild(popup);
-};
-
-
-/**
- * @override
- * @expose
- * @param {Array.<Object>} value The collection of data.
- */
-org.apache.flex.html.staticControls.ComboBox.prototype.set_dataProvider =
-    function(value) {
-  this.dataProvider = value;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.html.staticControls.ComboBox.prototype.get_text = function() {
-  return this.element.childNodes.item(0).value;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.html.staticControls.ComboBox.prototype.set_text =
-    function(value) {
-  this.element.childNodes.item(0).value = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Container.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Container.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Container.js
deleted file mode 100644
index 22a3840..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Container.js
+++ /dev/null
@@ -1,86 +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('org.apache.flex.html.staticControls.Container');
-
-goog.require('org.apache.flex.core.ContainerBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.ContainerBase}
- */
-org.apache.flex.html.staticControls.Container = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.html.staticControls.Container,
-    org.apache.flex.core.ContainerBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.Container.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'Container',
-                qName: 'org.apache.flex.html.staticControls.Container' }] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.Container.prototype.createElement =
-    function() {
-  var cb;
-
-  this.element = document.createElement('div');
-
-  this.positioner = this.element;
-  this.element.flexjs_wrapper = this;
-
-  return this.element;
-};
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.Container.prototype.addElement =
-    function(child) {
-  goog.base(this, 'addElement', child);
-  this.dispatchEvent('elementAdded');
-};
-
-
-/**
- * @expose
- */
-org.apache.flex.html.staticControls.Container.prototype.childrenAdded =
-    function() {
-  this.dispatchEvent('childrenAdded');
-};
-
-
-/**
- * @expose
- * @return {Array} the HTML DOM element children.
- */
-org.apache.flex.html.staticControls.Container.prototype.internalChildren =
-    function() {
-  return this.element.children;
-};
-
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ControlBar.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ControlBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ControlBar.js
deleted file mode 100644
index 09b1fa5..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/ControlBar.js
+++ /dev/null
@@ -1,57 +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('org.apache.flex.html.staticControls.ControlBar');
-
-goog.require('org.apache.flex.html.staticControls.Container');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.html.staticControls.Container}
- */
-org.apache.flex.html.staticControls.ControlBar = function() {
-  goog.base(this);
-
-};
-goog.inherits(org.apache.flex.html.staticControls.ControlBar,
-    org.apache.flex.html.staticControls.Container);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.ControlBar.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ControlBar',
-                qName: 'org.apache.flex.html.staticControls.ControlBar'}] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.ControlBar.prototype.createElement =
-    function() {
-
-  this.element = document.createElement('div');
-  this.element.className = 'ControlBar';
-  this.element.style.display = 'inline';
-
-  this.positioner = this.element;
-  this.element.flexjs_wrapper = this;
-
-  return this.element;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/DropDownList.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/DropDownList.js
deleted file mode 100644
index e1d2ecf..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/DropDownList.js
+++ /dev/null
@@ -1,114 +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('org.apache.flex.html.staticControls.DropDownList');
-
-goog.require('org.apache.flex.core.ListBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.ListBase}
- */
-org.apache.flex.html.staticControls.DropDownList = function() {
-  goog.base(this);
-  this.model = new org.apache.flex.html.staticControls.beads.
-      models.ArraySelectionModel();
-};
-goog.inherits(org.apache.flex.html.staticControls.DropDownList,
-    org.apache.flex.core.ListBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.DropDownList.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'DropDownList',
-                qName: 'org.apache.flex.html.staticControls.DropDownList'}] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.DropDownList.prototype.
-    createElement = function() {
-  this.element = document.createElement('select');
-  this.element.size = 1;
-  goog.events.listen(this.element, 'change',
-      goog.bind(this.changeHandler, this));
-  this.positioner = this.element;
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @param {Object} value The new dataProvider.
- */
-org.apache.flex.html.staticControls.DropDownList.prototype.
-    set_dataProvider = function(value) {
-  var dp, i, n, opt;
-
-  this.model.set_dataProvider(value);
-
-  dp = this.element.options;
-  n = dp.length;
-  for (i = 0; i < n; i++) {
-    dp.remove(0);
-  }
-
-  n = value.length;
-  for (i = 0; i < n; i++) {
-    opt = document.createElement('option');
-    opt.text = value[i];
-    dp.add(opt);
-  }
-
-};
-
-
-/**
- * @protected
- */
-org.apache.flex.html.staticControls.DropDownList.prototype.changeHandler =
-    function() {
-  this.model.set_selectedIndex(this.element.selectedIndex);
-  this.dispatchEvent('change');
-};
-
-
-/**
- * @expose
- * @param {number} value The new selected index.
- */
-org.apache.flex.html.staticControls.DropDownList.prototype.
-    set_selectedIndex = function(value) {
-  this.model.set_selectedIndex(value);
-  this.element.selectedIndex = value;
-};
-
-
-/**
- * @expose
- * @param {Object} value The new selected item.
- */
-org.apache.flex.html.staticControls.DropDownList.prototype.
-    set_selectedItem = function(value) {
-  this.model.set_selectedItem(value);
-  this.element.selectedIndex = this.get_selectedIndex();
-};


[14/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
new file mode 100644
index 0000000..58bec68
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
@@ -0,0 +1,172 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.layouts
+{
+	import flash.display.DisplayObject;
+	import flash.display.DisplayObjectContainer;
+	
+	import org.apache.flex.core.IBeadLayout;
+	import org.apache.flex.core.ILayoutParent;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+
+    /**
+     *  The NonVirtualHorizontalLayout class is a simple layout
+     *  bead.  It takes the set of children and lays them out
+     *  horizontally in one row, separating them according to
+     *  CSS layout rules for margin and vertical-align styles.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class NonVirtualHorizontalLayout implements IBeadLayout
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function NonVirtualHorizontalLayout()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			IEventDispatcher(value).addEventListener("widthChanged", changeHandler);
+			IEventDispatcher(value).addEventListener("childrenAdded", changeHandler);
+			IEventDispatcher(value).addEventListener("itemsCreated", changeHandler);
+		}
+	
+		private function changeHandler(event:Event):void
+		{
+			var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
+			var contentView:DisplayObjectContainer = layoutParent.contentView;
+			
+			var n:int = contentView.numChildren;
+			var marginLeft:Object;
+			var marginRight:Object;
+			var marginTop:Object;
+			var marginBottom:Object;
+			var margin:Object;
+			var maxHeight:Number = 0;
+			var verticalMargins:Array = [];
+			
+			for (var i:int = 0; i < n; i++)
+			{
+				var child:DisplayObject = contentView.getChildAt(i);
+				margin = ValuesManager.valuesImpl.getValue(child, "margin");
+				if (margin is Array)
+				{
+					if (margin.length == 1)
+						marginLeft = marginTop = marginRight = marginBottom = margin[0];
+					else if (margin.length <= 3)
+					{
+						marginLeft = marginRight = margin[1];
+						marginTop = marginBottom = margin[0];
+					}
+					else if (margin.length == 4)
+					{
+						marginLeft = margin[3];
+						marginBottom = margin[2];
+						marginRight = margin[1];
+						marginTop = margin[0];					
+					}
+				}
+				else if (margin == null)
+				{
+					marginLeft = ValuesManager.valuesImpl.getValue(child, "margin-left");
+					marginTop = ValuesManager.valuesImpl.getValue(child, "margin-top");
+					marginRight = ValuesManager.valuesImpl.getValue(child, "margin-right");
+					marginBottom = ValuesManager.valuesImpl.getValue(child, "margin-bottom");
+				}
+				else
+				{
+					marginLeft = marginTop = marginBottom = marginRight = margin;
+				}
+				var ml:Number;
+				var mr:Number;
+				var mt:Number;
+				var mb:Number;
+				var lastmr:Number;
+				mt = Number(marginTop);
+				if (isNaN(mt))
+					mt = 0;
+				mb = Number(marginBottom);
+				if (isNaN(mb))
+					mb = 0;
+				if (marginLeft == "auto")
+					ml = 0;
+				else
+				{
+					ml = Number(marginLeft);
+					if (isNaN(ml))
+						ml = 0;
+				}
+				if (marginRight == "auto")
+					mr = 0;
+				else
+				{
+					mr = Number(marginRight);
+					if (isNaN(mr))
+						mr = 0;
+				}
+				child.y = mt;
+				maxHeight = Math.max(maxHeight, ml + child.height + mr);
+				var xx:Number;
+				if (i == 0)
+					child.x = ml;
+				else
+					child.x = xx + ml + lastmr;
+				xx = child.x + child.width;
+				lastmr = mr;
+				var valign:Object = ValuesManager.valuesImpl.getValue(child, "vertical-align");
+				verticalMargins.push({ marginTop: marginTop, marginBottom: marginBottom, valign: valign });
+			}
+			for (i = 0; i < n; i++)
+			{
+				var obj:Object = verticalMargins[0]
+				child = contentView.getChildAt(i);
+				if (obj.valign == "middle")
+					child.y = maxHeight - child.height / 2;
+				else if (valign == "bottom")
+					child.y = maxHeight - child.height - obj.marginBottom;
+				else
+					child.y = obj.marginTop;
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalScrollingLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalScrollingLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalScrollingLayout.as
new file mode 100644
index 0000000..32e3597
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalScrollingLayout.as
@@ -0,0 +1,136 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.layouts
+{
+	import flash.display.DisplayObject;
+	import flash.display.DisplayObjectContainer;
+	
+	import org.apache.flex.core.IBeadLayout;
+	import org.apache.flex.core.IBorderModel;
+	import org.apache.flex.core.ILayoutParent;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.html.staticControls.supportClasses.Border;
+	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
+	
+    /**
+     *  The NonVirtualHorizontalScrollingLayout class is a layout
+     *  bead that displays a set of children horizontally in one row, 
+     *  separating them according to CSS layout rules for margin and 
+     *  vertical-align styles and lays out a horizontal ScrollBar
+     *  below the children.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class NonVirtualHorizontalScrollingLayout implements IBeadLayout
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function NonVirtualHorizontalScrollingLayout()
+		{
+		}
+		
+		private var hScrollBar:ScrollBar;
+		
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			IEventDispatcher(value).addEventListener("heightChanged", changeHandler);
+			IEventDispatcher(value).addEventListener("widthChanged", changeHandler);
+			IEventDispatcher(value).addEventListener("itemsCreated", changeHandler);
+		}
+		
+		private function changeHandler(event:Event):void
+		{            
+			var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
+			var contentView:DisplayObjectContainer = layoutParent.contentView;
+			var border:Border = layoutParent.border;
+			var borderModel:IBorderModel = border.model as IBorderModel;
+			
+			var ww:Number = layoutParent.resizableView.width;
+			var hh:Number = layoutParent.resizableView.height;
+			border.width = ww;
+			border.height = hh;
+			
+			contentView.width = ww - borderModel.offsets.left - borderModel.offsets.right;
+			contentView.height = hh - borderModel.offsets.top - borderModel.offsets.bottom;
+			contentView.x = borderModel.offsets.left;
+			contentView.y = borderModel.offsets.top;
+			
+			var n:int = contentView.numChildren;
+			var xx:Number = 0;
+			for (var i:int = 0; i < n; i++)
+			{
+				var ir:DisplayObject = contentView.getChildAt(i);
+				ir.x = xx;
+				ir.height = contentView.height;
+				xx += ir.width;			
+			}
+			/*
+			if (xx > dataGroup.width)
+			{
+				hScrollBar = listView.hScrollBar;
+				dataGroup.height -= hScrollBar.height;
+				IScrollBarModel(hScrollBar.model).maximum = xx;
+				IScrollBarModel(hScrollBar.model).pageSize = dataGroup.width;
+				IScrollBarModel(hScrollBar.model).pageStepSize = dataGroup.width;
+				hScrollBar.visible = true;
+				hScrollBar.width = dataGroup.width;
+				hScrollBar.x = dataGroup.x;
+				hScrollBar.y = dataGroup.height;
+				var xpos:Number = IScrollBarModel(hScrollBar.model).value;
+				dataGroup.scrollRect = new Rectangle(xpos, 0, xpos + dataGroup.width, dataGroup.height);
+				hScrollBar.addEventListener("scroll", scrollHandler);
+			}
+			else if (hScrollBar)
+			{
+				dataGroup.scrollRect = null;
+				hScrollBar.visible = false;
+			}
+			*/
+		}
+		
+		/*private function scrollHandler(event:Event):void
+		{
+			var xpos:Number = IScrollBarModel(hScrollBar.model).value;
+			dataGroup.scrollRect = new Rectangle(xpos, 0, xpos + dataGroup.width, dataGroup.height);
+		}*/
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.as
new file mode 100644
index 0000000..33f48e8
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.as
@@ -0,0 +1,191 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.layouts
+{
+	import flash.display.DisplayObject;
+	import flash.display.DisplayObjectContainer;
+	
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.ILayoutParent;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+
+    /**
+     *  The NonVirtualVerticalLayout class is a simple layout
+     *  bead.  It takes the set of children and lays them out
+     *  vertically in one column, separating them according to
+     *  CSS layout rules for margin and horizontal-align styles.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class NonVirtualVerticalLayout implements IBead
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function NonVirtualVerticalLayout()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			IEventDispatcher(value).addEventListener("heightChanged", changeHandler);
+			IEventDispatcher(value).addEventListener("childrenAdded", changeHandler);
+			IEventDispatcher(value).addEventListener("itemsCreated", changeHandler);
+			IEventDispatcher(value).addEventListener("beadsAdded", changeHandler);
+		}
+	
+		private function changeHandler(event:Event):void
+		{
+			var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
+			var contentView:DisplayObjectContainer = layoutParent.contentView;
+			
+			var n:int = contentView.numChildren;
+			var hasHorizontalFlex:Boolean;
+			var flexibleHorizontalMargins:Array = [];
+			var marginLeft:Object;
+			var marginRight:Object;
+			var marginTop:Object;
+			var marginBottom:Object;
+			var margin:Object;
+			var maxWidth:Number = 0;
+			for (var i:int = 0; i < n; i++)
+			{
+				var child:DisplayObject = contentView.getChildAt(i);
+				margin = ValuesManager.valuesImpl.getValue(child, "margin");
+				if (margin is Array)
+				{
+					if (margin.length == 1)
+						marginLeft = marginTop = marginRight = marginBottom = margin[0];
+					else if (margin.length <= 3)
+					{
+						marginLeft = marginRight = margin[1];
+						marginTop = marginBottom = margin[0];
+					}
+					else if (margin.length == 4)
+					{
+						marginLeft = margin[3];
+						marginBottom = margin[2];
+						marginRight = margin[1];
+						marginTop = margin[0];					
+					}
+				}
+				else if (margin == null)
+				{
+					marginLeft = ValuesManager.valuesImpl.getValue(child, "margin-left");
+					marginTop = ValuesManager.valuesImpl.getValue(child, "margin-top");
+					marginRight = ValuesManager.valuesImpl.getValue(child, "margin-right");
+					marginBottom = ValuesManager.valuesImpl.getValue(child, "margin-bottom");
+				}
+				else
+				{
+					marginLeft = marginTop = marginBottom = marginRight = margin;
+				}
+				var ml:Number;
+				var mr:Number;
+				var mt:Number;
+				var mb:Number;
+				var lastmb:Number;
+				mt = Number(marginTop);
+				if (isNaN(mt))
+					mt = 0;
+				mb = Number(marginBottom);
+				if (isNaN(mb))
+					mb = 0;
+				var yy:Number;
+				if (i == 0)
+					child.y = mt;
+				else
+					child.y = yy + Math.max(mt, lastmb);
+				yy = child.y + child.height;
+				lastmb = mb;
+				flexibleHorizontalMargins[i] = {};
+				if (marginLeft == "auto")
+				{
+					ml = 0;
+					flexibleHorizontalMargins[i].marginLeft = marginLeft;
+					hasHorizontalFlex = true;
+				}
+				else
+				{
+					ml = Number(marginLeft);
+					if (isNaN(ml))
+					{
+						ml = 0;
+						flexibleHorizontalMargins[i].marginLeft = marginLeft;
+					}
+					else
+						flexibleHorizontalMargins[i].marginLeft = ml;
+				}
+				if (marginRight == "auto")
+				{
+					mr = 0;
+					flexibleHorizontalMargins[i].marginRight = marginRight;
+					hasHorizontalFlex = true;
+				}
+				else
+				{
+					mr = Number(marginRight);
+					if (isNaN(mr))
+					{
+						mr = 0;
+						flexibleHorizontalMargins[i].marginRight = marginRight;
+					}
+					else
+						flexibleHorizontalMargins[i].marginRight = mr;
+				}
+				child.x = ml;
+				maxWidth = Math.max(maxWidth, ml + child.width + mr);
+			}
+			if (hasHorizontalFlex)
+			{
+				for (i = 0; i < n; i++)
+				{
+					child = contentView.getChildAt(i);
+					var obj:Object = flexibleHorizontalMargins[i];
+					if (obj.marginLeft == "auto" && obj.marginRight == "auto")
+						child.x = maxWidth - child.width / 2;
+					else if (obj.marginLeft == "auto")
+						child.x = maxWidth - child.width - obj.marginRight;
+				}
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as
new file mode 100644
index 0000000..6f2f424
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as
@@ -0,0 +1,140 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.layouts
+{
+	import flash.display.DisplayObject;
+	import flash.display.DisplayObjectContainer;
+	import flash.geom.Rectangle;
+	
+	import org.apache.flex.core.IBeadLayout;
+	import org.apache.flex.core.IBorderModel;
+	import org.apache.flex.core.ILayoutParent;
+	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.supportClasses.Border;
+	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
+
+    /**
+     *  The NonVirtualVerticalScrollingLayout class is a layout
+     *  bead that displays a set of children vertically in one row, 
+     *  separating them according to CSS layout rules for margin and 
+     *  vertical-align styles and lays out a vertical ScrollBar
+     *  to the right of the children.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class NonVirtualVerticalScrollingLayout implements IBeadLayout
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function NonVirtualVerticalScrollingLayout()
+		{
+		}
+        
+        private var vScrollBar:ScrollBar;	
+
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			IEventDispatcher(value).addEventListener("heightChanged", changeHandler);
+			IEventDispatcher(value).addEventListener("widthChanged", changeHandler);
+			IEventDispatcher(value).addEventListener("itemsCreated", changeHandler);
+			IEventDispatcher(value).addEventListener("layoutNeeded", changeHandler);
+		}
+	
+		private function changeHandler(event:Event):void
+		{            
+			var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
+			var contentView:DisplayObjectContainer = layoutParent.contentView;
+			var border:Border = layoutParent.border;
+			var borderModel:IBorderModel = border.model as IBorderModel;
+			
+            var ww:Number = DisplayObject(layoutParent.resizableView).width;
+            var hh:Number = DisplayObject(layoutParent.resizableView).height;
+            border.width = ww;
+            border.height = hh;
+           
+			contentView.width = ww - borderModel.offsets.left - borderModel.offsets.right;
+			contentView.height = hh - borderModel.offsets.top - borderModel.offsets.bottom;
+			contentView.x = borderModel.offsets.left;
+			contentView.y = borderModel.offsets.top;
+			
+			var n:int = contentView.numChildren;
+			var yy:Number = 0;
+			for (var i:int = 0; i < n; i++)
+			{
+				var ir:DisplayObject = contentView.getChildAt(i);
+				ir.y = yy;
+				ir.width = contentView.width;
+				yy += ir.height;			
+			}
+			if (yy > contentView.height)
+			{
+                vScrollBar = layoutParent.vScrollBar;
+				contentView.width -= vScrollBar.width;
+				IScrollBarModel(vScrollBar.model).maximum = yy;
+				IScrollBarModel(vScrollBar.model).pageSize = contentView.height;
+				IScrollBarModel(vScrollBar.model).pageStepSize = contentView.height;
+				vScrollBar.visible = true;
+				vScrollBar.height = contentView.height;
+				vScrollBar.y = contentView.y;
+				vScrollBar.x = contentView.width;
+                var vpos:Number = IScrollBarModel(vScrollBar.model).value;
+				contentView.scrollRect = new Rectangle(0, vpos, contentView.width, vpos + contentView.height);
+                vScrollBar.addEventListener("scroll", scrollHandler);
+			}
+			else if (vScrollBar)
+			{
+				contentView.scrollRect = null;
+				vScrollBar.visible = false;
+			}
+		}
+
+        private function scrollHandler(event:Event):void
+        {
+			var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
+			var contentView:DisplayObjectContainer = layoutParent.contentView;
+			
+            var vpos:Number = IScrollBarModel(vScrollBar.model).value;
+			contentView.scrollRect = new Rectangle(0, vpos, contentView.width, vpos + contentView.height);
+        }
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/TileLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/TileLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/TileLayout.as
new file mode 100644
index 0000000..b43457a
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/TileLayout.as
@@ -0,0 +1,184 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.layouts
+{	
+	import org.apache.flex.core.IBeadLayout;
+	import org.apache.flex.core.ILayoutParent;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.IUIBase;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	
+	/**
+	 *  The TileLayout class bead sizes and positions the elements it manages into rows and columns.
+	 *  The size of each element is determined either by setting TileLayout's columnWidth and rowHeight
+	 *  properties, or having the tile size determined by factoring the numColumns into the area assigned
+	 *  for the layout.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class TileLayout implements IBeadLayout
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function TileLayout()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			IEventDispatcher(_strand).addEventListener("itemsCreated",handleCreated);
+			IEventDispatcher(_strand).addEventListener("childrenAdded",handleCreated);
+		}
+		
+		private var _numColumns:Number = 4;
+		private var _columnWidth:Number = Number.NaN;
+		private var _rowHeight:Number = Number.NaN;
+		
+		/**
+		 *  The number of tiles to fit horizontally into the layout.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get numColumns():Number
+		{
+			return _numColumns;
+		}
+		public function set numColumns(value:Number):void
+		{
+			_numColumns = value;
+		}
+		
+		/**
+		 *  The width of each column, in pixels. If left unspecified, the
+		 *  columnWidth is determined by dividing the numColumns into the
+		 *  strand's bounding box width.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get columnWidth():Number
+		{
+			return _columnWidth;
+		}
+		public function set columnWidth(value:Number):void
+		{
+			_columnWidth = value;
+		}
+		
+		/**
+		 *  The height of each row, in pixels. If left unspecified, the
+		 *  rowHeight is determine by dividing the possible number of rows
+		 *  into the strand's bounding box height.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get rowHeight():Number
+		{
+			return _rowHeight;
+		}
+		public function set rowHeight(value:Number):void
+		{
+			_rowHeight = value;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleCreated(event:Event):void
+		{
+			// this is where we know the strand has things in it and we want to
+			// get the part of the strand that holds the items for the layout
+			updateLayout();
+		}
+		
+		/**
+		 * @private
+		 */
+		protected function updateLayout():void
+		{
+			// this is where the layout is calculated
+			var p:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
+			var area:UIBase = p.contentView as UIBase;
+			if (area == null) return;
+			
+			var xpos:Number = 0;
+			var ypos:Number = 0;
+			var useWidth:Number = columnWidth;
+			var useHeight:Number = rowHeight;
+			var n:Number = area.numChildren;
+			if (n == 0) return;
+			
+			if (isNaN(useWidth)) useWidth = Math.floor(area.width / numColumns); // + gap
+			if (isNaN(useHeight)) {
+				// given the width and total number of items, how many rows?
+				var numRows:Number = Math.floor(n/numColumns);
+				useHeight = Math.floor(area.height / numRows);
+			}
+			
+			for(var i:int=0; i < n; i++)
+			{
+				var child:IUIBase = area.getChildAt(i) as IUIBase;
+				child.width = useWidth;
+				child.height = useHeight;
+				child.x = xpos;
+				child.y = ypos;
+				
+				xpos += useWidth;
+				
+				var test:Number = (i+1)%numColumns;
+				
+				if (test == 0) {
+					xpos = 0;
+					ypos += useHeight;
+				} 
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as
new file mode 100644
index 0000000..7642379
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as
@@ -0,0 +1,111 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.layouts
+{
+	import flash.display.DisplayObject;
+	
+	import org.apache.flex.core.IBeadLayout;
+	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.IScrollBarView;
+
+    /**
+     *  The VScrollBarLayout class is a layout
+     *  bead that displays lays out the pieces of a
+     *  vertical ScrollBar like the thumb, track
+     *  and arrow buttons.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class VScrollBarLayout implements IBeadLayout
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function VScrollBarLayout()
+		{
+		}
+		
+		private var sbModel:IScrollBarModel;
+		private var sbView:IScrollBarView;
+		
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			sbView = _strand.getBeadByType(IScrollBarView) as IScrollBarView;
+			sbModel = _strand.getBeadByType(IScrollBarModel) as IScrollBarModel;
+			sbModel.addEventListener("maximumChange", changeHandler);
+			sbModel.addEventListener("minimumChange", changeHandler);
+			sbModel.addEventListener("snapIntervalChange", changeHandler);
+			sbModel.addEventListener("stepSizeChange", changeHandler);
+            sbModel.addEventListener("pageSizeChange", changeHandler);
+			sbModel.addEventListener("valueChange", changeHandler);
+			IEventDispatcher(_strand).addEventListener("heightChanged", changeHandler);
+			changeHandler(null);
+		}
+	
+		private function changeHandler(event:Event):void
+		{
+			var h:Number = DisplayObject(_strand).height;
+			var increment:DisplayObject = sbView.increment;
+			var decrement:DisplayObject = sbView.decrement;
+			var track:DisplayObject = sbView.track;
+			var thumb:DisplayObject = sbView.thumb;
+			
+			decrement.x = 0;
+			decrement.y = 0;
+			increment.x = 0;
+			increment.y = h - increment.height;
+			track.x = 0;
+			track.y = decrement.height;
+			track.height = increment.y - decrement.height;
+            thumb.height = sbModel.pageSize / (sbModel.maximum - sbModel.minimum) * track.height;
+			if (track.height > thumb.height)
+			{
+				thumb.visible = true;
+				thumb.y = (sbModel.value / (sbModel.maximum - sbModel.minimum - sbModel.pageSize) * (track.height - thumb.height)) + track.y;
+			}
+			else
+			{
+				thumb.visible = false;
+			}
+		}
+						
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/AlertModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/AlertModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/AlertModel.as
new file mode 100644
index 0000000..7ad8f11
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/AlertModel.as
@@ -0,0 +1,288 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{
+	import org.apache.flex.core.IAlertModel;
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.EventDispatcher;
+	
+	/**
+	 *  The AlertModel class bead implements the org.apache.flex.core.IAlertModel and holds the properties
+	 *  for an org.apache.flex.html.staticControls.Alert such the buttons to use and message to display.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class AlertModel extends EventDispatcher implements IAlertModel, IBead
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function AlertModel()
+		{
+			super();
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+		
+		private var _title:String;
+		
+		/**
+		 *  The title for the Alert.
+		 * 
+		 *  @copy org.apache.flex.core.IAlertModel#title
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get title():String
+		{
+			return _title;
+		}
+		public function set title(value:String):void
+		{
+			if( value != _title ) {
+				_title = value;
+				dispatchEvent( new Event("titleChange") );
+			}
+		}
+
+		private var _htmlTitle:String;
+		
+		/**
+		 *  The HTML title for the Alert.
+		 * 
+		 *  @copy org.apache.flex.core.IAlertModel#htmlTitle
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get htmlTitle():String
+		{
+			return _htmlTitle;
+		}
+		public function set htmlTitle(value:String):void
+		{
+			if( value != _htmlTitle ) {
+				_htmlTitle = value;
+				dispatchEvent( new Event("htmlTitleChange") );
+			}
+		}
+		
+		private var _message:String;
+		
+		/**
+		 *  The message to display.
+		 * 
+		 *  @copy org.apache.flex.core.IAlertModel#message
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get message():String
+		{
+			return _message;
+		}
+		public function set message(value:String):void
+		{
+			if( value != _message ) {
+				_message = value;
+				dispatchEvent( new Event("messageChange") );
+			}
+		}
+		
+		private var _htmlMessage:String;
+		
+		/**
+		 *  The HTML message to display.
+		 * 
+		 *  @copy org.apache.flex.core.IAlertModel#htmlMessage
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get htmlMessage():String
+		{
+			return _htmlMessage;
+		}
+		public function set htmlMessage(value:String):void
+		{
+			if( value != _htmlMessage )
+			{
+				_htmlMessage = value;
+				dispatchEvent( new Event("htmlMessageChange") );
+			}
+		}
+		
+		private var _flags:uint;
+		
+		/**
+		 *  Which buttons to display (see Alert for details).
+		 * 
+		 *  @copy org.apache.flex.core.IAlertModel#flags
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get flags():uint
+		{
+			return _flags;
+		}
+		public function set flags(value:uint):void
+		{
+			if( value != _flags )
+			{
+				_flags = value;
+				dispatchEvent( new Event("flagsChange") );
+			}
+		}
+		
+		private var _okLabel:String = "OK";
+		
+		/**
+		 *  The label to use for the OK button.
+		 * 
+		 *  @copy org.apache.flex.core.IAlertModel#okLabel
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get okLabel():String
+		{
+			return _okLabel;
+		}
+		public function set okLabel(value:String):void
+		{
+			if( value != _okLabel )
+			{
+				_okLabel = value;
+				dispatchEvent( new Event("okLabelChange") );
+			}
+		}
+		
+		private var _cancelLabel:String = "Cancel";
+		
+		/**
+		 *  The label to use for the Cancel button.
+		 * 
+		 *  @copy org.apache.flex.core.IAlertModel#cancelLabel
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get cancelLabel():String
+		{
+			return _cancelLabel;
+		}
+		public function set cancelLabel(value:String):void
+		{
+			if( value != _cancelLabel )
+			{
+				_cancelLabel = value;
+				dispatchEvent( new Event("cancelLabelChange") );
+			}
+		}
+		
+		private var _yesLabel:String = "YES";
+		
+		/**
+		 *  The label to use for the Yes button.
+		 * 
+		 *  @copy org.apache.flex.core.IAlertModel#yesLabel
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get yesLabel():String
+		{
+			return _yesLabel;
+		}
+		public function set yesLabel(value:String):void
+		{
+			if( value != _yesLabel )
+			{
+				_yesLabel = value;
+				dispatchEvent( new Event("yesLabelChange") );
+			}
+		}
+		
+		private var _noLabel:String = "NO";
+		
+		/**
+		 *  The label to use for the NO button.
+		 * 
+		 *  @copy org.apache.flex.core.IAlertModel#noLabel
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get noLabel():String
+		{
+			return _noLabel;
+		}
+		public function set noLabel(value:String):void
+		{
+			if( value != _noLabel )
+			{
+				_noLabel = value;
+				dispatchEvent( new Event("noLabelChange") );
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ArraySelectionModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
new file mode 100644
index 0000000..8859ab8
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
@@ -0,0 +1,234 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{
+	import org.apache.flex.core.IRollOverModel;
+	import org.apache.flex.core.ISelectionModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.EventDispatcher;
+			
+    /**
+     *  The ArraySelectionModel class is a selection model for
+     *  a dataProvider that is an array. It assumes that items
+     *  can be fetched from the dataProvider
+     *  dataProvider[index].  Other selection models
+     *  would support other kinds of data providers.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class ArraySelectionModel extends EventDispatcher implements ISelectionModel, IRollOverModel
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function ArraySelectionModel()
+		{
+		}
+
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+		
+		private var _dataProvider:Object;
+        
+        /**
+         *  @copy org.apache.flex.core.ISelectionModel#dataProvider
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get dataProvider():Object
+		{
+			return _dataProvider;
+		}
+
+        /**
+         *  @private
+         */
+		public function set dataProvider(value:Object):void
+		{
+            _dataProvider = value;
+			dispatchEvent(new Event("dataProviderChanged"));
+		}
+
+		private var _selectedIndex:int = -1;
+		private var _rollOverIndex:int = -1;
+		private var _labelField:String = null;
+		
+        /**
+         *  @copy org.apache.flex.core.ISelectionModel#labelField
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get labelField():String
+		{
+			return _labelField;
+		}
+
+        /**
+         *  @private
+         */
+		public function set labelField(value:String):void
+		{
+			if (value != _labelField) {
+				_labelField = value;
+				dispatchEvent(new Event("labelFieldChanged"));
+			}
+		}
+		
+        /**
+         *  @copy org.apache.flex.core.ISelectionModel#selectedIndex
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get selectedIndex():int
+		{
+			return _selectedIndex;
+		}
+
+        /**
+         *  @private
+         */
+		public function set selectedIndex(value:int):void
+		{
+			_selectedIndex = value;
+			_selectedItem = (value == -1) ? null : (value < _dataProvider.length) ? _dataProvider[value] : null;
+			dispatchEvent(new Event("selectedIndexChanged"));			
+		}
+		
+        /**
+         *  @copy org.apache.flex.core.IRollOverModel#rollOverIndex
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get rollOverIndex():int
+		{
+			return _rollOverIndex;
+		}
+
+        /**
+         *  @private
+         */
+		public function set rollOverIndex(value:int):void
+		{
+			_rollOverIndex = value;
+			dispatchEvent(new Event("rollOverIndexChanged"));			
+		}
+		
+		private var _selectedItem:Object;
+		
+        /**
+         *  @copy org.apache.flex.core.ISelectionModel#selectedItem
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get selectedItem():Object
+		{
+			return _selectedItem;
+		}
+
+        /**
+         *  @private
+         */
+		public function set selectedItem(value:Object):void
+		{
+			_selectedItem = value;	
+			var n:int = _dataProvider.length;
+			for (var i:int = 0; i < n; i++)
+			{
+				if (_dataProvider[i] == value)
+				{
+					_selectedIndex = i;
+					break;
+				}
+			}
+			dispatchEvent(new Event("selectedItemChanged"));			
+			dispatchEvent(new Event("selectedIndexChanged"));
+		}
+		
+		private var _selectedString:String;
+		
+        /**
+         *  An alternative to selectedItem for strongly typing the
+         *  the selectedItem if the Array is an Array of Strings.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get selectedString():String
+		{
+			return String(_selectedItem);
+		}
+
+        /**
+         *  @private
+         */
+		public function set selectedString(value:String):void
+		{
+			_selectedString = value;
+			var n:int = _dataProvider.length;
+			for (var i:int = 0; i < n; i++)
+			{
+				if (String(_dataProvider[i]) == value)
+				{
+					_selectedIndex = i;
+					break;
+				}
+			}
+			dispatchEvent(new Event("selectedItemChanged"));			
+			dispatchEvent(new Event("selectedIndexChanged"));			
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ComboBoxModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ComboBoxModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ComboBoxModel.as
new file mode 100644
index 0000000..0699c1d
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ComboBoxModel.as
@@ -0,0 +1,100 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IComboBoxModel;
+	import org.apache.flex.events.Event;
+			
+	/**
+	 *  The ComboBoxModel class bead extends org.apache.flex.html.staticControls.beads.models.ArraySelectionModel 
+	 *  and adds the text being displayed by the org.apache.flex.html.staticControls.ComboBox's input field.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ComboBoxModel extends ArraySelectionModel implements IBead, IComboBoxModel
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ComboBoxModel()
+		{
+		}
+
+		private var _text:String;
+		
+		/**
+		 *  The string to display in the org.apache.flex.html.staticControls.ComboBox input field.
+		 * 
+		 *  @copy org.apache.flex.core.IComboBoxModel#text
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get text():String
+		{
+			return _text;
+		}
+		
+		public function set text(value:String):void
+		{
+			if (value != _text)
+			{
+				_text = value;
+				dispatchEvent(new Event("textChange"));
+			}
+		}
+		
+		private var _html:String;
+		
+		/**
+		 *  The HTML string to display in the org.apache.flex.html.staticControls.ComboBox input field.
+		 * 
+		 *  @copy org.apache.flex.core.IComboBoxModel#html
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get html():String
+		{
+			return _html;
+		}
+		
+		public function set html(value:String):void
+		{
+			if (value != _html)
+			{
+				_html = value;
+				dispatchEvent(new Event("htmlChange"));
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ImageModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ImageModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ImageModel.as
new file mode 100644
index 0000000..1973b09
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ImageModel.as
@@ -0,0 +1,89 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{
+	import org.apache.flex.core.IImageModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.EventDispatcher;
+	
+	/**
+	 *  The ImageModel class bead defines the data associated with an org.apache.flex.html.staticControls.Image
+	 *  component, namely the source of the image.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ImageModel extends EventDispatcher implements IImageModel
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ImageModel()
+		{
+			super();
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+		
+		private var _source:String;
+		
+		/**
+		 *  The source of the image.
+		 * 
+		 *  @copy org.apache.flex.core.IImageModel#source
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get source():String
+		{
+			return _source;
+		}
+		public function set source(value:String):void
+		{
+			if (value != _source) {
+				_source = value;
+				dispatchEvent( new Event("urlChanged") );
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/PanelModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/PanelModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/PanelModel.as
new file mode 100644
index 0000000..02716c9
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/PanelModel.as
@@ -0,0 +1,138 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IPanelModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.EventDispatcher;
+	
+	/**
+	 *  The PanelModel bead class holds the values for a org.apache.flex.html.staticControls.Panel, such as its
+	 *  title.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class PanelModel extends EventDispatcher implements IBead, IPanelModel
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function PanelModel()
+		{
+			super();
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+		
+		private var _title:String;
+		
+		/**
+		 *  The title string for the org.apache.flex.html.staticControls.Panel.
+		 * 
+		 *  @copy org.apache.flex.core.ITitleBarModel#title
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get title():String
+		{
+			return _title;
+		}
+		public function set title(value:String):void
+		{
+			if( value != _title ) {
+				_title = value;
+				dispatchEvent( new Event('titleChange') );
+			}
+		}
+		
+		private var _htmlTitle:String;
+		
+		/**
+		 *  The HTML string for the title.
+		 * 
+		 *  @copy org.apache.flex.core.ITitleBarModel#htmlTitle
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get htmlTitle():String
+		{
+			return _htmlTitle;
+		}
+		public function set htmlTitle(value:String):void
+		{
+			if( value != _htmlTitle ) {
+				_htmlTitle = value;
+				dispatchEvent( new Event('htmlTitleChange') );
+			}
+		}
+		
+		private var _showCloseButton:Boolean = false;
+		
+		/**
+		 *  Indicates whether or not there is a Close button for the org.apache.flex.html.staticControls.Panel.
+		 * 
+		 *  @copy org.apache.flex.core.ITitleBarModel#showCloseButton
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get showCloseButton():Boolean
+		{
+			return _showCloseButton;
+		}
+		public function set showCloseButton(value:Boolean):void
+		{
+			if( value != _showCloseButton ) {
+				_showCloseButton = value;
+				dispatchEvent( new Event('showCloseButtonChange') );
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/RangeModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/RangeModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/RangeModel.as
new file mode 100644
index 0000000..9a5e421
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/RangeModel.as
@@ -0,0 +1,222 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{
+	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;
+			
+	/**
+	 *  The RangeModel class bead defines a set of for a numeric range of values
+	 *  which includes a minimum, maximum, and current value.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class RangeModel extends EventDispatcher implements IBead, IRangeModel
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function RangeModel()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+
+		private var _maximum:Number = 100;
+		
+		/**
+		 *  The maximum value for the range (defaults to 100).
+		 * 
+		 *  @copy org.apache.flex.core.IRangeModel#maximum
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get maximum():Number
+		{
+			return _maximum;
+		}
+		
+		public function set maximum(value:Number):void
+		{
+			if (value != _maximum)
+			{
+				_maximum = value;
+				dispatchEvent(new Event("maximumChange"));
+			}
+		}
+		
+		private var _minimum:Number = 0;
+		
+		/**
+		 *  The minimum value for the range (defaults to 0).
+		 * 
+		 *  @copy org.apache.flex.core.IRangeModel#minimum
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get minimum():Number
+		{
+			return _minimum;
+		}
+		
+		public function set minimum(value:Number):void
+		{
+			if (value != _minimum)
+			{
+				_minimum = value;
+				dispatchEvent(new Event("minimumChange"));
+			}
+		}
+
+		private var _snapInterval:Number = 1;
+		
+		/**
+		 *  The modulus value for the range. 
+		 * 
+		 *  @copy org.apache.flex.core.IRangeModel#snapInterval
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get snapInterval():Number
+		{
+			return _snapInterval;
+		}
+		
+		public function set snapInterval(value:Number):void
+		{
+			if (value != _snapInterval)
+			{
+				_snapInterval = value;
+				dispatchEvent(new Event("snapIntervalChange"));
+			}
+		}
+		
+		private var _stepSize:Number = 1;
+		
+		/**
+		 *  The amount to adjust the value either up or down toward the edge of the range.
+		 * 
+		 *  @copy org.apache.flex.core.IRangeModel#stepSize
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get stepSize():Number
+		{
+			return _stepSize;
+		}
+		
+		public function set stepSize(value:Number):void
+		{
+			if (value != _stepSize)
+			{
+				_stepSize = value;
+				dispatchEvent(new Event("stepSizeChange"));
+			}
+		}
+		
+		private var _value:Number = 0;
+		
+		/**
+		 *  The current value of the range, between the minimum and maximum values. Attempting
+		 *  to set the value outside of the minimum-maximum range changes the value to still be
+		 *  within the range. Note that the value is adjusted by the stepSize.
+		 * 
+		 *  @copy org.apache.flex.core.IRangeModel#value
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get value():Number
+		{
+			return _value;
+		}
+		
+		public function set value(newValue:Number):void
+		{
+			if (newValue != _value)
+			{
+				// value must lie within the boundaries of minimum & maximum
+				// and be on a step interval, so the value is adjusted to 
+				// what is coming in.
+				newValue = Math.max(minimum, newValue - stepSize);
+				newValue = Math.min(maximum, newValue + stepSize);
+				_value = snap(newValue);
+				dispatchEvent(new Event("valueChange"));
+			}
+		}
+		
+		/**
+		 * @private
+		 */
+		protected function snap(value:Number):Number
+		{
+			var si:Number = snapInterval;
+			var n:Number = Math.round((value - minimum) / si) * si + minimum;
+			if (value > 0)
+			{
+				if (value - n < n + si - value)
+					return n;
+				return n + si;
+				
+			}
+			if (value - n > n + si - value)
+				return n + si;
+			return n;
+		}
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ScrollBarModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ScrollBarModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ScrollBarModel.as
new file mode 100644
index 0000000..27fbef0
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ScrollBarModel.as
@@ -0,0 +1,98 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{
+	
+	import org.apache.flex.core.IScrollBarModel;
+	import org.apache.flex.events.Event;
+		
+	/**
+	 *  The ScrollBarModel class bead extends the org.apache.flex.html.staticControls.beads.models.RangeModel 
+	 *  and adds page size and page step sizes.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ScrollBarModel extends RangeModel implements IScrollBarModel
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ScrollBarModel()
+		{
+		}
+		
+		private var _pageSize:Number;
+		
+		/**
+		 *  The amount represented by the thumb control of the org.apache.flex.html.staticControls.ScrollBar.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get pageSize():Number
+		{
+			return _pageSize;
+		}
+		
+		public function set pageSize(value:Number):void
+		{
+			if (value != _pageSize)
+			{
+				_pageSize = value;
+				dispatchEvent(new Event("pageSizeChange"));
+			}
+		}
+				
+		private var _pageStepSize:Number;
+		
+		/**
+		 *  The amount to adjust the org.apache.flex.html.staticControls.ScrollBar if the scroll bar's 
+		 *  track area is selected.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get pageStepSize():Number
+		{
+			return _pageStepSize;
+		}
+		
+		public function set pageStepSize(value:Number):void
+		{
+			if (value != _pageStepSize)
+			{
+				_pageStepSize = value;
+				dispatchEvent(new Event("pageStepSizeChange"));
+			}
+		}
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/SingleLineBorderModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/SingleLineBorderModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/SingleLineBorderModel.as
new file mode 100644
index 0000000..64eb045
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/SingleLineBorderModel.as
@@ -0,0 +1,85 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{
+	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;
+		
+    /**
+     *  The SingleLineBorderModel class is a data model for
+     *  a single line border. This model is very simple,
+     *  it only stores the offsets from the edges of the
+     *  component.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class SingleLineBorderModel extends EventDispatcher implements IBead, IBorderModel
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function SingleLineBorderModel()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+
+        static private var rect:Rectangle = new Rectangle(1, 1, 1, 1);
+        
+        /**
+         *  The offsets of the border from the edges of the
+         *  component.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        public function get offsets():Rectangle
+        {
+            return rect;
+        }
+
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/StringSelectionModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/StringSelectionModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/StringSelectionModel.as
new file mode 100644
index 0000000..a72dc64
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/StringSelectionModel.as
@@ -0,0 +1,221 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{
+	
+	import org.apache.flex.core.ISelectionModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.EventDispatcher;
+		
+    /**
+     *  The StringSelectionModel class is a selection model for
+     *  selecting a single string from a vector of strings. 
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class StringSelectionModel extends EventDispatcher implements ISelectionModel
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function StringSelectionModel()
+		{
+		}
+
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+		
+		private var _strings:Vector.<String>;
+
+        /**
+         *  The vector of strings.  This is the same
+         *  as the dataProvider property but is
+         *  strongly typed.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get strings():Vector.<String>
+		{
+			return _strings;
+		}
+        
+        /**
+         *  @private
+         */
+		public function set strings(value:Vector.<String>):void
+		{
+			_strings = value;
+			dispatchEvent(new Event("dataProviderChanged"));
+		}
+
+        /**
+         *  The dataProvider, which is a
+         *  Vector.&lt;String&gt;.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get dataProvider():Object
+		{
+			return _strings;
+		}
+
+        /**
+         *  @private
+         */
+		public function set dataProvider(value:Object):void
+		{
+			_strings = value as Vector.<String>;
+			dispatchEvent(new Event("dataProviderChanged"));
+		}
+
+		private var _selectedIndex:int = -1;
+		
+        /**
+         *  @copy org.apache.flex.core.ISelectionModel#selectedIndex
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get selectedIndex():int
+		{
+			return _selectedIndex;
+		}
+
+        /**
+         *  @private
+         */
+		public function set selectedIndex(value:int):void
+		{
+			_selectedIndex = value;
+			_selectedString = (value == -1) ? null : (value < _strings.length) ? _strings[value] : null;
+			dispatchEvent(new Event("selectedIndexChanged"));			
+		}
+		private var _selectedString:String;
+		
+        /**
+         *  @copy org.apache.flex.core.ISelectionModel#selectedItem
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get selectedItem():Object
+		{
+			return _selectedString;
+		}
+        
+        /**
+         *  @private
+         */
+		public function set selectedItem(value:Object):void
+		{
+			selectedString = String(value);	
+		}
+
+        /**
+         *  The selected string.  This is the same as the
+         *  selectedItem, but is strongly-typed.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get selectedString():String
+		{
+			return _selectedString;
+		}
+        
+        /**
+         *  @private
+         */
+		public function set selectedString(value:String):void
+		{
+			_selectedString = value;
+			var n:int = _strings.length;
+			for (var i:int = 0; i < n; i++)
+			{
+				if (_strings[i] == value)
+				{
+					_selectedIndex = i;
+					break;
+				}
+			}
+			dispatchEvent(new Event("selectedItemChanged"));			
+		}
+		
+		
+		private var _labelField:String;
+		
+        /**
+         *  The labelField, which is not used in this
+         *  implementation.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get labelField():String
+		{
+			return _labelField;
+		}
+        
+        /**
+         *  @private
+         */
+		public function set labelField(value:String):void
+		{
+			if (value != _labelField) {
+				_labelField = value;
+				dispatchEvent(new Event("labelFieldChanged"));
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TextModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TextModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TextModel.as
new file mode 100644
index 0000000..3adf825
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TextModel.as
@@ -0,0 +1,122 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{	
+	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;
+		
+    /**
+     *  The TextModel class is most basic data model for a
+     *  component that displays text.  All FlexJS components
+     *  that display text should also support HTML, although
+     *  the Flash Player implementations may only support
+     *  a subset of HTML. 
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class TextModel extends EventDispatcher implements IBead, ITextModel
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function TextModel()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+
+		private var _text:String;
+
+        /**
+         *  @copy org.apache.flex.core.ITextModel#text
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        public function get text():String
+		{
+			return _text;
+		}
+		
+        /**
+         *  @private
+         */
+		public function set text(value:String):void
+		{
+			if (value != _text)
+			{
+				_text = value;
+				dispatchEvent(new Event("textChange"));
+			}
+		}
+		
+		private var _html:String;
+        
+        /**
+         *  @copy org.apache.flex.core.ITextModel#html
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get html():String
+		{
+			return _html;
+		}
+		
+        /**
+         *  @private
+         */
+		public function set html(value:String):void
+		{
+			if (value != _html)
+			{
+				_html = value;
+				dispatchEvent(new Event("htmlChange"));
+			}
+		}
+	}
+}
\ No newline at end of file


[29/35] git commit: [flex-asjs] [refs/heads/develop] - rename packages in these files

Posted by ah...@apache.org.
rename packages in these files


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

Branch: refs/heads/develop
Commit: 189fb58ad323602674b458ab798103988f0d9789
Parents: 8d37ef3
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 25 11:10:33 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 25 11:10:33 2014 -0700

----------------------------------------------------------------------
 .../src/org/apache/flex/html5/Button.as         |  2 +-
 .../src/org/apache/flex/html5/CheckBox.as       |  2 +-
 .../src/org/apache/flex/html5/ComboBox.as       |  2 +-
 .../src/org/apache/flex/html5/DropDownList.as   |  2 +-
 .../FlexJSUI/src/org/apache/flex/html5/Label.as |  2 +-
 .../FlexJSUI/src/org/apache/flex/html5/List.as  |  2 +-
 .../src/org/apache/flex/html5/RadioButton.as    |  2 +-
 .../src/org/apache/flex/html5/TextArea.as       |  2 +-
 .../src/org/apache/flex/html5/TextButton.as     |  2 +-
 .../src/org/apache/flex/html5/TextInput.as      |  2 +-
 .../src/org/apache/flex/html5/CheckBox.js       | 16 ++++++++--------
 .../src/org/apache/flex/html5/ComboBox.js       | 20 ++++++++++----------
 .../src/org/apache/flex/html5/DropDownList.js   |  6 +++---
 .../FlexJS/src/org/apache/flex/html5/Label.js   | 12 ++++++------
 .../js/FlexJS/src/org/apache/flex/html5/List.js |  8 ++++----
 .../src/org/apache/flex/html5/RadioButton.js    | 20 ++++++++++----------
 .../src/org/apache/flex/html5/TextArea.js       | 12 ++++++------
 .../src/org/apache/flex/html5/TextButton.js     | 12 ++++++------
 .../src/org/apache/flex/html5/TextInput.js      | 12 ++++++------
 19 files changed, 69 insertions(+), 69 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Button.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Button.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Button.as
index f111168..41a81ab 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Button.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Button.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
+package org.apache.flex.html5
 {
 	import org.apache.flex.html.Button;
 	

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/CheckBox.as
index 5b7d875..8af13ac 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/CheckBox.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/CheckBox.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
+package org.apache.flex.html5
 {
 	import org.apache.flex.html.CheckBox;
 	

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/ComboBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/ComboBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/ComboBox.as
index 3c8e586..2c10af6 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/ComboBox.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/ComboBox.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
+package org.apache.flex.html5
 {
 	import org.apache.flex.html.ComboBox;
 	

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/DropDownList.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/DropDownList.as
index 3d4dfd5..41dea1a 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/DropDownList.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/DropDownList.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
+package org.apache.flex.html5
 {
     import org.apache.flex.html.DropDownList;
     

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as
index 4a730a6..d6ee5d2 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
+package org.apache.flex.html5
 {
 	import org.apache.flex.html.Label;
 	

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as
index 4d3a9aa..8c501bd 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
+package org.apache.flex.html5
 {
 	import org.apache.flex.html.List;
 	

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/RadioButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/RadioButton.as
index d45440f..f3f1fa7 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/RadioButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/RadioButton.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
+package org.apache.flex.html5
 {
 	import org.apache.flex.html.RadioButton;
 	

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextArea.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextArea.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextArea.as
index 0bb5bc8..59363f7 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextArea.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextArea.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
+package org.apache.flex.html5
 {
 	import org.apache.flex.html.TextArea;
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextButton.as
index 00984fc..d92bf03 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextButton.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
+package org.apache.flex.html5
 {
 	import org.apache.flex.html.TextButton;
 	

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextInput.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextInput.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextInput.as
index 9bc9a1d..91d1eb9 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextInput.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextInput.as
@@ -15,7 +15,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
+package org.apache.flex.html5
 {
 	import org.apache.flex.html.TextInput;
 	

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/js/FlexJS/src/org/apache/flex/html5/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/CheckBox.js
index 4bb0af5..fff02e9 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/CheckBox.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/CheckBox.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html5.staticControls.CheckBox');
+goog.provide('org.apache.flex.html5.CheckBox');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,17 +22,17 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html5.staticControls.CheckBox = function() {
+org.apache.flex.html5.CheckBox = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html5.staticControls.CheckBox,
+goog.inherits(org.apache.flex.html5.CheckBox,
     org.apache.flex.core.UIBase);
 
 
 /**
  * @override
  */
-org.apache.flex.html5.staticControls.CheckBox.prototype.createElement =
+org.apache.flex.html5.CheckBox.prototype.createElement =
     function() {
   var cb;
 
@@ -53,7 +53,7 @@ org.apache.flex.html5.staticControls.CheckBox.prototype.createElement =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.html5.staticControls.CheckBox.prototype.get_text = function() {
+org.apache.flex.html5.CheckBox.prototype.get_text = function() {
   return this.element.childNodes.item(1).nodeValue;
 };
 
@@ -62,7 +62,7 @@ org.apache.flex.html5.staticControls.CheckBox.prototype.get_text = function() {
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.html5.staticControls.CheckBox.prototype.set_text =
+org.apache.flex.html5.CheckBox.prototype.set_text =
     function(value) {
   this.element.childNodes.item(1).nodeValue = value;
 };
@@ -72,7 +72,7 @@ org.apache.flex.html5.staticControls.CheckBox.prototype.set_text =
  * @expose
  * @return {boolean} The selected getter.
  */
-org.apache.flex.html5.staticControls.CheckBox.prototype.get_selected =
+org.apache.flex.html5.CheckBox.prototype.get_selected =
     function() {
   return this.element.childNodes.item(0).checked;
 };
@@ -82,7 +82,7 @@ org.apache.flex.html5.staticControls.CheckBox.prototype.get_selected =
  * @expose
  * @param {boolean} value The selected setter.
  */
-org.apache.flex.html5.staticControls.CheckBox.prototype.set_selected =
+org.apache.flex.html5.CheckBox.prototype.set_selected =
     function(value) {
   this.element.childNodes.item(0).checked = value;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js
index b6925e6..07427a8 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html5.staticControls.ComboBox');
+goog.provide('org.apache.flex.html5.ComboBox');
 
 goog.require('org.apache.flex.core.ListBase');
 
@@ -22,17 +22,17 @@ goog.require('org.apache.flex.core.ListBase');
  * @constructor
  * @extends {org.apache.flex.core.ListBase}
  */
-org.apache.flex.html5.staticControls.ComboBox = function() {
+org.apache.flex.html5.ComboBox = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html5.staticControls.ComboBox,
+goog.inherits(org.apache.flex.html5.ComboBox,
     org.apache.flex.core.ListBase);
 
 
 /**
  * @override
  */
-org.apache.flex.html5.staticControls.ComboBox.prototype.createElement =
+org.apache.flex.html5.ComboBox.prototype.createElement =
     function() {
   var button, input;
 
@@ -72,7 +72,7 @@ org.apache.flex.html5.staticControls.ComboBox.prototype.createElement =
  * @expose
  * @param {Event} event The event.
  */
-org.apache.flex.html5.staticControls.ComboBox.prototype.selectChanged =
+org.apache.flex.html5.ComboBox.prototype.selectChanged =
     function(event) {
   var select;
 
@@ -90,7 +90,7 @@ org.apache.flex.html5.staticControls.ComboBox.prototype.selectChanged =
  * @expose
  * @param {Event} event The event.
  */
-org.apache.flex.html5.staticControls.ComboBox.prototype.dismissPopup =
+org.apache.flex.html5.ComboBox.prototype.dismissPopup =
     function(event) {
   if (this.popup) {
     this.popup.parentNode.removeChild(this.popup);
@@ -103,7 +103,7 @@ org.apache.flex.html5.staticControls.ComboBox.prototype.dismissPopup =
  * @expose
  * @param {Event} event The event.
  */
-org.apache.flex.html5.staticControls.ComboBox.prototype.buttonClicked =
+org.apache.flex.html5.ComboBox.prototype.buttonClicked =
     function(event) {
   /**
    * @type {Array.<string>}
@@ -171,7 +171,7 @@ org.apache.flex.html5.staticControls.ComboBox.prototype.buttonClicked =
  * @expose
  * @param {Array.<Object>} value The collection of data.
  */
-org.apache.flex.html5.staticControls.ComboBox.prototype.set_dataProvider =
+org.apache.flex.html5.ComboBox.prototype.set_dataProvider =
     function(value) {
   this.dataProvider = value;
 };
@@ -181,7 +181,7 @@ org.apache.flex.html5.staticControls.ComboBox.prototype.set_dataProvider =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.html5.staticControls.ComboBox.prototype.get_text = function() {
+org.apache.flex.html5.ComboBox.prototype.get_text = function() {
   return this.element.childNodes.item(0).value;
 };
 
@@ -190,7 +190,7 @@ org.apache.flex.html5.staticControls.ComboBox.prototype.get_text = function() {
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.html5.staticControls.ComboBox.prototype.set_text =
+org.apache.flex.html5.ComboBox.prototype.set_text =
     function(value) {
   this.element.childNodes.item(0).value = value;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/js/FlexJS/src/org/apache/flex/html5/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/DropDownList.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/DropDownList.js
index 406c262..fd34f61 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/DropDownList.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/DropDownList.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html5.staticControls.DropDownList');
+goog.provide('org.apache.flex.html5.DropDownList');
 
 goog.require('org.apache.flex.core.ListBase');
 
@@ -22,8 +22,8 @@ goog.require('org.apache.flex.core.ListBase');
  * @constructor
  * @extends {org.apache.flex.core.ListBase}
  */
-org.apache.flex.html5.staticControls.DropDownList = function() {
+org.apache.flex.html5.DropDownList = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html5.staticControls.DropDownList,
+goog.inherits(org.apache.flex.html5.DropDownList,
     org.apache.flex.core.ListBase);

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/js/FlexJS/src/org/apache/flex/html5/Label.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/Label.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/Label.js
index 0265ce7..3221222 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/Label.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/Label.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html5.staticControls.Label');
+goog.provide('org.apache.flex.html5.Label');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,17 +22,17 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html5.staticControls.Label = function() {
+org.apache.flex.html5.Label = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html5.staticControls.Label,
+goog.inherits(org.apache.flex.html5.Label,
     org.apache.flex.core.UIBase);
 
 
 /**
  * @override
  */
-org.apache.flex.html5.staticControls.Label.prototype.createElement =
+org.apache.flex.html5.Label.prototype.createElement =
     function() {
   goog.base(this, 'createElement');
 
@@ -46,7 +46,7 @@ org.apache.flex.html5.staticControls.Label.prototype.createElement =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.html5.staticControls.Label.prototype.get_text = function() {
+org.apache.flex.html5.Label.prototype.get_text = function() {
   return this.element.innerHTML;
 };
 
@@ -55,7 +55,7 @@ org.apache.flex.html5.staticControls.Label.prototype.get_text = function() {
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.html5.staticControls.Label.prototype.set_text =
+org.apache.flex.html5.Label.prototype.set_text =
     function(value) {
   this.element.innerHTML = value;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/js/FlexJS/src/org/apache/flex/html5/List.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/List.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/List.js
index 754a77f..5d0eb74 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/List.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/List.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html5.staticControls.List');
+goog.provide('org.apache.flex.html5.List');
 
 goog.require('org.apache.flex.core.ListBase');
 
@@ -22,17 +22,17 @@ goog.require('org.apache.flex.core.ListBase');
  * @constructor
  * @extends {org.apache.flex.core.ListBase}
  */
-org.apache.flex.html5.staticControls.List = function() {
+org.apache.flex.html5.List = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html5.staticControls.List,
+goog.inherits(org.apache.flex.html5.List,
     org.apache.flex.core.ListBase);
 
 
 /**
  * @override
  */
-org.apache.flex.html5.staticControls.List.prototype.createElement =
+org.apache.flex.html5.List.prototype.createElement =
     function() {
   goog.base(this, 'createElement');
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/js/FlexJS/src/org/apache/flex/html5/RadioButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/RadioButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/RadioButton.js
index 4e5bc1f..ce2e2a3 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/RadioButton.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/RadioButton.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html5.staticControls.RadioButton');
+goog.provide('org.apache.flex.html5.RadioButton');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,17 +22,17 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html5.staticControls.RadioButton = function() {
+org.apache.flex.html5.RadioButton = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html5.staticControls.RadioButton,
+goog.inherits(org.apache.flex.html5.RadioButton,
     org.apache.flex.core.UIBase);
 
 
 /**
  * @override
  */
-org.apache.flex.html5.staticControls.RadioButton.prototype.createElement =
+org.apache.flex.html5.RadioButton.prototype.createElement =
     function() {
   var rb;
 
@@ -53,7 +53,7 @@ org.apache.flex.html5.staticControls.RadioButton.prototype.createElement =
  * @expose
  * @return {string} The groupName getter.
  */
-org.apache.flex.html5.staticControls.RadioButton.prototype.get_groupName =
+org.apache.flex.html5.RadioButton.prototype.get_groupName =
     function() {
   return this.element.childNodes.item(0).name;
 };
@@ -63,7 +63,7 @@ org.apache.flex.html5.staticControls.RadioButton.prototype.get_groupName =
  * @expose
  * @param {string} value The groupName setter.
  */
-org.apache.flex.html5.staticControls.RadioButton.prototype.set_groupName =
+org.apache.flex.html5.RadioButton.prototype.set_groupName =
     function(value) {
   this.element.childNodes.item(0).name = value;
 };
@@ -73,7 +73,7 @@ org.apache.flex.html5.staticControls.RadioButton.prototype.set_groupName =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.html5.staticControls.RadioButton.prototype.get_text =
+org.apache.flex.html5.RadioButton.prototype.get_text =
     function() {
   return this.element.childNodes.item(1).nodeValue;
 };
@@ -83,7 +83,7 @@ org.apache.flex.html5.staticControls.RadioButton.prototype.get_text =
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.html5.staticControls.RadioButton.prototype.set_text =
+org.apache.flex.html5.RadioButton.prototype.set_text =
     function(value) {
   this.element.childNodes.item(1).nodeValue = value;
 };
@@ -93,7 +93,7 @@ org.apache.flex.html5.staticControls.RadioButton.prototype.set_text =
  * @expose
  * @return {boolean} The selected getter.
  */
-org.apache.flex.html5.staticControls.RadioButton.prototype.get_selected =
+org.apache.flex.html5.RadioButton.prototype.get_selected =
     function() {
   return this.element.childNodes.item(0).checked;
 };
@@ -103,7 +103,7 @@ org.apache.flex.html5.staticControls.RadioButton.prototype.get_selected =
  * @expose
  * @param {boolean} value The selected setter.
  */
-org.apache.flex.html5.staticControls.RadioButton.prototype.set_selected =
+org.apache.flex.html5.RadioButton.prototype.set_selected =
     function(value) {
   this.element.childNodes.item(0).checked = value;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/js/FlexJS/src/org/apache/flex/html5/TextArea.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/TextArea.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/TextArea.js
index e65d895..ad6244c 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/TextArea.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/TextArea.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html5.staticControls.TextArea');
+goog.provide('org.apache.flex.html5.TextArea');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,17 +22,17 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html5.staticControls.TextArea = function() {
+org.apache.flex.html5.TextArea = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html5.staticControls.TextArea,
+goog.inherits(org.apache.flex.html5.TextArea,
     org.apache.flex.core.UIBase);
 
 
 /**
  * @override
  */
-org.apache.flex.html5.staticControls.TextArea.prototype.createElement =
+org.apache.flex.html5.TextArea.prototype.createElement =
     function() {
   this.element = document.createElement('textarea');
 
@@ -46,7 +46,7 @@ org.apache.flex.html5.staticControls.TextArea.prototype.createElement =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.html5.staticControls.TextArea.prototype.get_text = function() {
+org.apache.flex.html5.TextArea.prototype.get_text = function() {
   return this.element.value;
 };
 
@@ -55,7 +55,7 @@ org.apache.flex.html5.staticControls.TextArea.prototype.get_text = function() {
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.html5.staticControls.TextArea.prototype.set_text =
+org.apache.flex.html5.TextArea.prototype.set_text =
     function(value) {
   this.element.value = value;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/js/FlexJS/src/org/apache/flex/html5/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/TextButton.js
index a244aa5..57229ef 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/TextButton.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/TextButton.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html5.staticControls.TextButton');
+goog.provide('org.apache.flex.html5.TextButton');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,17 +22,17 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html5.staticControls.TextButton = function() {
+org.apache.flex.html5.TextButton = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html5.staticControls.TextButton,
+goog.inherits(org.apache.flex.html5.TextButton,
     org.apache.flex.core.UIBase);
 
 
 /**
  * @override
  */
-org.apache.flex.html5.staticControls.TextButton.prototype.createElement =
+org.apache.flex.html5.TextButton.prototype.createElement =
     function() {
   this.element = document.createElement('button');
   this.element.setAttribute('type', 'button');
@@ -47,7 +47,7 @@ org.apache.flex.html5.staticControls.TextButton.prototype.createElement =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.html5.staticControls.TextButton.prototype.get_text =
+org.apache.flex.html5.TextButton.prototype.get_text =
     function() {
   return this.element.innerHTML;
 };
@@ -57,7 +57,7 @@ org.apache.flex.html5.staticControls.TextButton.prototype.get_text =
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.html5.staticControls.TextButton.prototype.set_text =
+org.apache.flex.html5.TextButton.prototype.set_text =
     function(value) {
   this.element.innerHTML = value;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/189fb58a/frameworks/js/FlexJS/src/org/apache/flex/html5/TextInput.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/TextInput.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/TextInput.js
index 9dc0d83..c31ffc0 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html5/TextInput.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/TextInput.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html5.staticControls.TextInput');
+goog.provide('org.apache.flex.html5.TextInput');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,17 +22,17 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html5.staticControls.TextInput = function() {
+org.apache.flex.html5.TextInput = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html5.staticControls.TextInput,
+goog.inherits(org.apache.flex.html5.TextInput,
     org.apache.flex.core.UIBase);
 
 
 /**
  * @override
  */
-org.apache.flex.html5.staticControls.TextInput.prototype.createElement =
+org.apache.flex.html5.TextInput.prototype.createElement =
     function() {
   this.element = document.createElement('input');
   this.element.setAttribute('type', 'input');
@@ -47,7 +47,7 @@ org.apache.flex.html5.staticControls.TextInput.prototype.createElement =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.html5.staticControls.TextInput.prototype.get_text = function() {
+org.apache.flex.html5.TextInput.prototype.get_text = function() {
   return this.element.value;
 };
 
@@ -56,7 +56,7 @@ org.apache.flex.html5.staticControls.TextInput.prototype.get_text = function() {
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.html5.staticControls.TextInput.prototype.set_text =
+org.apache.flex.html5.TextInput.prototype.set_text =
     function(value) {
   this.element.value = value;
 };


[06/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
new file mode 100644
index 0000000..ceb83a7
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
@@ -0,0 +1,333 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.supportClasses
+{
+    import flash.text.TextFieldType;
+    
+    import org.apache.flex.core.CSSTextField;
+    import org.apache.flex.core.IBead;
+    import org.apache.flex.core.IBeadController;
+    import org.apache.flex.core.IStrand;
+    import org.apache.flex.core.IUIBase;
+    import org.apache.flex.core.UIBase;
+    import org.apache.flex.core.ValuesManager;
+    import org.apache.flex.events.Event;
+    import org.apache.flex.html.staticControls.beads.ITextItemRenderer;
+	
+	/**
+	 *  The TextFieldItemRenderer class provides a org.apache.flex.html.staticControls.TextField as an itemRenderer.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class TextFieldItemRenderer extends CSSTextField implements ITextItemRenderer, IStrand, IUIBase
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function TextFieldItemRenderer()
+		{
+			super();
+            type = TextFieldType.DYNAMIC;
+            selectable = false;
+		}
+        
+        public var highlightColor:uint = 0xCEDBEF;
+        public var selectedColor:uint = 0xA8C6EE;
+        public var downColor:uint = 0x808080;
+
+        private var _width:Number;
+		
+		/**
+		 * @private
+		 */
+        override public function get width():Number
+        {
+            if (isNaN(_width))
+            {
+                var value:* = ValuesManager.valuesImpl.getValue(this, "width");
+                if (value === undefined)
+                    return $width;
+                _width = Number(value);
+                super.width = value;
+            }
+            return _width;
+        }
+        override public function set width(value:Number):void
+        {
+            if (_width != value)
+            {
+                _width = value;
+                super.width = value;
+                dispatchEvent(new Event("widthChanged"));
+            }
+        }
+		
+		/**
+		 * @private
+		 */
+        protected function get $width():Number
+        {
+            return super.width;
+        }
+        
+        private var _height:Number;
+		
+		/**
+		 * @private
+		 */
+        override public function get height():Number
+        {
+            if (isNaN(_height))
+            {
+                var value:* = ValuesManager.valuesImpl.getValue(this, "height");
+                if (value === undefined)
+                    return $height;
+                _height = Number(value);
+                super.height = value;
+            }
+            return _height;
+        }
+        override public function set height(value:Number):void
+        {
+            if (_height != value)
+            {
+                _height = value;
+                super.height = value;
+                dispatchEvent(new Event("heightChanged"));
+            }
+        }
+		
+		/**
+		 * @private
+		 */
+        protected function get $height():Number
+        {
+            return super.height;
+        }
+
+		/**
+		 *  The String(data) for the itemRenderer instance.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get data():Object
+        {
+            return text;
+        }
+        public function set data(value:Object):void
+        {
+            text = String(value);
+        }
+		
+		/**
+		 * @private
+		 */
+		public function get labelField():String
+		{
+			return null;
+		}
+		public function set labelField(value:String):void
+		{
+			// nothing to do for this
+		}
+        
+        private var _index:int;
+        
+		/**
+		 *  An index value for the itemRenderer corresponding the data's position with its dataProvider.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get index():int
+        {
+            return _index;
+        }
+        public function set index(value:int):void
+        {
+            _index = value;
+        }
+        
+        private var _hovered:Boolean;
+        
+		/**
+		 *  Returns whether or not the itemRenderer is a "hovered" state.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get hovered():Boolean
+        {
+            return _hovered;
+        }
+        public function set hovered(value:Boolean):void
+        {
+            _hovered = value;
+            updateRenderer();
+        }
+        
+        private var _selected:Boolean;
+        
+		/**
+		 *  Whether or not the itemRenderer should be represented in a selected state.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get selected():Boolean
+        {
+            return _selected;
+        }
+        public function set selected(value:Boolean):void
+        {
+            _selected = value;
+            updateRenderer();
+        }
+
+        private var _down:Boolean;
+        
+		/**
+		 *  Whether or not the itemRenderer should be represented in a down (or pre-selected) state.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get down():Boolean
+        {
+            return _down;
+        }
+        public function set down(value:Boolean):void
+        {
+            _down = value;
+            updateRenderer();
+        }
+        
+		/**
+		 * @private
+		 */
+        public function updateRenderer():void
+        {
+            background = (down || selected || hovered);
+            if (down)
+                backgroundColor = downColor;
+            else if (hovered)
+                backgroundColor = highlightColor;
+            else if (selected)
+                backgroundColor = selectedColor;
+        }
+        
+		/**
+		 * @private
+		 */
+        public function get element():Object
+        {
+            return this;
+        }
+
+        // beads declared in MXML are added to the strand.
+        // from AS, just call addBead()
+        public var beads:Array;
+        
+        private var _beads:Vector.<IBead>;
+		
+		/**
+		 * @private
+		 */
+        public function addBead(bead:IBead):void
+        {
+            if (!_beads)
+                _beads = new Vector.<IBead>;
+            _beads.push(bead);
+            bead.strand = this;
+        }
+        
+		/**
+		 * @private
+		 */
+        public function getBeadByType(classOrInterface:Class):IBead
+        {
+            for each (var bead:IBead in _beads)
+            {
+                if (bead is classOrInterface)
+                    return bead;
+            }
+            return null;
+        }
+        
+		/**
+		 * @private
+		 */
+        public function removeBead(value:IBead):IBead	
+        {
+            var n:int = _beads.length;
+            for (var i:int = 0; i < n; i++)
+            {
+                var bead:IBead = _beads[i];
+                if (bead == value)
+                {
+                    _beads.splice(i, 1);
+                    return bead;
+                }
+            }
+            return null;
+        }
+        
+		/**
+		 * @private
+		 */
+        public function addedToParent():void
+        {
+            var c:Class;
+
+            // renderer has a default model (the 'data' property)
+            // and it is essentially a view of that model, so it
+            // only needs an assignable controller
+            
+            if (getBeadByType(IBeadController) == null) 
+            {
+                c = ValuesManager.valuesImpl.getValue(this, "iBeadController") as Class;
+                if (c)
+                {
+                    var controller:IBeadController = new c as IBeadController;
+                    if (controller)
+                        addBead(controller);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/UIItemRendererBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/UIItemRendererBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/UIItemRendererBase.as
new file mode 100644
index 0000000..b313650
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/UIItemRendererBase.as
@@ -0,0 +1,245 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.supportClasses
+{
+	import org.apache.flex.core.IItemRenderer;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.utils.MXMLDataInterpreter;
+	
+	/**
+	 *  The UIItemRendererBase class is the base class for all itemRenderers. An itemRenderer is used to
+	 *  display a single datum within a collection of data. Components such as a List use itemRenderers to 
+	 *  show their dataProviders.
+	 *
+ 	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class UIItemRendererBase extends UIBase implements IItemRenderer
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function UIItemRendererBase()
+		{
+		}
+		
+		/**
+		 * @private
+		 */
+		override public function addedToParent():void
+		{
+			super.addedToParent();
+			
+            // very common for item renderers to be resized by their containers,
+            addEventListener("widthChanged", sizeChangeHandler);
+            addEventListener("heightChanged", sizeChangeHandler);
+
+            // each MXML file can also have styles in fx:Style block
+            ValuesManager.valuesImpl.init(this);
+            
+            MXMLDataInterpreter.generateMXMLProperties(this, mxmlProperties);
+            MXMLDataInterpreter.generateMXMLInstances(this, this, MXMLDescriptor);
+            
+            dispatchEvent(new Event("initComplete"));
+            
+		}
+		
+		/**
+		 * @private
+		 */
+        public function get MXMLDescriptor():Array
+        {
+            return null;
+        }
+        
+        private var mxmlProperties:Array ;
+        
+		/**
+		 * @private
+		 */
+        public function generateMXMLAttributes(data:Array):void
+        {
+            mxmlProperties = data;
+        }
+        
+		public var backgroundColor:uint = 0xFFFFFF;
+		public var highlightColor:uint = 0xCEDBEF;
+		public var selectedColor:uint = 0xA8C6EE;
+		public var downColor:uint = 0x808080;
+		
+		private var _data:Object;
+		
+		/**
+		 *  The data being represented by this itemRenderer. This can be something simple like a String or
+		 *  a Number or something very complex.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get data():Object
+		{
+			return _data;
+		}
+		public function set data(value:Object):void
+		{
+			_data = value;
+		}
+		
+		private var _labelField:String = "label";
+		
+		/**
+		 * The name of the field within the data to use as a label. Some itemRenderers use this field to
+		 * identify the value they should show while other itemRenderers ignore this if they are showing
+		 * complex information.
+		 */
+		public function get labelField():String
+		{
+			return _labelField;
+		}
+		public function set labelField(value:String):void
+		{
+			_labelField = value;
+		}
+		
+		private var _index:int;
+		
+		/**
+		 *  The position with the dataProvider being shown by the itemRenderer instance.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get index():int
+		{
+			return _index;
+		}
+		public function set index(value:int):void
+		{
+			_index = value;
+		}
+		
+		private var _hovered:Boolean;
+		
+		/**
+		 *  Whether or not the itemRenderer is in a hovered state.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get hovered():Boolean
+		{
+			return _hovered;
+		}
+		public function set hovered(value:Boolean):void
+		{
+			_hovered = value;
+			updateRenderer();
+		}
+		
+		private var _selected:Boolean;
+		
+		/**
+		 *  Whether or not the itemRenderer is in a selected state.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get selected():Boolean
+		{
+			return _selected;
+		}
+		public function set selected(value:Boolean):void
+		{
+			_selected = value;
+			updateRenderer();
+		}
+		
+		private var _down:Boolean;
+		
+		/**
+		 *  Whether or not the itemRenderer is in a down (or pre-selected) state.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get down():Boolean
+		{
+			return _down;
+		}
+		public function set down(value:Boolean):void
+		{
+			_down = value;
+			updateRenderer();
+		}
+		
+		/**
+		 * @private
+		 */
+		public function updateRenderer():void
+		{
+			if (down)
+				backgroundColor = downColor;
+			else if (hovered)
+				backgroundColor = highlightColor;
+			else if (selected)
+				backgroundColor = selectedColor;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function sizeChangeHandler(event:Event):void
+		{
+			adjustSize();
+		}
+		
+		/**
+		 *  This function is called whenever the itemRenderer changes size. Sub-classes should override
+		 *  this method an handle the size change.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function adjustSize():void
+		{
+			// handle in subclass
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Button.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Button.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Button.as
new file mode 100644
index 0000000..4b7731d
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Button.as
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html5.staticControls
+{
+	import org.apache.flex.html.staticControls.Button;
+	
+	public class Button extends org.apache.flex.html.staticControls.Button
+	{
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/CheckBox.as
new file mode 100644
index 0000000..ec92d72
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/CheckBox.as
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html5.staticControls
+{
+	import org.apache.flex.html.staticControls.CheckBox;
+	
+	public class CheckBox extends org.apache.flex.html.staticControls.CheckBox 
+	{
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/ComboBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/ComboBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/ComboBox.as
new file mode 100644
index 0000000..ebeea35
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/ComboBox.as
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html5.staticControls
+{
+	import org.apache.flex.html.staticControls.ComboBox;
+	
+	public class ComboBox extends org.apache.flex.html.staticControls.ComboBox
+	{
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/DropDownList.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/DropDownList.as
new file mode 100644
index 0000000..14aa0fe
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/DropDownList.as
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html5.staticControls
+{
+    import org.apache.flex.html.staticControls.DropDownList;
+    
+    public class DropDownList extends org.apache.flex.html.staticControls.DropDownList
+	{
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as
new file mode 100644
index 0000000..8a8ad99
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html5.staticControls
+{
+	import org.apache.flex.html.staticControls.Label;
+	
+	/**
+	 *  Label probably should extend TextField directly,
+	 *  but the player's APIs for TextLine do not allow
+	 *  direct instantiation, and we might want to allow
+	 *  Labels to be declared and have their actual
+	 *  view be swapped out.
+	 */
+	public class Label extends org.apache.flex.html.staticControls.Label
+	{
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as
new file mode 100644
index 0000000..86e8ef8
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html5.staticControls
+{
+	import org.apache.flex.html.staticControls.List;
+	
+    /**
+	 *  Label probably should extend TextField directly,
+	 *  but the player's APIs for TextLine do not allow
+	 *  direct instantiation, and we might want to allow
+	 *  Labels to be declared and have their actual
+	 *  view be swapped out.
+	 */
+	public class List extends org.apache.flex.html.staticControls.List
+	{
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/RadioButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/RadioButton.as
new file mode 100644
index 0000000..78f117b
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/RadioButton.as
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html5.staticControls
+{
+	import org.apache.flex.html.staticControls.RadioButton;
+	
+	public class RadioButton extends org.apache.flex.html.staticControls.RadioButton
+	{
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextArea.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextArea.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextArea.as
new file mode 100644
index 0000000..a2c4f0b
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextArea.as
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html5.staticControls
+{
+	import org.apache.flex.html.staticControls.TextArea;
+
+	public class TextArea extends org.apache.flex.html.staticControls.TextArea
+	{
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextButton.as
new file mode 100644
index 0000000..d23ffb7
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextButton.as
@@ -0,0 +1,30 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html5.staticControls
+{
+	import org.apache.flex.html.staticControls.TextButton;
+	
+	public class TextButton extends org.apache.flex.html.staticControls.TextButton
+	{
+		public function TextButton()
+		{
+			super();
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextInput.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextInput.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextInput.as
new file mode 100644
index 0000000..adb723f
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextInput.as
@@ -0,0 +1,25 @@
+//
+//  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.html5.staticControls
+{
+	import org.apache.flex.html.staticControls.TextInput;
+	
+	public class TextInput extends org.apache.flex.html.staticControls.TextInput
+	{
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Button.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Button.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Button.as
deleted file mode 100644
index 4b7731d..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Button.as
+++ /dev/null
@@ -1,26 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.Button;
-	
-	public class Button extends org.apache.flex.html.staticControls.Button
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/CheckBox.as
deleted file mode 100644
index ec92d72..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/CheckBox.as
+++ /dev/null
@@ -1,26 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.CheckBox;
-	
-	public class CheckBox extends org.apache.flex.html.staticControls.CheckBox 
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/ComboBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/ComboBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/ComboBox.as
deleted file mode 100644
index ebeea35..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/ComboBox.as
+++ /dev/null
@@ -1,26 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.ComboBox;
-	
-	public class ComboBox extends org.apache.flex.html.staticControls.ComboBox
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/DropDownList.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/DropDownList.as
deleted file mode 100644
index 14aa0fe..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/DropDownList.as
+++ /dev/null
@@ -1,26 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html5.staticControls
-{
-    import org.apache.flex.html.staticControls.DropDownList;
-    
-    public class DropDownList extends org.apache.flex.html.staticControls.DropDownList
-	{
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Label.as
deleted file mode 100644
index 8a8ad99..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Label.as
+++ /dev/null
@@ -1,33 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.Label;
-	
-	/**
-	 *  Label probably should extend TextField directly,
-	 *  but the player's APIs for TextLine do not allow
-	 *  direct instantiation, and we might want to allow
-	 *  Labels to be declared and have their actual
-	 *  view be swapped out.
-	 */
-	public class Label extends org.apache.flex.html.staticControls.Label
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/List.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/List.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/List.as
deleted file mode 100644
index 86e8ef8..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/List.as
+++ /dev/null
@@ -1,33 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.List;
-	
-    /**
-	 *  Label probably should extend TextField directly,
-	 *  but the player's APIs for TextLine do not allow
-	 *  direct instantiation, and we might want to allow
-	 *  Labels to be declared and have their actual
-	 *  view be swapped out.
-	 */
-	public class List extends org.apache.flex.html.staticControls.List
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/RadioButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/RadioButton.as
deleted file mode 100644
index 78f117b..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/RadioButton.as
+++ /dev/null
@@ -1,26 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.RadioButton;
-	
-	public class RadioButton extends org.apache.flex.html.staticControls.RadioButton
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextArea.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextArea.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextArea.as
deleted file mode 100644
index a2c4f0b..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextArea.as
+++ /dev/null
@@ -1,26 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.TextArea;
-
-	public class TextArea extends org.apache.flex.html.staticControls.TextArea
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextButton.as
deleted file mode 100644
index d23ffb7..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextButton.as
+++ /dev/null
@@ -1,30 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.TextButton;
-	
-	public class TextButton extends org.apache.flex.html.staticControls.TextButton
-	{
-		public function TextButton()
-		{
-			super();
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextInput.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextInput.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextInput.as
deleted file mode 100644
index adb723f..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextInput.as
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  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.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.TextInput;
-	
-	public class TextInput extends org.apache.flex.html.staticControls.TextInput
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js
new file mode 100644
index 0000000..8f27c76
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js
@@ -0,0 +1,213 @@
+/**
+ * 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.html.staticControls.Alert');
+
+goog.require('org.apache.flex.core.UIBase');
+goog.require('org.apache.flex.html.staticControls.Container');
+goog.require('org.apache.flex.html.staticControls.Label');
+goog.require('org.apache.flex.html.staticControls.TextButton');
+goog.require('org.apache.flex.html.staticControls.TitleBar');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.html.staticControls.Container}
+ */
+org.apache.flex.html.staticControls.Alert = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.Alert,
+    org.apache.flex.html.staticControls.Container);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.Alert.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'Alert',
+                qName: 'org.apache.flex.html.staticControls.Alert'}] };
+
+
+/**
+ * @type {number} The value for the Yes button option.
+ */
+org.apache.flex.html.staticControls.Alert.YES = 0x000001;
+
+
+/**
+ * @type {number} The value for the No button option.
+ */
+org.apache.flex.html.staticControls.Alert.NO = 0x000002;
+
+
+/**
+ * @type {number} The value for the OK button option.
+ */
+org.apache.flex.html.staticControls.Alert.OK = 0x000004;
+
+
+/**
+ * @type {number} The value for the Cancel button option.
+ */
+org.apache.flex.html.staticControls.Alert.CANCEL = 0x000008;
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.Alert.prototype.createElement =
+    function() {
+  goog.base(this, 'createElement');
+
+  this.element.className = 'Alert';
+
+  // add in a title bar
+  this.titleBar = new org.apache.flex.html.staticControls.TitleBar();
+  this.addElement(this.titleBar);
+  this.titleBar.element.id = 'titleBar';
+
+  this.message = new org.apache.flex.html.staticControls.Label();
+  this.addElement(this.message);
+  this.message.element.id = 'message';
+
+  // add a place for the buttons
+  this.buttonArea = new org.apache.flex.html.staticControls.Container();
+  this.addElement(this.buttonArea);
+  this.buttonArea.element.id = 'buttonArea';
+
+  return this.element;
+};
+
+
+/**
+ * @param {string} message The message to be displayed.
+ * @param {Object} host The object to display the alert.
+ * @param {string} title The message to be displayed in the title bar.
+ * @param {number} flags The options for the buttons.
+ */
+org.apache.flex.html.staticControls.Alert.show =
+    function(message, host, title, flags) {
+
+  var a = new org.apache.flex.html.staticControls.Alert();
+  host.addElement(a);
+  a.set_title(title);
+  a.set_text(message);
+  a.set_flags(flags);
+
+  a.positioner.style.position = 'relative';
+  a.positioner.style.width = '200px';
+  a.positioner.style.margin = 'auto';
+  a.positioner.style.top = '100px';
+};
+
+
+/**
+ * @return {string} The message to be displayed in the title bar.
+ */
+org.apache.flex.html.staticControls.Alert.prototype.get_title = function()
+    {
+  return this.titleBar.get_title();
+};
+
+
+/**
+ * @param {string} value The message to be displayed in the title bar.
+ */
+org.apache.flex.html.staticControls.Alert.prototype.set_title =
+    function(value)
+    {
+  this.titleBar.set_title(value);
+};
+
+
+/**
+ * @return {string} The message to be displayed.
+ */
+org.apache.flex.html.staticControls.Alert.prototype.get_text = function()
+    {
+  return this.message.get_text();
+};
+
+
+/**
+ * @param {string} value The message to be displayed.
+ */
+org.apache.flex.html.staticControls.Alert.prototype.set_text =
+    function(value)
+    {
+  this.message.set_text(value);
+};
+
+
+/**
+ * @return {number} The button options.
+ */
+org.apache.flex.html.staticControls.Alert.prototype.get_flags = function()
+    {
+  return this.flags;
+};
+
+
+/**
+ * @param {number} value The button options.
+ */
+org.apache.flex.html.staticControls.Alert.prototype.set_flags =
+    function(value)
+    {
+  this.flags = value;
+
+  // add buttons based on flags
+  if (this.flags & org.apache.flex.html.staticControls.Alert.OK) {
+    var ok = new org.apache.flex.html.staticControls.TextButton();
+    this.buttonArea.addElement(ok);
+    ok.set_text('OK');
+    goog.events.listen(/** @type {EventTarget} */ (ok.element), 'click',
+        goog.bind(this.dismissAlert, this));
+  }
+  if (this.flags & org.apache.flex.html.staticControls.Alert.CANCEL) {
+    var cancel = new org.apache.flex.html.staticControls.TextButton();
+    this.buttonArea.addElement(cancel);
+    cancel.set_text('Cancel');
+    goog.events.listen(/** @type {EventTarget} */ (cancel.element), 'click',
+        goog.bind(this.dismissAlert, this));
+  }
+  if (this.flags & org.apache.flex.html.staticControls.Alert.YES) {
+    var yes = new org.apache.flex.html.staticControls.TextButton();
+    this.buttonArea.addElement(yes);
+    yes.set_text('YES');
+    goog.events.listen(/** @type {EventTarget} */ (yes.element), 'click',
+        goog.bind(this.dismissAlert, this));
+  }
+  if (this.flags & org.apache.flex.html.staticControls.Alert.NO) {
+    var nob = new org.apache.flex.html.staticControls.TextButton();
+    this.buttonArea.addElement(nob);
+    nob.set_text('NO');
+    goog.events.listen(/** @type {EventTarget} */ (nob.element), 'click',
+        goog.bind(this.dismissAlert, this));
+  }
+};
+
+
+/**
+ * @param {Object} event The event object.
+ */
+org.apache.flex.html.staticControls.Alert.prototype.dismissAlert =
+    function(event)
+    {
+  this.element.parentElement.removeChild(this.element);
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/Button.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Button.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Button.js
new file mode 100644
index 0000000..5f64d56
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Button.js
@@ -0,0 +1,60 @@
+/**
+ * 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.html.staticControls.Button');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.Button = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.Button,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.Button.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'Button',
+                qName: 'org.apache.flex.html.staticControls.Button'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.Button.prototype.createElement =
+    function() {
+  this.element = document.createElement('button');
+  this.element.setAttribute('type', 'button');
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+
+  if (org.apache.flex.core.ValuesManager.valuesImpl.getValue) {
+    var impl = org.apache.flex.core.ValuesManager.valuesImpl.
+        getValue(this, 'iStatesImpl');
+  }
+
+  return this.element;
+};
+

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js
new file mode 100644
index 0000000..3181aaa
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js
@@ -0,0 +1,85 @@
+/**
+ * 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.html.staticControls.ButtonBar');
+
+goog.require('org.apache.flex.core.ListBase');
+goog.require('org.apache.flex.html.staticControls.List');
+goog.require('org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData');
+goog.require('org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout');
+goog.require('org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.html.staticControls.List}
+ */
+org.apache.flex.html.staticControls.ButtonBar = function() {
+
+  //  this.model = new
+  //        org.apache.flex.html.staticControls.beads.models.ArraySelectionModel();
+  //  this.addBead(this.model);
+
+  goog.base(this);
+
+  //  this.addBead(new
+  //        org.apache.flex.html.staticControls.beads.ListView());
+
+  //  this.addBead(new
+  //org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout());
+
+  //  this.itemRendererFactory = new
+  //        org.apache.flex.html.staticControls.beads.
+  //        DataItemRendererFactoryForArrayData();
+  //  this.itemRendererFactory.set_itemRendererClass('org.apache.flex.html.' +
+  //        'staticControls.supportClasses.ButtonBarButtonItemRenderer');
+  //  this.addBead(this.itemRendererFactory);
+
+  //  this.addBead(new
+  //        org.apache.flex.html.staticControls.beads.controllers.
+  //        ListSingleSelectionMouseController());
+};
+goog.inherits(org.apache.flex.html.staticControls.ButtonBar,
+    org.apache.flex.html.staticControls.List);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.ButtonBar.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'ButtonBar',
+                qName: 'org.apache.flex.html.staticControls.ButtonBar'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.ButtonBar.prototype.createElement =
+    function() {
+  //goog.base(this, 'createElement');
+
+  this.element = document.createElement('div');
+  this.element.style.overflow = 'auto';
+  this.element.style.border = 'solid';
+  this.element.style.borderWidth = '1px';
+  this.element.style.borderColor = '#333333';
+  this.positioner = this.element;
+
+  this.set_className('ButtonBar');
+
+  return this.element;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html/CheckBox.js
new file mode 100644
index 0000000..0f63f39
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/CheckBox.js
@@ -0,0 +1,99 @@
+/**
+ * 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.html.staticControls.CheckBox');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.CheckBox = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.CheckBox,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.CheckBox.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'CheckBox',
+                qName: 'org.apache.flex.html.staticControls.CheckBox'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.CheckBox.prototype.createElement =
+    function() {
+  var cb;
+
+  this.element = document.createElement('label');
+
+  cb = document.createElement('input');
+  cb.type = 'checkbox';
+  this.element.appendChild(cb);
+  this.element.appendChild(document.createTextNode(''));
+
+  this.positioner = this.element;
+  cb.flexjs_wrapper = this;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html.staticControls.CheckBox.prototype.get_text = function() {
+  return this.element.childNodes.item(1).nodeValue;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html.staticControls.CheckBox.prototype.set_text =
+    function(value) {
+  this.element.childNodes.item(1).nodeValue = value;
+};
+
+
+/**
+ * @expose
+ * @return {boolean} The selected getter.
+ */
+org.apache.flex.html.staticControls.CheckBox.prototype.get_selected =
+    function() {
+  return this.element.childNodes.item(0).checked;
+};
+
+
+/**
+ * @expose
+ * @param {boolean} value The selected setter.
+ */
+org.apache.flex.html.staticControls.CheckBox.prototype.set_selected =
+    function(value) {
+  this.element.childNodes.item(0).checked = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js
new file mode 100644
index 0000000..b469b04
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js
@@ -0,0 +1,210 @@
+/**
+ * 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.html.staticControls.ComboBox');
+
+goog.require('org.apache.flex.core.ListBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.ListBase}
+ */
+org.apache.flex.html.staticControls.ComboBox = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.ComboBox,
+    org.apache.flex.core.ListBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'ComboBox',
+                qName: 'org.apache.flex.html.staticControls.ComboBox'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.createElement =
+    function() {
+  var button, input;
+
+  this.element = document.createElement('div');
+
+  input = document.createElement('input');
+  input.style.position = 'absolute';
+  input.style.width = '80px';
+  this.element.appendChild(input);
+
+  button = document.createElement('div');
+  button.style.position = 'absolute';
+  button.style.top = '0px';
+  button.style.right = '0px';
+  button.style.background = '#bbb';
+  button.style.width = '16px';
+  button.style.height = '20px';
+  button.style.margin = '0';
+  button.style.border = 'solid #609 1px';
+  goog.events.listen(button, 'click', goog.bind(this.buttonClicked, this));
+  this.element.appendChild(button);
+
+  this.element.style.position = 'relative';
+
+  this.positioner = this.element;
+
+  // add a click handler so that a click outside of the combo box can
+  // dismiss the pop-up should it be visible.
+  goog.events.listen(document, 'click',
+      goog.bind(this.dismissPopup, this));
+
+  input.flexjs_wrapper = this;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @param {Object} event The event.
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.selectChanged =
+    function(event) {
+  var select;
+
+  select = event.currentTarget;
+
+  this.set_selectedItem(select.options[select.selectedIndex].value);
+
+  this.popup.parentNode.removeChild(this.popup);
+  this.popup = null;
+
+  this.dispatchEvent(event);
+};
+
+
+/**
+ * @expose
+ * @param {Object=} opt_event The event.
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.dismissPopup =
+    function(opt_event) {
+  // remove the popup if it already exists
+  if (this.popup) {
+    this.popup.parentNode.removeChild(this.popup);
+    this.popup = null;
+  }
+};
+
+
+/**
+ * @expose
+ * @param {Object} event The event.
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.buttonClicked =
+    function(event) {
+  /**
+   * @type {Array.<string>}
+   */
+  var dp;
+  var i, input, left, n, opt, opts, pn, popup, select, si, top, width;
+
+  event.stopPropagation();
+
+  if (this.popup) {
+    this.dismissPopup();
+
+    return;
+  }
+
+  input = this.element.childNodes.item(0);
+
+  pn = this.element;
+  top = pn.offsetTop + input.offsetHeight;
+  left = pn.offsetLeft;
+  width = pn.offsetWidth;
+
+  popup = document.createElement('div');
+  popup.className = 'popup';
+  popup.id = 'test';
+  popup.style.position = 'absolute';
+  popup.style.top = top.toString() + 'px';
+  popup.style.left = left.toString() + 'px';
+  popup.style.width = width.toString() + 'px';
+  popup.style.margin = '0px auto';
+  popup.style.padding = '0px';
+  popup.style.zIndex = '10000';
+
+  select = document.createElement('select');
+  select.style.width = width.toString() + 'px';
+  goog.events.listen(select, 'change', goog.bind(this.selectChanged, this));
+  opts = select.options;
+
+  dp = /** @type {Array.<string>} */ (this.get_dataProvider());
+  n = dp.length;
+  for (i = 0; i < n; i++) {
+    opt = document.createElement('option');
+    opt.text = dp[i];
+    opts.add(opt);
+  }
+
+  select.size = n;
+
+  si = this.get_selectedIndex();
+  if (si < 0) {
+    select.value = null;
+  } else {
+    select.value = dp[si];
+  }
+
+  this.popup = popup;
+
+  popup.appendChild(select);
+  document.body.appendChild(popup);
+};
+
+
+/**
+ * @override
+ * @expose
+ * @param {Array.<Object>} value The collection of data.
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.set_dataProvider =
+    function(value) {
+  this.dataProvider = value;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.get_text = function() {
+  return this.element.childNodes.item(0).value;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.set_text =
+    function(value) {
+  this.element.childNodes.item(0).value = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/Container.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Container.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Container.js
new file mode 100644
index 0000000..22a3840
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Container.js
@@ -0,0 +1,86 @@
+/**
+ * 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.html.staticControls.Container');
+
+goog.require('org.apache.flex.core.ContainerBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.ContainerBase}
+ */
+org.apache.flex.html.staticControls.Container = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.Container,
+    org.apache.flex.core.ContainerBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.Container.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'Container',
+                qName: 'org.apache.flex.html.staticControls.Container' }] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.Container.prototype.createElement =
+    function() {
+  var cb;
+
+  this.element = document.createElement('div');
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+
+  return this.element;
+};
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.Container.prototype.addElement =
+    function(child) {
+  goog.base(this, 'addElement', child);
+  this.dispatchEvent('elementAdded');
+};
+
+
+/**
+ * @expose
+ */
+org.apache.flex.html.staticControls.Container.prototype.childrenAdded =
+    function() {
+  this.dispatchEvent('childrenAdded');
+};
+
+
+/**
+ * @expose
+ * @return {Array} the HTML DOM element children.
+ */
+org.apache.flex.html.staticControls.Container.prototype.internalChildren =
+    function() {
+  return this.element.children;
+};
+
+

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/ControlBar.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ControlBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ControlBar.js
new file mode 100644
index 0000000..09b1fa5
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ControlBar.js
@@ -0,0 +1,57 @@
+/**
+ * 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.html.staticControls.ControlBar');
+
+goog.require('org.apache.flex.html.staticControls.Container');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.html.staticControls.Container}
+ */
+org.apache.flex.html.staticControls.ControlBar = function() {
+  goog.base(this);
+
+};
+goog.inherits(org.apache.flex.html.staticControls.ControlBar,
+    org.apache.flex.html.staticControls.Container);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.ControlBar.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'ControlBar',
+                qName: 'org.apache.flex.html.staticControls.ControlBar'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.ControlBar.prototype.createElement =
+    function() {
+
+  this.element = document.createElement('div');
+  this.element.className = 'ControlBar';
+  this.element.style.display = 'inline';
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+
+  return this.element;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js b/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js
new file mode 100644
index 0000000..e1d2ecf
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js
@@ -0,0 +1,114 @@
+/**
+ * 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.html.staticControls.DropDownList');
+
+goog.require('org.apache.flex.core.ListBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.ListBase}
+ */
+org.apache.flex.html.staticControls.DropDownList = function() {
+  goog.base(this);
+  this.model = new org.apache.flex.html.staticControls.beads.
+      models.ArraySelectionModel();
+};
+goog.inherits(org.apache.flex.html.staticControls.DropDownList,
+    org.apache.flex.core.ListBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.DropDownList.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'DropDownList',
+                qName: 'org.apache.flex.html.staticControls.DropDownList'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.DropDownList.prototype.
+    createElement = function() {
+  this.element = document.createElement('select');
+  this.element.size = 1;
+  goog.events.listen(this.element, 'change',
+      goog.bind(this.changeHandler, this));
+  this.positioner = this.element;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The new dataProvider.
+ */
+org.apache.flex.html.staticControls.DropDownList.prototype.
+    set_dataProvider = function(value) {
+  var dp, i, n, opt;
+
+  this.model.set_dataProvider(value);
+
+  dp = this.element.options;
+  n = dp.length;
+  for (i = 0; i < n; i++) {
+    dp.remove(0);
+  }
+
+  n = value.length;
+  for (i = 0; i < n; i++) {
+    opt = document.createElement('option');
+    opt.text = value[i];
+    dp.add(opt);
+  }
+
+};
+
+
+/**
+ * @protected
+ */
+org.apache.flex.html.staticControls.DropDownList.prototype.changeHandler =
+    function() {
+  this.model.set_selectedIndex(this.element.selectedIndex);
+  this.dispatchEvent('change');
+};
+
+
+/**
+ * @expose
+ * @param {number} value The new selected index.
+ */
+org.apache.flex.html.staticControls.DropDownList.prototype.
+    set_selectedIndex = function(value) {
+  this.model.set_selectedIndex(value);
+  this.element.selectedIndex = value;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The new selected item.
+ */
+org.apache.flex.html.staticControls.DropDownList.prototype.
+    set_selectedItem = function(value) {
+  this.model.set_selectedItem(value);
+  this.element.selectedIndex = this.get_selectedIndex();
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js
new file mode 100644
index 0000000..4446917
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js
@@ -0,0 +1,86 @@
+/**
+ * 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.html.staticControls.Image');
+
+goog.require('org.apache.flex.core.UIBase');
+goog.require('org.apache.flex.html.staticControls.beads.ImageView');
+goog.require('org.apache.flex.html.staticControls.beads.models.ImageModel');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.Image = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.Image,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.Image.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'Image',
+                qName: 'org.apache.flex.html.staticControls.Image' }] };
+
+
+/**
+ * @override
+ * @protected
+ * @return {Object} The actual element to be parented.
+ */
+org.apache.flex.html.staticControls.Image.prototype.createElement =
+    function() {
+
+  this.element = document.createElement('img');
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+
+  this.model = new
+          org.apache.flex.html.staticControls.beads.models.ImageModel();
+
+  this.addBead(this.model);
+
+  this.addBead(new
+      org.apache.flex.html.staticControls.beads.ImageView());
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {String} The source identifier for the Image.
+ */
+org.apache.flex.html.staticControls.Image.prototype.
+    get_source = function() {
+  return this.model.get_source();
+};
+
+
+/**
+ * @expose
+ * @param {String} value The source identifier for the Image.
+ */
+org.apache.flex.html.staticControls.Image.prototype.
+    set_source = function(value) {
+  this.model.set_source(value);
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/Label.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Label.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Label.js
new file mode 100644
index 0000000..ec25864
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Label.js
@@ -0,0 +1,61 @@
+/**
+ * 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.html.staticControls.Label');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.Label = function() {
+  goog.base(this);
+
+  this.element = document.createElement('div');
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+};
+goog.inherits(org.apache.flex.html.staticControls.Label,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.Label.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'Label',
+                qName: 'org.apache.flex.html.staticControls.Label' }] };
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html.staticControls.Label.prototype.get_text = function() {
+  return this.element.innerHTML;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html.staticControls.Label.prototype.set_text = function(value) {
+  this.element.innerHTML = value;
+};


[13/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TitleBarModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TitleBarModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TitleBarModel.as
new file mode 100644
index 0000000..5ce0990
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TitleBarModel.as
@@ -0,0 +1,133 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.ITitleBarModel;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.EventDispatcher;
+	
+	/**
+	 *  The TitleBarModel class bead holds the values for the org.apache.flex.html.staticControls.TitleBar's 
+	 *  properties.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class TitleBarModel extends EventDispatcher implements IBead, ITitleBarModel
+	{
+		public function TitleBarModel()
+		{
+			super();
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+		
+		private var _title:String;
+		
+		/**
+		 *  The string title for the org.apache.flex.html.staticControls.TitleBar.
+		 * 
+		 *  @copy org.apache.flex.core.ITitleBarModel#title
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get title():String
+		{
+			return _title;
+		}
+		
+		public function set title(value:String):void
+		{
+			if( value != _title ) {
+				_title = value;
+				dispatchEvent( new Event('titleChange') );
+			}
+		}
+		
+		private var _htmlTitle:String;
+		
+		/**
+		 *  The HTML string for the title.
+		 * 
+		 *  @copy org.apache.flex.core.ITitleBarModel#htmlTitle
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get htmlTitle():String
+		{
+			return _htmlTitle;
+		}
+		
+		public function set htmlTitle(value:String):void
+		{
+			if( value != _htmlTitle ) {
+				_htmlTitle = value;
+				dispatchEvent( new Event('htmlTitleChange') );
+			}
+		}
+		
+		private var _showCloseButton:Boolean = false;
+		
+		/**
+		 *  Whether or not to show a close button.
+		 * 
+		 *  @copy org.apache.flex.core.ITitleBarModel#showCloseButton
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get showCloseButton():Boolean
+		{
+			return _showCloseButton;
+		}
+		
+		public function set showCloseButton(value:Boolean):void
+		{
+			if( value != _showCloseButton ) {
+				_showCloseButton = value;
+				dispatchEvent( new Event('showCloseButtonChange') );
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ToggleButtonModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ToggleButtonModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ToggleButtonModel.as
new file mode 100644
index 0000000..f0b334f
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ToggleButtonModel.as
@@ -0,0 +1,144 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{
+	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;
+	
+	/**
+	 *  The ToggleButtonModel class bead holds values for org.apache.flex.html.staticControls.Buttons 
+	 *  that have a state.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ToggleButtonModel extends EventDispatcher implements IBead, IToggleButtonModel
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ToggleButtonModel()
+		{
+			super();
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+		
+		private var _text:String;
+		
+		/**
+		 *  The text string for the org.apache.flex.html.staticControls.Button's label.
+		 * 
+		 *  @copy org.apache.flex.core.IToggleButtonModel#text
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get text():String
+		{
+			return _text;
+		}
+		
+		public function set text(value:String):void
+		{
+			if (value != _text)
+			{
+				_text = value;
+				dispatchEvent(new Event("textChange"));
+			}
+		}
+		
+		private var _html:String;
+		
+		/**
+		 *  The HTML string for the Button's label.
+		 * 
+		 *  @copy org.apache.flex.core.IToggleButtonModel#html
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get html():String
+		{
+			return _html;
+		}
+		
+		public function set html(value:String):void
+		{
+			if( value != html )
+			{
+				_html = value;
+				dispatchEvent(new Event("htmlChange"));
+			}
+		}
+		
+		private var _selected:Boolean;
+		
+		/**
+		 *  Whether or not the org.apache.flex.html.staticControls.Button is selected.
+		 * 
+		 *  @copy org.apache.flex.core.IToggleButtonModel#selected
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get selected():Boolean
+		{
+			return _selected;
+		}
+		
+		public function set selected(value:Boolean):void
+		{
+			if( value != _selected )
+			{
+				_selected = value;
+				dispatchEvent(new Event("selectedChange"));
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ValueToggleButtonModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ValueToggleButtonModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ValueToggleButtonModel.as
new file mode 100644
index 0000000..e306ad1
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ValueToggleButtonModel.as
@@ -0,0 +1,123 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.models
+{
+	
+	import org.apache.flex.core.IValueToggleButtonModel;
+	import org.apache.flex.events.Event;
+
+	/**
+	 *  The ValueToggleButtonModel class bead extends the 
+	 *  org.apache.flex.html.staticControls.beads.models.ToggleButtonModel and adds
+	 *  value intended to represent a collection of similar org.apache.flex.html.staticControls.Buttons 
+	 *  such as org.apache.flex.html.staticControls.RadioButtons.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ValueToggleButtonModel extends ToggleButtonModel implements IValueToggleButtonModel
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ValueToggleButtonModel()
+		{
+			super();
+		}
+		
+		private var _value:Object;
+		
+		/**
+		 *  The current value of the button collection.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get value():Object
+		{
+			return _value;
+		}
+		
+		public function set value(newValue:Object):void
+		{
+			if( newValue != _value )
+			{
+				_value = newValue;
+				dispatchEvent(new Event("valueChange"));
+			}
+		}
+		
+		private var _groupName:String;
+		
+		/**
+		 *  The name of the collection has shared by all of the buttons in the collection.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get groupName():String
+		{
+			return _groupName;
+		}
+		
+		public function set groupName(value:String):void
+		{
+			if( value != _groupName )
+			{
+				_groupName = value;
+				dispatchEvent(new Event("groupNameChange"));
+			}
+		}
+		
+		private var _selectedValue:Object;
+		
+		/**
+		 *  The value that is currently selected.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get selectedValue():Object
+		{
+			return _selectedValue;
+		}
+		
+		public function set selectedValue(newValue:Object):void
+		{
+			if( _selectedValue != newValue )
+			{
+				_selectedValue = newValue;
+				dispatchEvent(new Event("selectedValueChange"));
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Alert.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Alert.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Alert.as
deleted file mode 100644
index 7a04fe7..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Alert.as
+++ /dev/null
@@ -1,195 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import org.apache.flex.core.IAlertModel;
-	import org.apache.flex.core.IPopUp;
-	import org.apache.flex.core.UIBase;
-	
-	/**
-	 *  The Alert class is a component that displays a message and one or more buttons
-	 *  in a view that pops up over all other controls and views. The Alert component
-	 *  uses the AlertView bead to display a modal dialog with a title and a variety
-	 *  of buttons configured through the flag property of its show() static function.
-	 *  The Alert component uses the following beads:
-	 * 
-	 *  org.apache.flex.core.IBeadModel: the data model for the Alert.
-	 *  org.apache.flex.core.IBeadView: the bead used to create the parts of the Alert.
-	 *  org.apache.flex.core.IBeadController: the bead used to handle input events.
-	 *  org.apache.flex.core.IBorderBead: if present, draws a border around the Alert.
-	 *  org.apache.flex.core.IBackgroundBead: if present, places a solid color background below the Alert.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class Alert extends UIBase implements IPopUp
-	{
-		/**
-		 *  The bitmask button flag to show the YES button.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public static const YES:uint    = 0x000001;
-		
-		/**
-		 *  The bitmask button flag to show the NO button.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public static const NO:uint     = 0x000002;
-		
-		/**
-		 *  The bitmask button flag to show the OK button.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public static const OK:uint     = 0x000004;
-		
-		/**
-		 *  The bitmask button flag to show the Cancel button.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public static const CANCEL:uint = 0x000008;
-		
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function Alert()
-		{
-			super();
-			
-			className = "Alert";
-		}
-		
-		// note: only passing parent to this function as I don't see a way to identify
-		// the 'application' or top level view without supplying a place to start to
-		// look for it.
-		/**
-		 *  This static method is a convenience function to quickly create and display an Alert. The
-		 *  text and parent paramters are required, the others will default.
-		 * 
-		 *  @param String text The message content of the Alert.
-		 *  @param Object parent The object that hosts the pop-up.
-		 *  @param String title An optional title for the Alert.
-		 *  @param uint flags Identifies which buttons to display in the alert.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		static public function show( text:String, parent:Object, title:String="", flags:uint=Alert.OK ) : void
-		{
-			var alert:Alert = new Alert();
-			alert.message = text;
-			alert.title  = title;
-			alert.flags = flags;
-			
-			alert.show(parent);
-		}
-		
-		/**
-		 *  Shows the Alert anchored to the given parent object which is usally a root component such
-		 *  as a UIView..
-		 * 
-		 *  @param Object parent The object that hosts the pop-up.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function show(parent:Object) : void
-		{
-			parent.addElement(this);
-		}
-		
-		/**
-		 *  The tile of the Alert.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get title():String
-		{
-			return IAlertModel(model).title;
-		}
-		public function set title(value:String):void
-		{
-			IAlertModel(model).title = value;
-		}
-		
-		/**
-		 *  The message to display in the Alert body.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get message():String
-		{
-			return IAlertModel(model).message;
-		}
-		public function set message(value:String):void
-		{
-			IAlertModel(model).message = value;
-		}
-		
-		/**
-		 *  The buttons to display on the Alert as bit-mask values.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get flags():uint
-		{
-			return IAlertModel(model).flags;
-		}
-		public function set flags(value:uint):void
-		{
-			IAlertModel(model).flags = value;
-		}
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Button.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Button.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Button.as
deleted file mode 100644
index 8770153..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Button.as
+++ /dev/null
@@ -1,74 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.IUIBase;
-    import org.apache.flex.core.UIButtonBase;
-	import org.apache.flex.events.IEventDispatcher;
-	
-    //--------------------------------------
-    //  Events
-    //--------------------------------------
-    
-    /**
-     *  Dispatched when the user clicks on a button.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	[Event(name="click", type="org.apache.flex.events.Event")]
-
-    /**
-     *  The Button class is a simple button.  Use TextButton for
-     *  buttons that should show text.  This is the lightest weight
-     *  button used for non-text buttons like the arrow buttons
-     *  in a Scrollbar or NumericStepper.
-     * 
-     *  The most common view for this button is CSSButtonView that
-     *  allows you to specify a backgroundImage in CSS that defines
-     *  the look of the button.
-     * 
-     *  However, when used in ScrollBar and when composed in many
-     *  other components, it is more common to assign a custom view
-     *  to the button.  
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class Button extends UIButtonBase implements IStrand, IEventDispatcher, IUIBase
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function Button()
-		{
-			super();
-		}		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/ButtonBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/ButtonBar.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/ButtonBar.as
deleted file mode 100644
index 06da973..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/ButtonBar.as
+++ /dev/null
@@ -1,53 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	/**
-	 *  The ButtonBar class is a component that displays a set of Buttons. The ButtonBar
-	 *  is actually a List with a default horizontal layout and an itemRenderer that 
-	 *  produces Buttons. The ButtonBar uses the following beads:
-	 * 
-	 *  org.apache.flex.core.IBeadModel: the data model for the ButtonBar, including the dataProvider.
-	 *  org.apache.flex.core.IBeadView: constructs the parts of the component.
-	 *  org.apache.flex.core.IBeadController: handles input events.
-	 *  org.apache.flex.core.IBeadLayout: sizes and positions the component parts.
-	 *  org.apache.flex.core.IDataProviderItemRendererMapper: produces itemRenderers.
-	 *  org.apache.flex.core.IItemRenderer: the class or class factory to use.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ButtonBar extends List
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ButtonBar()
-		{
-			super();
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/CheckBox.as
deleted file mode 100644
index 175d411..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/CheckBox.as
+++ /dev/null
@@ -1,116 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-    import flash.events.MouseEvent;
-	
-	import org.apache.flex.core.IToggleButtonModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.UIButtonBase;
-	import org.apache.flex.events.Event;
-	
-    //--------------------------------------
-    //  Events
-    //--------------------------------------
-    
-    /**
-     *  Dispatched when the user checks or un-checks the CheckBox.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	[Event(name="change", type="org.apache.flex.events.Event")]
-
-    /**
-     *  The CheckBox class implements the common user interface
-     *  control.  The CheckBox includes its text label.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class CheckBox extends UIButtonBase implements IStrand
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function CheckBox()
-		{
-			super();
-			
-			addEventListener(MouseEvent.CLICK, internalMouseHandler);
-		}
-		
-        /**
-         *  The text label for the CheckBox.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get text():String
-		{
-			return IToggleButtonModel(model).text;
-		}
-        
-        /**
-         *  @private
-         */
-		public function set text(value:String):void
-		{
-			IToggleButtonModel(model).text = value;
-		}
-		
-        /**
-         *  <code>true</code> if the check mark is displayed.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get selected():Boolean
-		{
-			return IToggleButtonModel(model).selected;
-		}
-		
-        /**
-         *  @private
-         */
-		public function set selected(value:Boolean):void
-		{
-			IToggleButtonModel(model).selected = value;
-		}
-				
-		private function internalMouseHandler(event:Event) : void
-		{
-			selected = !selected;
-			dispatchEvent(new Event("change"));
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/ComboBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/ComboBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/ComboBox.as
deleted file mode 100644
index 7fdebc1..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/ComboBox.as
+++ /dev/null
@@ -1,114 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import org.apache.flex.core.IComboBoxModel;
-	import org.apache.flex.core.UIBase;
-	
-	[Event(name="change", type="org.apache.flex.events.Event")]
-	
-	/**
-	 *  The ComboBox class is a component that displays an input field and
-	 *  pop-up List with selections. Selecting an item from the pop-up List
-	 *  places that item into the input field of the ComboBox. The ComboBox
-	 *  uses the following bead types:
-	 * 
-	 *  org.apache.flex.core.IBeadModel: the data model, which includes the dataProvider, selectedItem, and
-	 *  so forth.
-	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the component.
-	 *  org.apache.flex.core.IBeadController: the bead that handles input and output.
-	 *  org.apache.flex.core.IPopUp: the bead responsible for displaying the selection list.
-	 *  org.apache.flex.core.IDataProviderItemRendererMapper: the bead responsible for creating the itemRenders.
-	 *  org.apache.flex.core.IItemRenderer: the class or factory used to display an item in the component.
-	 * 
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ComboBox extends UIBase
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ComboBox()
-		{
-			super();
-		}
-		
-		/**
-		 *  The data for display by the ComboBox.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get dataProvider():Object
-		{
-			return IComboBoxModel(model).dataProvider;
-		}
-		public function set dataProvider(value:Object):void
-		{
-			IComboBoxModel(model).dataProvider = value;
-		}
-		
-		/**
-		 *  The index of the currently selected item. Changing this item changes
-		 *  the selectedItem value.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get selectedIndex():int
-		{
-			return IComboBoxModel(model).selectedIndex;
-		}
-		public function set selectedIndex(value:int):void
-		{
-			IComboBoxModel(model).selectedIndex = value;
-		}
-		
-		/**
-		 *  The item that is currently selected. Changing this item changes
-		 *  the selectedIndex.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get selectedItem():Object
-		{
-			return IComboBoxModel(model).selectedItem;
-		}
-		public function set selectedItem(value:Object):void
-		{
-			IComboBoxModel(model).selectedItem = value;
-		}
-				
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Container.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Container.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Container.as
deleted file mode 100644
index f9450b1..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Container.as
+++ /dev/null
@@ -1,188 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	
-	import org.apache.flex.core.IChrome;
-	import org.apache.flex.core.IContainer;
-	import org.apache.flex.core.IUIBase;
-	import org.apache.flex.core.ContainerBase;
-	import org.apache.flex.events.Event;
-	
-	[DefaultProperty("mxmlContent")]
-    
-    /**
-     *  The Container class implements a basic container of
-     *  other controls and containers.  The position and size
-     *  of the children are determined by a layout or by
-     *  absolute positioning and sizing.  This Container does
-     *  not have a built-in scrollbar or clipping of content
-     *  exceeds its boundaries.
-     * 
-     *  While the container is relatively lightweight, it should
-     *  generally not be used as the base class for other controls,
-     *  even if those controls are composed of children.  That's
-     *  because the fundamental API of Container is to support
-     *  an arbitrary set of children, and most controls only
-     *  support a specific set of children.
-     * 
-     *  And that's one of the advantages of beads: that functionality
-     *  used in a Container can also be used in a Control as long
-     *  as that bead doesn't assume that its strand is a Container.
-     * 
-     *  For example, even though you can use a Panel to create the
-     *  equivalent of an Alert control, the Alert is a 
-     *  control and not a Container because the Alert does not
-     *  support an arbitrary set of children.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */    
-	public class Container extends ContainerBase implements IContainer
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function Container()
-		{
-			super();
-			actualParent = this;
-		}
-		
-		private var actualParent:DisplayObjectContainer;
-		
-        /**
-         *  Set a platform-specific object as the actual parent for 
-         *  children.  This must be public so it can be accessed
-         *  by beads.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function setActualParent(parent:DisplayObjectContainer):void
-		{
-			actualParent = parent;	
-		}
-		
-        /**
-         *  @private
-         */
-        override public function getElementIndex(c:Object):int
-        {
-            if (c is IUIBase)
-                return actualParent.getChildIndex(IUIBase(c).element as DisplayObject);
-            else
-                return actualParent.getChildIndex(c as DisplayObject);
-        }
-
-        /**
-         *  @private
-         */
-        override public function addElement(c:Object):void
-        {
-            if (c is IUIBase)
-            {
-				if (c is IChrome ) {
-					addChild(IUIBase(c).element as DisplayObject);
-					IUIBase(c).addedToParent();
-				}
-				else {
-                	actualParent.addChild(IUIBase(c).element as DisplayObject);
-                	IUIBase(c).addedToParent();
-				}
-            }
-            else {
-				if (c is IChrome) {
-					addChild(c as DisplayObject);
-				}
-				else {
-					actualParent.addChild(c as DisplayObject);
-				}
-			}
-        }
-        
-        /**
-         *  @private
-         */
-        override public function addElementAt(c:Object, index:int):void
-        {
-            if (c is IUIBase)
-            {
-				if (c is IChrome) {
-					addChildAt(IUIBase(c).element as DisplayObject, index);
-					IUIBase(c).addedToParent();
-				}
-				else {
-                	actualParent.addChildAt(IUIBase(c).element as DisplayObject, index);
-                	IUIBase(c).addedToParent();
-				}
-            }
-            else {
-				if (c is IChrome) {
-					addChildAt(c as DisplayObject, index);
-				} else {
-                	actualParent.addChildAt(c as DisplayObject, index);
-				}
-			}
-        }
-        
-        /**
-         *  @private
-         */
-        override public function removeElement(c:Object):void
-        {
-            if (c is IUIBase)
-                actualParent.removeChild(IUIBase(c).element as DisplayObject);
-            else
-                actualParent.removeChild(c as DisplayObject);
-        }
-        
-        /**
-         *  Get the array of children.  To change the children use
-         *  addElement, removeElement.
-         */
-        public function getChildren():Array
-		{
-			var children:Array = [];
-			var n:int = actualParent.numChildren;
-			for (var i:int = 0; i < n; i++)
-				children.push(actualParent.getChildAt(i));
-			return children;
-		}
-
-        /**
-         *  @private
-         */
-		public function childrenAdded():void
-		{
-			dispatchEvent(new Event("childrenAdded"));
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/ControlBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/ControlBar.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/ControlBar.as
deleted file mode 100644
index 75456d7..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/ControlBar.as
+++ /dev/null
@@ -1,76 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	
-	import org.apache.flex.core.IBeadLayout;
-	import org.apache.flex.core.IChrome;
-	import org.apache.flex.core.IContainer;
-	import org.apache.flex.core.ValuesManager;
-
-	/**
-	 *  The ControlBar class is used within a Panel as a place to position
-	 *  additional controls. The ControlBar appears at the bottom of the 
-	 *  org.apache.flex.html.staticControls.Panel
-	 *  and is not part of the Panel's scrollable content area. The ControlBar
-	 *  is a Container and implements the org.apache.flex.core.IChrome interface, indicating that is
-	 *  outside of the Container's content area. The ControlBar uses the following
-	 *  beads:
-	 * 
-	 *  org.apache.flex.core.IBeadModel: the data model for the component.
-	 *  org.apache.flex.core.IMeasurementBead: helps determine the overlay size of the ControlBar for layout.
-	 *  org.apache.flex.core.IBorderBead: if present, displays a border around the component.
-	 *  org.apache.flex.core.IBackgroundBead: if present, displays a solid background below the ControlBar.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ControlBar extends Container implements IContainer, IChrome
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ControlBar()
-		{
-			super();
-			
-			className = "ControlBar";
-		}
-		
-		/**
-		 * @private
-		 */
-		override public function addedToParent():void
-		{
-			super.addedToParent();	
-			
-			if( getBeadByType(IBeadLayout) == null ) {
-				var layout:IBeadLayout = new (ValuesManager.valuesImpl.getValue(this, "iBeadLayout")) as IBeadLayout;
-				addBead(layout);
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/DropDownList.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/DropDownList.as
deleted file mode 100644
index 4ae7405..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/DropDownList.as
+++ /dev/null
@@ -1,137 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-    import org.apache.flex.core.ISelectionModel;
-    
-    //--------------------------------------
-    //  Events
-    //--------------------------------------
-    
-    /**
-     *  Dispatched when the user selects an item.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-    [Event(name="change", type="org.apache.flex.events.Event")]
-    
-    /**
-     *  The DropDownList class implements the basic equivalent of
-     *  the <code>&lt;select&gt;</code> tag in HTML.
-     *  The default implementation only lets the user see and
-     *  choose from an array of strings.  More complex controls
-     *  would display icons as well as strings, or colors instead
-     *  of strings or just about anything.
-     * 
-     *  The default behavior only lets the user choose one and 
-     *  only one item.  More complex controls would allow
-     *  mutiple selection by not dismissing the dropdown as soon
-     *  as a selection is made.
-     * 
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */    
-	public class DropDownList extends Button
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function DropDownList()
-		{
-		}
-		
-        /**
-         *  The data set to be displayed.  Usually a simple
-         *  array of strings.  A more complex component
-         *  would allow more complex data and data sets.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function get dataProvider():Object
-        {
-            return ISelectionModel(model).dataProvider;
-        }
-
-        /**
-         *  @private
-         */
-        public function set dataProvider(value:Object):void
-        {
-            ISelectionModel(model).dataProvider = value;
-        }
-        
-        /**
-         *  @copy org.apache.flex.core.ISelectionModel#selectedIndex
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function get selectedIndex():int
-        {
-            return ISelectionModel(model).selectedIndex;
-        }
-
-        /**
-         *  @private
-         */
-        public function set selectedIndex(value:int):void
-        {
-            ISelectionModel(model).selectedIndex = value;
-        }
-        
-
-        /**
-         *  @copy org.apache.flex.core.ISelectionModel#selectedItem
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function get selectedItem():Object
-        {
-            return ISelectionModel(model).selectedItem;
-        }
-
-        /**
-         *  @private
-         */
-        public function set selectedItem(value:Object):void
-        {
-            ISelectionModel(model).selectedItem = value;
-        }
-                        
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Image.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Image.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Image.as
deleted file mode 100644
index adda24b..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Image.as
+++ /dev/null
@@ -1,68 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import org.apache.flex.core.IImageModel;
-	import org.apache.flex.core.UIBase;
-	
-	/**
-	 *  The Image class is a component that displays a bitmap. The Image uses
-	 *  the following beads:
-	 * 
-	 *  org.apache.flex.core.IBeadModel: the data model for the Image, including the source property.
-	 *  org.apache.flex.core.IBeadView: constructs the visual elements of the component.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class Image extends UIBase
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function Image()
-		{
-			super();
-		}
-		
-		/**
-		 *  The location of the bitmap, usually a URL.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get source():String
-		{
-			return IImageModel(model).source;
-		}
-		public function set source(value:String):void
-		{
-			IImageModel(model).source = value;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Label.as
deleted file mode 100644
index 4702274..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Label.as
+++ /dev/null
@@ -1,118 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import org.apache.flex.core.ITextModel;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	
-	/*
-	 *  Label probably should extend TextField directly,
-	 *  but the player's APIs for TextLine do not allow
-	 *  direct instantiation, and we might want to allow
-	 *  Labels to be declared and have their actual
-	 *  view be swapped out.
-	 */
-
-    /**
-     *  The Label class implements the basic control for labeling
-     *  other controls.  
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */    
-    public class Label extends UIBase
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function Label()
-		{
-			super();
-		}
-		
-        /**
-         *  The text to display in the label.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get text():String
-		{
-			return ITextModel(model).text;
-		}
-
-        /**
-         *  @private
-         */
-		public function set text(value:String):void
-		{
-			ITextModel(model).text = value;
-		}
-		
-        /**
-         *  The html-formatted text to display in the label.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get html():String
-		{
-			return ITextModel(model).html;
-		}
-
-        /**
-         *  @private
-         */
-		public function set html(value:String):void
-		{
-			ITextModel(model).html = value;
-		}
-				
-        /**
-         *  @private
-         */
-		override public function set width(value:Number):void
-		{
-			super.width = value;
-			IEventDispatcher(model).dispatchEvent( new Event("widthChanged") );
-		}
-		
-        /**
-         *  @private
-         */
-		override public function set height(value:Number):void
-		{
-			super.height = value;
-			IEventDispatcher(model).dispatchEvent( new Event("heightChanged") );
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/List.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/List.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/List.as
deleted file mode 100644
index 1f93e24..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/List.as
+++ /dev/null
@@ -1,185 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import mx.core.IFactory;
-	
-	import org.apache.flex.core.IDataProviderItemRendererMapper;
-	import org.apache.flex.core.IRollOverModel;
-	import org.apache.flex.core.ISelectionModel;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.ValuesManager;
-	
-    [Event(name="change", type="org.apache.flex.events.Event")]
-    
-	/**
-	 *  The List class is a component that displays multiple data items. The List uses
-	 *  the following bead types:
-	 * 
-	 *  org.apache.flex.core.IBeadModel: the data model, which includes the dataProvider, selectedItem, and
-	 *  so forth.
-	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the list.
-	 *  org.apache.flex.core.IBeadController: the bead that handles input and output.
-	 *  org.apache.flex.core.IBeadLayout: the bead responsible for the size and position of the itemRenderers.
-	 *  org.apache.flex.core.IDataProviderItemRendererMapper: the bead responsible for creating the itemRenders.
-	 *  org.apache.flex.core.IItemRenderer: the class or factory used to display an item in the list.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class List extends UIBase
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function List()
-		{
-			super();
-		}
-		
-		/**
-		 *  The name of field within the data used for display. Each item of the
-		 *  data should have a property with this name.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get labelField():String
-		{
-			return ISelectionModel(model).labelField;
-		}
-		public function set labelField(value:String):void
-		{
-			ISelectionModel(model).labelField = value;
-		}
-		
-		/**
-		 *  The data being display by the List.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-        public function get dataProvider():Object
-        {
-            return ISelectionModel(model).dataProvider;
-        }
-        public function set dataProvider(value:Object):void
-        {
-            ISelectionModel(model).dataProvider = value;
-        }
-
-		/**
-		 *  The index of the currently selected item. Changing this value
-		 *  also changes the selectedItem property.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-        public function get selectedIndex():int
-		{
-			return ISelectionModel(model).selectedIndex;
-		}
-		public function set selectedIndex(value:int):void
-		{
-			ISelectionModel(model).selectedIndex = value;
-		}
-
-		/**
-		 *  The index of the item currently below the pointer.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-        public function get rollOverIndex():int
-		{
-			return IRollOverModel(model).rollOverIndex;
-		}
-		public function set rollOverIndex(value:int):void
-		{
-			IRollOverModel(model).rollOverIndex = value;
-		}
-		
-		/**
-		 *  The item currently selected. Changing this value also 
-		 *  changes the selectedIndex property.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get selectedItem():Object
-		{
-			return ISelectionModel(model).selectedItem;
-		}
-		public function set selectedItem(value:Object):void
-		{
-			ISelectionModel(model).selectedItem = value;
-		}
-		
-		private var _itemRenderer:IFactory;
-		
-		/**
-		 *  The class or factory used to display each item.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get itemRenderer():IFactory
-		{
-			return _itemRenderer;
-		}
-		public function set itemRenderer(value:IFactory):void
-		{
-			_itemRenderer = value;
-		}
-		
-		/**
-		 * @private
-		 */
-		override public function addedToParent():void
-		{
-            super.addedToParent();
-            
-            if (getBeadByType(IDataProviderItemRendererMapper) == null)
-            {
-                var mapper:IDataProviderItemRendererMapper = new (ValuesManager.valuesImpl.getValue(this, "iDataProviderItemRendererMapper")) as IDataProviderItemRendererMapper;
-                addBead(mapper);
-            }
-		}
-        
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/NumericStepper.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/NumericStepper.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/NumericStepper.as
deleted file mode 100644
index f588d7c..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/NumericStepper.as
+++ /dev/null
@@ -1,143 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import org.apache.flex.core.IRangeModel;
-
-	[Event(name="valueChanged", type="org.apache.flex.events.Event")]
-	
-	/**
-	 *  The NumericStepper class is a component that displays a numeric
-	 *  value and up/down controls (using a org.apache.flex.html.staticControls.Spinner) to 
-	 *  increase and decrease the value by specific amounts. The NumericStepper uses the following beads:
-	 * 
-	 *  org.apache.flex.core.IBeadModel: the data model for the component of type org.apache.flex.core.IRangeModel.
-	 *  org.apache.flex.core.IBeadView: constructs the parts of the component.
-	 *  org.apache.flex.core.IBeadController: handles the input events.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class NumericStepper extends Container
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function NumericStepper()
-		{
-			super();
-		}
-		
-		/**
-		 *  The current value of the control.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get value():Number
-		{
-			return IRangeModel(model).value;
-		}
-		public function set value(newValue:Number):void
-		{
-			IRangeModel(model).value = newValue;
-		}
-		
-		/**
-		 *  The minimum value the control will display.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get minimum():Number
-		{
-			return IRangeModel(model).minimum;
-		}
-		public function set minimum(value:Number):void
-		{
-			IRangeModel(model).minimum = value;
-		}
-		
-		/**
-		 *  The maximum value the control will display.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get maximum():Number
-		{
-			return IRangeModel(model).maximum;
-		}
-		public function set maximum(value:Number):void
-		{
-			IRangeModel(model).maximum = value;
-		}
-		
-		/**
-		 *  The amount to increase or descrease the value. The value
-		 *  will not exceed the minimum or maximum value. The final
-		 *  value is affected by the snapInterval.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get stepSize():Number
-		{
-			return IRangeModel(model).stepSize;
-		}
-		public function set stepSize(value:Number):void
-		{
-			IRangeModel(model).stepSize = value;
-		}
-		
-		/**
-		 *  The modulus for the value. If this property is set,
-		 *  the value displayed with a muliple of the snapInterval.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get snapInterval():Number
-		{
-			return IRangeModel(model).snapInterval;
-		}
-		public function set snapInterval(value:Number):void
-		{
-			IRangeModel(model).snapInterval = value;
-		}
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Panel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Panel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Panel.as
deleted file mode 100644
index ff7afed..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Panel.as
+++ /dev/null
@@ -1,123 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import org.apache.flex.core.IPanelModel;
-
-	[Event(name="close", type="org.apache.flex.events.Event")]
-	
-	/**
-	 *  The Panel class is a Container component capable of parenting other
-	 *  components. The Panel has a TitleBar and an optional org.apache.flex.html.staticControls.ControlBar. 
-	 *  The Panel uses the following bead types:
-	 * 
-	 *  org.apache.flex.core.IBeadModel: the data model for the Panel that includes the title and whether
-	 *  or not to display the close button.
-	 *  org.apache.flex.core.IBeadView: creates the parts of the Panel.
-	 *  org.apache.flex.core.IBorderBead: if present, draws a border around the Panel.
-	 *  org.apache.flex.core.IBackgroundBead: if present, provides a colored background for the Panel.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class Panel extends Container
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function Panel()
-		{
-			super();
-		}
-		
-		/**
-		 *  The string to display in the org.apache.flex.html.staticControls.TitleBar.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get title():String
-		{
-			return IPanelModel(model).title;
-		}
-		public function set title(value:String):void
-		{
-			IPanelModel(model).title = value;
-		}
-		
-		/**
-		 *  The HTML string to display in the org.apache.flex.html.staticControls.TitleBar.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get htmlTitle():String
-		{
-			return IPanelModel(model).htmlTitle;
-		}
-		public function set htmlTitle(value:String):void
-		{
-			IPanelModel(model).htmlTitle = value;
-		}
-		
-		/**
-		 * Whether or not to show a Close button in the org.apache.flex.html.staticControls.TitleBar.
-		 */
-		public function get showCloseButton():Boolean
-		{
-			return IPanelModel(model).showCloseButton;
-		}
-		public function set showCloseButton(value:Boolean):void
-		{
-			IPanelModel(model).showCloseButton = value;
-		}
-		
-		private var _controlBar:Array;
-		
-		/**
-		 *  The items in the org.apache.flex.html.staticControls.ControlBar. Setting this property automatically
-		 *  causes the ControlBar to display.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get controlBar():Array
-		{
-			return _controlBar;
-		}
-		public function set controlBar(value:Array):void
-		{
-			_controlBar = value;
-		}
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/RadioButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/RadioButton.as
deleted file mode 100644
index 0a1add5..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/RadioButton.as
+++ /dev/null
@@ -1,208 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import flash.display.DisplayObject;
-	import flash.events.MouseEvent;
-	import flash.utils.Dictionary;
-	
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.IValueToggleButtonModel;
-	import org.apache.flex.core.UIButtonBase;
-	import org.apache.flex.events.Event;
-	
-	[Event(name="change", type="org.apache.flex.events.Event")]
-
-	/**
-	 *  The RadioButton class is a component that displays a selectable Button. RadioButtons
-	 *  are typically used in groups, identified by the groupName property. RadioButton use
-	 *  the following beads:
-	 * 
-	 *  org.apache.flex.core.IBeadModel: the data model, which includes the groupName.
-	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the RadioButton..
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class RadioButton extends UIButtonBase implements IStrand
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function RadioButton(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null)
-		{
-			super(upState, overState, downState, hitTestState);
-			
-			addEventListener(MouseEvent.CLICK, internalMouseHandler);
-		}
-		
-		protected static var dict:Dictionary = new Dictionary(true);
-		
-		private var _groupName:String;
-		
-		/**
-		 *  The name of the group. Only one RadioButton in a group is selected.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get groupName() : String
-		{
-			return IValueToggleButtonModel(model).groupName;
-		}
-		public function set groupName(value:String) : void
-		{
-			IValueToggleButtonModel(model).groupName = value;
-		}
-		
-		/**
-		 *  The string used as a label for the RadioButton.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get text():String
-		{
-			return IValueToggleButtonModel(model).text;
-		}
-		public function set text(value:String):void
-		{
-			IValueToggleButtonModel(model).text = value;
-		}
-		
-		/**
-		 *  Whether or not the RadioButton instance is selected. Setting this property
-		 *  causes the currently selected RadioButton in the same group to lose the
-		 *  selection.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get selected():Boolean
-		{
-			return IValueToggleButtonModel(model).selected;
-		}
-		public function set selected(selValue:Boolean):void
-		{
-			IValueToggleButtonModel(model).selected = selValue;
-			
-			// if this button is being selected, its value should become
-			// its group's selectedValue
-			if( selValue ) {
-				for each(var rb:RadioButton in dict)
-				{
-					if( rb.groupName == groupName )
-					{
-						rb.selectedValue = value;
-					}
-				}
-			}
-		}
-		
-		/**
-		 *  The value associated with the RadioButton. For example, RadioButtons with labels,
-		 *  "Red", "Green", and "Blue" might have the values 0, 1, and 2 respectively.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get value():Object
-		{
-			return IValueToggleButtonModel(model).value;
-		}
-		public function set value(newValue:Object):void
-		{
-			IValueToggleButtonModel(model).value = newValue;
-		}
-		
-		/**
-		 *  The group's currently selected value.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get selectedValue():Object 
-		{
-			return IValueToggleButtonModel(model).selectedValue;
-		}
-		public function set selectedValue(newValue:Object):void 
-		{
-			// a radio button is really selected when its value matches that of the group's value
-			IValueToggleButtonModel(model).selected = (newValue == value);
-			IValueToggleButtonModel(model).selectedValue = newValue;
-		}
-				
-		/**
-		 * @private
-		 */
-		override public function addedToParent():void
-		{
-            super.addedToParent();
-
-            // if this instance is selected, set the local selectedValue to
-			// this instance's value
-			if( selected ) selectedValue = value;
-			
-			else {
-			
-				// make sure this button's selectedValue is set from its group's selectedValue
-				// to keep it in sync with the rest of the buttons in its group.
-				for each(var rb:RadioButton in dict)
-				{
-					if( rb.groupName == groupName )
-					{
-						selectedValue = rb.selectedValue;
-						break;
-					}
-				}
-			}
-			
-			dict[this] = this;
-		}
-			
-		/**
-		 * @private
-		 */
-		private function internalMouseHandler(event:Event) : void
-		{
-			// prevent radiobutton from being turned off by a click
-			if( !selected ) {
-				selected = !selected;
-				dispatchEvent(new Event("change"));
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/SimpleAlert.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/SimpleAlert.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/SimpleAlert.as
deleted file mode 100644
index ccf73ea..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/SimpleAlert.as
+++ /dev/null
@@ -1,132 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{	
-	import org.apache.flex.core.IAlertModel;
-	import org.apache.flex.core.IPopUp;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.events.Event;
-	
-	[Event(name="close", type="org.apache.flex.events.Event")]
-	
-	/**
-	 *  The SimpleAlert class is a component that displays a message and an OK button. The
-	 *  SimpleAlert converts directly to window.alert() for HTML. SimpleAlert uses
-	 *  the following beads:
-	 * 
-	 *  org.apache.flex.core.IBeadModel: the data model, which includes the message.
-	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the Alert.
-	 *  org.apache.flex.core.IBeadController: the bead responsible for handling input events.
-	 *  org.apache.flex.core.IBorderBead: a bead, if present, that draws a border around the control.
-	 *  org.apache.flex.core.IBackgroundBead: a bead, if present, that creates a solid-color background.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class SimpleAlert extends UIBase implements IPopUp
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function SimpleAlert()
-		{
-			super();
-			
-			className = "SimpleAlert";
-		}
-		
-		/**
-		 *  The message to display.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		private function get message():String
-		{
-			return IAlertModel(model).message;
-		}
-		private function set message(value:String):void
-		{
-			IAlertModel(model).message = value;
-		}
-		
-		/**
-		 *  The HTML message to display.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		private function get htmlMessage():String
-		{
-			return IAlertModel(model).htmlMessage;
-		}
-		private function set htmlMessage(value:String):void
-		{
-			IAlertModel(model).htmlMessage = value;
-		}
-		
-		/**
-		 *  This function causes the SimpleAlert to appear. The parent is used for ActionScript and
-		 *  identifies the IPopUpParent that manages the alert.
-		 * 
-		 *  @param Object parent The object that hosts the pop-up.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function show(parent:Object) : void
-		{
-			parent.addElement(this);
-		}
-		
-		/**
-		 *  A convenience function to compose and display the alert.
-		 * 
-		 *  @param String message The content to display in the SimpleAlert.
-		 *  @param Object parent The object that hosts the pop-up.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		static public function show(message:String, parent:Object):SimpleAlert
-		{
-			var alert:SimpleAlert = new SimpleAlert();
-			alert.message = message;
-			alert.show(parent);
-			
-			return alert;
-		}
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/SimpleList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/SimpleList.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/SimpleList.as
deleted file mode 100644
index ba096c6..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/SimpleList.as
+++ /dev/null
@@ -1,46 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	/**
-	 *  The SimpleList class is a component that displays data in a vertical column. This
-	 *  component differs from org.apache.flex.html.staticControls.List in that it displays 
-	 *  only string values and maps to the &lt;select&gt; HTML element.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class SimpleList extends List
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function SimpleList()
-		{
-			super();
-		}
-	}
-}
\ No newline at end of file


[02/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.js
deleted file mode 100644
index d340174..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.js
+++ /dev/null
@@ -1,92 +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('org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData');
-
-goog.require('org.apache.flex.core.IDataProviderItemRendererMapper');
-goog.require('org.apache.flex.core.IItemRenderer');
-goog.require('org.apache.flex.events.EventDispatcher');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
- * @implements {org.apache.flex.core.IItemRenderer}
- */
-org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData =
-    function() {
-  goog.base(this);
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.
-        beads.TextItemRendererFactoryForArrayData,
-    org.apache.flex.events.EventDispatcher);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData.
-    prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'TextItemRendererFactoryForArrayData',
-                qName: 'org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData' }],
-      interfaces: [org.apache.flex.core.IItemRenderer] };
-
-
-/**
- * @expose
- * @param {Object} value The component strand.
- */
-org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData.
-    prototype.set_strand = function(value) {
-  this.strand_ = value;
-
-  this.model = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
-
-  this.listView = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.ListView);
-  this.dataGroup = this.listView.get_dataGroup();
-
-  this.model.addEventListener('dataProviderChanged',
-      goog.bind(this.dataProviderChangedHandler, this));
-
-  this.dataProviderChangedHandler(null);
-};
-
-
-/**
- * @expose
- * @param {Object} event The event that triggered the dataProvider change.
- */
-org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData.
-    prototype.dataProviderChangedHandler = function(event) {
-  var dp, i, n, opt;
-
-  dp = this.model.get_dataProvider();
-  n = dp.length;
-  for (i = 0; i < n; i++) {
-    opt = new
-        org.apache.flex.html.staticControls.supportClasses.StringItemRenderer();
-    this.dataGroup.addElement(opt);
-    opt.set_text(dp[i]);
-  }
-
-  var newEvent = new org.apache.flex.events.Event('itemsCreated');
-  this.strand_.dispatchEvent(newEvent);
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.js
deleted file mode 100644
index 8893383..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.js
+++ /dev/null
@@ -1,124 +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('org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController');
-
-goog.require('org.apache.flex.core.IBeadController');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.IBeadController}
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ItemRendererMouseController = function() {
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ItemRendererMouseController.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ItemRendererMouseController',
-                qName: 'org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController' }],
-      interfaces: [org.apache.flex.core.IBeadController] };
-
-
-/**
- * @expose
- * @param {Object} value The strand for this component.
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ItemRendererMouseController.prototype.set_strand = function(value) {
-  this.strand_ = value;
-
-  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEOVER,
-      goog.bind(this.handleMouseOver, this));
-
-  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEOUT,
-      goog.bind(this.handleMouseOut, this));
-
-  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEDOWN,
-      goog.bind(this.handleMouseDown, this));
-
-  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEUP,
-      goog.bind(this.handleMouseUp, this));
-};
-
-
-/**
- * @expose
- * @param {Object} event The mouse event that triggered the hover.
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ItemRendererMouseController.prototype.handleMouseOver = function(event) {
-
-  this.strand_.set_hovered(true);
-
-  var newEvent = new goog.events.Event('rollover');
-  newEvent.target = this.strand_;
-  this.strand_.get_itemRendererParent().dispatchEvent(newEvent);
-};
-
-
-/**
- * @expose
- * @param {Object} event The mouse-out event.
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ItemRendererMouseController.prototype.handleMouseOut = function(event) {
-
-  this.strand_.set_hovered(false);
-
-  var newEvent = new goog.events.Event('rollout');
-  newEvent.target = this.strand_;
-  this.strand_.get_itemRendererParent().dispatchEvent(newEvent);
-};
-
-
-/**
- * @expose
- * @param {Object} event The mouse-down event.
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ItemRendererMouseController.prototype.handleMouseDown = function(event) {
-
-  // ??
-};
-
-
-/**
- * @expose
- * @param {Object} event The mouse-up event that triggers the selection.
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ItemRendererMouseController.prototype.handleMouseUp = function(event) {
-
-  var newEvent = new goog.events.Event('selected');
-
-  // normally you do not - and should not - change the target of an event,
-  // but these events do not propagate nor bubble up the object tree, so
-  // we have to force the event's target to be this item renderer instance.
-
-  newEvent.target = this.strand_;
-
-  // since the event is not going to up the chain, we also have to dispatch
-  // it against its final destination.
-
-  this.strand_.get_itemRendererParent().dispatchEvent(newEvent);
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.js
deleted file mode 100644
index 42025b3..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.js
+++ /dev/null
@@ -1,77 +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('org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController');
-
-goog.require('org.apache.flex.core.IBeadController');
-goog.require('org.apache.flex.html.staticControls.beads.ListView');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.IBeadController}
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ListSingleSelectionMouseController = function() {
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ListSingleSelectionMouseController',
-                qName: 'org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController' }],
-      interfaces: [org.apache.flex.core.IBeadController] };
-
-
-/**
- * @expose
- *        ListSingleSelectionMouseController}
- * @param {Object} value The strand for this component.
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ListSingleSelectionMouseController.prototype.set_strand = function(value) {
-  this.strand_ = value;
-
-  this.model = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
-  this.listView = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.ListView);
-
-  this.dataGroup = this.listView.get_dataGroup();
-  this.dataGroup.addEventListener('selected',
-      goog.bind(this.selectedHandler, this));
-};
-
-
-/**
- * @expose
- *        ListSingleSelectionMouseController}
- * @param {Object} event The event that triggered the selection.
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ListSingleSelectionMouseController.prototype.selectedHandler =
-        function(event) {
-
-  var index = event.target.get_index();
-  this.model.set_selectedIndex(index);
-
-  var newEvent = new org.apache.flex.events.Event('change');
-  this.strand_.dispatchEvent(newEvent);
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SliderMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SliderMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SliderMouseController.js
deleted file mode 100644
index afa6c29..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SliderMouseController.js
+++ /dev/null
@@ -1,173 +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('org.apache.flex.html.staticControls.beads.controllers.SliderMouseController');
-
-goog.require('org.apache.flex.html.staticControls.beads.SliderThumbView');
-goog.require('org.apache.flex.html.staticControls.beads.SliderTrackView');
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController =
-    function() {
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    SliderMouseController.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'SliderMouseController',
-                qName: 'org.apache.flex.html.staticControls.beads.controllers.SliderMouseController' }] };
-
-
-/**
- * @expose
- *        SliderMouseController}
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
-    prototype.set_strand = function(value) {
-  this.strand_ = value;
-
-  this.track = this.strand_.getBeadByType(
-      org.apache.flex.html.staticControls.beads.SliderTrackView);
-  this.thumb = this.strand_.getBeadByType(
-      org.apache.flex.html.staticControls.beads.SliderThumbView);
-
-  goog.events.listen(this.track.element, goog.events.EventType.CLICK,
-                     this.handleTrackClick, false, this);
-
-  goog.events.listen(this.thumb.element, goog.events.EventType.MOUSEDOWN,
-                     this.handleThumbDown, false, this);
-};
-
-
-/**
- *        SliderMouseController}
- * @param {Event} event The event triggering the function.
- * @return {void} Handles click on track.
- */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
-    prototype.handleTrackClick =
-    function(event)
-    {
-  var xloc = event.clientX;
-  var p = Math.min(1, xloc / parseInt(this.track.element.style.width, 10));
-  var n = p * (this.strand_.get_maximum() - this.strand_.get_minimum()) +
-          this.strand_.get_minimum();
-
-  this.strand_.set_value(n);
-
-  this.origin = parseInt(this.thumb.element.style.left, 10);
-  this.position = parseInt(this.thumb.element.style.left, 10);
-
-  this.calcValFromMousePosition(event, true);
-
-  this.strand_.dispatchEvent(new org.apache.flex.events.Event('valueChanged'));
-};
-
-
-/**
- *        SliderMouseController}
- * @param {Event} event The event triggering the function.
- * @return {void} Handles mouse-down on the thumb.
- */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
-    prototype.handleThumbDown =
-    function(event)
-    {
-  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEUP,
-                     this.handleThumbUp, false, this);
-  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEMOVE,
-                     this.handleThumbMove, false, this);
-
-  this.origin = event.clientX;
-  this.position = parseInt(this.thumb.element.style.left, 10);
-};
-
-
-/**
- *        SliderMouseController}
- * @param {Event} event The event triggering the function.
- * @return {void} Handles mouse-up on the thumb.
- */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
-    prototype.handleThumbUp =
-    function(event)
-    {
-  goog.events.unlisten(this.strand_.element, goog.events.EventType.MOUSEUP,
-                       this.handleThumbUp, false, this);
-  goog.events.unlisten(this.strand_.element, goog.events.EventType.MOUSEMOVE,
-                       this.handleThumbMove, false, this);
-
-  this.calcValFromMousePosition(event, false);
-
-  this.strand_.dispatchEvent(new org.apache.flex.events.Event('valueChanged'));
-};
-
-
-/**
- *        SliderMouseController}
- * @param {Event} event The event triggering the function.
- * @return {void} Handles mouse-move on the thumb.
- */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
-    prototype.handleThumbMove =
-    function(event)
-    {
-  this.calcValFromMousePosition(event, false);
-
-  this.strand_.dispatchEvent(new org.apache.flex.events.Event('valueChanged'));
-};
-
-
-/**
- *        SliderMouseController}
- * @param {Event} event The event triggering the function.
- * @param {boolean} useOffset If true, event.offsetX is used in the calculation.
- * @return {void} Determines the new value based on the movement of the mouse
- * along the slider.
- */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
-    prototype.calcValFromMousePosition =
-    function(event, useOffset)
-    {
-  var deltaX = (useOffset ? event.offsetX : event.clientX) - this.origin;
-  var thumbW = parseInt(this.thumb.element.style.width, 10) / 2;
-  var newX = this.position + deltaX;
-
-  var p = newX / parseInt(this.track.element.style.width, 10);
-  var n = p * (this.strand_.get_maximum() - this.strand_.get_minimum()) +
-          this.strand_.get_minimum();
-  n = this.strand_.snap(n);
-  if (n < this.strand_.get_minimum()) n = this.strand_.get_minimum();
-  else if (n > this.strand_.get_maximum()) n = this.strand_.get_maximum();
-
-  p = (n - this.strand_.get_minimum()) / (this.strand_.get_maximum() -
-      this.strand_.get_minimum());
-  newX = p * parseInt(this.track.element.style.width, 10);
-
-  this.thumb.element.style.left = String(newX -
-      parseInt(this.thumb.element.style.width, 10) / 2) + 'px';
-
-  this.strand_.set_value(n);
-};
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SpinnerMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SpinnerMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SpinnerMouseController.js
deleted file mode 100644
index 4549d09..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SpinnerMouseController.js
+++ /dev/null
@@ -1,86 +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('org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController');
-
-goog.require('org.apache.flex.html.staticControls.TextButton');
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController =
-    function() {
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    SpinnerMouseController.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'SpinnerMouseController',
-                qName: 'org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController' }] };
-
-
-/**
- * @expose
- *        SpinnerMouseController}
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController.
-    prototype.set_strand = function(value) {
-  this.strand_ = value;
-
-  this.incrementButton = this.strand_.incrementButton;
-  this.decrementButton = this.strand_.decrementButton;
-
-  goog.events.listen(this.incrementButton.element, goog.events.EventType.CLICK,
-      goog.bind(this.handleIncrementClick, this));
-
-  goog.events.listen(this.decrementButton.element, goog.events.EventType.CLICK,
-      goog.bind(this.handleDecrementClick, this));
-};
-
-
-/**
- *        SpinnerMouseController}
- * @param {Object} event The event object.
- */
-org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController.
-    prototype.handleIncrementClick = function(event)
-    {
-  var newValue = this.strand_.snap(Math.min(this.strand_.get_maximum(),
-      this.strand_.get_value() +
-      this.strand_.get_stepSize()));
-  this.strand_.set_value(newValue);
-};
-
-
-/**
- *        SpinnerMouseController}
- * @param {Event} event The event object.
- */
-org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController.
-    prototype.handleDecrementClick =
-    function(event)
-    {
-  var newValue = this.strand_.snap(Math.max(this.strand_.get_minimum(),
-      this.strand_.get_value() -
-      this.strand_.get_stepSize()));
-  this.strand_.set_value(newValue);
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.js
deleted file mode 100644
index 6e1c0cf..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.js
+++ /dev/null
@@ -1,113 +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('org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout');
-
-goog.require('org.apache.flex.core.IBeadLayout');
-goog.require('org.apache.flex.html.staticControls.beads.ListView');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.IBeadLayout}
- */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout =
-    function() {
-  this.strand_ = null;
-
-  this.className = 'ButtonBarLayout';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout
-    .prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ButtonBarLayout',
-                qName: 'org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout' }],
-      interfaces: [org.apache.flex.core.IBeadLayout] };
-
-
-/**
- * @expose
- * @param {Array} value A set of widths to use for each button (optional).
- */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.prototype.set_buttonWidths =
-function(value) {
-  this.buttonWidths_ = value;
-};
-
-
-/**
- * @expose
- * @return {Array} A set of widths to use for each button.
- */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.prototype.get_buttonWidths =
-function() {
-  return this.buttonWidths_;
-};
-
-
-/**
- * @expose
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.
-    prototype.set_strand =
-    function(value) {
-  if (this.strand_ !== value) {
-    this.strand_ = value;
-    this.strand_.addEventListener('childrenAdded',
-        goog.bind(this.changeHandler, this));
-    this.strand_.addEventListener('itemsCreated',
-        goog.bind(this.changeHandler, this));
-    this.strand_.element.style.display = 'block';
-  }
-};
-
-
-/**
- * @param {org.apache.flex.events.Event} event The text getter.
- */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.
-    prototype.changeHandler = function(event) {
-  var children, i, n, xpos, useWidth, useHeight;
-
-  children = this.strand_.internalChildren();
-  n = children.length;
-
-  xpos = 0;
-  useWidth = this.strand_.get_width() / n;
-  useHeight = this.strand_.get_height();
-
-  for (i = 0; i < n; i++)
-  {
-    children[i].set_height(useHeight);
-    if (this.buttonWidths_) children[i].set_width(this.buttonWidths_[i]);
-    else children[i].set_width(useWidth);
-    children[i].element.style['vertical-align'] = 'middle';
-    children[i].element.style['text-align'] = 'center';
-    children[i].element.style['left-margin'] = 'auto';
-    children[i].element.style['right-margin'] = 'auto';
-
-    if (children[i].element.style.display == 'none')
-      children[i].lastDisplay_ = 'inline-block';
-    else
-      children[i].element.style.display = 'inline-block';
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalLayout.js
deleted file mode 100644
index d649698..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalLayout.js
+++ /dev/null
@@ -1,85 +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('org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout');
-
-goog.require('org.apache.flex.core.IBeadLayout');
-goog.require('org.apache.flex.html.staticControls.beads.ListView');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.IBeadLayout}
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout =
-    function() {
-  this.strand_ = null;
-  this.className = 'NonVirtualHorizontalLayout';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout.
-    prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'NonVirtualHorizontalLayout',
-                qName: 'org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout' }],
-      interfaces: [org.apache.flex.core.IBeadLayout] };
-
-
-/**
- * @expose
-          NonVirtualHorizontalLayout}
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout.
-    prototype.set_strand =
-    function(value) {
-  if (this.strand_ !== value) {
-    this.strand_ = value;
-    this.strand_.addEventListener('childrenAdded',
-        goog.bind(this.changeHandler, this));
-    this.strand_.addEventListener('itemsCreated',
-                                  goog.bind(this.changeHandler, this));
-    this.strand_.addEventListener('elementAdded',
-                                  goog.bind(this.changeHandler, this));
-    this.strand_.element.style.display = 'block';
-
-    this.changeHandler(null);
-  }
-};
-
-
-/**
-          NonVirtualHorizontalLayout}
- * @param {org.apache.flex.events.Event} event The text getter.
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout.
-    prototype.changeHandler = function(event) {
-  var children, i, n;
-
-  children = this.strand_.internalChildren();
-  n = children.length;
-  for (i = 0; i < n; i++)
-  {
-    if (children[i].style.display == 'none')
-      children[i].lastDisplay_ = 'inline-block';
-    else
-      children[i].style.display = 'inline-block';
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js
deleted file mode 100644
index 23269b1..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js
+++ /dev/null
@@ -1,76 +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('org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout');
-
-goog.require('org.apache.flex.core.IBeadLayout');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.IBeadLayout}
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout =
-    function() {
-  this.strand_ = null;
-  this.className = 'NonVirtualVerticalLayout';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'NonVirtualVerticalLayout',
-                qName: 'org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout'}],
-      interfaces: [org.apache.flex.core.IBeadLayout] };
-
-
-/**
- * @expose
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout.
-    prototype.set_strand = function(value) {
-  if (this.strand_ !== value) {
-    this.strand_ = value;
-    this.strand_.addEventListener('childrenAdded',
-        goog.bind(this.changeHandler, this));
-    this.strand_.addEventListener('layoutNeeded',
-        goog.bind(this.changeHandler, this));
-  }
-};
-
-
-/**
- * @param {org.apache.flex.events.Event} event The text getter.
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout.
-    prototype.changeHandler = function(event) {
-  var children, i, n;
-
-  children = this.strand_.internalChildren();
-  n = children.length;
-  for (i = 0; i < n; i++)
-  {
-    if (children[i].style.display === 'none') {
-      children[i].lastDisplay_ = 'block';
-    } else {
-      children[i].style.display = 'block';
-    }
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.js
deleted file mode 100644
index 87073c3..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.js
+++ /dev/null
@@ -1,80 +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('org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalScrollingLayout');
-
-goog.require('org.apache.flex.core.IBeadLayout');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.IBeadLayout}
- */
-org.apache.flex.html.staticControls.beads.layouts.
-    NonVirtualVerticalScrollingLayout = function() {
-  this.strand_ = null;
-  this.className = 'NonVirtualVerticalScrollingLayout';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.layouts.
-    NonVirtualVerticalScrollingLayout.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'NonVirtualVerticalScrollingLayout',
-                qName: 'org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalScrollingLayout' }],
-      interfaces: [org.apache.flex.core.IBeadLayout] };
-
-
-/**
- * @expose
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.beads.layouts.
-    NonVirtualVerticalScrollingLayout.prototype.set_strand = function(value) {
-  if (this.strand_ !== value) {
-    this.strand_ = value;
-    this.strand_.addEventListener('childrenAdded',
-        goog.bind(this.changeHandler, this));
-    this.strand_.addEventListener('layoutNeeded',
-        goog.bind(this.changeHandler, this));
-  }
-};
-
-
-/**
- * @param {org.apache.flex.events.Event} event The text getter.
- */
-org.apache.flex.html.staticControls.beads.layouts.
-    NonVirtualVerticalScrollingLayout.prototype.changeHandler =
-        function(event) {
-  var children, i, n;
-
-  children = this.strand_.internalChildren();
-  n = children.length;
-
-  for (i = 0; i < n; i++)
-  {
-    if (children[i].element.style.display == 'none')
-      children[i].lastDisplay_ = 'block';
-    else {
-      children[i].element.style.display = 'inline-block';
-      children[i].set_width(this.strand_.get_width());
-    }
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/TileLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/TileLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/TileLayout.js
deleted file mode 100644
index c9b42f2..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/TileLayout.js
+++ /dev/null
@@ -1,158 +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('org.apache.flex.html.staticControls.beads.layouts.TileLayout');
-
-goog.require('org.apache.flex.core.IBeadLayout');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.IBeadLayout}
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout =
-    function() {
-  this.strand_ = null;
-  this.className = 'TileLayout';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'TileLayout',
-                qName: 'org.apache.flex.html.staticControls.beads.layouts.TileLayout'}],
-      interfaces: [org.apache.flex.core.IBeadLayout] };
-
-
-/**
- * @expose
- * @return {number} The number of columns wide for the layout.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
-  get_numColumns = function() {
-  return this._numColumns;
-};
-
-
-/**
- * @expose
- * @param {number} value The number of columns wide for the layout.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
-  set_numColumns = function(value) {
-  this._numColumns = value;
-};
-
-
-/**
- * @expose
- * @return {number} The width of each column in the layout.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
-  get_columnWidth = function() {
-  return this._columnWidth;
-};
-
-
-/**
- * @expose
- * @param {number} value The width of each column in the layout.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
-  set_columnWidth = function(value) {
-  this._columnWidth = value;
-};
-
-
-/**
- * @expose
- * @return {number} The height of each row of the layout.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
-  get_rowHeight = function() {
-  return this._rowHeight;
-};
-
-
-/**
- * @expose
- * @param {number} value The height of each row of the Tile layout.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
-  set_rowHeight = function(value) {
-  this._rowHeight = value;
-};
-
-
-/**
- * @expose
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
-  set_strand = function(value) {
-  if (this.strand_ !== value) {
-    this.strand_ = value;
-    this.strand_.addEventListener('childrenAdded',
-        goog.bind(this.changeHandler, this));
-    this.strand_.addEventListener('layoutNeeded',
-        goog.bind(this.changeHandler, this));
-  }
-};
-
-
-/**
- * @param {org.apache.flex.events.Event} event The text getter.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.
-    prototype.changeHandler = function(event) {
-  var children, i, n;
-  var xpos, ypos, useWidth, useHeight;
-
-  children = this.strand_.internalChildren();
-  n = children.length;
-  if (n === 0) return;
-
-  xpos = 0;
-  ypos = 0;
-  useWidth = this.get_columnWidth();
-  useHeight = this.get_rowHeight();
-
-  if (isNaN(useWidth)) useWidth = Math.floor(this.strand_.get_width() / this.get_numColumns()); // + gap
-  if (isNaN(useHeight)) {
-    // given the width and total number of items, how many rows?
-    var numRows = Math.floor(n / this.get_numColumns());
-    useHeight = Math.floor(this.strand_.get_height() / numRows);
-  }
-
-  for (i = 0; i < n; i++)
-  {
-    var child = children[i].flexjs_wrapper;
-    child.set_width(useWidth);
-    child.set_height(useHeight);
-    child.set_x(xpos);
-    child.set_y(ypos);
-
-    xpos += useWidth;
-
-    if (((i + 1) % this.get_numColumns()) === 0) {
-      xpos = 0;
-      ypos += useHeight;
-    }
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.js
deleted file mode 100644
index 8d3c0f6..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.js
+++ /dev/null
@@ -1,160 +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('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
-
-goog.require('org.apache.flex.core.ISelectionModel');
-goog.require('org.apache.flex.events.EventDispatcher');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
- * @implements {org.apache.flex.core.ISelectionModel}
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel =
-    function() {
-  goog.base(this);
-  this.className = 'ArraySelectionModel';
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.beads.models.ArraySelectionModel,
-    org.apache.flex.events.EventDispatcher);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ArraySelectionModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.ArraySelectionModel' }],
-      interfaces: [org.apache.flex.core.ISelectionModel] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
-    set_strand = function(value) {
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @return {Object} value The dataProvider.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
-    get_dataProvider = function() {
-  return this.dataProvider_;
-};
-
-
-/**
- * @expose
- * @param {Object} value The dataProvider.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
-    set_dataProvider = function(value) {
-  this.dataProvider_ = value;
-  this.dispatchEvent('dataProviderChanged');
-};
-
-
-/**
- * @expose
- * @return {number} value The selected index.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
-    get_selectedIndex = function() {
-  return this.selectedIndex_;
-};
-
-
-/**
- * @expose
- * @param {number} value The selected index.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
-    set_selectedIndex = function(value) {
-  this.selectedIndex_ = value;
-  this.dispatchEvent('selectedIndexChanged');
-};
-
-
-/**
- * @expose
- * @return {Object} value The selected item.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
-    get_selectedItem = function() {
-  var si;
-
-  si = this.selectedIndex_;
-
-  if (!this.dataProvider_ || si < 0 ||
-      si >= this.dataProvider_.length) {
-    return null;
-  }
-
-  return this.dataProvider_[si];
-};
-
-
-/**
- * @expose
- * @param {Object} value The selected item.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
-    set_selectedItem = function(value) {
-  // find item in dataProvider and set selectedIndex or -1 if not exists
-
-  this.selectedIndex_ = -1;
-  var n = this.dataProvider_.length;
-  for (var i = 0; i < n; i++) {
-    var item = this.dataProvider_[i];
-    if (item == value) {
-      this.selectedIndex_ = i;
-      break;
-    }
-  }
-
-  this.dispatchEvent('selectedItemChanged');
-  this.dispatchEvent('selectedIndexChanged');
-};
-
-
-/**
- * @expose
- * @return {String} The name of the field to use as a label.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.get_labelField =
-function() {
-  return this.labelField_;
-};
-
-
-/**
- * @expose
- * @param {String} value The name of the field to use as a label.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.set_labelField =
-function(value) {
-  this.labelField_ = value;
-  this.dispatchEvent('labelFieldChanged');
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.js
deleted file mode 100644
index 15c0f9a..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.js
+++ /dev/null
@@ -1,79 +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('org.apache.flex.html.staticControls.beads.models.DataGridModel');
-
-goog.require('org.apache.flex.core.IDataGridModel');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.html.staticControls.beads.models.ArraySelectionModel}
- * @implements {org.apache.flex.core.IDataGridModel}
- */
-org.apache.flex.html.staticControls.beads.models.DataGridModel =
-    function() {
-  goog.base(this);
-
-  this.labelFields_ = [];
-
-  this.className = 'DataGridModel';
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.beads.models.DataGridModel,
-    org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'DataGridModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.DataGridModel' }],
-      interfaces: [org.apache.flex.core.IDataGridModel] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.
-    set_strand = function(value) {
-  goog.base(this, 'set_strand', value);
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @param {Array} value Array of DataGridColumn instances.
- */
-org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.
-    set_columns = function(value) {
-  this.columns_ = value;
-};
-
-
-/**
- * @expose
- * @return {Array} Array of DataGridColumn instances.
- */
-org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.
-    get_columns = function() {
-  return this.columns_;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ImageModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ImageModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ImageModel.js
deleted file mode 100644
index 889a6b7..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ImageModel.js
+++ /dev/null
@@ -1,72 +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('org.apache.flex.html.staticControls.beads.models.ImageModel');
-
-goog.require('org.apache.flex.events.EventDispatcher');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
- */
-org.apache.flex.html.staticControls.beads.models.ImageModel =
-    function() {
-  goog.base(this);
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.beads.models.ImageModel,
-    org.apache.flex.events.EventDispatcher);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ImageModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.ImageModel'}] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.
-    set_strand = function(value) {
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @return {Object} value The image source.
- */
-org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.
-    get_source = function() {
-  return this.source;
-};
-
-
-/**
- * @expose
- * @param {Object} value The image source.
- */
-org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.
-    set_source = function(value) {
-  this.source = value;
-  this.dispatchEvent('sourceChanged');
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/PanelModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/PanelModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/PanelModel.js
deleted file mode 100644
index 04c735d..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/PanelModel.js
+++ /dev/null
@@ -1,136 +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('org.apache.flex.html.staticControls.beads.models.PanelModel');
-
-goog.require('org.apache.flex.events.EventDispatcher');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel = function() {
-  goog.base(this);
-
-  /**
-   * @private
-   * @type {string}
-   */
-  this.title_ = '';
-  /**
-   * @private
-   * @type {string}
-   */
-  this.htmlTitle_ = '';
-  /**
-   * @private
-   * @type {boolean}
-   */
-  this.showCloseButton_ = false;
-};
-goog.inherits(org.apache.flex.html.staticControls.beads.models.PanelModel,
-    org.apache.flex.events.EventDispatcher);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'PanelModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.PanelModel'}] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
-    set_strand = function(value) {
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @return {string} The title.
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
-    get_title = function() {
-  return this.title_;
-};
-
-
-/**
- * @expose
- * @param {string} value The title to set.
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
-    set_title = function(value) {
-  if (this.title_ != value) {
-    this.title_ = value;
-    this.dispatchEvent('titleChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {string} The HTML title.
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
-    get_htmlTitle = function() {
-  return this.htmlTitle_;
-};
-
-
-/**
- * @expose
- * @param {string} value The new HTML title.
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
-    set_htmlTitle = function(value) {
-  if (this.htmlTitle_ != value) {
-    this.htmlTitle_ = value;
-    this.dispatchEvent('htmlTitleChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {boolean} Returns true if the close button should appear in
- * the TitleBar.
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
-    get_showCloseButton = function() {
-  return this.showCloseButton_;
-};
-
-
-/**
- * @expose
- * @param {boolean} value Determines if the close button shows (true) or
- * not (false).
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
-    set_showCloseButton = function(value) {
-  if (this.showCloseButton_ != value) {
-    this.showCloseButton_ = value;
-    this.dispatchEvent('showCloseButtonChange');
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/RangeModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/RangeModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/RangeModel.js
deleted file mode 100644
index eeb391b..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/RangeModel.js
+++ /dev/null
@@ -1,200 +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('org.apache.flex.html.staticControls.beads.models.RangeModel');
-
-goog.require('org.apache.flex.events.EventDispatcher');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel = function() {
-  goog.base(this);
-
-  this.minimum_ = 0;
-  this.maximum_ = 100;
-  this.value_ = 0;
-  this.snapInterval_ = 1;
-  this.stepSize_ = 1;
-};
-goog.inherits(org.apache.flex.html.staticControls.beads.models.RangeModel,
-    org.apache.flex.events.EventDispatcher);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'RangeModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.RangeModel'}] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    set_strand = function(value) {
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @return {number} The current minimum value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    get_minimum = function() {
-  return this.minimum_;
-};
-
-
-/**
- * @expose
- * @param {number} value The new minimum value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    set_minimum = function(value) {
-  if (this.minimum_ != value) {
-    this.minimum_ = value;
-    this.dispatchEvent('minimumChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {number} The current maximu value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    get_maximum = function() {
-  return this.maximum_;
-};
-
-
-/**
- * @expose
- * @param {number} value The new maximum value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    set_maximum = function(value) {
-  if (this.maximum_ != value) {
-    this.maximum_ = value;
-    this.dispatchEvent('maximumChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {number} The current value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    get_value = function() {
-  return this.value_;
-};
-
-
-/**
- * @expose
- * @param {number} newValue The new value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    set_value = function(newValue) {
-  if (this.value_ != newValue) {
-
-    // value must lie within the boundaries of minimum & maximum
-    // and be on a step interval, so the value is adjusted to
-    // what is coming in.
-    newValue = Math.max(this.minimum_, newValue - this.stepSize_);
-    newValue = Math.min(this.maximum_, newValue + this.stepSize_);
-    this.value_ = this.snap(newValue);
-
-    this.dispatchEvent('valueChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {number} The current snapInterval value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    get_snapInterval = function() {
-  return this.snapInterval_;
-};
-
-
-/**
- * @expose
- * @param {number} value The new snapInterval value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    set_snapInterval = function(value) {
-  if (this.snapInterval_ != value) {
-    this.snapInterval_ = value;
-    this.dispatchEvent('snapIntervalChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {number} The current stepSize value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    get_stepSize = function() {
-  return this.stepSize_;
-};
-
-
-/**
- * @expose
- * @param {number} value The new stepSize value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    set_stepSize = function(value) {
-  if (this.stepSize_ != value) {
-    this.stepSize_ = value;
-    this.dispatchEvent('stepSizeChange');
-  }
-};
-
-
-/**
- * @expose
- * @param {number} value The candidate number.
- * @return {number} Adjusted value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    snap = function(value) {
-  var si = this.snapInterval_;
-  var n = Math.round((value - this.minimum_) / si) *
-                 si + this.minimum_;
-  if (value > 0)
-  {
-    if (value - n < n + si - value)
-      return n;
-    return n + si;
-  }
-  if (value - n > n + si - value)
-    return n + si;
-  return n;
-};
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/TitleBarModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/TitleBarModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/TitleBarModel.js
deleted file mode 100644
index 8d9b64d..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/TitleBarModel.js
+++ /dev/null
@@ -1,136 +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('org.apache.flex.html.staticControls.beads.models.TitleBarModel');
-
-goog.require('org.apache.flex.events.EventDispatcher');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel = function() {
-  goog.base(this);
-
-  /**
-   * @private
-   * @type {string}
-   */
-  this.title_ = '';
-  /**
-   * @private
-   * @type {string}
-   */
-  this.htmlTitle_ = '';
-  /**
-   * @private
-   * @type {boolean}
-   */
-  this.showCloseButton_ = false;
-};
-goog.inherits(org.apache.flex.html.staticControls.beads.models.TitleBarModel,
-    org.apache.flex.events.EventDispatcher);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'RangeModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.TitleBarModel'}] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
-    set_strand = function(value) {
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @return {string} The title.
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
-    get_title = function() {
-  return this.title_;
-};
-
-
-/**
- * @expose
- * @param {string} value The title to set.
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
-    set_title = function(value) {
-  if (this.title_ != value) {
-    this.title_ = value;
-    this.dispatchEvent('titleChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {string} The HTML title.
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
-    get_htmlTitle = function() {
-  return this.htmlTitle_;
-};
-
-
-/**
- * @expose
- * @param {string} value The new HTML title.
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
-    set_htmlTitle = function(value) {
-  if (this.htmlTitle_ != value) {
-    this.htmlTitle_ = value;
-    this.dispatchEvent('htmlTitleChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {boolean} Returns true if the close button should appear in
- * the TitleBar.
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
-    get_showCloseButton = function() {
-  return this.showCloseButton_;
-};
-
-
-/**
- * @expose
- * @param {boolean} value Determines if the close button shows (true) or
- * not (false).
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
-    set_showCloseButton = function(value) {
-  if (this.showCloseButton_ != value) {
-    this.showCloseButton_ = value;
-    this.dispatchEvent('showCloseButtonChange');
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/ButtonBarButtonItemRenderer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/ButtonBarButtonItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/ButtonBarButtonItemRenderer.js
deleted file mode 100644
index ff85b7a..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/ButtonBarButtonItemRenderer.js
+++ /dev/null
@@ -1,112 +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('org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer');
-
-goog.require('org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController');
-goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.html.staticControls.supportClasses.DataItemRenderer}
- */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer =
-    function() {
-  goog.base(this);
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.
-        supportClasses.ButtonBarButtonItemRenderer,
-    org.apache.flex.html.staticControls.supportClasses.DataItemRenderer);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ButtonBarButtonItemRenderer',
-                qName: 'org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer' }] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
-    prototype.createElement = function() {
-
-  this.element = document.createElement('div');
-  this.positioner = this.element;
-
-  this.button = document.createElement('button');
-  this.element.appendChild(this.button);
-
-  this.element.flexjs_wrapper = this;
-  this.set_className('ButtonBarButtonItemRenderer');
-
-  // itemRenderers should provide something for the background to handle
-  // the selection and highlight
-  this.backgroundView = this.element;
-
-  this.controller = new org.apache.flex.html.staticControls.beads.controllers.
-      ItemRendererMouseController();
-  this.controller.set_strand(this);
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
-    prototype.set_strand = function(value) {
-
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @return {Object} The strand.
- */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
-    prototype.get_strand = function() {
-  return this.strand_;
-};
-
-
-/**
- * @expose
- * @param {Object} value The text to display.
- */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
-    prototype.set_data = function(value) {
-
-  goog.base(this, 'set_data', value);
-
-  if (value.hasOwnProperty('label')) {
-    this.button.innerHTML = value.label;
-  }
-  else if (value.hasOwnProperty('title')) {
-    this.button.innerHTML = value.title;
-  }
-  else {
-    this.button.innerHHTML = String(value);
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.js
deleted file mode 100644
index 8b59a9b..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.js
+++ /dev/null
@@ -1,107 +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('org.apache.flex.html.staticControls.supportClasses.DataGridColumn');
-
-goog.require('mx.core.IFactory');
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn =
-    function() {
-};
-
-
-/**
- * @expose
- * @return {mx.core.IFactory} The object factory for the itemRenderer.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_itemRenderer =
-function() {
-  return this.itemRenderer_;
-};
-
-
-/**
- * @expose
- * @param {mx.core.IFactory} value The object factory for the itemRenderer.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_itemRenderer =
-function(value) {
-  this.itemRenderer_ = value;
-};
-
-
-/**
- * @expose
- * @return {Number} The width of the column.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_columnWidth =
-function() {
-  return this.columnWidth_;
-};
-
-
-/**
- * @expose
- * @param {Number} value The width of the column.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_columnWidth =
-function(value) {
-  this.columnWidth_ = value;
-};
-
-
-/**
- * @expose
- * @return {String} The label for the column.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_label =
-function() {
-  return this.label_;
-};
-
-
-/**
- * @expose
- * @param {String} value The label for the column.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_label =
-function(value) {
-  this.label_ = value;
-};
-
-
-/**
- * @expose
- * @return {String} The field for the data for the column.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_dataField =
-function() {
-  return this.dataField_;
-};
-
-
-/**
- * @expose
- * @param {String} value The field for the data for the column.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_dataField =
-function(value) {
-  this.dataField_ = value;
-};
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataItemRenderer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataItemRenderer.js
deleted file mode 100644
index 48d8c4f..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataItemRenderer.js
+++ /dev/null
@@ -1,158 +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('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
-
-goog.require('org.apache.flex.core.IItemRenderer');
-goog.require('org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController');
-goog.require('org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase}
- * @implements {org.apache.flex.core.IItemRenderer}
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer =
-    function() {
-  goog.base(this);
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.supportClasses.DataItemRenderer,
-    org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'DataItemRenderer',
-                qName: 'org.apache.flex.html.staticControls.supportClasses.DataItemRenderer' }],
-      interfaces: [org.apache.flex.core.IItemRenderer] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.createElement = function() {
-
-  this.element = document.createElement('div');
-  this.positioner = this.element;
-
-  this.element.flexjs_wrapper = this;
-  this.set_className('DataItemRenderer');
-
-  // itemRenderers should provide something for the background to handle
-  // the selection and highlight
-  this.backgroundView = this.element;
-
-  this.controller = new org.apache.flex.html.staticControls.beads.controllers.
-      ItemRendererMouseController();
-  this.controller.set_strand(this);
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @return {Object} The item renderer's parent.
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.get_itemRendererParent = function() {
-  return this.rendererParent_;
-};
-
-
-/**
- * @expose
- * @param {Object} value The item renderer's parent.
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.set_itemRendererParent = function(value) {
-  this.rendererParent_ = value;
-};
-
-
-/**
- * @expose
- * @param {Object} value The renderer's index.
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.set_index = function(value) {
-  this.index_ = value;
-};
-
-
-/**
- * @expose
- * @param {string} value The name of field to use.
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.set_dataField = function(value) {
-
-  this.dataField_ = value;
-};
-
-
-/**
- * @expose
- * @return {string} The name of the field to use.
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.get_dataField = function() {
-
-  return this.dataField_;
-};
-
-
-/**
- * @override
- * @param {Boolean} value The selection state.
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.set_selected = function(value) {
-  this.selected_ = value;
-
-  if (value) {
-    this.backgroundView.style.backgroundColor = '#9C9C9C';
-  } else {
-    this.backgroundView.style.backgroundColor = null;
-  }
-};
-
-
-/**
- * @override
- * @param {Boolean} value The hovered state.
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.set_hovered = function(value) {
-  this.hovered_ = value;
-
-  if (value) {
-    this.backgroundView.style.backgroundColor = '#ECECEC';
-  } else {
-    if (this.selected_) {
-      this.backgroundView.style.backgroundColor = '#9C9C9C';
-    } else {
-      this.backgroundView.style.backgroundColor = null;
-    }
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.js
deleted file mode 100644
index 83fb799..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.js
+++ /dev/null
@@ -1,108 +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('org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup');
-
-goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
-goog.require('org.apache.flex.utils.Language');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup =
-    function() {
-  this.renderers = [];
-  goog.base(this);
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'NonVirtualDataGroup',
-                qName: 'org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup' }] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
-    prototype.set_strand = function(value) {
-  this.strand_ = value;
-};
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
-    prototype.createElement = function() {
-  this.element = document.createElement('div');
-  this.element.style.overflow = 'auto';
-  this.element.style.display = 'inline-block';
-  this.element.style.position = 'inherit';
-  this.element.flexjs_wrapper = this;
-  this.set_className('NonVirtualDataGroup');
-
-  this.positioner = this.element;
-
-  return this.element;
-};
-
-
-/**
- * @override
- * @param {Object} value The child element being added.
- */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
-    prototype.addElement = function(value) {
-  goog.base(this, 'addElement', value);
-
-  var itemRenderer = org.apache.flex.utils.Language.as(value,
-                           org.apache.flex.html.staticControls.supportClasses.DataItemRenderer);
-  itemRenderer.set_index(this.renderers.length);
-  itemRenderer.set_itemRendererParent(this);
-  this.renderers.push(value);
-};
-
-
-/**
- * @expose
- */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
-    prototype.removeAllElements = function() {
-    // to do
-};
-
-
-/**
- * @expose
- * @param {Object} index The index for the itemRenderer.
- * @return {Object} The itemRenderer that matches the index.
- */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
-    prototype.getItemRendererForIndex = function(index) {
-  return this.renderers[index];
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/StringItemRenderer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/StringItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/StringItemRenderer.js
deleted file mode 100644
index c19729e..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/StringItemRenderer.js
+++ /dev/null
@@ -1,178 +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('org.apache.flex.html.staticControls.supportClasses.StringItemRenderer');
-
-goog.require('org.apache.flex.core.IItemRenderer');
-goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController');
-goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.html.staticControls.supportClasses.DataItemRenderer}
- * @implements {org.apache.flex.core.IItemRenderer}
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer =
-    function() {
-  goog.base(this);
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.supportClasses.StringItemRenderer,
-    org.apache.flex.html.staticControls.supportClasses.DataItemRenderer);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'StringItemRenderer',
-                qName: 'org.apache.flex.html.staticControls.supportClasses.StringItemRenderer' }],
-      interfaces: [org.apache.flex.core.IItemRenderer] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.createElement = function() {
-
-  this.element = document.createElement('div');
-  this.positioner = this.element;
-
-  this.element.flexjs_wrapper = this;
-  this.set_className('StringItemRenderer');
-
-  // itemRenderers should provide something for the background to handle
-  // the selection and highlight
-  this.backgroundView = this.element;
-
-  this.controller = new org.apache.flex.html.staticControls.beads.controllers.
-      ItemRendererMouseController();
-  this.controller.set_strand(this);
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.set_strand = function(value) {
-
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @return {Object} The strand.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.get_strand = function() {
-  return this.strand_;
-};
-
-
-/**
- * @expose
- * @return {Object} The item renderer's parent.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.get_itemRendererParent = function() {
-  return this.rendererParent_;
-};
-
-
-/**
- * @expose
- * @param {Object} value The item renderer's parent.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.set_itemRendererParent = function(value) {
-  this.rendererParent_ = value;
-};
-
-
-/**
- * @expose
- * @param {Object} value The renderer's index.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.set_index = function(value) {
-  this.index_ = value;
-};
-
-
-/**
- * @expose
- * @param {Object} value The text to display.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.set_text = function(value) {
-
-  this.element.innerHTML = value;
-};
-
-
-/**
- * @expose
- * @return {Object} The text being displayed.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.get_text = function() {
-
-  return this.element.innerHTML;
-};
-
-
-/**
- * @expose
- * @param {Object} value The text to display.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.set_data = function(value) {
-
-  goog.base(this, 'set_data', value);
-
-  if (this.get_labelField()) {
-    this.element.innerHTML = String(value[this.get_labelField()]);
-  }
-  else if (this.get_dataField()) {
-    this.element.innerHTML = String(value[this.get_dataField()]);
-  }
-  else if (value.toString) {
-    this.element.innerHTML = value.toString();
-  } else {
-    this.element.innerHTML = String(value);
-  }
-};
-
-
-/**
- * @expose
- * @return {Object} The text being displayed.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.get_data = function() {
-
-  return this.element.innerHTML;
-};


[23/35] sed removal of staticControls. Now to see what I missed

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js
index d340174..a013e4b 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js
@@ -12,12 +12,12 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData');
+goog.provide('org.apache.flex.html.beads.TextItemRendererFactoryForArrayData');
 
 goog.require('org.apache.flex.core.IDataProviderItemRendererMapper');
 goog.require('org.apache.flex.core.IItemRenderer');
 goog.require('org.apache.flex.events.EventDispatcher');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
+goog.require('org.apache.flex.html.beads.models.ArraySelectionModel');
 
 
 
@@ -26,12 +26,12 @@ goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionMod
  * @extends {org.apache.flex.events.EventDispatcher}
  * @implements {org.apache.flex.core.IItemRenderer}
  */
-org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData =
+org.apache.flex.html.beads.TextItemRendererFactoryForArrayData =
     function() {
   goog.base(this);
 };
 goog.inherits(
-    org.apache.flex.html.staticControls.
+    org.apache.flex.html.
         beads.TextItemRendererFactoryForArrayData,
     org.apache.flex.events.EventDispatcher);
 
@@ -41,10 +41,10 @@ goog.inherits(
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData.
+org.apache.flex.html.beads.TextItemRendererFactoryForArrayData.
     prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'TextItemRendererFactoryForArrayData',
-                qName: 'org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData' }],
+                qName: 'org.apache.flex.html.beads.TextItemRendererFactoryForArrayData' }],
       interfaces: [org.apache.flex.core.IItemRenderer] };
 
 
@@ -52,15 +52,15 @@ org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData.
  * @expose
  * @param {Object} value The component strand.
  */
-org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData.
+org.apache.flex.html.beads.TextItemRendererFactoryForArrayData.
     prototype.set_strand = function(value) {
   this.strand_ = value;
 
   this.model = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
+      org.apache.flex.html.beads.models.ArraySelectionModel);
 
   this.listView = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.ListView);
+      org.apache.flex.html.beads.ListView);
   this.dataGroup = this.listView.get_dataGroup();
 
   this.model.addEventListener('dataProviderChanged',
@@ -74,7 +74,7 @@ org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData.
  * @expose
  * @param {Object} event The event that triggered the dataProvider change.
  */
-org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData.
+org.apache.flex.html.beads.TextItemRendererFactoryForArrayData.
     prototype.dataProviderChangedHandler = function(event) {
   var dp, i, n, opt;
 
@@ -82,7 +82,7 @@ org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData.
   n = dp.length;
   for (i = 0; i < n; i++) {
     opt = new
-        org.apache.flex.html.staticControls.supportClasses.StringItemRenderer();
+        org.apache.flex.html.supportClasses.StringItemRenderer();
     this.dataGroup.addElement(opt);
     opt.set_text(dp[i]);
   }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js
index 8893383..a647a25 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController');
+goog.provide('org.apache.flex.html.beads.controllers.ItemRendererMouseController');
 
 goog.require('org.apache.flex.core.IBeadController');
 
@@ -22,7 +22,7 @@ goog.require('org.apache.flex.core.IBeadController');
  * @constructor
  * @implements {org.apache.flex.core.IBeadController}
  */
-org.apache.flex.html.staticControls.beads.controllers.
+org.apache.flex.html.beads.controllers.
     ItemRendererMouseController = function() {
 };
 
@@ -32,10 +32,10 @@ org.apache.flex.html.staticControls.beads.controllers.
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.controllers.
+org.apache.flex.html.beads.controllers.
     ItemRendererMouseController.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'ItemRendererMouseController',
-                qName: 'org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController' }],
+                qName: 'org.apache.flex.html.beads.controllers.ItemRendererMouseController' }],
       interfaces: [org.apache.flex.core.IBeadController] };
 
 
@@ -43,7 +43,7 @@ org.apache.flex.html.staticControls.beads.controllers.
  * @expose
  * @param {Object} value The strand for this component.
  */
-org.apache.flex.html.staticControls.beads.controllers.
+org.apache.flex.html.beads.controllers.
     ItemRendererMouseController.prototype.set_strand = function(value) {
   this.strand_ = value;
 
@@ -65,7 +65,7 @@ org.apache.flex.html.staticControls.beads.controllers.
  * @expose
  * @param {Object} event The mouse event that triggered the hover.
  */
-org.apache.flex.html.staticControls.beads.controllers.
+org.apache.flex.html.beads.controllers.
     ItemRendererMouseController.prototype.handleMouseOver = function(event) {
 
   this.strand_.set_hovered(true);
@@ -80,7 +80,7 @@ org.apache.flex.html.staticControls.beads.controllers.
  * @expose
  * @param {Object} event The mouse-out event.
  */
-org.apache.flex.html.staticControls.beads.controllers.
+org.apache.flex.html.beads.controllers.
     ItemRendererMouseController.prototype.handleMouseOut = function(event) {
 
   this.strand_.set_hovered(false);
@@ -95,7 +95,7 @@ org.apache.flex.html.staticControls.beads.controllers.
  * @expose
  * @param {Object} event The mouse-down event.
  */
-org.apache.flex.html.staticControls.beads.controllers.
+org.apache.flex.html.beads.controllers.
     ItemRendererMouseController.prototype.handleMouseDown = function(event) {
 
   // ??
@@ -106,7 +106,7 @@ org.apache.flex.html.staticControls.beads.controllers.
  * @expose
  * @param {Object} event The mouse-up event that triggers the selection.
  */
-org.apache.flex.html.staticControls.beads.controllers.
+org.apache.flex.html.beads.controllers.
     ItemRendererMouseController.prototype.handleMouseUp = function(event) {
 
   var newEvent = new goog.events.Event('selected');

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js
index 42025b3..eb5b3d2 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js
@@ -12,11 +12,11 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController');
+goog.provide('org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController');
 
 goog.require('org.apache.flex.core.IBeadController');
-goog.require('org.apache.flex.html.staticControls.beads.ListView');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
+goog.require('org.apache.flex.html.beads.ListView');
+goog.require('org.apache.flex.html.beads.models.ArraySelectionModel');
 
 
 
@@ -24,7 +24,7 @@ goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionMod
  * @constructor
  * @implements {org.apache.flex.core.IBeadController}
  */
-org.apache.flex.html.staticControls.beads.controllers.
+org.apache.flex.html.beads.controllers.
     ListSingleSelectionMouseController = function() {
 };
 
@@ -34,9 +34,9 @@ org.apache.flex.html.staticControls.beads.controllers.
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'ListSingleSelectionMouseController',
-                qName: 'org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController' }],
+                qName: 'org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController' }],
       interfaces: [org.apache.flex.core.IBeadController] };
 
 
@@ -45,14 +45,14 @@ org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseCo
  *        ListSingleSelectionMouseController}
  * @param {Object} value The strand for this component.
  */
-org.apache.flex.html.staticControls.beads.controllers.
+org.apache.flex.html.beads.controllers.
     ListSingleSelectionMouseController.prototype.set_strand = function(value) {
   this.strand_ = value;
 
   this.model = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
+      org.apache.flex.html.beads.models.ArraySelectionModel);
   this.listView = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.ListView);
+      org.apache.flex.html.beads.ListView);
 
   this.dataGroup = this.listView.get_dataGroup();
   this.dataGroup.addEventListener('selected',
@@ -65,7 +65,7 @@ org.apache.flex.html.staticControls.beads.controllers.
  *        ListSingleSelectionMouseController}
  * @param {Object} event The event that triggered the selection.
  */
-org.apache.flex.html.staticControls.beads.controllers.
+org.apache.flex.html.beads.controllers.
     ListSingleSelectionMouseController.prototype.selectedHandler =
         function(event) {
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js
index afa6c29..f63fdd3 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js
@@ -12,17 +12,17 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.controllers.SliderMouseController');
+goog.provide('org.apache.flex.html.beads.controllers.SliderMouseController');
 
-goog.require('org.apache.flex.html.staticControls.beads.SliderThumbView');
-goog.require('org.apache.flex.html.staticControls.beads.SliderTrackView');
+goog.require('org.apache.flex.html.beads.SliderThumbView');
+goog.require('org.apache.flex.html.beads.SliderTrackView');
 
 
 
 /**
  * @constructor
  */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController =
+org.apache.flex.html.beads.controllers.SliderMouseController =
     function() {
 };
 
@@ -32,10 +32,10 @@ org.apache.flex.html.staticControls.beads.controllers.SliderMouseController =
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.controllers.
+org.apache.flex.html.beads.controllers.
     SliderMouseController.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'SliderMouseController',
-                qName: 'org.apache.flex.html.staticControls.beads.controllers.SliderMouseController' }] };
+                qName: 'org.apache.flex.html.beads.controllers.SliderMouseController' }] };
 
 
 /**
@@ -43,14 +43,14 @@ org.apache.flex.html.staticControls.beads.controllers.
  *        SliderMouseController}
  * @param {Object} value The strand.
  */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
+org.apache.flex.html.beads.controllers.SliderMouseController.
     prototype.set_strand = function(value) {
   this.strand_ = value;
 
   this.track = this.strand_.getBeadByType(
-      org.apache.flex.html.staticControls.beads.SliderTrackView);
+      org.apache.flex.html.beads.SliderTrackView);
   this.thumb = this.strand_.getBeadByType(
-      org.apache.flex.html.staticControls.beads.SliderThumbView);
+      org.apache.flex.html.beads.SliderThumbView);
 
   goog.events.listen(this.track.element, goog.events.EventType.CLICK,
                      this.handleTrackClick, false, this);
@@ -65,7 +65,7 @@ org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
  * @param {Event} event The event triggering the function.
  * @return {void} Handles click on track.
  */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
+org.apache.flex.html.beads.controllers.SliderMouseController.
     prototype.handleTrackClick =
     function(event)
     {
@@ -90,7 +90,7 @@ org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
  * @param {Event} event The event triggering the function.
  * @return {void} Handles mouse-down on the thumb.
  */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
+org.apache.flex.html.beads.controllers.SliderMouseController.
     prototype.handleThumbDown =
     function(event)
     {
@@ -109,7 +109,7 @@ org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
  * @param {Event} event The event triggering the function.
  * @return {void} Handles mouse-up on the thumb.
  */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
+org.apache.flex.html.beads.controllers.SliderMouseController.
     prototype.handleThumbUp =
     function(event)
     {
@@ -129,7 +129,7 @@ org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
  * @param {Event} event The event triggering the function.
  * @return {void} Handles mouse-move on the thumb.
  */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
+org.apache.flex.html.beads.controllers.SliderMouseController.
     prototype.handleThumbMove =
     function(event)
     {
@@ -146,7 +146,7 @@ org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
  * @return {void} Determines the new value based on the movement of the mouse
  * along the slider.
  */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
+org.apache.flex.html.beads.controllers.SliderMouseController.
     prototype.calcValFromMousePosition =
     function(event, useOffset)
     {

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js
index 4549d09..7adb27d 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js
@@ -12,16 +12,16 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController');
+goog.provide('org.apache.flex.html.beads.controllers.SpinnerMouseController');
 
-goog.require('org.apache.flex.html.staticControls.TextButton');
+goog.require('org.apache.flex.html.TextButton');
 
 
 
 /**
  * @constructor
  */
-org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController =
+org.apache.flex.html.beads.controllers.SpinnerMouseController =
     function() {
 };
 
@@ -31,10 +31,10 @@ org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController =
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.controllers.
+org.apache.flex.html.beads.controllers.
     SpinnerMouseController.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'SpinnerMouseController',
-                qName: 'org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController' }] };
+                qName: 'org.apache.flex.html.beads.controllers.SpinnerMouseController' }] };
 
 
 /**
@@ -42,7 +42,7 @@ org.apache.flex.html.staticControls.beads.controllers.
  *        SpinnerMouseController}
  * @param {Object} value The strand.
  */
-org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController.
+org.apache.flex.html.beads.controllers.SpinnerMouseController.
     prototype.set_strand = function(value) {
   this.strand_ = value;
 
@@ -61,7 +61,7 @@ org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController.
  *        SpinnerMouseController}
  * @param {Object} event The event object.
  */
-org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController.
+org.apache.flex.html.beads.controllers.SpinnerMouseController.
     prototype.handleIncrementClick = function(event)
     {
   var newValue = this.strand_.snap(Math.min(this.strand_.get_maximum(),
@@ -75,7 +75,7 @@ org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController.
  *        SpinnerMouseController}
  * @param {Event} event The event object.
  */
-org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController.
+org.apache.flex.html.beads.controllers.SpinnerMouseController.
     prototype.handleDecrementClick =
     function(event)
     {

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js
index 6e1c0cf..57fe07d 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js
@@ -12,10 +12,10 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout');
+goog.provide('org.apache.flex.html.beads.layouts.ButtonBarLayout');
 
 goog.require('org.apache.flex.core.IBeadLayout');
-goog.require('org.apache.flex.html.staticControls.beads.ListView');
+goog.require('org.apache.flex.html.beads.ListView');
 
 
 
@@ -23,7 +23,7 @@ goog.require('org.apache.flex.html.staticControls.beads.ListView');
  * @constructor
  * @implements {org.apache.flex.core.IBeadLayout}
  */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout =
+org.apache.flex.html.beads.layouts.ButtonBarLayout =
     function() {
   this.strand_ = null;
 
@@ -36,10 +36,10 @@ org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout =
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout
+org.apache.flex.html.beads.layouts.ButtonBarLayout
     .prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'ButtonBarLayout',
-                qName: 'org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout' }],
+                qName: 'org.apache.flex.html.beads.layouts.ButtonBarLayout' }],
       interfaces: [org.apache.flex.core.IBeadLayout] };
 
 
@@ -47,7 +47,7 @@ org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout
  * @expose
  * @param {Array} value A set of widths to use for each button (optional).
  */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.prototype.set_buttonWidths =
+org.apache.flex.html.beads.layouts.ButtonBarLayout.prototype.set_buttonWidths =
 function(value) {
   this.buttonWidths_ = value;
 };
@@ -57,7 +57,7 @@ function(value) {
  * @expose
  * @return {Array} A set of widths to use for each button.
  */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.prototype.get_buttonWidths =
+org.apache.flex.html.beads.layouts.ButtonBarLayout.prototype.get_buttonWidths =
 function() {
   return this.buttonWidths_;
 };
@@ -67,7 +67,7 @@ function() {
  * @expose
  * @param {Object} value The new host.
  */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.
+org.apache.flex.html.beads.layouts.ButtonBarLayout.
     prototype.set_strand =
     function(value) {
   if (this.strand_ !== value) {
@@ -84,7 +84,7 @@ org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.
 /**
  * @param {org.apache.flex.events.Event} event The text getter.
  */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.
+org.apache.flex.html.beads.layouts.ButtonBarLayout.
     prototype.changeHandler = function(event) {
   var children, i, n, xpos, useWidth, useHeight;
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js
index d649698..a28f503 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js
@@ -12,10 +12,10 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout');
+goog.provide('org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout');
 
 goog.require('org.apache.flex.core.IBeadLayout');
-goog.require('org.apache.flex.html.staticControls.beads.ListView');
+goog.require('org.apache.flex.html.beads.ListView');
 
 
 
@@ -23,7 +23,7 @@ goog.require('org.apache.flex.html.staticControls.beads.ListView');
  * @constructor
  * @implements {org.apache.flex.core.IBeadLayout}
  */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout =
+org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout =
     function() {
   this.strand_ = null;
   this.className = 'NonVirtualHorizontalLayout';
@@ -35,10 +35,10 @@ org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout =
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout.
+org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout.
     prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'NonVirtualHorizontalLayout',
-                qName: 'org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout' }],
+                qName: 'org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout' }],
       interfaces: [org.apache.flex.core.IBeadLayout] };
 
 
@@ -47,7 +47,7 @@ org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout.
           NonVirtualHorizontalLayout}
  * @param {Object} value The new host.
  */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout.
+org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout.
     prototype.set_strand =
     function(value) {
   if (this.strand_ !== value) {
@@ -69,7 +69,7 @@ org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout.
           NonVirtualHorizontalLayout}
  * @param {org.apache.flex.events.Event} event The text getter.
  */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout.
+org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout.
     prototype.changeHandler = function(event) {
   var children, i, n;
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js
index 23269b1..1828677 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout');
+goog.provide('org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout');
 
 goog.require('org.apache.flex.core.IBeadLayout');
 
@@ -22,7 +22,7 @@ goog.require('org.apache.flex.core.IBeadLayout');
  * @constructor
  * @implements {org.apache.flex.core.IBeadLayout}
  */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout =
+org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout =
     function() {
   this.strand_ = null;
   this.className = 'NonVirtualVerticalLayout';
@@ -34,9 +34,9 @@ org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout =
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'NonVirtualVerticalLayout',
-                qName: 'org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout'}],
+                qName: 'org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout'}],
       interfaces: [org.apache.flex.core.IBeadLayout] };
 
 
@@ -44,7 +44,7 @@ org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout.proto
  * @expose
  * @param {Object} value The new host.
  */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout.
+org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout.
     prototype.set_strand = function(value) {
   if (this.strand_ !== value) {
     this.strand_ = value;
@@ -59,7 +59,7 @@ org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout.
 /**
  * @param {org.apache.flex.events.Event} event The text getter.
  */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout.
+org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout.
     prototype.changeHandler = function(event) {
   var children, i, n;
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.js
index 87073c3..a813dd2 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalScrollingLayout');
+goog.provide('org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout');
 
 goog.require('org.apache.flex.core.IBeadLayout');
 
@@ -22,7 +22,7 @@ goog.require('org.apache.flex.core.IBeadLayout');
  * @constructor
  * @implements {org.apache.flex.core.IBeadLayout}
  */
-org.apache.flex.html.staticControls.beads.layouts.
+org.apache.flex.html.beads.layouts.
     NonVirtualVerticalScrollingLayout = function() {
   this.strand_ = null;
   this.className = 'NonVirtualVerticalScrollingLayout';
@@ -34,10 +34,10 @@ org.apache.flex.html.staticControls.beads.layouts.
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.layouts.
+org.apache.flex.html.beads.layouts.
     NonVirtualVerticalScrollingLayout.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'NonVirtualVerticalScrollingLayout',
-                qName: 'org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalScrollingLayout' }],
+                qName: 'org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout' }],
       interfaces: [org.apache.flex.core.IBeadLayout] };
 
 
@@ -45,7 +45,7 @@ org.apache.flex.html.staticControls.beads.layouts.
  * @expose
  * @param {Object} value The new host.
  */
-org.apache.flex.html.staticControls.beads.layouts.
+org.apache.flex.html.beads.layouts.
     NonVirtualVerticalScrollingLayout.prototype.set_strand = function(value) {
   if (this.strand_ !== value) {
     this.strand_ = value;
@@ -60,7 +60,7 @@ org.apache.flex.html.staticControls.beads.layouts.
 /**
  * @param {org.apache.flex.events.Event} event The text getter.
  */
-org.apache.flex.html.staticControls.beads.layouts.
+org.apache.flex.html.beads.layouts.
     NonVirtualVerticalScrollingLayout.prototype.changeHandler =
         function(event) {
   var children, i, n;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js
index c9b42f2..87d5d7c 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.layouts.TileLayout');
+goog.provide('org.apache.flex.html.beads.layouts.TileLayout');
 
 goog.require('org.apache.flex.core.IBeadLayout');
 
@@ -22,7 +22,7 @@ goog.require('org.apache.flex.core.IBeadLayout');
  * @constructor
  * @implements {org.apache.flex.core.IBeadLayout}
  */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout =
+org.apache.flex.html.beads.layouts.TileLayout =
     function() {
   this.strand_ = null;
   this.className = 'TileLayout';
@@ -34,9 +34,9 @@ org.apache.flex.html.staticControls.beads.layouts.TileLayout =
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.beads.layouts.TileLayout.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'TileLayout',
-                qName: 'org.apache.flex.html.staticControls.beads.layouts.TileLayout'}],
+                qName: 'org.apache.flex.html.beads.layouts.TileLayout'}],
       interfaces: [org.apache.flex.core.IBeadLayout] };
 
 
@@ -44,7 +44,7 @@ org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.FLEXJS_CL
  * @expose
  * @return {number} The number of columns wide for the layout.
  */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
+org.apache.flex.html.beads.layouts.TileLayout.prototype.
   get_numColumns = function() {
   return this._numColumns;
 };
@@ -54,7 +54,7 @@ org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
  * @expose
  * @param {number} value The number of columns wide for the layout.
  */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
+org.apache.flex.html.beads.layouts.TileLayout.prototype.
   set_numColumns = function(value) {
   this._numColumns = value;
 };
@@ -64,7 +64,7 @@ org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
  * @expose
  * @return {number} The width of each column in the layout.
  */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
+org.apache.flex.html.beads.layouts.TileLayout.prototype.
   get_columnWidth = function() {
   return this._columnWidth;
 };
@@ -74,7 +74,7 @@ org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
  * @expose
  * @param {number} value The width of each column in the layout.
  */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
+org.apache.flex.html.beads.layouts.TileLayout.prototype.
   set_columnWidth = function(value) {
   this._columnWidth = value;
 };
@@ -84,7 +84,7 @@ org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
  * @expose
  * @return {number} The height of each row of the layout.
  */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
+org.apache.flex.html.beads.layouts.TileLayout.prototype.
   get_rowHeight = function() {
   return this._rowHeight;
 };
@@ -94,7 +94,7 @@ org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
  * @expose
  * @param {number} value The height of each row of the Tile layout.
  */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
+org.apache.flex.html.beads.layouts.TileLayout.prototype.
   set_rowHeight = function(value) {
   this._rowHeight = value;
 };
@@ -104,7 +104,7 @@ org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
  * @expose
  * @param {Object} value The new host.
  */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
+org.apache.flex.html.beads.layouts.TileLayout.prototype.
   set_strand = function(value) {
   if (this.strand_ !== value) {
     this.strand_ = value;
@@ -119,7 +119,7 @@ org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
 /**
  * @param {org.apache.flex.events.Event} event The text getter.
  */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.
+org.apache.flex.html.beads.layouts.TileLayout.
     prototype.changeHandler = function(event) {
   var children, i, n;
   var xpos, ypos, useWidth, useHeight;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ArraySelectionModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ArraySelectionModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ArraySelectionModel.js
index 8d3c0f6..5ea0c33 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ArraySelectionModel.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ArraySelectionModel.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
+goog.provide('org.apache.flex.html.beads.models.ArraySelectionModel');
 
 goog.require('org.apache.flex.core.ISelectionModel');
 goog.require('org.apache.flex.events.EventDispatcher');
@@ -24,13 +24,13 @@ goog.require('org.apache.flex.events.EventDispatcher');
  * @extends {org.apache.flex.events.EventDispatcher}
  * @implements {org.apache.flex.core.ISelectionModel}
  */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel =
+org.apache.flex.html.beads.models.ArraySelectionModel =
     function() {
   goog.base(this);
   this.className = 'ArraySelectionModel';
 };
 goog.inherits(
-    org.apache.flex.html.staticControls.beads.models.ArraySelectionModel,
+    org.apache.flex.html.beads.models.ArraySelectionModel,
     org.apache.flex.events.EventDispatcher);
 
 
@@ -39,9 +39,9 @@ goog.inherits(
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.beads.models.ArraySelectionModel.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'ArraySelectionModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.ArraySelectionModel' }],
+                qName: 'org.apache.flex.html.beads.models.ArraySelectionModel' }],
       interfaces: [org.apache.flex.core.ISelectionModel] };
 
 
@@ -49,7 +49,7 @@ org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.F
  * @expose
  * @param {Object} value The strand.
  */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
+org.apache.flex.html.beads.models.ArraySelectionModel.prototype.
     set_strand = function(value) {
   this.strand_ = value;
 };
@@ -59,7 +59,7 @@ org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
  * @expose
  * @return {Object} value The dataProvider.
  */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
+org.apache.flex.html.beads.models.ArraySelectionModel.prototype.
     get_dataProvider = function() {
   return this.dataProvider_;
 };
@@ -69,7 +69,7 @@ org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
  * @expose
  * @param {Object} value The dataProvider.
  */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
+org.apache.flex.html.beads.models.ArraySelectionModel.prototype.
     set_dataProvider = function(value) {
   this.dataProvider_ = value;
   this.dispatchEvent('dataProviderChanged');
@@ -80,7 +80,7 @@ org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
  * @expose
  * @return {number} value The selected index.
  */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
+org.apache.flex.html.beads.models.ArraySelectionModel.prototype.
     get_selectedIndex = function() {
   return this.selectedIndex_;
 };
@@ -90,7 +90,7 @@ org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
  * @expose
  * @param {number} value The selected index.
  */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
+org.apache.flex.html.beads.models.ArraySelectionModel.prototype.
     set_selectedIndex = function(value) {
   this.selectedIndex_ = value;
   this.dispatchEvent('selectedIndexChanged');
@@ -101,7 +101,7 @@ org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
  * @expose
  * @return {Object} value The selected item.
  */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
+org.apache.flex.html.beads.models.ArraySelectionModel.prototype.
     get_selectedItem = function() {
   var si;
 
@@ -120,7 +120,7 @@ org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
  * @expose
  * @param {Object} value The selected item.
  */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
+org.apache.flex.html.beads.models.ArraySelectionModel.prototype.
     set_selectedItem = function(value) {
   // find item in dataProvider and set selectedIndex or -1 if not exists
 
@@ -143,7 +143,7 @@ org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
  * @expose
  * @return {String} The name of the field to use as a label.
  */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.get_labelField =
+org.apache.flex.html.beads.models.ArraySelectionModel.prototype.get_labelField =
 function() {
   return this.labelField_;
 };
@@ -153,7 +153,7 @@ function() {
  * @expose
  * @param {String} value The name of the field to use as a label.
  */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.set_labelField =
+org.apache.flex.html.beads.models.ArraySelectionModel.prototype.set_labelField =
 function(value) {
   this.labelField_ = value;
   this.dispatchEvent('labelFieldChanged');

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/DataGridModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/DataGridModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/DataGridModel.js
index 15c0f9a..9de0156 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/DataGridModel.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/DataGridModel.js
@@ -12,19 +12,19 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.models.DataGridModel');
+goog.provide('org.apache.flex.html.beads.models.DataGridModel');
 
 goog.require('org.apache.flex.core.IDataGridModel');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
+goog.require('org.apache.flex.html.beads.models.ArraySelectionModel');
 
 
 
 /**
  * @constructor
- * @extends {org.apache.flex.html.staticControls.beads.models.ArraySelectionModel}
+ * @extends {org.apache.flex.html.beads.models.ArraySelectionModel}
  * @implements {org.apache.flex.core.IDataGridModel}
  */
-org.apache.flex.html.staticControls.beads.models.DataGridModel =
+org.apache.flex.html.beads.models.DataGridModel =
     function() {
   goog.base(this);
 
@@ -33,8 +33,8 @@ org.apache.flex.html.staticControls.beads.models.DataGridModel =
   this.className = 'DataGridModel';
 };
 goog.inherits(
-    org.apache.flex.html.staticControls.beads.models.DataGridModel,
-    org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
+    org.apache.flex.html.beads.models.DataGridModel,
+    org.apache.flex.html.beads.models.ArraySelectionModel);
 
 
 /**
@@ -42,9 +42,9 @@ goog.inherits(
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.beads.models.DataGridModel.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'DataGridModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.DataGridModel' }],
+                qName: 'org.apache.flex.html.beads.models.DataGridModel' }],
       interfaces: [org.apache.flex.core.IDataGridModel] };
 
 
@@ -52,7 +52,7 @@ org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.FLEXJS_
  * @expose
  * @param {Object} value The strand.
  */
-org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.
+org.apache.flex.html.beads.models.DataGridModel.prototype.
     set_strand = function(value) {
   goog.base(this, 'set_strand', value);
   this.strand_ = value;
@@ -63,7 +63,7 @@ org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.
  * @expose
  * @param {Array} value Array of DataGridColumn instances.
  */
-org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.
+org.apache.flex.html.beads.models.DataGridModel.prototype.
     set_columns = function(value) {
   this.columns_ = value;
 };
@@ -73,7 +73,7 @@ org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.
  * @expose
  * @return {Array} Array of DataGridColumn instances.
  */
-org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.
+org.apache.flex.html.beads.models.DataGridModel.prototype.
     get_columns = function() {
   return this.columns_;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ImageModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ImageModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ImageModel.js
index 889a6b7..36b4bf1 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ImageModel.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/ImageModel.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.models.ImageModel');
+goog.provide('org.apache.flex.html.beads.models.ImageModel');
 
 goog.require('org.apache.flex.events.EventDispatcher');
 
@@ -22,12 +22,12 @@ goog.require('org.apache.flex.events.EventDispatcher');
  * @constructor
  * @extends {org.apache.flex.events.EventDispatcher}
  */
-org.apache.flex.html.staticControls.beads.models.ImageModel =
+org.apache.flex.html.beads.models.ImageModel =
     function() {
   goog.base(this);
 };
 goog.inherits(
-    org.apache.flex.html.staticControls.beads.models.ImageModel,
+    org.apache.flex.html.beads.models.ImageModel,
     org.apache.flex.events.EventDispatcher);
 
 
@@ -36,16 +36,16 @@ goog.inherits(
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.beads.models.ImageModel.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'ImageModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.ImageModel'}] };
+                qName: 'org.apache.flex.html.beads.models.ImageModel'}] };
 
 
 /**
  * @expose
  * @param {Object} value The strand.
  */
-org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.
+org.apache.flex.html.beads.models.ImageModel.prototype.
     set_strand = function(value) {
   this.strand_ = value;
 };
@@ -55,7 +55,7 @@ org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.
  * @expose
  * @return {Object} value The image source.
  */
-org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.
+org.apache.flex.html.beads.models.ImageModel.prototype.
     get_source = function() {
   return this.source;
 };
@@ -65,7 +65,7 @@ org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.
  * @expose
  * @param {Object} value The image source.
  */
-org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.
+org.apache.flex.html.beads.models.ImageModel.prototype.
     set_source = function(value) {
   this.source = value;
   this.dispatchEvent('sourceChanged');

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/PanelModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/PanelModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/PanelModel.js
index 04c735d..026efe1 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/PanelModel.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/PanelModel.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.models.PanelModel');
+goog.provide('org.apache.flex.html.beads.models.PanelModel');
 
 goog.require('org.apache.flex.events.EventDispatcher');
 
@@ -22,7 +22,7 @@ goog.require('org.apache.flex.events.EventDispatcher');
  * @constructor
  * @extends {org.apache.flex.events.EventDispatcher}
  */
-org.apache.flex.html.staticControls.beads.models.PanelModel = function() {
+org.apache.flex.html.beads.models.PanelModel = function() {
   goog.base(this);
 
   /**
@@ -41,7 +41,7 @@ org.apache.flex.html.staticControls.beads.models.PanelModel = function() {
    */
   this.showCloseButton_ = false;
 };
-goog.inherits(org.apache.flex.html.staticControls.beads.models.PanelModel,
+goog.inherits(org.apache.flex.html.beads.models.PanelModel,
     org.apache.flex.events.EventDispatcher);
 
 
@@ -50,16 +50,16 @@ goog.inherits(org.apache.flex.html.staticControls.beads.models.PanelModel,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.beads.models.PanelModel.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'PanelModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.PanelModel'}] };
+                qName: 'org.apache.flex.html.beads.models.PanelModel'}] };
 
 
 /**
  * @expose
  * @param {Object} value The strand.
  */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
+org.apache.flex.html.beads.models.PanelModel.prototype.
     set_strand = function(value) {
   this.strand_ = value;
 };
@@ -69,7 +69,7 @@ org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
  * @expose
  * @return {string} The title.
  */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
+org.apache.flex.html.beads.models.PanelModel.prototype.
     get_title = function() {
   return this.title_;
 };
@@ -79,7 +79,7 @@ org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
  * @expose
  * @param {string} value The title to set.
  */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
+org.apache.flex.html.beads.models.PanelModel.prototype.
     set_title = function(value) {
   if (this.title_ != value) {
     this.title_ = value;
@@ -92,7 +92,7 @@ org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
  * @expose
  * @return {string} The HTML title.
  */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
+org.apache.flex.html.beads.models.PanelModel.prototype.
     get_htmlTitle = function() {
   return this.htmlTitle_;
 };
@@ -102,7 +102,7 @@ org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
  * @expose
  * @param {string} value The new HTML title.
  */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
+org.apache.flex.html.beads.models.PanelModel.prototype.
     set_htmlTitle = function(value) {
   if (this.htmlTitle_ != value) {
     this.htmlTitle_ = value;
@@ -116,7 +116,7 @@ org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
  * @return {boolean} Returns true if the close button should appear in
  * the TitleBar.
  */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
+org.apache.flex.html.beads.models.PanelModel.prototype.
     get_showCloseButton = function() {
   return this.showCloseButton_;
 };
@@ -127,7 +127,7 @@ org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
  * @param {boolean} value Determines if the close button shows (true) or
  * not (false).
  */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
+org.apache.flex.html.beads.models.PanelModel.prototype.
     set_showCloseButton = function(value) {
   if (this.showCloseButton_ != value) {
     this.showCloseButton_ = value;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/RangeModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/RangeModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/RangeModel.js
index eeb391b..b3a1231 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/RangeModel.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/RangeModel.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.models.RangeModel');
+goog.provide('org.apache.flex.html.beads.models.RangeModel');
 
 goog.require('org.apache.flex.events.EventDispatcher');
 
@@ -22,7 +22,7 @@ goog.require('org.apache.flex.events.EventDispatcher');
  * @constructor
  * @extends {org.apache.flex.events.EventDispatcher}
  */
-org.apache.flex.html.staticControls.beads.models.RangeModel = function() {
+org.apache.flex.html.beads.models.RangeModel = function() {
   goog.base(this);
 
   this.minimum_ = 0;
@@ -31,7 +31,7 @@ org.apache.flex.html.staticControls.beads.models.RangeModel = function() {
   this.snapInterval_ = 1;
   this.stepSize_ = 1;
 };
-goog.inherits(org.apache.flex.html.staticControls.beads.models.RangeModel,
+goog.inherits(org.apache.flex.html.beads.models.RangeModel,
     org.apache.flex.events.EventDispatcher);
 
 
@@ -40,16 +40,16 @@ goog.inherits(org.apache.flex.html.staticControls.beads.models.RangeModel,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.beads.models.RangeModel.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'RangeModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.RangeModel'}] };
+                qName: 'org.apache.flex.html.beads.models.RangeModel'}] };
 
 
 /**
  * @expose
  * @param {Object} value The strand.
  */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+org.apache.flex.html.beads.models.RangeModel.prototype.
     set_strand = function(value) {
   this.strand_ = value;
 };
@@ -59,7 +59,7 @@ org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
  * @expose
  * @return {number} The current minimum value.
  */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+org.apache.flex.html.beads.models.RangeModel.prototype.
     get_minimum = function() {
   return this.minimum_;
 };
@@ -69,7 +69,7 @@ org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
  * @expose
  * @param {number} value The new minimum value.
  */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+org.apache.flex.html.beads.models.RangeModel.prototype.
     set_minimum = function(value) {
   if (this.minimum_ != value) {
     this.minimum_ = value;
@@ -82,7 +82,7 @@ org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
  * @expose
  * @return {number} The current maximu value.
  */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+org.apache.flex.html.beads.models.RangeModel.prototype.
     get_maximum = function() {
   return this.maximum_;
 };
@@ -92,7 +92,7 @@ org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
  * @expose
  * @param {number} value The new maximum value.
  */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+org.apache.flex.html.beads.models.RangeModel.prototype.
     set_maximum = function(value) {
   if (this.maximum_ != value) {
     this.maximum_ = value;
@@ -105,7 +105,7 @@ org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
  * @expose
  * @return {number} The current value.
  */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+org.apache.flex.html.beads.models.RangeModel.prototype.
     get_value = function() {
   return this.value_;
 };
@@ -115,7 +115,7 @@ org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
  * @expose
  * @param {number} newValue The new value.
  */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+org.apache.flex.html.beads.models.RangeModel.prototype.
     set_value = function(newValue) {
   if (this.value_ != newValue) {
 
@@ -135,7 +135,7 @@ org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
  * @expose
  * @return {number} The current snapInterval value.
  */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+org.apache.flex.html.beads.models.RangeModel.prototype.
     get_snapInterval = function() {
   return this.snapInterval_;
 };
@@ -145,7 +145,7 @@ org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
  * @expose
  * @param {number} value The new snapInterval value.
  */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+org.apache.flex.html.beads.models.RangeModel.prototype.
     set_snapInterval = function(value) {
   if (this.snapInterval_ != value) {
     this.snapInterval_ = value;
@@ -158,7 +158,7 @@ org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
  * @expose
  * @return {number} The current stepSize value.
  */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+org.apache.flex.html.beads.models.RangeModel.prototype.
     get_stepSize = function() {
   return this.stepSize_;
 };
@@ -168,7 +168,7 @@ org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
  * @expose
  * @param {number} value The new stepSize value.
  */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+org.apache.flex.html.beads.models.RangeModel.prototype.
     set_stepSize = function(value) {
   if (this.stepSize_ != value) {
     this.stepSize_ = value;
@@ -182,7 +182,7 @@ org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
  * @param {number} value The candidate number.
  * @return {number} Adjusted value.
  */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
+org.apache.flex.html.beads.models.RangeModel.prototype.
     snap = function(value) {
   var si = this.snapInterval_;
   var n = Math.round((value - this.minimum_) / si) *

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/TitleBarModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/TitleBarModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/TitleBarModel.js
index 8d9b64d..35d006d 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/TitleBarModel.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/models/TitleBarModel.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.models.TitleBarModel');
+goog.provide('org.apache.flex.html.beads.models.TitleBarModel');
 
 goog.require('org.apache.flex.events.EventDispatcher');
 
@@ -22,7 +22,7 @@ goog.require('org.apache.flex.events.EventDispatcher');
  * @constructor
  * @extends {org.apache.flex.events.EventDispatcher}
  */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel = function() {
+org.apache.flex.html.beads.models.TitleBarModel = function() {
   goog.base(this);
 
   /**
@@ -41,7 +41,7 @@ org.apache.flex.html.staticControls.beads.models.TitleBarModel = function() {
    */
   this.showCloseButton_ = false;
 };
-goog.inherits(org.apache.flex.html.staticControls.beads.models.TitleBarModel,
+goog.inherits(org.apache.flex.html.beads.models.TitleBarModel,
     org.apache.flex.events.EventDispatcher);
 
 
@@ -50,16 +50,16 @@ goog.inherits(org.apache.flex.html.staticControls.beads.models.TitleBarModel,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.beads.models.TitleBarModel.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'RangeModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.TitleBarModel'}] };
+                qName: 'org.apache.flex.html.beads.models.TitleBarModel'}] };
 
 
 /**
  * @expose
  * @param {Object} value The strand.
  */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
+org.apache.flex.html.beads.models.TitleBarModel.prototype.
     set_strand = function(value) {
   this.strand_ = value;
 };
@@ -69,7 +69,7 @@ org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
  * @expose
  * @return {string} The title.
  */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
+org.apache.flex.html.beads.models.TitleBarModel.prototype.
     get_title = function() {
   return this.title_;
 };
@@ -79,7 +79,7 @@ org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
  * @expose
  * @param {string} value The title to set.
  */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
+org.apache.flex.html.beads.models.TitleBarModel.prototype.
     set_title = function(value) {
   if (this.title_ != value) {
     this.title_ = value;
@@ -92,7 +92,7 @@ org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
  * @expose
  * @return {string} The HTML title.
  */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
+org.apache.flex.html.beads.models.TitleBarModel.prototype.
     get_htmlTitle = function() {
   return this.htmlTitle_;
 };
@@ -102,7 +102,7 @@ org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
  * @expose
  * @param {string} value The new HTML title.
  */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
+org.apache.flex.html.beads.models.TitleBarModel.prototype.
     set_htmlTitle = function(value) {
   if (this.htmlTitle_ != value) {
     this.htmlTitle_ = value;
@@ -116,7 +116,7 @@ org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
  * @return {boolean} Returns true if the close button should appear in
  * the TitleBar.
  */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
+org.apache.flex.html.beads.models.TitleBarModel.prototype.
     get_showCloseButton = function() {
   return this.showCloseButton_;
 };
@@ -127,7 +127,7 @@ org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
  * @param {boolean} value Determines if the close button shows (true) or
  * not (false).
  */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
+org.apache.flex.html.beads.models.TitleBarModel.prototype.
     set_showCloseButton = function(value) {
   if (this.showCloseButton_ != value) {
     this.showCloseButton_ = value;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.js
index ff85b7a..a16fd65 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.js
@@ -12,25 +12,25 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer');
+goog.provide('org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer');
 
-goog.require('org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController');
-goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
+goog.require('org.apache.flex.html.beads.controllers.ItemRendererMouseController');
+goog.require('org.apache.flex.html.supportClasses.DataItemRenderer');
 
 
 
 /**
  * @constructor
- * @extends {org.apache.flex.html.staticControls.supportClasses.DataItemRenderer}
+ * @extends {org.apache.flex.html.supportClasses.DataItemRenderer}
  */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer =
+org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer =
     function() {
   goog.base(this);
 };
 goog.inherits(
-    org.apache.flex.html.staticControls.
+    org.apache.flex.html.
         supportClasses.ButtonBarButtonItemRenderer,
-    org.apache.flex.html.staticControls.supportClasses.DataItemRenderer);
+    org.apache.flex.html.supportClasses.DataItemRenderer);
 
 
 /**
@@ -38,15 +38,15 @@ goog.inherits(
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'ButtonBarButtonItemRenderer',
-                qName: 'org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer' }] };
+                qName: 'org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer' }] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
+org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer.
     prototype.createElement = function() {
 
   this.element = document.createElement('div');
@@ -62,7 +62,7 @@ org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
   // the selection and highlight
   this.backgroundView = this.element;
 
-  this.controller = new org.apache.flex.html.staticControls.beads.controllers.
+  this.controller = new org.apache.flex.html.beads.controllers.
       ItemRendererMouseController();
   this.controller.set_strand(this);
 
@@ -74,7 +74,7 @@ org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
  * @expose
  * @param {Object} value The strand.
  */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
+org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer.
     prototype.set_strand = function(value) {
 
   this.strand_ = value;
@@ -85,7 +85,7 @@ org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
  * @expose
  * @return {Object} The strand.
  */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
+org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer.
     prototype.get_strand = function() {
   return this.strand_;
 };
@@ -95,7 +95,7 @@ org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
  * @expose
  * @param {Object} value The text to display.
  */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
+org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer.
     prototype.set_data = function(value) {
 
   goog.base(this, 'set_data', value);

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataGridColumn.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataGridColumn.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataGridColumn.js
index 8b59a9b..46aec00 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataGridColumn.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataGridColumn.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.supportClasses.DataGridColumn');
+goog.provide('org.apache.flex.html.supportClasses.DataGridColumn');
 
 goog.require('mx.core.IFactory');
 
@@ -21,7 +21,7 @@ goog.require('mx.core.IFactory');
 /**
  * @constructor
  */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn =
+org.apache.flex.html.supportClasses.DataGridColumn =
     function() {
 };
 
@@ -30,7 +30,7 @@ org.apache.flex.html.staticControls.supportClasses.DataGridColumn =
  * @expose
  * @return {mx.core.IFactory} The object factory for the itemRenderer.
  */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_itemRenderer =
+org.apache.flex.html.supportClasses.DataGridColumn.prototype.get_itemRenderer =
 function() {
   return this.itemRenderer_;
 };
@@ -40,7 +40,7 @@ function() {
  * @expose
  * @param {mx.core.IFactory} value The object factory for the itemRenderer.
  */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_itemRenderer =
+org.apache.flex.html.supportClasses.DataGridColumn.prototype.set_itemRenderer =
 function(value) {
   this.itemRenderer_ = value;
 };
@@ -50,7 +50,7 @@ function(value) {
  * @expose
  * @return {Number} The width of the column.
  */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_columnWidth =
+org.apache.flex.html.supportClasses.DataGridColumn.prototype.get_columnWidth =
 function() {
   return this.columnWidth_;
 };
@@ -60,7 +60,7 @@ function() {
  * @expose
  * @param {Number} value The width of the column.
  */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_columnWidth =
+org.apache.flex.html.supportClasses.DataGridColumn.prototype.set_columnWidth =
 function(value) {
   this.columnWidth_ = value;
 };
@@ -70,7 +70,7 @@ function(value) {
  * @expose
  * @return {String} The label for the column.
  */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_label =
+org.apache.flex.html.supportClasses.DataGridColumn.prototype.get_label =
 function() {
   return this.label_;
 };
@@ -80,7 +80,7 @@ function() {
  * @expose
  * @param {String} value The label for the column.
  */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_label =
+org.apache.flex.html.supportClasses.DataGridColumn.prototype.set_label =
 function(value) {
   this.label_ = value;
 };
@@ -90,7 +90,7 @@ function(value) {
  * @expose
  * @return {String} The field for the data for the column.
  */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_dataField =
+org.apache.flex.html.supportClasses.DataGridColumn.prototype.get_dataField =
 function() {
   return this.dataField_;
 };
@@ -100,7 +100,7 @@ function() {
  * @expose
  * @param {String} value The field for the data for the column.
  */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_dataField =
+org.apache.flex.html.supportClasses.DataGridColumn.prototype.set_dataField =
 function(value) {
   this.dataField_ = value;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataItemRenderer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataItemRenderer.js
index 48d8c4f..c39a64d 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataItemRenderer.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataItemRenderer.js
@@ -12,26 +12,26 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
+goog.provide('org.apache.flex.html.supportClasses.DataItemRenderer');
 
 goog.require('org.apache.flex.core.IItemRenderer');
-goog.require('org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController');
-goog.require('org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase');
+goog.require('org.apache.flex.html.beads.controllers.ItemRendererMouseController');
+goog.require('org.apache.flex.html.supportClasses.UIItemRendererBase');
 
 
 
 /**
  * @constructor
- * @extends {org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase}
+ * @extends {org.apache.flex.html.supportClasses.UIItemRendererBase}
  * @implements {org.apache.flex.core.IItemRenderer}
  */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer =
+org.apache.flex.html.supportClasses.DataItemRenderer =
     function() {
   goog.base(this);
 };
 goog.inherits(
-    org.apache.flex.html.staticControls.supportClasses.DataItemRenderer,
-    org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase);
+    org.apache.flex.html.supportClasses.DataItemRenderer,
+    org.apache.flex.html.supportClasses.UIItemRendererBase);
 
 
 /**
@@ -39,17 +39,17 @@ goog.inherits(
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+org.apache.flex.html.supportClasses.DataItemRenderer.
     prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'DataItemRenderer',
-                qName: 'org.apache.flex.html.staticControls.supportClasses.DataItemRenderer' }],
+                qName: 'org.apache.flex.html.supportClasses.DataItemRenderer' }],
       interfaces: [org.apache.flex.core.IItemRenderer] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+org.apache.flex.html.supportClasses.DataItemRenderer.
     prototype.createElement = function() {
 
   this.element = document.createElement('div');
@@ -62,7 +62,7 @@ org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
   // the selection and highlight
   this.backgroundView = this.element;
 
-  this.controller = new org.apache.flex.html.staticControls.beads.controllers.
+  this.controller = new org.apache.flex.html.beads.controllers.
       ItemRendererMouseController();
   this.controller.set_strand(this);
 
@@ -74,7 +74,7 @@ org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
  * @expose
  * @return {Object} The item renderer's parent.
  */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+org.apache.flex.html.supportClasses.DataItemRenderer.
     prototype.get_itemRendererParent = function() {
   return this.rendererParent_;
 };
@@ -84,7 +84,7 @@ org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
  * @expose
  * @param {Object} value The item renderer's parent.
  */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+org.apache.flex.html.supportClasses.DataItemRenderer.
     prototype.set_itemRendererParent = function(value) {
   this.rendererParent_ = value;
 };
@@ -94,7 +94,7 @@ org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
  * @expose
  * @param {Object} value The renderer's index.
  */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+org.apache.flex.html.supportClasses.DataItemRenderer.
     prototype.set_index = function(value) {
   this.index_ = value;
 };
@@ -104,7 +104,7 @@ org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
  * @expose
  * @param {string} value The name of field to use.
  */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+org.apache.flex.html.supportClasses.DataItemRenderer.
     prototype.set_dataField = function(value) {
 
   this.dataField_ = value;
@@ -115,7 +115,7 @@ org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
  * @expose
  * @return {string} The name of the field to use.
  */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+org.apache.flex.html.supportClasses.DataItemRenderer.
     prototype.get_dataField = function() {
 
   return this.dataField_;
@@ -126,7 +126,7 @@ org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
  * @override
  * @param {Boolean} value The selection state.
  */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+org.apache.flex.html.supportClasses.DataItemRenderer.
     prototype.set_selected = function(value) {
   this.selected_ = value;
 
@@ -142,7 +142,7 @@ org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
  * @override
  * @param {Boolean} value The hovered state.
  */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
+org.apache.flex.html.supportClasses.DataItemRenderer.
     prototype.set_hovered = function(value) {
   this.hovered_ = value;
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js
index 83fb799..4f82ec1 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js
@@ -12,10 +12,10 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup');
+goog.provide('org.apache.flex.html.supportClasses.NonVirtualDataGroup');
 
 goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
+goog.require('org.apache.flex.html.supportClasses.DataItemRenderer');
 goog.require('org.apache.flex.utils.Language');
 
 
@@ -24,13 +24,13 @@ goog.require('org.apache.flex.utils.Language');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup =
+org.apache.flex.html.supportClasses.NonVirtualDataGroup =
     function() {
   this.renderers = [];
   goog.base(this);
 };
 goog.inherits(
-    org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup,
+    org.apache.flex.html.supportClasses.NonVirtualDataGroup,
     org.apache.flex.core.UIBase);
 
 
@@ -39,16 +39,16 @@ goog.inherits(
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.supportClasses.NonVirtualDataGroup.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'NonVirtualDataGroup',
-                qName: 'org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup' }] };
+                qName: 'org.apache.flex.html.supportClasses.NonVirtualDataGroup' }] };
 
 
 /**
  * @expose
  * @param {Object} value The strand.
  */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
+org.apache.flex.html.supportClasses.NonVirtualDataGroup.
     prototype.set_strand = function(value) {
   this.strand_ = value;
 };
@@ -57,7 +57,7 @@ org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
 /**
  * @override
  */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
+org.apache.flex.html.supportClasses.NonVirtualDataGroup.
     prototype.createElement = function() {
   this.element = document.createElement('div');
   this.element.style.overflow = 'auto';
@@ -76,12 +76,12 @@ org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
  * @override
  * @param {Object} value The child element being added.
  */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
+org.apache.flex.html.supportClasses.NonVirtualDataGroup.
     prototype.addElement = function(value) {
   goog.base(this, 'addElement', value);
 
   var itemRenderer = org.apache.flex.utils.Language.as(value,
-                           org.apache.flex.html.staticControls.supportClasses.DataItemRenderer);
+                           org.apache.flex.html.supportClasses.DataItemRenderer);
   itemRenderer.set_index(this.renderers.length);
   itemRenderer.set_itemRendererParent(this);
   this.renderers.push(value);
@@ -91,7 +91,7 @@ org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
 /**
  * @expose
  */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
+org.apache.flex.html.supportClasses.NonVirtualDataGroup.
     prototype.removeAllElements = function() {
     // to do
 };
@@ -102,7 +102,7 @@ org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
  * @param {Object} index The index for the itemRenderer.
  * @return {Object} The itemRenderer that matches the index.
  */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
+org.apache.flex.html.supportClasses.NonVirtualDataGroup.
     prototype.getItemRendererForIndex = function(index) {
   return this.renderers[index];
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js
index c19729e..662d926 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js
@@ -12,27 +12,27 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.supportClasses.StringItemRenderer');
+goog.provide('org.apache.flex.html.supportClasses.StringItemRenderer');
 
 goog.require('org.apache.flex.core.IItemRenderer');
 goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController');
-goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
+goog.require('org.apache.flex.html.beads.controllers.ItemRendererMouseController');
+goog.require('org.apache.flex.html.supportClasses.DataItemRenderer');
 
 
 
 /**
  * @constructor
- * @extends {org.apache.flex.html.staticControls.supportClasses.DataItemRenderer}
+ * @extends {org.apache.flex.html.supportClasses.DataItemRenderer}
  * @implements {org.apache.flex.core.IItemRenderer}
  */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer =
+org.apache.flex.html.supportClasses.StringItemRenderer =
     function() {
   goog.base(this);
 };
 goog.inherits(
-    org.apache.flex.html.staticControls.supportClasses.StringItemRenderer,
-    org.apache.flex.html.staticControls.supportClasses.DataItemRenderer);
+    org.apache.flex.html.supportClasses.StringItemRenderer,
+    org.apache.flex.html.supportClasses.DataItemRenderer);
 
 
 /**
@@ -40,17 +40,17 @@ goog.inherits(
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+org.apache.flex.html.supportClasses.StringItemRenderer.
     prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'StringItemRenderer',
-                qName: 'org.apache.flex.html.staticControls.supportClasses.StringItemRenderer' }],
+                qName: 'org.apache.flex.html.supportClasses.StringItemRenderer' }],
       interfaces: [org.apache.flex.core.IItemRenderer] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+org.apache.flex.html.supportClasses.StringItemRenderer.
     prototype.createElement = function() {
 
   this.element = document.createElement('div');
@@ -63,7 +63,7 @@ org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
   // the selection and highlight
   this.backgroundView = this.element;
 
-  this.controller = new org.apache.flex.html.staticControls.beads.controllers.
+  this.controller = new org.apache.flex.html.beads.controllers.
       ItemRendererMouseController();
   this.controller.set_strand(this);
 
@@ -75,7 +75,7 @@ org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
  * @expose
  * @param {Object} value The strand.
  */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+org.apache.flex.html.supportClasses.StringItemRenderer.
     prototype.set_strand = function(value) {
 
   this.strand_ = value;
@@ -86,7 +86,7 @@ org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
  * @expose
  * @return {Object} The strand.
  */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+org.apache.flex.html.supportClasses.StringItemRenderer.
     prototype.get_strand = function() {
   return this.strand_;
 };
@@ -96,7 +96,7 @@ org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
  * @expose
  * @return {Object} The item renderer's parent.
  */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+org.apache.flex.html.supportClasses.StringItemRenderer.
     prototype.get_itemRendererParent = function() {
   return this.rendererParent_;
 };
@@ -106,7 +106,7 @@ org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
  * @expose
  * @param {Object} value The item renderer's parent.
  */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+org.apache.flex.html.supportClasses.StringItemRenderer.
     prototype.set_itemRendererParent = function(value) {
   this.rendererParent_ = value;
 };
@@ -116,7 +116,7 @@ org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
  * @expose
  * @param {Object} value The renderer's index.
  */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+org.apache.flex.html.supportClasses.StringItemRenderer.
     prototype.set_index = function(value) {
   this.index_ = value;
 };
@@ -126,7 +126,7 @@ org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
  * @expose
  * @param {Object} value The text to display.
  */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+org.apache.flex.html.supportClasses.StringItemRenderer.
     prototype.set_text = function(value) {
 
   this.element.innerHTML = value;
@@ -137,7 +137,7 @@ org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
  * @expose
  * @return {Object} The text being displayed.
  */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+org.apache.flex.html.supportClasses.StringItemRenderer.
     prototype.get_text = function() {
 
   return this.element.innerHTML;
@@ -148,7 +148,7 @@ org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
  * @expose
  * @param {Object} value The text to display.
  */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+org.apache.flex.html.supportClasses.StringItemRenderer.
     prototype.set_data = function(value) {
 
   goog.base(this, 'set_data', value);
@@ -171,7 +171,7 @@ org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
  * @expose
  * @return {Object} The text being displayed.
  */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
+org.apache.flex.html.supportClasses.StringItemRenderer.
     prototype.get_data = function() {
 
   return this.element.innerHTML;


[17/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ComboBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ComboBoxView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ComboBoxView.as
new file mode 100644
index 0000000..f959cd4
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ComboBoxView.as
@@ -0,0 +1,248 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	import flash.display.DisplayObjectContainer;
+	import flash.display.Sprite;
+	
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IComboBoxModel;
+	import org.apache.flex.core.IPopUpHost;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.ValuesManager;
+    import org.apache.flex.core.IParent;
+	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.TextInput;
+	
+	/**
+	 *  The ComboBoxView class creates the visual elements of the org.apache.flex.html.staticControls.ComboBox 
+	 *  component. The job of the view bead is to put together the parts of the ComboBox such as the TextInput
+	 *  control and org.apache.flex.html.staticControls.Button to trigger the pop-up.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ComboBoxView implements IBeadView, IComboBoxView
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ComboBoxView()
+		{
+		}
+		
+		private var textInput:TextInput;
+		private var button:Button;
+		private var selectionModel:IComboBoxModel;
+		
+		/**
+		 *  The value of the TextInput component of the ComboBox.
+		 * 
+		 *  @copy org.apache.flex.html.staticControls.beads.IComboBoxView#text
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get text():String
+		{
+			return textInput.text;
+		}
+		public function set text(value:String):void
+		{
+			textInput.text = value;
+		}
+		
+		/**
+		 *  The HTML value of the TextInput component of the ComboBox.
+		 * 
+		 *  @copy org.apache.flex.html.staticControls.beads.IComboBoxView#html
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get html():String
+		{
+			return textInput.html;
+		}
+		public function set html(value:String):void
+		{
+			textInput.html = value;
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get strand():IStrand
+		{
+			return _strand;
+		}
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+        
+			selectionModel = value.getBeadByType(IComboBoxModel) as IComboBoxModel;
+			selectionModel.addEventListener("selectedIndexChanged", selectionChangeHandler);
+            
+			textInput = new TextInput();
+			IParent(strand).addElement(textInput);
+			textInput.width = 100;
+			textInput.height = 18;
+			
+			upSprite = new Sprite();
+			drawButton( upSprite, "up", 18, 18 );
+			overSprite = new Sprite();
+			drawButton( overSprite, "over", 18, 18 );
+			downSprite = new Sprite();
+			drawButton( downSprite, "down", 18, 18 );
+			
+			button = new Button();
+            button.upState = upSprite;
+            button.overState = overSprite;
+            button.downState = downSprite;
+			DisplayObjectContainer(strand).addChild(button);
+			button.width = 18;
+			button.height = 18;
+			button.x = textInput.width;
+			button.y = textInput.y;
+			
+			// listen for events on the text input and modify the list and selection
+			textInput.addEventListener("change", textChangeHandler,false,0,true);
+		}
+		
+		private var upSprite:Sprite;
+		private var overSprite:Sprite;
+		private var downSprite:Sprite;
+		
+		/**
+		 * @private
+		 */
+		private function drawButton( sprite:Sprite, mode:String, width:Number, height:Number ) : void
+		{
+			sprite.graphics.clear();
+			sprite.graphics.lineStyle(1,0xFFFFFF);
+			sprite.graphics.drawRect(0, 0, width-1, height-1);
+			sprite.graphics.lineStyle(-1);
+			
+			if( mode == "over" ) sprite.graphics.beginFill(0xCCCCCC);
+			else if( mode == "down" ) sprite.graphics.beginFill(0x888888);
+			sprite.graphics.drawRect(0, 0, width-1, height-1);
+			sprite.graphics.endFill();
+			
+			sprite.graphics.beginFill(0x333333);
+			sprite.graphics.moveTo(4,4);
+			sprite.graphics.lineTo(width-4,4);
+			sprite.graphics.lineTo(int(width/2),height-4);
+			sprite.graphics.lineTo(4,4);
+			sprite.graphics.endFill();
+		}
+		
+		private var _popUp:IStrand;
+		
+		/**
+		 *  The pop-up component that holds the selection list.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get popUp():IStrand
+		{
+			return _popUp;
+		}
+		
+		private var _popUpVisible:Boolean;
+		
+		/**
+		 *  This property is true if the pop-up selection list is currently visible.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get popUpVisible():Boolean
+		{
+			return _popUpVisible;
+		}
+		public function set popUpVisible(value:Boolean):void
+		{
+			if (value != _popUpVisible)
+			{
+				_popUpVisible = value;
+				if (value)
+				{
+					if (!_popUp)
+					{
+						var popUpClass:Class = ValuesManager.valuesImpl.getValue(_strand, "iPopUp") as Class;
+						_popUp = new popUpClass() as IStrand;
+					}
+					var root:Object = DisplayObject(_strand).root;
+					var host:DisplayObjectContainer = DisplayObject(_strand).parent;
+					while (host && !(host is IPopUpHost))
+						host = host.parent;
+                    if (host)
+    					IPopUpHost(host).addElement(popUp);
+				}
+				else
+				{
+					DisplayObject(_popUp).parent.removeChild(_popUp as DisplayObject);                    
+				}
+			}
+		}
+		
+		/**
+		 * @private
+		 */
+		private function selectionChangeHandler(event:Event):void
+		{
+			text = selectionModel.selectedItem.toString();
+		}
+		
+		/**
+		 * @private
+		 */
+		private function textChangeHandler(event:Event):void
+		{	
+			var newEvent:Event = new Event("change");
+			IEventDispatcher(strand).dispatchEvent(newEvent);
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as
new file mode 100644
index 0000000..67f1458
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as
@@ -0,0 +1,253 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	import flash.display.DisplayObjectContainer;
+	
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.ILayoutParent;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.html.staticControls.Container;
+	import org.apache.flex.html.staticControls.supportClasses.Border;
+	import org.apache.flex.html.staticControls.supportClasses.ContainerContentArea;
+	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
+	
+    /**
+     *  The ContainerView class is the default view for
+     *  the org.apache.flex.html.staticControls.Container class.
+     *  It lets you use some CSS styles to manage the border, background
+     *  and padding around the content area.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class ContainerView implements IBeadView, ILayoutParent
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function ContainerView()
+		{
+		}
+		
+        /**
+         *  The actual parent that parents the children.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */        
+		protected var actualParent:DisplayObjectContainer;
+				
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			var backgroundColor:Object = ValuesManager.valuesImpl.getValue(value, "background-color");
+			var backgroundImage:Object = ValuesManager.valuesImpl.getValue(value, "background-image");
+			if (backgroundColor != null || backgroundImage != null)
+			{
+				if (value.getBeadByType(IBackgroundBead) == null)
+					value.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBackgroundBead")) as IBead);					
+			}
+			
+			var borderStyle:String;
+			var borderStyles:Object = ValuesManager.valuesImpl.getValue(value, "border");
+			if (borderStyles is Array)
+			{
+				borderStyle = borderStyles[1];
+			}
+			if (borderStyle == null)
+			{
+				borderStyle = ValuesManager.valuesImpl.getValue(value, "border-style") as String;
+			}
+			if (borderStyle != null && borderStyle != "none")
+			{
+				if (value.getBeadByType(IBorderBead) == null)
+					value.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBorderBead")) as IBead);	
+			}
+			
+			var padding:Object = determinePadding();
+			
+			if (contentAreaNeeded())
+			{
+				actualParent = new ContainerContentArea();
+				DisplayObjectContainer(value).addChild(actualParent);
+				Container(value).setActualParent(actualParent);
+				actualParent.x = padding.paddingLeft;
+				actualParent.y = padding.paddingTop;
+			}
+			else
+			{
+				actualParent = value as UIBase;
+			}
+		}
+		
+		/**
+		 *  Determines the top and left padding values, if any, as set by
+		 *  padding style values. This includes "padding" for all padding values
+		 *  as well as "padding-left" and "padding-top".
+		 * 
+		 *  Returns an object with paddingLeft and paddingTop properties.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		protected function determinePadding():Object
+		{
+			var paddingLeft:Object;
+			var paddingTop:Object;
+			var padding:Object = ValuesManager.valuesImpl.getValue(_strand, "padding");
+			if (padding is Array)
+			{
+				if (padding.length == 1)
+					paddingLeft = paddingTop = padding[0];
+				else if (padding.length <= 3)
+				{
+					paddingLeft = padding[1];
+					paddingTop = padding[0];
+				}
+				else if (padding.length == 4)
+				{
+					paddingLeft = padding[3];
+					paddingTop = padding[0];					
+				}
+			}
+			else if (padding == null)
+			{
+				paddingLeft = ValuesManager.valuesImpl.getValue(_strand, "padding-left");
+				paddingTop = ValuesManager.valuesImpl.getValue(_strand, "padding-top");
+			}
+			else
+			{
+				paddingLeft = paddingTop = padding;
+			}
+			var pl:Number = Number(paddingLeft);
+			var pt:Number = Number(paddingTop);
+			
+			return {paddingLeft:pl, paddingTop:pt};
+		}
+		
+		/**
+		 *  Returns true if container to create a separate ContainerContentArea.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		protected function contentAreaNeeded():Boolean
+		{
+			var padding:Object = determinePadding();
+			
+			return (!isNaN(padding.paddingLeft) && padding.paddingLeft > 0 ||
+				    !isNaN(padding.paddingTop) && padding.paddingTop > 0);
+		}
+		
+        /**
+         *  The parent of the children.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get contentView():DisplayObjectContainer
+		{
+			return actualParent;
+		}
+		
+        /**
+         *  The border.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get border():Border
+		{
+			return null;
+		}
+		
+        /**
+         *  The host component, which can resize to different slots.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get resizableView():DisplayObject
+		{
+			return _strand as DisplayObject;
+		}
+		
+        /**
+         *  The vertical ScrollBar, if it exists.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get vScrollBar():ScrollBar
+		{
+			return null;
+		}
+		
+        /**
+         *  The horizontal ScrollBar, if it exists.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get hScrollBar():ScrollBar
+		{
+			return null;
+		}
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ControlBarMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ControlBarMeasurementBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ControlBarMeasurementBead.as
new file mode 100644
index 0000000..8dcbf6d
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ControlBarMeasurementBead.as
@@ -0,0 +1,116 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObjectContainer;
+	
+	import org.apache.flex.core.IMeasurementBead;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.IUIBase;
+	import org.apache.flex.html.staticControls.Container;
+	
+	/**
+	 *  The ControlBarMeasurementBead class measures the size of a org.apache.flex.html.staticControls.ControlBar
+	 *  component.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ControlBarMeasurementBead implements IMeasurementBead
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ControlBarMeasurementBead()
+		{
+		}
+		
+		/**
+		 *  Returns the overall width of the ControlBar.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get measuredWidth():Number
+		{
+			// Note: the measurement should problably be done by the ControlBar's layout manager bead
+			// since it would know the arrangement of the items and how far apart they are and if
+			// there are margins and paddings and gaps involved.
+			var mwidth:Number = 0;
+			var children:Array = Container(_strand).getChildren();
+			var n:int = children.length;
+			for(var i:int=0; i < n; i++) {
+				var child:IUIBase = children[i] as IUIBase;
+				if( child == null ) continue;
+				var childMeasure:IMeasurementBead = child.getBeadByType(IMeasurementBead) as IMeasurementBead;
+                if (childMeasure)
+    				mwidth += childMeasure.measuredWidth;
+			}
+			return mwidth;
+		}
+		
+		/**
+		 *  Returns the overall height of the ControlBar.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get measuredHeight():Number
+		{
+			// Note: the measurement should problably be done by the ControlBar's layout manager bead
+			// since it would know the arrangement of the items and how far apart they are and if
+			// there are margins and paddings and gaps involved.
+			var mheight:Number = 0;
+			var n:int = DisplayObjectContainer(_strand).numChildren;
+			for(var i:int=0; i < n; i++) {
+				var child:IUIBase = DisplayObjectContainer(_strand).getChildAt(i) as IUIBase;
+				if( child == null ) continue;
+				var childMeasure:IMeasurementBead = child.getBeadByType(IMeasurementBead) as IMeasurementBead;
+				mheight += childMeasure.measuredHeight;
+			}
+			return mheight;
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
new file mode 100644
index 0000000..565c8df
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
@@ -0,0 +1,143 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IDataProviderItemRendererMapper;
+	import org.apache.flex.core.IItemRenderer;
+	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.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	
+    /**
+     *  The DataItemRendererFactoryForArrayData class reads an
+     *  array of data and creates an item renderer for every
+     *  item in the array.  Other implementations of
+     *  IDataProviderItemRendererMapper map different data 
+     *  structures or manage a virtual set of renderers.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class DataItemRendererFactoryForArrayData implements IBead, IDataProviderItemRendererMapper
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function DataItemRendererFactoryForArrayData()
+		{
+		}
+		
+		private var selectionModel:ISelectionModel;
+		
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			selectionModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
+			var listView:IListView = value.getBeadByType(IListView) as IListView;
+			dataGroup = listView.dataGroup;
+			selectionModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
+			
+			if (!itemRendererFactory)
+			{
+				_itemRendererFactory = new (ValuesManager.valuesImpl.getValue(_strand, "iItemRendererClassFactory")) as IItemRendererClassFactory;
+				_strand.addBead(_itemRendererFactory);
+			}
+			
+			dataProviderChangeHandler(null);
+		}
+		
+		private var _itemRendererFactory:IItemRendererClassFactory;
+		
+        /**
+         *  The org.apache.flex.core.IItemRendererClassFactory used 
+         *  to generate instances of item renderers.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get itemRendererFactory():IItemRendererClassFactory
+		{
+			return _itemRendererFactory;
+		}
+		
+        /**
+         *  @private
+         */
+		public function set itemRendererFactory(value:IItemRendererClassFactory):void
+		{
+			_itemRendererFactory = value;
+		}
+		
+        /**
+         *  The org.apache.flex.core.IItemRendererParent that will
+         *  parent the item renderers.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		protected var dataGroup:IItemRendererParent;
+		
+		private function dataProviderChangeHandler(event:Event):void
+		{
+			var dp:Array = selectionModel.dataProvider as Array;
+			if (!dp)
+				return;
+			
+			dataGroup.removeAllElements();
+			
+			var n:int = dp.length; 
+			for (var i:int = 0; i < n; i++)
+			{
+				var ir:IItemRenderer = itemRendererFactory.createItemRenderer(dataGroup) as IItemRenderer;
+				ir.index = i;
+				ir.labelField = selectionModel.labelField;
+				dataGroup.addElement(ir);
+				ir.data = dp[i];
+			}
+			
+			IEventDispatcher(_strand).dispatchEvent(new Event("itemsCreated"));
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DownArrowButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DownArrowButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DownArrowButtonView.as
new file mode 100644
index 0000000..3be7ed6
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DownArrowButtonView.as
@@ -0,0 +1,103 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.Graphics;
+	import flash.display.Shape;
+	import flash.display.SimpleButton;
+
+	import org.apache.flex.core.IStrand;
+    import org.apache.flex.core.IBeadView;
+	
+    /**
+     *  The DownArrowButtonView class is the view for
+     *  the down arrow button in a ScrollBar and other controls.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class DownArrowButtonView implements IBeadView
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function DownArrowButtonView()
+		{
+			upView = new Shape();
+			downView = new Shape();
+			overView = new Shape();
+
+			drawView(upView.graphics, 0xCCCCCC);
+			drawView(downView.graphics, 0x808080);
+			drawView(overView.graphics, 0xEEEEEE);
+		}
+		
+		private function drawView(g:Graphics, bgColor:uint):void
+		{
+			g.lineStyle(1);
+			g.beginFill(bgColor);
+			g.drawRect(0, 0, 16, 16);
+			g.endFill();
+			g.lineStyle(0);
+			g.beginFill(0);
+			g.moveTo(4, 4);
+			g.lineTo(12, 4);
+			g.lineTo(8, 12);
+			g.lineTo(4, 4);
+			g.endFill();
+		}
+		
+		private var _strand:IStrand;
+		
+		private var shape:Shape;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			shape = new Shape();
+			shape.graphics.beginFill(0xCCCCCC);
+			shape.graphics.drawRect(0, 0, 16, 16);
+			shape.graphics.endFill();
+			SimpleButton(value).upState = upView;
+			SimpleButton(value).downState = downView;
+			SimpleButton(value).overState = overView;
+			SimpleButton(value).hitTestState = shape;
+		}
+				
+		private var upView:Shape;
+		private var downView:Shape;
+		private var overView:Shape;
+        
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DropDownListView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DropDownListView.as
new file mode 100644
index 0000000..0849c7a
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/DropDownListView.as
@@ -0,0 +1,283 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	import flash.display.DisplayObjectContainer;
+	import flash.display.Graphics;
+	import flash.display.Shape;
+	import flash.display.SimpleButton;
+	import flash.display.Sprite;
+	import flash.text.TextFieldType;
+	
+	import org.apache.flex.core.CSSTextField;
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IPopUpHost;
+	import org.apache.flex.core.ISelectionModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.IPopUpHost;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+
+    /**
+     *  The DropDownListView class is the default view for
+     *  the org.apache.flex.html.staticControls.DropDownList class.
+     *  It displays a simple text label with what appears to be a
+     *  down arrow button on the right, but really, the entire
+     *  view is the button that will display or dismiss the dropdown.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class DropDownListView implements IDropDownListView, IBeadView
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function DropDownListView()
+		{
+            upSprite = new Sprite();
+            downSprite = new Sprite();
+            overSprite = new Sprite();
+			upTextField = new CSSTextField();
+			downTextField = new CSSTextField();
+			overTextField = new CSSTextField();
+            upSprite.addChild(upTextField);
+            overSprite.addChild(overTextField);
+            downSprite.addChild(downTextField);
+			upTextField.border = true;
+			downTextField.border = true;
+			overTextField.border = true;
+			upTextField.background = true;
+			downTextField.background = true;
+			overTextField.background = true;
+			upTextField.borderColor = 0;
+			downTextField.borderColor = 0;
+			overTextField.borderColor = 0;
+			upTextField.backgroundColor = 0xEEEEEE;
+			downTextField.backgroundColor = 0x808080;
+			overTextField.backgroundColor = 0xFFFFFF;
+			upTextField.selectable = false;
+			upTextField.type = TextFieldType.DYNAMIC;
+			downTextField.selectable = false;
+			downTextField.type = TextFieldType.DYNAMIC;
+			overTextField.selectable = false;
+			overTextField.type = TextFieldType.DYNAMIC;
+			//upTextField.autoSize = "left";
+			//downTextField.autoSize = "left";
+			//overTextField.autoSize = "left";
+            
+            upArrows = new Shape();
+            overArrows = new Shape();
+            downArrows = new Shape();
+            upSprite.addChild(upArrows);
+			overSprite.addChild(overArrows);
+			downSprite.addChild(downArrows);
+            drawArrows(upArrows, 0xEEEEEE);
+            drawArrows(overArrows, 0xFFFFFF);
+            drawArrows(downArrows, 0x808080);
+
+		}
+
+        private function drawArrows(shape:Shape, color:uint):void
+        {
+            var g:Graphics = shape.graphics;
+            g.beginFill(color);
+            g.drawRect(0, 0, 16, 17);
+            g.endFill();
+            g.beginFill(0);
+            g.moveTo(8, 2);
+            g.lineTo(12, 6);
+            g.lineTo(4, 6);
+            g.lineTo(8, 2);
+            g.endFill();
+            g.beginFill(0);
+            g.moveTo(8, 14);
+            g.lineTo(12, 10);
+            g.lineTo(4, 10);
+            g.lineTo(8, 14);
+            g.endFill();
+            g.lineStyle(1, 0);
+            g.drawRect(0, 0, 16, 17);
+        }
+        
+		private var selectionModel:ISelectionModel;
+		
+		private var _strand:IStrand;
+		
+		private var shape:Shape;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+            selectionModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
+            selectionModel.addEventListener("selectedIndexChanged", selectionChangeHandler);
+			shape = new Shape();
+			shape.graphics.beginFill(0xCCCCCC);
+			shape.graphics.drawRect(0, 0, 10, 10);
+			shape.graphics.endFill();
+			SimpleButton(value).upState = upSprite;
+			SimpleButton(value).downState = downSprite;
+			SimpleButton(value).overState = overSprite;
+			SimpleButton(value).hitTestState = shape;
+			if (selectionModel.selectedIndex !== -1)
+				text = selectionModel.selectedItem.toString();
+            IEventDispatcher(value).addEventListener("heightChanged", changeHandler);
+            IEventDispatcher(value).addEventListener("widthChanged", changeHandler);
+			changeHandler(null);
+		}
+		
+		private function selectionChangeHandler(event:Event):void
+		{
+			text = selectionModel.selectedItem.toString();
+		}
+		
+        private function changeHandler(event:Event):void
+        {
+            var ww:Number = DisplayObject(_strand).width;
+            var hh:Number = DisplayObject(_strand).height;
+            upArrows.x = ww - upArrows.width;            
+            overArrows.x = ww - overArrows.width;            
+            downArrows.x = ww - downArrows.width;
+			upTextField.width = upArrows.x;
+			downTextField.width = downArrows.x;
+			overTextField.width = overArrows.x;
+			upTextField.height = hh;
+			downTextField.height = hh;
+			overTextField.height = hh;
+			shape.graphics.clear();
+			shape.graphics.beginFill(0xCCCCCC);
+			shape.graphics.drawRect(0, 0, ww, hh);
+			shape.graphics.endFill();
+        }
+        
+		private var upTextField:CSSTextField;
+		private var downTextField:CSSTextField;
+		private var overTextField:CSSTextField;
+        private var upSprite:Sprite;
+        private var downSprite:Sprite;
+        private var overSprite:Sprite;
+        private var upArrows:Shape;
+        private var downArrows:Shape;
+        private var overArrows:Shape;
+		
+        /**
+         *  The text that is displayed in the view.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function get text():String
+		{
+			return upTextField.text;
+		}
+        
+        /**
+         *  @private
+         */
+		public function set text(value:String):void
+		{
+            var ww:Number = DisplayObject(_strand).width;
+            var hh:Number = DisplayObject(_strand).height;
+			upTextField.text = value;
+			downTextField.text = value;
+			overTextField.text = value;
+			
+		}
+		
+        private var _popUp:IStrand;
+        
+        /**
+         *  The dropdown/popup that displays the set of choices.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        public function get popUp():IStrand
+        {
+            return _popUp;
+        }
+        
+        private var _popUpVisible:Boolean;
+        
+        /**
+         *  A flag that indicates whether the dropdown/popup is
+         *  visible.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        public function get popUpVisible():Boolean
+        {
+            return _popUpVisible;
+        }
+        
+        /**
+         *  @private
+         */
+        public function set popUpVisible(value:Boolean):void
+        {
+            if (value != _popUpVisible)
+            {
+                _popUpVisible = value;
+                if (value)
+                {
+                    if (!_popUp)
+                    {
+                        var popUpClass:Class = ValuesManager.valuesImpl.getValue(_strand, "iPopUp") as Class;
+                        _popUp = new popUpClass() as IStrand;
+                    }
+					var root:Object = DisplayObject(_strand).root;
+					var host:DisplayObjectContainer = DisplayObject(_strand).parent;
+                    while (host && !(host is IPopUpHost))
+                        host = host.parent;
+                    if (host)
+                        IPopUpHost(host).addElement(popUp);
+                }
+                else
+                {
+                    DisplayObject(_popUp).parent.removeChild(_popUp as DisplayObject);                    
+                }
+            }
+        }
+        
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBackgroundBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBackgroundBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBackgroundBead.as
new file mode 100644
index 0000000..921bc8a
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBackgroundBead.as
@@ -0,0 +1,35 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import org.apache.flex.core.IBead;
+
+    /**
+     *  The IBackgroundBead interface is a marker interface for beads
+     *  that draw backgrounds.
+     * 
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public interface IBackgroundBead extends IBead
+	{
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBorderBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBorderBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBorderBead.as
new file mode 100644
index 0000000..66115c8
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IBorderBead.as
@@ -0,0 +1,35 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import org.apache.flex.core.IBead;
+
+    /**
+     *  The IBackgroundBead interface is a marker interface for beads
+     *  that draw backgrounds.
+     * 
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public interface IBorderBead extends IBead
+	{
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IComboBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IComboBoxView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IComboBoxView.as
new file mode 100644
index 0000000..dc4ceb7
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IComboBoxView.as
@@ -0,0 +1,78 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+    import org.apache.flex.core.IBeadView;
+    import org.apache.flex.core.IStrand;
+    
+	/**
+	 *  The IComboBoxView interface provides the protocol for any bead that
+	 *  creates the visual parts for a org.apache.flex.html.staticControls.ComboBox control.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public interface IComboBoxView extends IBeadView
+	{
+		/**
+		 *  The string appearing in the input area for the ComboBox.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		function get text():String;
+		function set text(value:String):void;
+		
+		/**
+		 *  The HTML string appearing in the input area for the ComboBox.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		function get html():String;
+		function set html(value:String):void;
+		
+		/**
+		 *  The component housing the selection list.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		function get popUp():IStrand;
+		
+		/**
+		 *  Determines whether or not the pop-up with the selection list is visible or not.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		function get popUpVisible():Boolean;
+		function set popUpVisible(value:Boolean):void;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IDropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IDropDownListView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IDropDownListView.as
new file mode 100644
index 0000000..ca865bc
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IDropDownListView.as
@@ -0,0 +1,57 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+    import org.apache.flex.core.IBeadView;
+    import org.apache.flex.core.IStrand;
+
+    /**
+     *  The IDropDownListView interface is the interface for views for
+     *  the org.apache.flex.html.staticControls.DropDownList.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public interface IDropDownListView extends IBeadView
+	{
+        
+        /**
+         *  @copy org.apache.flex.html.staticControls.beads.DropDownListView#popup
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        function get popUp():IStrand;
+        
+        /**
+         *  @copy org.apache.flex.html.staticControls.beads.DropDownListView#popupVisible
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        function get popUpVisible():Boolean;
+        function set popUpVisible(value:Boolean):void;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IGraphicsDrawing.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IGraphicsDrawing.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IGraphicsDrawing.as
new file mode 100644
index 0000000..e19f7f6
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IGraphicsDrawing.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.html.staticControls.beads
+{
+    /**
+     *  The IGraphicsDrawing interface is a marker interface for beads
+     *  that draw into the graphics layer.  This helps a bead determine
+     *  if it is the first of many graphics drawing beads so it can
+     *  know whether or not to clear the graphics layer before drawing.
+     * 
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public interface IGraphicsDrawing
+	{
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IListView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IListView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IListView.as
new file mode 100644
index 0000000..6b53e18
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IListView.as
@@ -0,0 +1,56 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{	
+	import org.apache.flex.core.IItemRendererParent;
+	import org.apache.flex.core.IStrand;
+
+	/**
+	 *  The IListView interface provides the protocol for any bead that
+	 *  creates the visual parts for a org.apache.flex.html.staticControls.List control.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public interface IListView
+	{
+		/**
+		 *  The component which parents all of the itemRenderers for each
+		 *  datum being displayed by the List component.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		function get dataGroup():IItemRendererParent;
+		
+		/**
+		 *  The host component.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		function get strand():IStrand;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IScrollBarView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IScrollBarView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IScrollBarView.as
new file mode 100644
index 0000000..0ccfac2
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/IScrollBarView.as
@@ -0,0 +1,80 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	
+	import org.apache.flex.core.IScrollBarModel;
+	import org.apache.flex.core.IStrand;
+
+    /**
+     *  The IScrollBarView interface is the interface for views for
+     *  the org.apache.flex.html.staticControls.supportClasses.ScrollBar.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public interface IScrollBarView
+	{
+        /**
+         *  The down arrow button in a vertical ScrollBar or right arrow
+         *  button in a horizontal ScrollBar
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		function get increment():DisplayObject;
+        
+        /**
+         *  The up arrow button in a vertical ScrollBar or left arrow
+         *  button in a horizontal ScrollBar
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		function get decrement():DisplayObject;
+
+        /**
+         *  The track in a ScrollBar
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		function get track():DisplayObject;
+        
+        /**
+         *  The thumb in a ScrollBar
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		function get thumb():DisplayObject;
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISliderView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISliderView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISliderView.as
new file mode 100644
index 0000000..aa2b912
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISliderView.as
@@ -0,0 +1,56 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	
+	import org.apache.flex.core.IBead;
+	
+	/**
+	 *  The ISliderView interface provides the protocol for any bead that
+	 *  creates the visual parts for a org.apache.flex.html.staticControls.Slider control.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public interface ISliderView extends IBead
+	{
+		/**
+		 *  The component used for the track area of the org.apache.flex.html.staticControls.Slider.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		function get track():DisplayObject;
+		
+		/**
+		 *  The component used for the thumb button of the org.apache.flex.html.staticControls.Slider.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		function get thumb():DisplayObject;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISpinnerView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISpinnerView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISpinnerView.as
new file mode 100644
index 0000000..4ef5f81
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ISpinnerView.as
@@ -0,0 +1,56 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	
+	import org.apache.flex.core.IBead;
+	
+	/**
+	 *  The ISpinnerView interface provides the protocol for any bead that
+	 *  creates the visual parts for a org.apache.flex.html.staticControls.Spinner control.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public interface ISpinnerView extends IBead
+	{
+		/**
+		 *  The component used to increment the org.apache.flex.html.staticControls.Spinner value.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		function get increment():DisplayObject;
+		
+		/**
+		 *  The component used to decrement the org.apache.flex.html.staticControls.Spinner value.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		function get decrement():DisplayObject;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextFieldView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextFieldView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextFieldView.as
new file mode 100644
index 0000000..f9bff0b
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextFieldView.as
@@ -0,0 +1,44 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import org.apache.flex.core.CSSTextField;
+
+    /**
+     *  The ITextFieldView interface is the interface for views for
+     *  the use a CSSTextField to display text.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public interface ITextFieldView
+	{
+        /**
+         *  The org.apache.flex.core.CSSTextField used to display text.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		function get textField():CSSTextField;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextItemRenderer.as
new file mode 100644
index 0000000..0e86593
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ITextItemRenderer.as
@@ -0,0 +1,45 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import org.apache.flex.core.IItemRenderer;
+
+    /**
+     *  The ITextItemRenderer interface is the interface for
+     *  for org.apache.flex.core.IItemRenderer that display text.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public interface ITextItemRenderer extends IItemRenderer
+	{
+        /**
+         *  The text to be displayed in the item renderer.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        function get text():String;
+        function set text(value:String):void;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ImageView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ImageView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ImageView.as
new file mode 100644
index 0000000..3b12779
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ImageView.as
@@ -0,0 +1,121 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.Bitmap;
+	import flash.display.Loader;
+	import flash.display.LoaderInfo;
+	import flash.net.URLRequest;
+	
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IImageModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	
+	/**
+	 *  The ImageView class creates the visual elements of the org.apache.flex.html.staticControls.Image component.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ImageView implements IBeadView
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ImageView()
+		{
+		}
+		
+		private var bitmap:Bitmap;
+		private var loader:Loader;
+		
+		private var _strand:IStrand;
+		private var _model:IImageModel;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			IEventDispatcher(_strand).addEventListener("widthChanged",handleSizeChange);
+			IEventDispatcher(_strand).addEventListener("heightChanged",handleSizeChange);
+			
+			_model = value.getBeadByType(IImageModel) as IImageModel;
+			_model.addEventListener("urlChanged",handleUrlChange);
+			
+			handleUrlChange(null);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleUrlChange(event:Event):void
+		{
+			if (_model.source) {
+				loader = new Loader();
+				loader.contentLoaderInfo.addEventListener("complete",onComplete);
+				loader.load(new URLRequest(_model.source));
+			}
+		}
+		
+		/**
+		 * @private
+		 */
+		private function onComplete(event:Object):void
+		{
+			if (bitmap) {
+				UIBase(_strand).removeChild(bitmap);
+			}
+			
+			bitmap = Bitmap(LoaderInfo(event.target).content);
+			
+			UIBase(_strand).addChild(bitmap);
+			
+			handleSizeChange(null);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleSizeChange(event:Object):void
+		{
+			if (bitmap) {
+				bitmap.width = UIBase(_strand).width;
+				bitmap.height = UIBase(_strand).height;
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ListView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ListView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ListView.as
new file mode 100644
index 0000000..ff86d64
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ListView.as
@@ -0,0 +1,260 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{	
+	import flash.display.DisplayObject;
+	import flash.display.DisplayObjectContainer;
+	
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IBeadLayout;
+	import org.apache.flex.core.IBeadModel;
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IItemRenderer;
+	import org.apache.flex.core.IItemRendererParent;
+	import org.apache.flex.core.ILayoutParent;
+	import org.apache.flex.core.IParent;
+	import org.apache.flex.core.IRollOverModel;
+	import org.apache.flex.core.ISelectionModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.Strand;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.html.staticControls.beads.models.ScrollBarModel;
+	import org.apache.flex.html.staticControls.beads.models.SingleLineBorderModel;
+	import org.apache.flex.html.staticControls.supportClasses.Border;
+	import org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup;
+	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
+
+	/**
+	 *  The List class creates the visual elements of the org.apache.flex.html.staticControls.List 
+	 *  component. A List consists of the area to display the data (in the dataGroup), any 
+	 *  scrollbars, and so forth.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ListView extends Strand implements IBeadView, IStrand, IListView, ILayoutParent
+	{
+		public function ListView()
+		{
+		}
+						
+		private var listModel:ISelectionModel;
+		
+		private var _border:Border;
+		
+		/**
+		 *  The border surrounding the org.apache.flex.html.staticControls.List.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get border():Border
+        {
+            return _border;
+        }
+		
+		private var _dataGroup:IItemRendererParent;
+		
+		/**
+		 *  The area holding the itemRenderers.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get dataGroup():IItemRendererParent
+		{
+			return _dataGroup;
+		}
+		
+		private var _vScrollBar:ScrollBar;
+		
+		/**
+		 *  The vertical org.apache.flex.html.staticControls.ScrollBar, if needed.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get vScrollBar():ScrollBar
+		{
+            if (!_vScrollBar)
+                _vScrollBar = createScrollBar();
+			return _vScrollBar;
+		}
+		
+		/**
+		 *  The horizontal org.apache.flex.html.staticControls.ScrollBar, currently null.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get hScrollBar():ScrollBar
+		{
+			return null;
+		}
+		
+		/**
+		 *  The contentArea includes the dataGroup and scrollBars.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get contentView():DisplayObjectContainer
+		{
+			return _dataGroup as DisplayObjectContainer;
+		}
+		
+		/**
+		 * @private
+		 */
+		public function get resizableView():DisplayObject
+		{
+			return _strand as DisplayObject;
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get strand():IStrand
+		{
+			return _strand;
+		}
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			IEventDispatcher(_strand).addEventListener("widthChanged", handleSizeChange);
+			IEventDispatcher(_strand).addEventListener("heightChanged",handleSizeChange);
+            
+            listModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
+            listModel.addEventListener("selectedIndexChanged", selectionChangeHandler);
+            listModel.addEventListener("rollOverIndexChanged", rollOverIndexChangeHandler);
+
+            _border = new Border();
+            _border.model = new (ValuesManager.valuesImpl.getValue(value, "iBorderModel")) as IBeadModel;
+            _border.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBorderBead")) as IBead);
+            IParent(_strand).addElement(_border);
+            
+			_dataGroup = new NonVirtualDataGroup();
+			IParent(_strand).addElement(_dataGroup);
+            
+            if (_strand.getBeadByType(IBeadLayout) == null)
+            {
+                var mapper:IBeadLayout = new (ValuesManager.valuesImpl.getValue(_strand, "iBeadLayout")) as IBeadLayout;
+				strand.addBead(mapper);
+            }  
+			
+			handleSizeChange(null);
+		}
+		
+		private var lastSelectedIndex:int = -1;
+		
+		/**
+		 * @private
+		 */
+		private function selectionChangeHandler(event:Event):void
+		{
+			if (lastSelectedIndex != -1)
+			{
+				var ir:IItemRenderer = dataGroup.getItemRendererForIndex(lastSelectedIndex) as IItemRenderer;
+                ir.selected = false;
+			}
+			if (listModel.selectedIndex != -1)
+			{
+	            ir = dataGroup.getItemRendererForIndex(listModel.selectedIndex);
+	            ir.selected = true;
+			}
+            lastSelectedIndex = listModel.selectedIndex;
+		}
+		
+		private var lastRollOverIndex:int = -1;
+		
+		/**
+		 * @private
+		 */
+		private function rollOverIndexChangeHandler(event:Event):void
+		{
+			if (lastRollOverIndex != -1)
+			{
+				var ir:IItemRenderer = dataGroup.getItemRendererForIndex(lastRollOverIndex) as IItemRenderer;
+                ir.hovered = false;
+			}
+			if (IRollOverModel(listModel).rollOverIndex != -1)
+			{
+	            ir = dataGroup.getItemRendererForIndex(IRollOverModel(listModel).rollOverIndex);
+	            ir.hovered = true;
+			}
+			lastRollOverIndex = IRollOverModel(listModel).rollOverIndex;
+		}
+			
+		/**
+		 * @private
+		 */
+		private function createScrollBar():ScrollBar
+		{
+			var vsb:ScrollBar;
+			vsb = new ScrollBar();
+			var vsbm:ScrollBarModel = new ScrollBarModel();
+			vsbm.maximum = 100;
+			vsbm.minimum = 0;
+			vsbm.pageSize = 10;
+			vsbm.pageStepSize = 10;
+			vsbm.snapInterval = 1;
+			vsbm.stepSize = 1;
+			vsbm.value = 0;
+			vsb.model = vsbm;
+			vsb.width = 16;
+            IParent(_strand).addElement(vsb);
+			return vsb;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleSizeChange(event:Event):void
+		{
+			UIBase(_dataGroup).x = 0;
+			UIBase(_dataGroup).y = 0;
+			UIBase(_dataGroup).width = UIBase(_strand).width;
+			UIBase(_dataGroup).height = UIBase(_strand).height;
+		}
+				
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
new file mode 100644
index 0000000..600e50c
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
@@ -0,0 +1,216 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	import flash.display.DisplayObjectContainer;
+	
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.ILayoutParent;
+	import org.apache.flex.core.IParent;
+	import org.apache.flex.core.IRangeModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.createjs.staticControls.Label;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.html.staticControls.Spinner;
+	import org.apache.flex.html.staticControls.TextInput;
+	import org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout;
+	import org.apache.flex.html.staticControls.supportClasses.Border;
+	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
+	
+	/**
+	 *  The NumericStepperView class creates the visual elements of the 
+	 *  org.apache.flex.html.staticControls.NumericStepper component. A NumberStepper consists of a 
+	 *  org.apache.flex.html.staticControls.TextInput component to display the value and a 
+	 *  org.apache.flex.html.staticControls.Spinner to change the value.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class NumericStepperView implements IBeadView, ILayoutParent
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function NumericStepperView()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+		private var label:Label;
+		private var input:TextInput;
+		private var spinner:Spinner;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			// add a horizontal layout bead
+			value.addBead(new NonVirtualHorizontalLayout());
+            
+			// add an input field
+			input = new TextInput();
+			IParent(value).addElement(input);
+			
+			// add a spinner
+			spinner = new Spinner();
+			spinner.addBead( UIBase(value).model );
+			IParent(value).addElement(spinner);
+			spinner.width = 17;
+			input.height = spinner.height; // should be spinner.height = input.height but the spinner buttons won't get small enough
+			
+			// listen for changes to the text input field which will reset the
+			// value. ideally, we should either set the input to accept only
+			// numeric values or, barring that, reject non-numeric entries. we
+			// cannot do that right now however.
+			input.model.addEventListener("textChange",inputChangeHandler);
+			
+			// listen for change events on the spinner so the value can be updated as
+			// as resizing the component
+			spinner.addEventListener("valueChanged",spinnerValueChanged);
+			IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
+			IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler);
+			
+			// listen for changes to the model itself and update the UI accordingly
+			IEventDispatcher(UIBase(value).model).addEventListener("valueChange",modelChangeHandler);
+			IEventDispatcher(UIBase(value).model).addEventListener("minimumChange",modelChangeHandler);
+			IEventDispatcher(UIBase(value).model).addEventListener("maximumChange",modelChangeHandler);
+			IEventDispatcher(UIBase(value).model).addEventListener("stepSizeChange",modelChangeHandler);
+			IEventDispatcher(UIBase(value).model).addEventListener("snapIntervalChange",modelChangeHandler);
+			
+			input.text = String(spinner.value);
+			
+			// set a default size which will trigger the sizeChangeHandler
+			var minWidth:Number = Math.max(50+spinner.width,UIBase(value).width);
+			
+			UIBase(value).width = minWidth;
+			UIBase(value).height = spinner.height;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function sizeChangeHandler(event:Event) : void
+		{
+			input.x = 2;
+			input.y = (UIBase(_strand).height - input.height)/2;
+			input.width = UIBase(_strand).width-spinner.width-2;
+			spinner.x = input.width+2;
+			spinner.y = 0;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function spinnerValueChanged(event:Event) : void
+		{
+			input.text = String(spinner.value);
+			
+			var newEvent:Event = new Event(event.type,event.bubbles);
+			IEventDispatcher(_strand).dispatchEvent(newEvent);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function inputChangeHandler(event:Event) : void
+		{
+			var newValue:Number = Number(input.text);
+
+			if( !isNaN(newValue) ) {
+				spinner.value = newValue;
+			}
+			else {
+				input.text = String(spinner.value);
+			}
+		}
+		
+		/**
+		 * @private
+		 */
+		private function modelChangeHandler( event:Event ) : void
+		{
+			var n:Number = IRangeModel(UIBase(_strand).model).value;
+			input.text = String(IRangeModel(UIBase(_strand).model).value);
+		}
+		
+		/**
+		 *  The area containing the TextInput and Spinner controls.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get contentView():DisplayObjectContainer
+		{
+			return _strand as DisplayObjectContainer;
+		}
+		
+		/**
+		 *  @private
+		 */
+		public function get border():Border
+		{
+			return null;
+		}
+		
+		/**
+		 * @private
+		 */
+		public function get vScrollBar():ScrollBar
+		{
+			return null;
+		}
+		
+		/**
+		 * @private
+		 */
+		public function get hScrollBar():ScrollBar
+		{
+			return null;
+		}
+		
+		/**
+		 * @private
+		 */
+		public function get resizableView():DisplayObject
+		{
+			return _strand as DisplayObject;
+		}
+	}
+}
\ No newline at end of file


[28/35] git commit: [flex-asjs] [refs/heads/develop] - clean mustella/bin

Posted by ah...@apache.org.
clean mustella/bin


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

Branch: refs/heads/develop
Commit: 8d37ef3c69ad3c6dfc7f1969a69c68ae87810170
Parents: daa3dab
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 25 11:06:54 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 25 11:06:54 2014 -0700

----------------------------------------------------------------------
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8d37ef3c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 8ac5ac2..9e2fede 100644
--- a/build.xml
+++ b/build.xml
@@ -353,8 +353,8 @@
         <ant dir="${basedir}/asdoc" target="clean" />
         <!--
         <ant dir="${basedir}/ide/flashbuilder" target="clean" />
-        <ant dir="${basedir}/mustella" target="clean"/>
-        -->
+         -->
+        <delete dir="${basedir}/mustella/tests/bin" failonerror="false" includeEmptyDirs="true"/>
     </target>
 
     <target name="examples-clean">


[05/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/List.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/List.js b/frameworks/js/FlexJS/src/org/apache/flex/html/List.js
new file mode 100644
index 0000000..c554129
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/List.js
@@ -0,0 +1,176 @@
+/**
+ * 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.html.staticControls.List');
+
+goog.require('mx.core.IFactory');
+goog.require('org.apache.flex.core.IDataProviderItemRendererMapper');
+goog.require('org.apache.flex.core.IItemRendererClassFactory');
+goog.require('org.apache.flex.core.ItemRendererClassFactory');
+goog.require('org.apache.flex.core.ListBase');
+goog.require('org.apache.flex.core.ValuesManager');
+goog.require('org.apache.flex.html.staticControls.beads.ListView');
+goog.require('org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData');
+goog.require('org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController');
+goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
+goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.ListBase}
+ */
+org.apache.flex.html.staticControls.List = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.List,
+    org.apache.flex.core.ListBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.List.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'List',
+                qName: 'org.apache.flex.html.staticControls.List' }] };
+
+
+/**
+ * @expose
+ * @return {mx.core.IFactory} The itemRenderer generator.
+ */
+org.apache.flex.html.staticControls.List.prototype.get_itemRenderer =
+function() {
+  return this.itemRenderer_;
+};
+
+
+/**
+ * @expose
+ * @param {mx.core.IFactory} value The itemRenderer generator.
+ */
+org.apache.flex.html.staticControls.List.prototype.set_itemRenderer =
+function(value) {
+  this.itemRenderer_ = value;
+};
+
+
+/**
+ * @expose
+ * @return {String} The name of the field to use as a label.
+ */
+org.apache.flex.html.staticControls.List.prototype.get_labelField =
+function() {
+  return this.get_model().get_labelField();
+};
+
+
+/**
+ * @expose
+ * @param {String} value The name of the field to use as a label.
+ */
+org.apache.flex.html.staticControls.List.prototype.set_labelField =
+function(value) {
+  this.get_model().set_labelField(value);
+};
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.List.prototype.createElement =
+    function() {
+  goog.base(this, 'createElement');
+  this.set_className('List');
+
+  return this.element;
+};
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.List.prototype.addedToParent =
+    function() {
+  goog.base(this, 'addedToParent');
+
+  var b = this.getBeadByType(org.apache.flex.core.IDataProviderItemRendererMapper);
+  if (org.apache.flex.core.ValuesManager.valuesImpl.getValue && !b) {
+    /**
+     * @type {Function}
+     */
+    var c;
+    c = /** @type {Function} */ (org.apache.flex.core.ValuesManager.valuesImpl.getValue(this,
+                            'iDataProviderItemRendererMapper'));
+    if (c) {
+      var bead = new c();
+      this.addBead(bead);
+    }
+  }
+//  var c = this.getBeadByType(org.apache.flex.core.IItemRenderer);
+//  if (c == null) {
+//    c = this.getBeadByType(
+//          org.apache.flex.html.staticControls.supportClasses.DataItemRenderer);
+//    if (c == null) {
+//      this.addBead(new
+//                   org.apache.flex.html.staticControls.beads.
+//                   TextItemRendererFactoryForArrayData());
+//    }
+//  }
+};
+
+
+/**
+ * @expose
+ * @return {Array.<Object>} An array of objects that make up the actual
+ *                          list (most likely itemRenderers).
+ */
+org.apache.flex.html.staticControls.List.prototype.internalChildren =
+    function() {
+  var listView =
+      this.getBeadByType(org.apache.flex.html.staticControls.beads.ListView);
+  var dg = listView.get_dataGroup();
+  var items = null;
+  if (dg.renderers) {
+    items = dg.renderers;
+  }
+  return items;
+};
+
+
+/**
+ * @expose
+ * @param {Object} event The event that triggered the selection.
+ */
+org.apache.flex.html.staticControls.List.prototype.selectedHandler =
+    function(event) {
+  var itemRenderer = event.currentTarget;
+  if (this.renderers) {
+    var n = this.renderers.length;
+    var i;
+    for (i = 0; i < n; i++) {
+      var test = this.renderers[i];
+      if (test == itemRenderer) {
+        this.model.set_selectedIndex(i);
+        itemRenderer.set_selected(true);
+      }
+      else {
+        test.set_selected(false);
+      }
+    }
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js b/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js
new file mode 100644
index 0000000..66926ef
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js
@@ -0,0 +1,185 @@
+/**
+ * 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.html.staticControls.NumericStepper');
+
+goog.require('org.apache.flex.core.UIBase');
+goog.require('org.apache.flex.html.staticControls.Spinner');
+goog.require('org.apache.flex.html.staticControls.TextInput');
+goog.require('org.apache.flex.html.staticControls.beads.models.RangeModel');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.NumericStepper = function() {
+  this.model =
+      new org.apache.flex.html.staticControls.beads.models.RangeModel();
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.NumericStepper,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.NumericStepper.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'NumericStepper',
+                qName: 'org.apache.flex.html.staticControls.NumericStepper' }] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.NumericStepper.prototype.createElement =
+    function() {
+  this.element = document.createElement('div');
+  this.positioner = this.element;
+
+  this.input = new org.apache.flex.html.staticControls.TextInput();
+  this.addElement(this.input);
+  this.input.positioner.style.display = 'inline-block';
+
+  this.spinner = new org.apache.flex.html.staticControls.Spinner();
+  this.addElement(this.spinner);
+  this.spinner.positioner.style.display = 'inline-block';
+  goog.events.listen(this.spinner, 'valueChanged',
+      goog.bind(this.spinnerChange, this));
+
+  this.element.flexjs_wrapper = this;
+  this.set_className('NumericStepper');
+
+  this.input.set_text(String(this.spinner.get_value()));
+
+  return this.element;
+};
+
+
+/**
+ * @param {Object} event The input event.
+ */
+org.apache.flex.html.staticControls.NumericStepper.prototype.spinnerChange =
+    function(event)
+    {
+  var newValue = this.spinner.get_value();
+  this.set_value(newValue);
+  this.input.set_text(String(this.spinner.get_value()));
+  this.dispatchEvent(new org.apache.flex.events.Event('valueChanged'));
+};
+
+
+/**
+ * @expose
+ * @return {Number} The current minimum value.
+ */
+org.apache.flex.html.staticControls.NumericStepper.prototype.get_minimum =
+    function() {
+  return this.model.get_minimum();
+};
+
+
+/**
+ * @expose
+ * @param {Number} value The new minimum value.
+ */
+org.apache.flex.html.staticControls.NumericStepper.prototype.set_minimum =
+    function(value) {
+  this.model.set_minimum(value);
+};
+
+
+/**
+ * @expose
+ * @return {Number} The current maximum value.
+ */
+org.apache.flex.html.staticControls.NumericStepper.prototype.get_maximum =
+    function() {
+  return this.model.get_maximum();
+};
+
+
+/**
+ * @expose
+ * @param {Number} value The new maximum value.
+ */
+org.apache.flex.html.staticControls.NumericStepper.prototype.set_maximum =
+    function(value) {
+  this.model.set_maximum(value);
+};
+
+
+/**
+ * @expose
+ * @return {Number} The current value.
+ */
+org.apache.flex.html.staticControls.NumericStepper.prototype.get_value =
+    function() {
+  return this.model.get_value();
+};
+
+
+/**
+ * @expose
+ * @param {Number} newValue The new value.
+ */
+org.apache.flex.html.staticControls.NumericStepper.prototype.set_value =
+    function(newValue) {
+  this.model.set_value(newValue);
+};
+
+
+/**
+ * @expose
+ * @return {Number} The current snapInterval value.
+ */
+org.apache.flex.html.staticControls.NumericStepper.prototype.get_snapInterval =
+    function() {
+  return this.model.get_snapInterval();
+};
+
+
+/**
+ * @expose
+ * @param {Number} value The new snapInterval value.
+ */
+org.apache.flex.html.staticControls.NumericStepper.prototype.set_snapInterval =
+    function(value) {
+  this.model.set_snapInterval(value);
+};
+
+
+/**
+ * @expose
+ * @return {Number} The current stepSize value.
+ */
+org.apache.flex.html.staticControls.NumericStepper.prototype.get_stepSize =
+    function() {
+  return this.model.get_stepSize();
+};
+
+
+/**
+ * @expose
+ * @param {Number} value The new stepSize value.
+ */
+org.apache.flex.html.staticControls.NumericStepper.prototype.set_stepSize =
+    function(value) {
+  this.model.set_stepSize(value);
+};
+

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js
new file mode 100644
index 0000000..88a22b5
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js
@@ -0,0 +1,186 @@
+/**
+ * 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.html.staticControls.Panel');
+
+goog.require('org.apache.flex.html.staticControls.Container');
+goog.require('org.apache.flex.html.staticControls.ControlBar');
+goog.require('org.apache.flex.html.staticControls.TitleBar');
+goog.require('org.apache.flex.html.staticControls.beads.PanelView');
+goog.require('org.apache.flex.html.staticControls.beads.models.PanelModel');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.html.staticControls.Container}
+ */
+org.apache.flex.html.staticControls.Panel = function() {
+  this.model =
+      new org.apache.flex.html.staticControls.beads.models.PanelModel();
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.Panel,
+    org.apache.flex.html.staticControls.Container);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.Panel.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'Panel',
+                qName: 'org.apache.flex.html.staticControls.Panel' }] };
+
+
+/**
+ * @override
+ * @param {Object} c Element being added.
+ */
+org.apache.flex.html.staticControls.Panel.prototype.addElement = function(c) {
+  if (c == this.titleBar) {
+    this.element.insertBefore(this.titleBar.element, this.contentArea);
+  }
+  else if (c == this.controlBar) {
+    this.element.appendChild(c.element);
+  }
+  else {
+    this.contentArea.appendChild(c.element);
+  }
+  c.addedToParent();
+};
+
+
+/**
+ * @override
+ * @param {Object} c The child element.
+ * @param {number} index The index.
+ */
+org.apache.flex.html.staticControls.Panel.prototype.addElementAt =
+    function(c, index) {
+  var children = this.internalChildren();
+  if (index >= children.length)
+    this.addElement(c);
+  else
+  {
+    this.contentArea.insertBefore(c.element,
+        children[index]);
+    c.addedToParent();
+  }
+};
+
+
+/**
+ * @override
+ * @param {Object} c The child element.
+ * @return {number} The index in parent.
+ */
+org.apache.flex.html.staticControls.Panel.prototype.getElementIndex =
+    function(c) {
+  var children = this.internalChildren();
+  var n = children.length;
+  for (var i = 0; i < n; i++)
+  {
+    if (children[i] == c.element)
+      return i;
+  }
+  return -1;
+};
+
+
+/**
+ * @override
+ * @param {Object} c The child element.
+ */
+org.apache.flex.html.staticControls.Panel.prototype.removeElement =
+    function(c) {
+  this.contentArea.removeChild(c.element);
+};
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.Panel.prototype.createElement =
+    function() {
+
+  this.element = document.createElement('div');
+  this.element.className = 'Panel';
+
+  this.contentArea = document.createElement('div');
+  this.contentArea.flexjs_wrapper = this;
+  this.element.appendChild(this.contentArea);
+
+  this.panelView = new org.apache.flex.html.staticControls.beads.PanelView();
+  this.panelView.set_strand(this);
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+
+  return this.element;
+};
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.Panel.prototype.addedToParent =
+    function() {
+  goog.base(this, 'addedToParent');
+};
+
+
+/**
+ * @expose
+ * @return {string} The title getter.
+ */
+org.apache.flex.html.staticControls.Panel.prototype.get_title = function() {
+  return this.model.get_title();
+};
+
+
+/**
+ * @expose
+ * @param {string} value The title setter.
+ */
+org.apache.flex.html.staticControls.Panel.prototype.set_title =
+    function(value) {
+  this.model.set_title(value);
+};
+
+
+/**
+ * @expose
+ * @return {Array} The controlBar getter.
+ */
+org.apache.flex.html.staticControls.Panel.prototype.get_controlBar =
+    function() {
+  return this.controlBarChildren;
+};
+
+
+/**
+ * @expose
+ * @param {Array} value The controlBar setter.
+ */
+org.apache.flex.html.staticControls.Panel.prototype.set_controlBar =
+    function(value) {
+  this.controlBarChildren = value;
+
+  for (var i = 0; i < value.length; i++) {
+    var item = value[i];
+    this.controlBar.addElement(item);
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/RadioButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/RadioButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html/RadioButton.js
new file mode 100644
index 0000000..5713e3d
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/RadioButton.js
@@ -0,0 +1,197 @@
+/**
+ * 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.html.staticControls.RadioButton');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.RadioButton = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.RadioButton,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'RadioButton',
+                qName: 'org.apache.flex.html.staticControls.RadioButton'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.createElement =
+    function() {
+  var rb;
+
+  this.element = document.createElement('label');
+
+  rb = document.createElement('input');
+  rb.type = 'radio';
+  this.element.appendChild(rb);
+  this.element.appendChild(document.createTextNode('radio button'));
+
+  this.positioner = this.element;
+  rb.flexjs_wrapper = this;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.initModel =
+    function() {
+};
+
+
+/**
+ * @expose
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.initSkin =
+    function() {
+};
+
+
+/**
+ * @expose
+ * @return {string} The groupName getter.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.get_groupName =
+    function() {
+  return this.element.childNodes.item(0).name;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The groupName setter.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.set_groupName =
+    function(value) {
+  this.element.childNodes.item(0).name = value;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.get_text =
+    function() {
+  return this.element.childNodes.item(1).nodeValue;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.set_text =
+    function(value) {
+  this.element.childNodes.item(1).nodeValue = value;
+};
+
+
+/**
+ * @expose
+ * @return {boolean} The selected getter.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.get_selected =
+    function() {
+  return this.element.childNodes.item(0).checked;
+};
+
+
+/**
+ * @expose
+ * @param {boolean} value The selected setter.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.set_selected =
+    function(value) {
+  this.element.childNodes.item(0).checked = value;
+};
+
+
+/**
+ * @expose
+ * @return {Object} The value getter.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.get_value =
+    function() {
+  return this.element.childNodes.item(0).value;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The value setter.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.set_value =
+    function(value) {
+  this.element.childNodes.item(0).value = value;
+};
+
+
+/**
+ * @expose
+ * @return {Object} The value of the selected RadioButton.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.get_selectedValue =
+    function() {
+  var buttons, groupName, i, n;
+
+  groupName = this.element.childNodes.item(0).name;
+  buttons = document.getElementsByName(groupName);
+  n = buttons.length;
+
+  for (i = 0; i < n; i++) {
+    if (buttons[i].checked) {
+      return buttons[i].value;
+    }
+  }
+  return null;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The value of the selected RadioButton.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.set_selectedValue =
+    function(value) {
+  var buttons, groupName, i, n;
+
+  groupName = this.element.childNodes.item(0).name;
+  buttons = document.getElementsByName(groupName);
+  n = buttons.length;
+  for (i = 0; i < n; i++) {
+    if (buttons[i].value === value) {
+      buttons[i].checked = true;
+      break;
+    }
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleAlert.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleAlert.js b/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleAlert.js
new file mode 100644
index 0000000..5fc3530
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleAlert.js
@@ -0,0 +1,51 @@
+/**
+ * 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.html.staticControls.SimpleAlert');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.SimpleAlert = function() {
+  goog.base(this);
+
+};
+goog.inherits(org.apache.flex.html.staticControls.SimpleAlert,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.SimpleAlert.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'SimpleAlert',
+                qName: 'org.apache.flex.html.staticControls.SimpleAlert'}] };
+
+
+/**
+ * @param {string} message The message to display in the alert.
+ * @param {Object} host The host that should display the alert.
+ */
+org.apache.flex.html.staticControls.SimpleAlert.show =
+    function(message, host) {
+
+  alert(message);
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js b/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js
new file mode 100644
index 0000000..79e40ef
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js
@@ -0,0 +1,129 @@
+/**
+ * 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.html.staticControls.SimpleList');
+
+goog.require('org.apache.flex.core.ListBase');
+goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.ListBase}
+ */
+org.apache.flex.html.staticControls.SimpleList = function() {
+  goog.base(this);
+  this.model = new org.apache.flex.html.staticControls.
+      beads.models.ArraySelectionModel();
+};
+goog.inherits(org.apache.flex.html.staticControls.SimpleList,
+    org.apache.flex.core.ListBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.SimpleList.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'SimpleList',
+                qName: 'org.apache.flex.html.staticControls.SimpleList'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.SimpleList.prototype.
+    createElement = function() {
+  this.element = document.createElement('select');
+  this.element.size = 5;
+  goog.events.listen(this.element, 'change',
+      goog.bind(this.changeHandler, this));
+  this.positioner = this.element;
+  this.set_className('SimpleList');
+
+  return this.element;
+};
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.SimpleList.prototype.
+    get_dataProvider = function() {
+  return this.model.get_dataProvider();
+};
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.SimpleList.prototype.
+    set_dataProvider = function(value) {
+  var dp, i, n, opt;
+
+  this.model.set_dataProvider(value);
+
+  dp = this.element.options;
+  n = dp.length;
+  for (i = 0; i < n; i++) {
+    dp.remove(0);
+  }
+
+  n = value.length;
+  for (i = 0; i < n; i++) {
+    opt = document.createElement('option');
+    opt.text = value[i].toString();
+    dp.add(opt);
+  }
+
+};
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.SimpleList.prototype.
+    get_selectedIndex = function() {
+  return this.model.get_selectedIndex();
+};
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.SimpleList.prototype.
+    set_selectedIndex = function(value) {
+  this.model.set_selectedIndex(value);
+};
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.SimpleList.prototype.
+    get_selectedItem = function() {
+  return this.model.get_selectedItem();
+};
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.SimpleList.prototype.
+    set_selectedItem = function(value) {
+  this.model.set_selectedItem(value);
+};
+

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js
new file mode 100644
index 0000000..6a19bd4
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js
@@ -0,0 +1,219 @@
+/**
+ * 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.html.staticControls.Slider');
+
+goog.require('org.apache.flex.core.UIBase');
+goog.require('org.apache.flex.html.staticControls.beads.SliderThumbView');
+goog.require('org.apache.flex.html.staticControls.beads.SliderTrackView');
+goog.require('org.apache.flex.html.staticControls.beads.controllers.SliderMouseController');
+goog.require('org.apache.flex.html.staticControls.beads.models.RangeModel');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.Slider = function() {
+  this.model =
+      new org.apache.flex.html.staticControls.beads.models.RangeModel();
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.Slider,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.Slider.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'Slider',
+                qName: 'org.apache.flex.html.staticControls.Slider'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.Slider.prototype.createElement =
+    function() {
+
+  this.element = document.createElement('div');
+  this.element.style.width = '200px';
+  this.element.style.height = '30px';
+
+  this.track = new org.apache.flex.html.staticControls.beads.SliderTrackView();
+  this.addBead(this.track);
+
+  this.thumb = new org.apache.flex.html.staticControls.beads.SliderThumbView();
+  this.addBead(this.thumb);
+
+  this.controller = new org.apache.flex.html.staticControls.beads.controllers.
+                    SliderMouseController();
+  this.addBead(this.controller);
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+
+  this.set_className('Slider');
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {number} The value getter.
+ */
+org.apache.flex.html.staticControls.Slider.prototype.get_value =
+    function() {
+  return this.model.get_value();
+};
+
+
+/**
+ * @expose
+ * @param {Object} newValue The new value.
+ * @return {void} The value setter.
+ */
+org.apache.flex.html.staticControls.Slider.prototype.set_value =
+    function(newValue) {
+  this.model.set_value(newValue);
+  this.setThumbFromValue(this.model.get_value());
+};
+
+
+/**
+ * @expose
+ * @return {number} The minimum getter.
+ */
+org.apache.flex.html.staticControls.Slider.prototype.get_minimum =
+    function() {
+  return this.model.get_minimum();
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The new minimum value.
+ * @return {void} The minimum setter.
+ */
+org.apache.flex.html.staticControls.Slider.prototype.set_minimum =
+    function(value) {
+  this.model.set_minimum(value);
+};
+
+
+/**
+ * @expose
+ * @return {number} The maximum getter.
+ */
+org.apache.flex.html.staticControls.Slider.prototype.get_maximum =
+    function() {
+  return this.model.get_maximum();
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The new maximum value.
+ * @return {void} The maximum setter.
+ */
+org.apache.flex.html.staticControls.Slider.prototype.set_maximum =
+    function(value) {
+  this.model.set_maximum(value);
+};
+
+
+/**
+ * @expose
+ * @return {number} The snapInterval getter.
+ */
+org.apache.flex.html.staticControls.Slider.prototype.get_snapInterval =
+    function() {
+  return this.model.get_snapInterval();
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The new snapInterval value.
+ * @return {void} The snapInterval setter.
+ */
+org.apache.flex.html.staticControls.Slider.prototype.set_snapInterval =
+    function(value) {
+  this.model.set_snapInterval(value);
+};
+
+
+/**
+ * @expose
+ * @return {number} The stepSize getter.
+ */
+org.apache.flex.html.staticControls.Slider.prototype.get_stepSize =
+    function() {
+  return this.model.get_stepSize();
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The new stepSize value.
+ * @return {void} The stepSize setter.
+ */
+org.apache.flex.html.staticControls.Slider.prototype.set_stepSize =
+    function(value) {
+  this.model.set_stepSize(value);
+};
+
+
+/**
+ * @param {Object} value The current value.
+ * @return {number} Calculates the new value based snapInterval and stepSize.
+ */
+org.apache.flex.html.staticControls.Slider.prototype.snap = function(value)
+    {
+  var si = this.get_snapInterval();
+  var n = Math.round((value - this.get_minimum()) / si) *
+      si + this.get_minimum();
+  if (value > 0)
+  {
+    if (value - n < n + si - value)
+      return n;
+    return n + si;
+  }
+  if (value - n > n + si - value)
+    return n + si;
+  return n;
+};
+
+
+/**
+ * @param {number} value The value used to calculate new position of the thumb.
+ * @return {void} Moves the thumb to the corresponding position.
+ */
+org.apache.flex.html.staticControls.Slider.prototype.setThumbFromValue =
+    function(value)
+    {
+  var min = this.model.get_minimum();
+  var max = this.model.get_maximum();
+  var p = (value - min) / (max - min);
+  var xloc = p * (parseInt(this.track.element.style.width, 10) -
+             parseInt(this.thumb.element.style.width, 10));
+
+  this.thumb.element.style.left = String(xloc) + 'px';
+};
+

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js
new file mode 100644
index 0000000..8911105
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js
@@ -0,0 +1,211 @@
+/**
+ * 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.html.staticControls.Spinner');
+
+goog.require('org.apache.flex.core.UIBase');
+goog.require('org.apache.flex.html.staticControls.TextButton');
+goog.require('org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.Spinner = function() {
+  goog.base(this);
+
+  this.minimum_ = 0;
+  this.maximum_ = 100;
+  this.value_ = 1;
+  this.stepSize_ = 1;
+  this.snapInterval_ = 1;
+};
+goog.inherits(org.apache.flex.html.staticControls.Spinner,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.Spinner.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'Spinner',
+                qName: 'org.apache.flex.html.staticControls.Spinner'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.Spinner.prototype.createElement =
+    function() {
+  this.element = document.createElement('div');
+  this.positioner = this.element;
+
+  this.element.style.verticalAlign = 'middle';
+
+  this.incrementButton = new org.apache.flex.html.staticControls.TextButton();
+  this.incrementButton.set_text('\u2191');
+  this.addElement(this.incrementButton);
+
+  this.decrementButton = new org.apache.flex.html.staticControls.TextButton();
+  this.decrementButton.set_text('\u2193');
+  this.addElement(this.decrementButton);
+
+  this.controller = new org.apache.flex.html.staticControls.
+      beads.controllers.SpinnerMouseController();
+  this.addBead(this.controller);
+
+  this.element.flexjs_wrapper = this;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {number} The current value.
+ */
+org.apache.flex.html.staticControls.Spinner.prototype.get_value =
+    function() {
+  return this.value_;
+};
+
+
+/**
+ * @expose
+ * @param {number} value The new value.
+ */
+org.apache.flex.html.staticControls.Spinner.prototype.set_value =
+    function(value) {
+  if (value != this.value_) {
+    this.value_ = value;
+    this.dispatchEvent('valueChanged');
+  }
+};
+
+
+/**
+ * @expose
+ * @return {number} The minimum value.
+ */
+org.apache.flex.html.staticControls.Spinner.prototype.get_minimum = function() {
+  return this.minimum_;
+};
+
+
+/**
+ * @expose
+ * @param {number} value The new minimum value.
+ */
+org.apache.flex.html.staticControls.Spinner.prototype.set_minimum =
+    function(value) {
+  if (value != this.minimum_) {
+    this.minimum_ = value;
+    this.dispatchEvent('minimumChanged');
+  }
+};
+
+
+/**
+ * @expose
+ * @return {number} The maximum value.
+ */
+org.apache.flex.html.staticControls.Spinner.prototype.get_maximum =
+    function() {
+  return this.maximum_;
+};
+
+
+/**
+ * @expose
+ * @param {number} value The new maximum setter.
+ */
+org.apache.flex.html.staticControls.Spinner.prototype.set_maximum =
+    function(value) {
+  if (value != this.maximum_) {
+    this.maximum_ = value;
+    this.dispatchEvent('maximumChanged');
+  }
+};
+
+
+/**
+ * @expose
+ * @return {number} The snapInterval.
+ */
+org.apache.flex.html.staticControls.Spinner.prototype.get_snapInterval =
+    function() {
+  return this.snapInterval_;
+};
+
+
+/**
+ * @expose
+ * @param {number} value The new snapInterval value.
+ */
+org.apache.flex.html.staticControls.Spinner.prototype.set_snapInterval =
+    function(value) {
+  if (value != this.snapInterval_) {
+    this.snapInterval_ = value;
+    this.dispatchEvent('snapIntervalChanged');
+  }
+};
+
+
+/**
+ * @expose
+ * @return {number} The stepSize.
+ */
+org.apache.flex.html.staticControls.Spinner.prototype.get_stepSize =
+    function() {
+  return this.stepSize_;
+};
+
+
+/**
+ * @expose
+ * @param {number} value The new stepSize value.
+ */
+org.apache.flex.html.staticControls.Spinner.prototype.set_stepSize =
+    function(value) {
+  if (value != this.stepSize_) {
+    this.stepSize_ = value;
+    this.dispatchEvent('stepSizeChanged');
+  }
+};
+
+
+/**
+ * @param {number} value The proposed value.
+ * @return {number} The new value based on snapInterval
+ * and stepSize.
+ */
+org.apache.flex.html.staticControls.Spinner.prototype.snap = function(value)
+    {
+  var si = this.snapInterval_;
+  var n = Math.round((value - this.minimum_) / si) * si + this.minimum_;
+  if (value > 0)
+  {
+    if (value - n < n + si - value)
+      return n;
+    return n + si;
+  }
+  if (value - n > n + si - value)
+    return n + si;
+  return n;
+};
+

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/TextArea.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/TextArea.js b/frameworks/js/FlexJS/src/org/apache/flex/html/TextArea.js
new file mode 100644
index 0000000..2e018e5
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/TextArea.js
@@ -0,0 +1,72 @@
+/**
+ * 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.html.staticControls.TextArea');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.TextArea = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.TextArea,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.TextArea.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'TextArea',
+                qName: 'org.apache.flex.html.staticControls.TextArea'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.TextArea.prototype.createElement =
+    function() {
+
+  this.element = document.createElement('textarea');
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html.staticControls.TextArea.prototype.get_text = function() {
+  return this.element.value;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html.staticControls.TextArea.prototype.set_text =
+    function(value) {
+  this.element.value = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html/TextButton.js
new file mode 100644
index 0000000..882b178
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/TextButton.js
@@ -0,0 +1,58 @@
+/**
+ * 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.html.staticControls.TextButton');
+
+goog.require('org.apache.flex.html.staticControls.Button');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.html.staticControls.Button}
+ */
+org.apache.flex.html.staticControls.TextButton = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.TextButton,
+    org.apache.flex.html.staticControls.Button);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.TextButton.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'TextButton',
+                qName: 'org.apache.flex.html.staticControls.TextButton'}] };
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html.staticControls.TextButton.prototype.get_text = function() {
+  return this.element.innerHTML;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html.staticControls.TextButton.prototype.set_text =
+    function(value) {
+  this.element.innerHTML = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/TextInput.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/TextInput.js b/frameworks/js/FlexJS/src/org/apache/flex/html/TextInput.js
new file mode 100644
index 0000000..48cccab
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/TextInput.js
@@ -0,0 +1,95 @@
+/**
+ * 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.html.staticControls.TextInput');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.TextInput = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.TextInput,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.TextInput.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'TextInput',
+                qName: 'org.apache.flex.html.staticControls.TextInput'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.TextInput.prototype.createElement = function() {
+  this.element = document.createElement('input');
+  this.element.setAttribute('type', 'input');
+
+  //attach input handler to dispatch flexjs change event when user write in textinput
+  //goog.events.listen(this.element, 'change', goog.bind(this.killChangeHandler, this));
+  goog.events.listen(this.element, 'input', goog.bind(this.inputChangeHandler_, this));
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html.staticControls.TextInput.prototype.get_text = function() {
+  return this.element.value;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html.staticControls.TextInput.prototype.set_text = function(value) {
+  this.element.value = value;
+};
+
+
+/**
+ * @expose
+ * @param {Object} event The event.
+ */
+/*org.apache.flex.html.staticControls.TextInput.prototype.killChangeHandler = function(event) {
+    //event.preventDefault();
+};*/
+
+
+/**
+ * @private
+ * @param {Object} event The event.
+ */
+org.apache.flex.html.staticControls.TextInput.prototype.inputChangeHandler_ = function(event) {
+  event.stopPropagation();
+
+  this.dispatchEvent(new org.apache.flex.events.Event(org.apache.flex.events.Event.EventType.CHANGE));
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js
new file mode 100644
index 0000000..36f9322
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js
@@ -0,0 +1,150 @@
+/**
+ * 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.html.staticControls.TitleBar');
+
+goog.require('org.apache.flex.html.staticControls.Container');
+goog.require('org.apache.flex.html.staticControls.Label');
+goog.require('org.apache.flex.html.staticControls.TextButton');
+goog.require('org.apache.flex.html.staticControls.beads.models.TitleBarModel');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.html.staticControls.Container}
+ */
+org.apache.flex.html.staticControls.TitleBar = function() {
+
+  this.model =
+      new org.apache.flex.html.staticControls.beads.models.TitleBarModel();
+
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.TitleBar,
+    org.apache.flex.html.staticControls.Container);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.TitleBar.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'TitleBar',
+                qName: 'org.apache.flex.html.staticControls.TitleBar'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.TitleBar.prototype.createElement =
+    function() {
+
+  this.element = document.createElement('div');
+
+  this.titleLabel = new org.apache.flex.html.staticControls.Label();
+  this.addElement(this.titleLabel);
+  this.titleLabel.element.id = 'title';
+  this.titleLabel.positioner.style.display = 'inline-block';
+  this.titleLabel.set_className('TitleBarLabel');
+
+  this.titleButton = new org.apache.flex.html.staticControls.TextButton();
+  this.addElement(this.titleButton);
+  this.titleButton.element.id = 'closeButton';
+  this.titleButton.text = 'Close';
+  this.titleButton.positioner.style.position = 'absolute';
+  this.titleButton.positioner.style.right = '0px';
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+
+  this.set_className('TitleBar');
+
+  // listen for changes to the model so items can be changed in the view
+  this.model.addEventListener('titleChange',
+      goog.bind(this.changeHandler, this));
+
+  return this.element;
+};
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.TitleBar.prototype.addedToParent =
+    function() {
+
+  this.titleLabel.set_text(this.model.get_title());
+
+  if (this.model.showCloseButton) {
+    this.titleButton.positioner.style.display = 'inline-block';
+  } else {
+    this.titleButton.positioner.style.display = 'none';
+  }
+};
+
+
+/**
+ * @param {Object} event The event that triggered this handler.
+ */
+org.apache.flex.html.staticControls.TitleBar.prototype.changeHandler =
+    function(event) {
+  if (event.type == 'titleChange') {
+    this.titleLabel.set_text(this.model.get_title());
+  }
+  else if (event.type == 'htmlTitleChange') {
+    this.titleLabel.set_text(this.model.get_htmlTitle());
+  }
+};
+
+
+/**
+ * @expose
+ * @return {string} The title getter.
+ */
+org.apache.flex.html.staticControls.TitleBar.prototype.get_title =
+    function() {
+  return this.model.get_title();
+};
+
+
+/**
+ * @expose
+ * @param {string} value The title setter.
+ */
+org.apache.flex.html.staticControls.TitleBar.prototype.set_title =
+    function(value) {
+  this.model.set_title(value);
+};
+
+
+/**
+ * @expose
+ * @return {string} The showCloseButton getter.
+ */
+org.apache.flex.html.staticControls.TitleBar.prototype.get_showCloseButton =
+    function() {
+  return this.model.get_showCloseButton();
+};
+
+
+/**
+ * @expose
+ * @param {string} value The title setter.
+ */
+org.apache.flex.html.staticControls.TitleBar.prototype.set_showCloseButton =
+    function(value) {
+  this.model.set_showCloseButton(value);
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.js b/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.js
new file mode 100644
index 0000000..13a5ae9
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.js
@@ -0,0 +1,91 @@
+/**
+ * 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.html.staticControls.accessories.NumericOnlyTextInputBead');
+
+
+
+/**
+ * @constructor
+ */
+org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead =
+    function() {
+
+  /**
+   * @protected
+   * @type {Object}
+   */
+  this.promptElement = null;
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'NumericOnlyTextInputBead',
+                qName: 'org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead' }] };
+
+
+/**
+ * @expose
+ * @param {Object} value The new host.
+ */
+org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead.
+    prototype.set_strand = function(value) {
+  if (this.strand_ !== value) {
+    this.strand_ = value;
+    value.addEventListener('keypress', goog.bind(this.validateInput, this));
+  }
+};
+
+
+/**
+ * @expose
+ * @param {Object} event The input to validate?
+ */
+org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead.
+    prototype.validateInput = function(event) {
+
+  var code = event.charCode;
+
+  // backspace or delete
+  if (event.keyCode == 8 || event.keyCode == 46) return;
+
+  // tab or return/enter
+  if (event.keyCode == 9 || event.keyCode == 13) return;
+
+  // left or right cursor arrow
+  if (event.keyCode == 37 || event.keyCode == 39) return;
+
+  var key = String.fromCharCode(code);
+
+  var regex = /[0-9]|\./;
+  if (!regex.test(key)) {
+    event.returnValue = false;
+    if (event.preventDefault) event.preventDefault();
+    return;
+  }
+  var cursorStart = event.target.selectionStart;
+  var cursorEnd = event.target.selectionEnd;
+  var left = event.target.value.substring(0, cursorStart);
+  var right = event.target.value.substr(cursorEnd);
+  var complete = left + key + right;
+  if (isNaN(complete)) {
+    event.returnValue = false;
+    if (event.preventDefault) event.preventDefault();
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/PasswordInputBead.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/PasswordInputBead.js b/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/PasswordInputBead.js
new file mode 100644
index 0000000..cd5baf7
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/PasswordInputBead.js
@@ -0,0 +1,53 @@
+/**
+ * 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.html.staticControls.accessories.PasswordInputBead');
+
+
+
+/**
+ * @constructor
+ */
+org.apache.flex.html.staticControls.accessories.PasswordInputBead =
+    function() {
+
+  /**
+   * @protected
+   * @type {Object}
+   */
+  this.promptElement = null;
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.accessories.PasswordInputBead.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'PasswordInputBead',
+                qName: 'org.apache.flex.html.staticControls.accessories.PasswordInputBead' }] };
+
+
+/**
+ * @expose
+ * @param {Object} value The new host.
+ */
+org.apache.flex.html.staticControls.accessories.PasswordInputBead.
+    prototype.set_strand = function(value) {
+  if (this.strand_ !== value) {
+    this.strand_ = value;
+    value.element.type = 'password';
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/TextPromptBead.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/TextPromptBead.js b/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/TextPromptBead.js
new file mode 100644
index 0000000..444f370
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/TextPromptBead.js
@@ -0,0 +1,72 @@
+/**
+ * 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.html.staticControls.accessories.TextPromptBead');
+
+
+
+/**
+ * @constructor
+ */
+org.apache.flex.html.staticControls.accessories.TextPromptBead = function() {
+
+  /**
+   * @protected
+   * @type {Object}
+   */
+  this.promptElement = null;
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.accessories.TextPromptBead.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'TextPromptBead',
+                qName: 'org.apache.flex.html.staticControls.accessories.TextPromptBead' }] };
+
+
+/**
+ * @expose
+ * @return {string} value The new prompt.
+ */
+org.apache.flex.html.staticControls.accessories.TextPromptBead.prototype.
+    get_prompt = function() {
+  return this.prompt;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The new prompt.
+ */
+org.apache.flex.html.staticControls.accessories.TextPromptBead.prototype.
+    set_prompt = function(value) {
+  this.prompt = value;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The new host.
+ */
+org.apache.flex.html.staticControls.accessories.TextPromptBead.prototype.
+    set_strand = function(value) {
+  if (this.strand_ !== value) {
+    this.strand_ = value;
+    value.element.placeholder = this.prompt;
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ButtonBarView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ButtonBarView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ButtonBarView.js
new file mode 100644
index 0000000..2801b9f
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ButtonBarView.js
@@ -0,0 +1,55 @@
+/**
+ * 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.html.staticControls.beads.ButtonBarView');
+
+goog.require('org.apache.flex.html.staticControls.beads.ListView');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.html.staticControls.beads.ListView}
+ */
+org.apache.flex.html.staticControls.beads.ButtonBarView = function() {
+  this.lastSelectedIndex = -1;
+  goog.base(this);
+
+  this.className = 'ButtonBarView';
+};
+goog.inherits(
+    org.apache.flex.html.staticControls.beads.ButtonBarView,
+    org.apache.flex.html.staticControls.beads.ListView);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.ButtonBarView.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'ButtonBarView',
+                qName: 'org.apache.flex.html.staticControls.beads.ButtonBarView' }] };
+
+
+/**
+ * @expose
+ * @param {Object} value The new host.
+ */
+org.apache.flex.html.staticControls.beads.ButtonBarView.prototype.set_strand =
+    function(value) {
+
+  goog.base(this, 'set_strand', value);
+  this.strand_ = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js
new file mode 100644
index 0000000..f461ef7
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js
@@ -0,0 +1,137 @@
+/**
+ * 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.html.staticControls.beads.DataItemRendererFactoryForArrayData');
+
+goog.require('org.apache.flex.core.IDataProviderItemRendererMapper');
+goog.require('org.apache.flex.events.EventDispatcher');
+goog.require('org.apache.flex.html.staticControls.beads.ListView');
+goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
+goog.require('org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer');
+
+
+
+/**
+ * @constructor
+ * @implements {org.apache.flex.core.IDataProviderItemRendererMapper}
+ */
+org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData =
+    function() {
+};
+
+
+/**
+ * @expose
+ */
+org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.prototype.itemRendererFactory = null;
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
+    prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'DataItemRendererFactoryForArrayData',
+                qName: 'org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData' }],
+      interfaces: [org.apache.flex.core.IDataProviderItemRendererMapper] };
+
+
+/**
+ * @private
+ * @type {Object}
+ */
+org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
+    prototype.itemRendererClass_ = null;
+
+
+/**
+ * @expose
+ * @param {Object} value The component strand.
+ */
+org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
+    prototype.set_strand = function(value) {
+  this.strand_ = value;
+
+  this.model = value.getBeadByType(
+      org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
+
+  this.listView = value.getBeadByType(
+      org.apache.flex.html.staticControls.beads.ListView);
+  this.dataGroup = this.listView.get_dataGroup();
+
+  this.model.addEventListener('dataProviderChanged',
+      goog.bind(this.dataProviderChangedHandler, this));
+
+  if (org.apache.flex.core.ValuesManager.valuesImpl.getValue && !this.itemRendererFactory_) {
+    /**
+     * @type {Function}
+     */
+    var c = /** @type {Function} */ (org.apache.flex.core.ValuesManager.valuesImpl.getValue(this.strand_,
+            'iItemRendererClassFactory'));
+    this.itemRendererFactory_ = new c();
+    this.strand_.addBead(this.itemRendererFactory_);
+  }
+
+  this.dataProviderChangedHandler(null);
+};
+
+
+/**
+ * @expose
+ * @return {Object} The itemRenderer.
+ */
+org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
+    prototype.get_itemRendererClass = function() {
+  if (org.apache.flex.core.ValuesManager.valuesImpl.getValue && !this.itemRendererClass_) {
+    var c = org.apache.flex.core.ValuesManager.valuesImpl.getValue(this.strand_, 'iItemRenderer');
+    if (c) {
+      this.itemRendererClass_ = c;
+    }
+  }
+  return this.itemRendererClass_;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value class to use for the item renderer.
+ */
+org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
+    prototype.set_itemRendererClass = function(value) {
+  this.itemRendererClass_ = value;
+};
+
+
+/**
+ * @expose
+ * @param {Object} event The event that triggered the dataProvider change.
+ */
+org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
+    prototype.dataProviderChangedHandler = function(event) {
+  var dp, i, n, opt;
+
+  dp = this.model.get_dataProvider();
+  n = dp.length;
+  for (i = 0; i < n; i++) {
+    var ir = this.itemRendererFactory_.createItemRenderer(this.dataGroup);
+    ir.set_index(i);
+    ir.set_labelField(this.model.get_labelField());
+    ir.set_data(dp[i]);
+  }
+
+  var newEvent = new org.apache.flex.events.Event('itemsCreated');
+  this.strand_.dispatchEvent(newEvent);
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/IListView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/IListView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/IListView.js
new file mode 100644
index 0000000..9f4cb33
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/IListView.js
@@ -0,0 +1,43 @@
+/**
+ * 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.
+ */
+
+/**
+ * @fileoverview
+ * @suppress {checkTypes}
+ */
+
+goog.provide('org.apache.flex.html.staticControls.beads.IListView');
+
+goog.require('org.apache.flex.core.IBeadView');
+
+
+
+/**
+ * IListView
+ *
+ * @interface
+ */
+org.apache.flex.html.staticControls.beads.IListView = function() {
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.IListView.prototype.FLEXJS_CLASS_INFO =
+{ names: [{ name: 'IListView',
+            qName: 'org.apache.flex.html.staticControls.beads.IListView'}],
+  interfaces: [org.apache.flex.core.IBeadView] };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ImageView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ImageView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ImageView.js
new file mode 100644
index 0000000..d63cf23
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ImageView.js
@@ -0,0 +1,63 @@
+/**
+ * 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.html.staticControls.beads.ImageView');
+
+
+goog.require('org.apache.flex.html.staticControls.beads.models.ImageModel');
+
+
+
+/**
+ * @constructor
+ */
+org.apache.flex.html.staticControls.beads.ImageView = function() {
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.ImageView
+  .prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'ImageView',
+                qName: 'org.apache.flex.html.staticControls.beads.ImageView'}] };
+
+
+/**
+ * @expose
+ * @param {Object} value The new host.
+ */
+org.apache.flex.html.staticControls.beads.ImageView.prototype.set_strand =
+    function(value) {
+
+  this.strand_ = value;
+
+  this.model = value.getBeadByType(
+      org.apache.flex.html.staticControls.beads.models.ImageModel);
+  this.model.addEventListener('sourceChanged',
+      goog.bind(this.sourceChangeHandler, this));
+};
+
+
+/**
+ * @expose
+ * @param {Object} event The event triggered by the source change.
+ */
+org.apache.flex.html.staticControls.beads.ImageView.prototype.
+    sourceChangeHandler = function(event) {
+  this.strand_.element.src = this.model.get_source();
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js
new file mode 100644
index 0000000..862b94c
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js
@@ -0,0 +1,168 @@
+/**
+ * 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.html.staticControls.beads.ListView');
+
+goog.require('org.apache.flex.core.IBeadLayout');
+goog.require('org.apache.flex.core.IBeadView');
+goog.require('org.apache.flex.core.IItemRendererParent');
+goog.require('org.apache.flex.core.ILayoutParent');
+goog.require('org.apache.flex.core.ValuesManager');
+goog.require('org.apache.flex.html.staticControls.beads.IListView');
+goog.require('org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData');
+goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
+goog.require('org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup');
+
+
+
+/**
+ * @constructor
+ * @implements {org.apache.flex.core.ILayoutParent}
+ * @implements {org.apache.flex.html.staticControls.beads.IListView}
+ */
+org.apache.flex.html.staticControls.beads.ListView = function() {
+  this.lastSelectedIndex = -1;
+
+  this.className = 'ListView';
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.ListView.prototype.
+    FLEXJS_CLASS_INFO =
+    { names: [{ name: 'ListView',
+                qName: 'org.apache.flex.html.staticControls.beads.ListView' }],
+      interfaces: [org.apache.flex.html.staticControls.beads.IListView, org.apache.flex.core.ILayoutParent] };
+
+
+/**
+ * @expose
+ * @param {Object} value The new host.
+ */
+org.apache.flex.html.staticControls.beads.ListView.prototype.set_strand =
+    function(value) {
+
+  this.strand_ = value;
+
+  this.strand_.addEventListener('widthChanged',
+      goog.bind(this.handleSizeChange, this));
+  this.strand_.addEventListener('heightChanged',
+      goog.bind(this.handleSizeChange, this));
+
+  /*if (this.strand_.getBeadByType(org.apache.flex.core.IBeadLayout) == null) {
+    var m = org.apache.flex.core.ValuesManager.valuesImpl.
+        getValue(this.strand_,'iBeadLayout');
+    var c = new m();
+    this.strand_.addBead(c);
+  }*/
+
+  this.model = this.strand_.get_model();
+  this.model.addEventListener('selectedIndexChanged',
+      goog.bind(this.selectionChangeHandler, this));
+
+  this.dataGroup_ = new
+      org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup();
+  this.dataGroup_.set_strand(this);
+  this.strand_.addElement(this.dataGroup_);
+
+  this.handleSizeChange(null);
+};
+
+
+/**
+ * @expose
+ * @return {Object} The DataGroup instance.
+ */
+org.apache.flex.html.staticControls.beads.ListView.prototype.get_dataGroup =
+    function() {
+  return this.dataGroup_;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The event that triggered the selection.
+ */
+org.apache.flex.html.staticControls.beads.ListView.prototype.
+    selectionChangeHandler = function(value) {
+  var ir;
+  if (this.lastSelectedIndex != -1) {
+    ir = this.dataGroup_.getItemRendererForIndex(this.lastSelectedIndex);
+    if (ir) ir.set_selected(false);
+  }
+  if (this.model.get_selectedIndex() != -1) {
+    ir = this.dataGroup_.getItemRendererForIndex(
+        this.model.get_selectedIndex());
+    if (ir) ir.set_selected(true);
+  }
+  this.lastSelectedIndex = this.model.get_selectedIndex();
+};
+
+
+/**
+ * @expose
+ * @return {Object} The view that contains the layout objects.
+ */
+org.apache.flex.html.staticControls.beads.ListView.prototype.get_contentView = function() {
+  return this;
+};
+
+
+/**
+ * @expose
+ * @return {Object} The border for the layout area.
+ */
+org.apache.flex.html.staticControls.beads.ListView.prototype.get_border = function() {
+  return null;
+};
+
+
+/**
+ * @expose
+ * @return {Object} The vertical scrollbar.
+ */
+org.apache.flex.html.staticControls.beads.ListView.prototype.get_vScrollBar = function() {
+  return null;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The vertical scrollbar.
+ */
+org.apache.flex.html.staticControls.beads.ListView.prototype.set_vScrollBar = function(value) {
+};
+
+
+/**
+ * @expose
+ * @return {Object} The view that can be resized.
+ */
+org.apache.flex.html.staticControls.beads.ListView.prototype.get_resizeableView = function() {
+  return this;
+};
+
+
+/**
+ * @expose
+ * @param {Object} event The event that triggered the resize.
+ */
+org.apache.flex.html.staticControls.beads.ListView.prototype.handleSizeChange = function(event) {
+  this.dataGroup_.set_width(this.strand_.get_width());
+  this.dataGroup_.set_height(this.strand_.get_height());
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js
new file mode 100644
index 0000000..e19e6a0
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js
@@ -0,0 +1,72 @@
+/**
+ * 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.html.staticControls.beads.PanelView');
+
+
+
+/**
+ * @constructor
+ */
+org.apache.flex.html.staticControls.beads.PanelView = function() {
+
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.PanelView
+  .prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'PanelView',
+                qName: 'org.apache.flex.html.staticControls.beads.PanelView'}] };
+
+
+/**
+ * @expose
+ * @param {Object} value The new host.
+ */
+org.apache.flex.html.staticControls.beads.PanelView.prototype.set_strand =
+    function(value) {
+
+  this.strand_ = value;
+
+  this.strand_.titleBar = new org.apache.flex.html.staticControls.TitleBar();
+  this.strand_.titleBar.addedToParent();
+  this.strand_.titleBar.element.id = 'titleBar';
+  this.strand_.addElement(this.strand_.titleBar);
+
+  this.strand_.controlBar =
+      new org.apache.flex.html.staticControls.ControlBar();
+  this.strand_.addElement(this.strand_.controlBar);
+
+  // listen for changes to the strand's model so items can be changed
+  // in the view
+  this.strand_.model.addEventListener('titleChange',
+      goog.bind(this.changeHandler, this));
+
+};
+
+
+/**
+ * @param {Object} event The event that triggered this handler.
+ */
+org.apache.flex.html.staticControls.beads.PanelView.prototype.changeHandler =
+    function(event) {
+  if (event.type == 'titleChange') {
+    this.strand_.titleBar.set_title(this.strand_.model.get_title());
+  }
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderThumbView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderThumbView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderThumbView.js
new file mode 100644
index 0000000..9afc551
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderThumbView.js
@@ -0,0 +1,61 @@
+/**
+ * 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.html.staticControls.beads.SliderThumbView');
+
+
+
+/**
+ * @constructor
+ */
+org.apache.flex.html.staticControls.beads.SliderThumbView = function() {
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.SliderThumbView
+  .prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'SliderThumbView',
+                qName: 'org.apache.flex.html.staticControls.beads.SliderThumbView'}] };
+
+
+/**
+ * @expose
+ * @param {Object} value The strand.
+ */
+org.apache.flex.html.staticControls.beads.SliderThumbView.prototype.
+    set_strand = function(value) {
+  this.strand_ = value;
+
+  this.element = document.createElement('div');
+  this.element.className = 'SliderThumb';
+  this.element.id = 'thumb';
+  this.element.style.backgroundColor = '#949494';
+  this.element.style.border = 'thin solid #747474';
+  this.element.style.position = 'relative';
+  this.element.style.height = '30px';
+  this.element.style.width = '10px';
+  this.element.style.zIndex = '2';
+  this.element.style.top = '-10px';
+  this.element.style.left = '20px';
+
+  this.strand_.element.appendChild(this.element);
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderTrackView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderTrackView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderTrackView.js
new file mode 100644
index 0000000..f1a4152
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderTrackView.js
@@ -0,0 +1,61 @@
+/**
+ * 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.html.staticControls.beads.SliderTrackView');
+
+
+
+/**
+ * @constructor
+ */
+org.apache.flex.html.staticControls.beads.SliderTrackView = function() {
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.SliderTrackView
+  .prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'SliderTrackView',
+                qName: 'org.apache.flex.html.staticControls.beads.SliderTrackView'}] };
+
+
+/**
+ * @expose
+ * @param {Object} value The strand.
+ */
+org.apache.flex.html.staticControls.beads.SliderTrackView.prototype.
+    set_strand = function(value) {
+  this.strand_ = value;
+
+  this.element = document.createElement('div');
+  this.element.className = 'SliderTrack';
+  this.element.id = 'track';
+  this.element.style.backgroundColor = '#E4E4E4';
+  this.element.style.height = '10px';
+  this.element.style.width = '200px';
+  this.element.style.border = 'thin solid #C4C4C4';
+  this.element.style.position = 'relative';
+  this.element.style.left = '0px';
+  this.element.style.top = '10px';
+  this.element.style.zIndex = '1';
+
+  this.strand_.element.appendChild(this.element);
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js
new file mode 100644
index 0000000..d340174
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js
@@ -0,0 +1,92 @@
+/**
+ * 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.html.staticControls.beads.TextItemRendererFactoryForArrayData');
+
+goog.require('org.apache.flex.core.IDataProviderItemRendererMapper');
+goog.require('org.apache.flex.core.IItemRenderer');
+goog.require('org.apache.flex.events.EventDispatcher');
+goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.events.EventDispatcher}
+ * @implements {org.apache.flex.core.IItemRenderer}
+ */
+org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData =
+    function() {
+  goog.base(this);
+};
+goog.inherits(
+    org.apache.flex.html.staticControls.
+        beads.TextItemRendererFactoryForArrayData,
+    org.apache.flex.events.EventDispatcher);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData.
+    prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'TextItemRendererFactoryForArrayData',
+                qName: 'org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData' }],
+      interfaces: [org.apache.flex.core.IItemRenderer] };
+
+
+/**
+ * @expose
+ * @param {Object} value The component strand.
+ */
+org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData.
+    prototype.set_strand = function(value) {
+  this.strand_ = value;
+
+  this.model = value.getBeadByType(
+      org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
+
+  this.listView = value.getBeadByType(
+      org.apache.flex.html.staticControls.beads.ListView);
+  this.dataGroup = this.listView.get_dataGroup();
+
+  this.model.addEventListener('dataProviderChanged',
+      goog.bind(this.dataProviderChangedHandler, this));
+
+  this.dataProviderChangedHandler(null);
+};
+
+
+/**
+ * @expose
+ * @param {Object} event The event that triggered the dataProvider change.
+ */
+org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData.
+    prototype.dataProviderChangedHandler = function(event) {
+  var dp, i, n, opt;
+
+  dp = this.model.get_dataProvider();
+  n = dp.length;
+  for (i = 0; i < n; i++) {
+    opt = new
+        org.apache.flex.html.staticControls.supportClasses.StringItemRenderer();
+    this.dataGroup.addElement(opt);
+    opt.set_text(dp[i]);
+  }
+
+  var newEvent = new org.apache.flex.events.Event('itemsCreated');
+  this.strand_.dispatchEvent(newEvent);
+};


[30/35] remove other staticControls folder. Next commit renames packages in the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/svg/staticControls/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/svg/staticControls/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/svg/staticControls/TextButton.js
deleted file mode 100644
index 04325ef..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/svg/staticControls/TextButton.js
+++ /dev/null
@@ -1,94 +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('org.apache.flex.svg.staticControls.TextButton');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.svg.staticControls.TextButton = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.svg.staticControls.TextButton,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.svg.staticControls.TextButton.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'TextButton',
-                qName: 'org.apache.flex.svg.staticControls.TextButton'}] };
-
-
-/**
- * @override
- */
-org.apache.flex.svg.staticControls.TextButton.prototype.createElement =
-    function() {
-  this.element = document.createElement('embed');
-  this.element.setAttribute('src', 'org/apache/flex/svg/staticControls/assets/TextButton_Skin.svg');
-
-  this.positioner = this.element;
-
-  return this.element;
-};
-
-
-/**
- * @override
- */
-org.apache.flex.svg.staticControls.TextButton.prototype.finalizeElement =
-    function() {
-  var listenersArray;
-  if (goog.events.hasListener(this.element, goog.events.EventType.CLICK)) {
-    listenersArray = goog.events.getListeners(this.element, goog.events.EventType.CLICK, false);
-
-    /* As we are assigning an actual function object instead of just the name,
-       make sure to use a unique name ('clickHandler') instead of a native
-       name, like 'click' or 'onclick'.
-
-       Note: use array notation for property assignment so the compiler doesn't
-             rename the property ;-)
-    */
-    this.element['clickHandler'] = listenersArray[0].listener;
-  }
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.svg.staticControls.TextButton.prototype.get_text =
-    function() {
-  return this.element.getAttribute('label');
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.svg.staticControls.TextButton.prototype.set_text =
-    function(value) {
-  this.element.setAttribute('label', value);
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/svg/staticControls/assets/TextButton_Skin.svg
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/svg/staticControls/assets/TextButton_Skin.svg b/frameworks/js/FlexJS/src/org/apache/flex/svg/staticControls/assets/TextButton_Skin.svg
deleted file mode 100644
index 7986725..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/svg/staticControls/assets/TextButton_Skin.svg
+++ /dev/null
@@ -1,279 +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.
-
--->
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="button" width="100%" height="100%" 
-	onload="return init(evt)"
-	onmouseover="return handleMouseOver(evt)" 
-	onmousedown="return handleMouseDown(evt)" 
-	onmouseup="return handleMouseUp(evt)" 
-	onmouseout="return handleMouseOut(evt)"
-	onclick="handleOnClick(evt)"
-	>
-	<style type="text/css">
-		.button {cursor: pointer;}
-	</style>
-  
-  <script type="text/ecmascript">
-	<![CDATA[
-		
-		var labelStr = "";
-		var clickHandler;
-		
-		function init(event)
-		{
-			//Set Initial button state
-			document.getElementById("button_up").style.display="inline";
-			document.getElementById("button_over").style.display="none";
-			document.getElementById("button_down").style.display="none";
-			
-			//Set label from the embed's frameElement.attributes values
-			labelStr = window.frameElement.attributes["label"].value;
-			var labelElement = document.getElementById("labelDisplay");
-			labelElement.firstChild.nodeValue = labelStr;
-			
-			//Store callbacks
-			clickHandler = window.frameElement.clickHandler;
-		}
-	
-		function handleMouseOver(event)
-		{
-			document.getElementById("button_up").style.display="none";
-			document.getElementById("button_over").style.display="inline";
-			document.getElementById("button_down").style.display="none";
-		}
-		
-		function handleMouseDown(event)
-		{
-			document.getElementById("button_up").style.display="none";
-			document.getElementById("button_over").style.display="none";
-			document.getElementById("button_down").style.display="inline";
-		}
-		
-		function handleMouseUp(event)
-		{
-			document.getElementById("button_up").style.display="none";
-			document.getElementById("button_over").style.display="inline";
-			document.getElementById("button_down").style.display="none";
-		}
-		
-		function handleMouseOut(event)
-		{
-			document.getElementById("button_up").style.display="inline";
-			document.getElementById("button_over").style.display="none";
-			document.getElementById("button_down").style.display="none";
-		}
-		
-		function handleOnClick(evt)
-		{
-			clickHandler(evt,this);
-		}
-
-	]]></script>
-	<svg xmlns="http://www.w3.org/2000/svg" id="button_up" width="100%" height="100%" version="1.1" >
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="-1" right="-1" top="-1" bottom="-1">
-			<defs>
-				<linearGradient id="button_up_idLinearGradientx63x32" gradientTransform="rotate(90)">
-					<stop offset="0" stop-color="#000000" stop-opacity="0.01" />
-					<stop offset="1" stop-color="#000000" stop-opacity="0.07" />
-				</linearGradient>
-			</defs>
-			<rect id="button_up_shadow" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_up_idLinearGradientx63x32)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
-			<defs>
-				<linearGradient id="button_up_idLinearGradientx63x54" gradientTransform="rotate(90)">
-					<stop offset="0" stop-color="#FFFFFF" stop-opacity="0.85" />
-					<stop offset="1" stop-color="#D8D8D8" stop-opacity="0.85" />
-				</linearGradient>
-			</defs>
-			<rect id="button_up_fill" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_up_idLinearGradientx63x54)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
-			<defs>
-				<linearGradient id="button_up_idLinearGradientx63x76" x1="0%" y1="100%" x2="0%" y2="0%">
-					<stop offset="0.0" stop-color="#000000" stop-opacity="0.0627" />
-					<stop offset="0.48" stop-color="#000000" stop-opacity="0.0099" />
-					<stop offset="0.48001" stop-color="#000000" stop-opacity="0" />
-				</linearGradient>
-			</defs>
-			<rect id="button_up_lowlight" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_up_idLinearGradientx63x76)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
-			<defs>
-				<linearGradient id="button_up_idLinearGradientx63x100" gradientTransform="rotate(90)">
-					<stop offset="0.0" stop-color="#FFFFFF" stop-opacity="0.33" />
-					<stop offset="0.48" stop-color="#FFFFFF" stop-opacity="0.33" />
-					<stop offset="0.48001" stop-color="#FFFFFF" stop-opacity="0" />
-				</linearGradient>
-			</defs>
-			<rect id="button_up_highlight" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_up_idLinearGradientx63x100)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
-			<defs>
-				<linearGradient id="button_up_idLinearGradientStrokex63x129" gradientTransform="rotate(90)">
-					<stop offset="0" stop-color="#FFFFFF" />
-					<stop offset="1" stop-color="#D8D8D8" />
-				</linearGradient>
-			</defs>
-			<rect id="button_up_highlightStroke" rx="2" ry="2" width="100%" height="100%" fill="none" style="stroke-width:2;stroke:url(#button_up_idLinearGradientStrokex63x129)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="0" right="0" top="0" bottom="0">
-			<defs>
-				<linearGradient id="button_up_idLinearGradientStrokex63x205" gradientTransform="rotate(90)">
-					<stop offset="0" stop-color="#000000" stop-opacity="0.5625" />
-					<stop offset="1" stop-color="#000000" stop-opacity="0.75" />
-				</linearGradient>
-			</defs>
-			<rect id="button_up_border" rx="2" ry="2" width="100%" height="100%" fill="none" style="stroke-width:2;stroke:url(#button_up_idLinearGradientStrokex63x205)" />
-		</svg>
-	</svg>
-
-	<svg xmlns="http://www.w3.org/2000/svg" id="button_over" width="100%" height="100%" version="1.1" >
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="-1" right="-1" top="-1" bottom="-1">
-			<defs>
-				<linearGradient id="button_over_idLinearGradientx63x32" gradientTransform="rotate(90)">
-					<stop offset="0" stop-color="#000000" stop-opacity="0.01" />
-					<stop offset="1" stop-color="#000000" stop-opacity="0.07" />
-				</linearGradient>
-			</defs>
-			<rect id="button_over_shadow" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_over_idLinearGradientx63x32)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
-			<defs>
-				<linearGradient id="button_over_idLinearGradientx63x54" gradientTransform="rotate(90)">
-					<stop offset="0" stop-color="#BBBDBD" stop-opacity="0.85" />
-					<stop offset="1" stop-color="#9FA0A1" stop-opacity="0.85" />
-				</linearGradient>
-			</defs>
-			<rect id="button_over_fill" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_over_idLinearGradientx63x54)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
-			<defs>
-				<linearGradient id="button_over_idLinearGradientx63x76" x1="0%" y1="100%" x2="0%" y2="0%">
-					<stop offset="0.0" stop-color="#000000" stop-opacity="0.0627" />
-					<stop offset="0.48" stop-color="#000000" stop-opacity="0.0099" />
-					<stop offset="0.48001" stop-color="#000000" stop-opacity="0" />
-				</linearGradient>
-			</defs>
-			<rect id="button_over_lowlight" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_over_idLinearGradientx63x76)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
-			<defs>
-				<linearGradient id="button_over_idLinearGradientx63x100" gradientTransform="rotate(90)">
-					<stop offset="0.0" stop-color="#FFFFFF" stop-opacity="0.22" />
-					<stop offset="0.48" stop-color="#FFFFFF" stop-opacity="0.22" />
-					<stop offset="0.48001" stop-color="#FFFFFF" stop-opacity="0" />
-				</linearGradient>
-			</defs>
-			<rect id="button_over_highlight" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_over_idLinearGradientx63x100)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
-			<defs>
-				<linearGradient id="button_over_idLinearGradientStrokex63x129" gradientTransform="rotate(90)">
-					<stop offset="0" stop-color="#FFFFFF" stop-opacity="0.22" />
-					<stop offset="1" stop-color="#D8D8D8" stop-opacity="0.22" />
-				</linearGradient>
-			</defs>
-			<rect id="button_over_highlightStroke" rx="2" ry="2" width="100%" height="100%" fill="none" style="stroke-width:2;stroke:url(#button_over_idLinearGradientStrokex63x129)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="0" right="0" top="0" bottom="0">
-			<defs>
-				<linearGradient id="button_over_idLinearGradientStrokex63x205" gradientTransform="rotate(90)">
-					<stop offset="0" stop-color="#000000" stop-opacity="0.5625" />
-					<stop offset="1" stop-color="#000000" stop-opacity="0.75" />
-				</linearGradient>
-			</defs>
-			<rect id="button_over_border" width="100%" height="100%" rx="2" ry="2" fill="none" style="stroke-width:2;stroke:url(#button_over_idLinearGradientStrokex63x205)" />
-		</svg>
-	</svg>
-	<svg xmlns="http://www.w3.org/2000/svg" id="button_down" width="100%" height="100%" version="1.1" >
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="-1" right="-1" top="-1" bottom="-1">
-			<defs>
-				<linearGradient id="button_down_idLinearGradientx63x32" gradientTransform="rotate(90)">
-					<stop offset="0" stop-color="#FFFFFF" stop-opacity="0" />
-					<stop offset="1" stop-color="#FFFFFF" stop-opacity="0.5" />
-				</linearGradient>
-			</defs>
-			<rect id="button_down_shadow" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_down_idLinearGradientx63x32)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
-			<defs>
-				<linearGradient id="button_down_idLinearGradientx63x54" gradientTransform="rotate(90)">
-					<stop offset="0" stop-color="#AAAAAA" stop-opacity="0.85" />
-					<stop offset="1" stop-color="#929496" stop-opacity="0.85" />
-				</linearGradient>
-			</defs>
-			<rect id="button_down_fill" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_down_idLinearGradientx63x54)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
-			<defs>
-				<linearGradient id="button_down_idLinearGradientx63x76" x1="0%" y1="100%" x2="0%" y2="0%">
-					<stop offset="0.0" stop-color="#000000" stop-opacity="0.0627" />
-					<stop offset="0.48" stop-color="#000000" stop-opacity="0.0099" />
-					<stop offset="0.48001" stop-color="#000000" stop-opacity="0" />
-				</linearGradient>
-			</defs>
-			<rect id="button_down_lowlight" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_down_idLinearGradientx63x76)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
-			<defs>
-				<linearGradient id="button_down_idLinearGradientx63x100" gradientTransform="rotate(90)">
-					<stop offset="0.0" stop-color="#FFFFFF" stop-opacity="0.12" />
-					<stop offset="0.48" stop-color="#FFFFFF" stop-opacity="0.12" />
-					<stop offset="0.48001" stop-color="#FFFFFF" stop-opacity="0" />
-				</linearGradient>
-			</defs>
-			<rect id="button_down_highlight" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_down_idLinearGradientx63x100)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
-			<defs>
-				<linearGradient id="button_down_idLinearGradientStrokex63x149" gradientTransform="rotate(90)">
-					<stop offset="0.0" stop-color="#000000" stop-opacity="0.25" />
-					<stop offset="0.001" stop-color="#000000" stop-opacity="0.25" />
-					<stop offset="0.0011" stop-color="#000000" stop-opacity="0.07" />
-					<stop offset="0.965" stop-color="#000000" stop-opacity="0.07" />
-					<stop offset="0.9651" stop-color="#000000" stop-opacity="0.00" />
-				</linearGradient>
-			</defs>
-			<rect id="button_down_hldownstroke1" rx="2" ry="2" width="100%" height="100%" fill="none" style="stroke-width:2;stroke:url(#button_down_idLinearGradientStrokex63x149)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="2" right="2" top="2" bottom="2">
-			<defs>
-				<linearGradient id="button_down_idLinearGradientStrokex63x182" gradientTransform="rotate(90)">
-					<stop offset="0.0" stop-color="#000000" stop-opacity="0.09" />
-					<stop offset="0.0001" stop-color="#000000" stop-opacity="0.00" />
-				</linearGradient>
-			</defs>
-			<rect id="button_down_hldownstroke2" rx="2" ry="2" width="100%" height="100%" fill="none" style="stroke-width:2;stroke:url(#button_down_idLinearGradientStrokex63x182)" />
-		</svg>
-		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="0" right="0" top="0" bottom="0">
-			<defs>
-				<linearGradient id="button_down_idLinearGradientStrokex63x205" gradientTransform="rotate(90)">
-					<stop offset="0" stop-color="#000000" stop-opacity="0.6375" />
-					<stop offset="1" stop-color="#000000" stop-opacity="0.85" />
-				</linearGradient>
-			</defs>
-			<rect id="button_down_border" width="100%" height="100%" rx="2" ry="2" fill="none" style="stroke-width:2;stroke:url(#button_down_idLinearGradientStrokex63x205)" />
-		</svg>
-	</svg>
-	<svg id="labelDisplaySVG" xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" version="1.1" >
-		<text id="labelDisplay" text-anchor="middle" font-family="verdana" font-size="12" dy=".3em" x="50%" y="50%" > </text>
-	</svg>
-	<rect id="mouse_catcher" width="100%" height="100%" fill="none" pointer-events="all"/>
-</svg>
\ No newline at end of file


[34/35] git commit: [flex-asjs] [refs/heads/develop] - finish sed sweep of staticControls

Posted by ah...@apache.org.
finish sed sweep of staticControls


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

Branch: refs/heads/develop
Commit: f43a7b61a5bc07e9c4e37414e9482ff6231669ac
Parents: 9fecc95
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 25 13:12:32 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 25 13:12:32 2014 -0700

----------------------------------------------------------------------
 .../src/mybeads/RowHeightBead.as                |   8 +-
 .../src/products/ProductItemRenderer.as         |   6 +-
 .../DataGridXcompile/src/DataGridXcompile.mxml  |   2 +-
 .../DataGridXcompile/src/MyInitialView.mxml     |   8 +-
 .../customControls/beads/DataGridColumnView.as  |   4 +-
 .../html/customControls/beads/DataGridView.as   |  14 +-
 .../DataItemRendererFactoryForColumnData.as     |   6 +-
 .../html/staticControls/beads/BoxGridView.as    |   6 +-
 .../FlexJSTest_Panel/src/MyInitialView.mxml     |  14 +-
 .../FlexJSTest_jquery/src/MyInitialView.mxml    |   4 +-
 examples/FormatExample/src/MyFormView.mxml      |   2 +-
 .../FormatExample/src/dialogs/DialogView.as     |   4 +-
 .../accessories/NumberFormatter.as              |   4 +-
 .../accessories/PhoneNumberFormatter.as         |   4 +-
 examples/ListsTest/src/FirstView.mxml           |   4 +-
 .../src/products/ProductItemRenderer.as         |   8 +-
 examples/StockQuote/src/MyInitialView.mxml      |   4 +-
 .../sample/todo/renderers/TodoItemRenderer.as   |  10 +-
 .../src/sample/todo/views/TodoListView.mxml     |   4 +-
 .../as/projects/FlexJSJX/basic-manifest.xml     |  16 +-
 frameworks/as/projects/FlexJSJX/defaults.css    |  26 +-
 .../as/projects/FlexJSJX/src/FlexJSJXClasses.as |  29 +--
 .../src/org/apache/flex/charts/BarChart.as      |   4 +-
 .../apache/flex/charts/beads/BarChartView.as    |   4 +-
 .../charts/beads/ChartItemRendererFactory.as    |   4 +-
 .../org/apache/flex/charts/beads/XAxisBead.as   |   6 +-
 .../charts/supportClasses/BoxItemRenderer.as    |   6 +-
 .../flex/core/IDataGridPresentationModel.as     |   4 +-
 .../flexUnitTests/DataGridColumnTesterTest.as   |   4 +-
 .../as/projects/FlexJSUI/basic-manifest.xml     |  72 +++---
 .../as/projects/FlexJSUI/createjs-manifest.xml  |   6 +-
 frameworks/as/projects/FlexJSUI/defaults.css    | 240 +++++++++----------
 .../as/projects/FlexJSUI/html5-manifest.xml     |  18 +-
 .../as/projects/FlexJSUI/jquery-manifest.xml    |   6 +-
 .../as/projects/FlexJSUI/src/FlexJSUIClasses.as | 119 ++++-----
 .../src/org/apache/flex/core/ILayoutParent.as   |   6 +-
 .../src/org/apache/flex/createjs/CheckBox.as    |   4 +-
 .../src/org/apache/flex/createjs/Label.as       |   4 +-
 .../src/org/apache/flex/createjs/TextButton.as  |   2 +-
 .../src/org/apache/flex/html/beads/AlertView.as |   2 +-
 .../flex/html/beads/NumericStepperView.as       |   2 +-
 .../src/org/apache/flex/jquery/CheckBox.as      |   4 +-
 .../src/org/apache/flex/jquery/RadioButton.as   |   4 +-
 .../src/org/apache/flex/jquery/TextButton.as    |   4 +-
 .../src/org/apache/flex/svg/TextButton.as       |   4 +-
 .../as/projects/FlexJSUI/svg-manifest.xml       |   2 +-
 .../core/IDataProviderItemRendererMapper.js     |   2 +-
 .../FlexJS/src/org/apache/flex/core/ListBase.js |   2 +-
 .../src/org/apache/flex/html/ButtonBar.js       |   2 +-
 .../src/org/apache/flex/svg/TextButton.js       |   2 +-
 frameworks/js/FlexJS/tests/MyInitialView.js     |   8 +-
 .../js/FlexJS/tests/MySimpleValuesImpl.js       |   6 +-
 frameworks/js/FlexJS/tests/test.html            |   6 +-
 marmotinni/build.xml                            |   6 +-
 .../staticControls/textButton/TextButton.java   |   2 +-
 mustella/tests/basicTests/BasicTests.css        |   4 +-
 mustella/tests/basicTests/shim/VBox.as          |   4 +-
 57 files changed, 382 insertions(+), 380 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridExample/src/mybeads/RowHeightBead.as
----------------------------------------------------------------------
diff --git a/examples/DataGridExample/src/mybeads/RowHeightBead.as b/examples/DataGridExample/src/mybeads/RowHeightBead.as
index 2b0661e..7c41e64 100644
--- a/examples/DataGridExample/src/mybeads/RowHeightBead.as
+++ b/examples/DataGridExample/src/mybeads/RowHeightBead.as
@@ -28,9 +28,9 @@ package mybeads
 	import org.apache.flex.core.UIBase;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.List;
-	import org.apache.flex.html.staticControls.beads.DataGridView;
-	import org.apache.flex.html.staticControls.beads.IListView;
+	import org.apache.flex.html.List;
+	import org.apache.flex.html.beads.DataGridView;
+	import org.apache.flex.html.beads.IListView;
 	
 	public class RowHeightBead implements IBead
 	{
@@ -152,4 +152,4 @@ package mybeads
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridExample/src/products/ProductItemRenderer.as
----------------------------------------------------------------------
diff --git a/examples/DataGridExample/src/products/ProductItemRenderer.as b/examples/DataGridExample/src/products/ProductItemRenderer.as
index f24da32..b08f759 100644
--- a/examples/DataGridExample/src/products/ProductItemRenderer.as
+++ b/examples/DataGridExample/src/products/ProductItemRenderer.as
@@ -18,8 +18,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 package products
 {
-	import org.apache.flex.html.staticControls.Image;
-	import org.apache.flex.html.staticControls.supportClasses.DataItemRenderer;
+	import org.apache.flex.html.Image;
+	import org.apache.flex.html.supportClasses.DataItemRenderer;
 	
 	public class ProductItemRenderer extends DataItemRenderer
 	{
@@ -58,4 +58,4 @@ package products
 			updateRenderer();
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridXcompile/src/DataGridXcompile.mxml
----------------------------------------------------------------------
diff --git a/examples/DataGridXcompile/src/DataGridXcompile.mxml b/examples/DataGridXcompile/src/DataGridXcompile.mxml
index 9182b33..6d89f91 100644
--- a/examples/DataGridXcompile/src/DataGridXcompile.mxml
+++ b/examples/DataGridXcompile/src/DataGridXcompile.mxml
@@ -22,7 +22,7 @@
 				   xmlns:local="*"
 				   xmlns:models="models.*"
 				   xmlns:basic="library://ns.apache.org/flexjs/basic" 
-				   xmlns:staticControls="org.apache.flex.html.staticControls.*"
+				   xmlns:staticControls="org.apache.flex.html.*"
 				   >
 	
 	<basic:valuesImpl>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridXcompile/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/DataGridXcompile/src/MyInitialView.mxml b/examples/DataGridXcompile/src/MyInitialView.mxml
index 11bf6c0..71dee99 100644
--- a/examples/DataGridXcompile/src/MyInitialView.mxml
+++ b/examples/DataGridXcompile/src/MyInitialView.mxml
@@ -31,16 +31,16 @@ limitations under the License.
 		
 		.boxGrid {
 			background-color: #FF0000;
-			IBeadView: ClassReference('org.apache.flex.html.staticControls.beads.BoxGridView');
+			IBeadView: ClassReference('org.apache.flex.html.beads.BoxGridView');
 		}
 		
 		custom|DataGrid
 		{
-			IDataGridPresentationModel: ClassReference("org.apache.flex.html.staticControls.beads.models.DataGridPresentationModel");
+			IDataGridPresentationModel: ClassReference("org.apache.flex.html.beads.models.DataGridPresentationModel");
 			IBeadView: ClassReference("org.apache.flex.html.customControls.beads.DataGridView");
-			IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.DataGridModel");
+			IBeadModel: ClassReference("org.apache.flex.html.beads.models.DataGridModel");
 			IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-			IItemRenderer: ClassReference("org.apache.flex.html.staticControls.supportClasses.StringItemRenderer");
+			IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
 			
 			background-color: #FFFFFF;
 		}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridColumnView.as
----------------------------------------------------------------------
diff --git a/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridColumnView.as b/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridColumnView.as
index 92ae4d2..88bd2ff 100644
--- a/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridColumnView.as
+++ b/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridColumnView.as
@@ -19,7 +19,7 @@
 package org.apache.flex.html.customControls.beads
 {
 	import org.apache.flex.core.IStrand;
-	import org.apache.flex.html.staticControls.beads.ListView;
+	import org.apache.flex.html.beads.ListView;
 	
 	public class DataGridColumnView extends ListView
 	{
@@ -54,4 +54,4 @@ package org.apache.flex.html.customControls.beads
 			_labelField = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as
----------------------------------------------------------------------
diff --git a/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as b/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as
index 0f41aab..97f59e8 100644
--- a/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as
+++ b/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as
@@ -30,12 +30,12 @@ package org.apache.flex.html.customControls.beads
 	import org.apache.flex.core.ValuesManager;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.ButtonBar;
-	import org.apache.flex.html.staticControls.Container;
-	import org.apache.flex.html.staticControls.List;
-	import org.apache.flex.html.staticControls.SimpleList;
-	import org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout;
-	import org.apache.flex.html.staticControls.beads.models.ArraySelectionModel;
+	import org.apache.flex.html.ButtonBar;
+	import org.apache.flex.html.Container;
+	import org.apache.flex.html.List;
+	import org.apache.flex.html.SimpleList;
+	import org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout;
+	import org.apache.flex.html.beads.models.ArraySelectionModel;
 	
 	public class DataGridView implements IDataGridView
 	{
@@ -146,4 +146,4 @@ package org.apache.flex.html.customControls.beads
 			IEventDispatcher(_strand).dispatchEvent(new Event('change'));
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataItemRendererFactoryForColumnData.as
----------------------------------------------------------------------
diff --git a/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataItemRendererFactoryForColumnData.as b/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataItemRendererFactoryForColumnData.as
index a3e5a38..493984f 100644
--- a/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataItemRendererFactoryForColumnData.as
+++ b/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataItemRendererFactoryForColumnData.as
@@ -28,8 +28,8 @@ package org.apache.flex.html.customControls.beads
 	import org.apache.flex.core.ValuesManager;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.supportClasses.DataItemRenderer;
-	import org.apache.flex.html.staticControls.beads.IListView;
+	import org.apache.flex.html.supportClasses.DataItemRenderer;
+	import org.apache.flex.html.beads.IListView;
 	
 	public class DataItemRendererFactoryForColumnData implements IBead, IDataProviderItemRendererMapper
 	{
@@ -98,4 +98,4 @@ package org.apache.flex.html.customControls.beads
 			IEventDispatcher(_strand).dispatchEvent(new Event("itemsCreated"));
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridXcompile/src/org/apache/flex/html/staticControls/beads/BoxGridView.as
----------------------------------------------------------------------
diff --git a/examples/DataGridXcompile/src/org/apache/flex/html/staticControls/beads/BoxGridView.as b/examples/DataGridXcompile/src/org/apache/flex/html/staticControls/beads/BoxGridView.as
index e716abb..a9d7b8f 100644
--- a/examples/DataGridXcompile/src/org/apache/flex/html/staticControls/beads/BoxGridView.as
+++ b/examples/DataGridXcompile/src/org/apache/flex/html/staticControls/beads/BoxGridView.as
@@ -16,12 +16,12 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
 {
 	import org.apache.flex.core.IBeadView;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.UIBase;
-	import org.apache.flex.html.staticControls.Label;
+	import org.apache.flex.html.Label;
 	
 	public class BoxGridView implements IBeadView
 	{
@@ -45,4 +45,4 @@ package org.apache.flex.html.staticControls.beads
 			UIBase(_strand).addElement(label);
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/FlexJSTest_Panel/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_Panel/src/MyInitialView.mxml b/examples/FlexJSTest_Panel/src/MyInitialView.mxml
index e5df7da..a9c0647 100644
--- a/examples/FlexJSTest_Panel/src/MyInitialView.mxml
+++ b/examples/FlexJSTest_Panel/src/MyInitialView.mxml
@@ -22,8 +22,8 @@ limitations under the License.
 			    initComplete="initControls()">
     <fx:Script>
         <![CDATA[
-			import org.apache.flex.html.staticControls.Alert;
-			import org.apache.flex.html.staticControls.SimpleAlert;
+			import org.apache.flex.html.Alert;
+			import org.apache.flex.html.SimpleAlert;
 			
 			private function initControls():void
 			{
@@ -103,17 +103,17 @@ limitations under the License.
         @media -flex-flash
         {
             .TitleBar {
-                iBackgroundBead: ClassReference('org.apache.flex.html.staticControls.beads.SolidBackgroundBead');
+                iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
             }
             
             .panel1 {
-                iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
-                iBackgroundBead: ClassReference('org.apache.flex.html.staticControls.beads.SolidBackgroundBead');
+                iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+                iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
             }
             
             .numStepper {
-                iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
-                iBackgroundBead: ClassReference('org.apache.flex.html.staticControls.beads.SolidBackgroundBead');
+                iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+                iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
             }
             
         }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/FlexJSTest_jquery/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_jquery/src/MyInitialView.mxml b/examples/FlexJSTest_jquery/src/MyInitialView.mxml
index 7868d10..40b533c 100644
--- a/examples/FlexJSTest_jquery/src/MyInitialView.mxml
+++ b/examples/FlexJSTest_jquery/src/MyInitialView.mxml
@@ -25,8 +25,8 @@ limitations under the License.
         <![CDATA[            
 			import org.apache.flex.events.CustomEvent;
 			import org.apache.flex.events.Event;
-			import org.apache.flex.html.staticControls.Label;
-			import org.apache.flex.html.staticControls.TextButton;
+			import org.apache.flex.html.Label;
+			import org.apache.flex.html.TextButton;
 			import org.apache.flex.utils.Timer;
 			
 			private var timer:org.apache.flex.utils.Timer;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/FormatExample/src/MyFormView.mxml
----------------------------------------------------------------------
diff --git a/examples/FormatExample/src/MyFormView.mxml b/examples/FormatExample/src/MyFormView.mxml
index 60df6dd..56d89d7 100644
--- a/examples/FormatExample/src/MyFormView.mxml
+++ b/examples/FormatExample/src/MyFormView.mxml
@@ -21,7 +21,7 @@ limitations under the License.
 				xmlns:basic="library://ns.apache.org/flexjs/basic"
 				xmlns:local="*" 
 				xmlns:models="models.*" 
-				xmlns:acc="org.apache.flex.html.staticControls.accessories.*">
+				xmlns:acc="org.apache.flex.html.accessories.*">
 	
 	<fx:Style>
 		.title {

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/FormatExample/src/dialogs/DialogView.as
----------------------------------------------------------------------
diff --git a/examples/FormatExample/src/dialogs/DialogView.as b/examples/FormatExample/src/dialogs/DialogView.as
index dc4377d..0122c06 100644
--- a/examples/FormatExample/src/dialogs/DialogView.as
+++ b/examples/FormatExample/src/dialogs/DialogView.as
@@ -19,7 +19,7 @@
 package dialogs
 {
 	import org.apache.flex.core.IStrand;
-	import org.apache.flex.html.staticControls.beads.PanelView;
+	import org.apache.flex.html.beads.PanelView;
 	
 	public class DialogView extends PanelView
 	{
@@ -35,4 +35,4 @@ package dialogs
 			super.strand = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/NumberFormatter.as
----------------------------------------------------------------------
diff --git a/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/NumberFormatter.as b/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/NumberFormatter.as
index ab9e6b7..0d1b613 100644
--- a/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/NumberFormatter.as
+++ b/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/NumberFormatter.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.accessories
+package org.apache.flex.html.accessories
 {
 	import org.apache.flex.core.IBeadModel;
 	import org.apache.flex.core.IFormatBead;
@@ -207,4 +207,4 @@ package org.apache.flex.html.staticControls.accessories
 			return result;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/PhoneNumberFormatter.as
----------------------------------------------------------------------
diff --git a/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/PhoneNumberFormatter.as b/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/PhoneNumberFormatter.as
index 5655732..7523c96 100644
--- a/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/PhoneNumberFormatter.as
+++ b/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/PhoneNumberFormatter.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.accessories
+package org.apache.flex.html.accessories
 {
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IBeadModel;
@@ -192,4 +192,4 @@ package org.apache.flex.html.staticControls.accessories
 			return result;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/ListsTest/src/FirstView.mxml
----------------------------------------------------------------------
diff --git a/examples/ListsTest/src/FirstView.mxml b/examples/ListsTest/src/FirstView.mxml
index 7c480a6..32e9d82 100644
--- a/examples/ListsTest/src/FirstView.mxml
+++ b/examples/ListsTest/src/FirstView.mxml
@@ -38,13 +38,13 @@ limitations under the License.
 		 * the itemRenderer in a style definition along with other settings.
 		 */
 		.productList {
-			IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData");
+			IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
 			IItemRenderer: ClassReference("products.ProductItemRenderer");
 		}
 		
 		sample|ProductItemRenderer {
 			height: 40;
-			IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController");
+			IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
 		}
 		
 	</fx:Style>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/ListsTest/src/products/ProductItemRenderer.as
----------------------------------------------------------------------
diff --git a/examples/ListsTest/src/products/ProductItemRenderer.as b/examples/ListsTest/src/products/ProductItemRenderer.as
index 2e39669..587cae6 100644
--- a/examples/ListsTest/src/products/ProductItemRenderer.as
+++ b/examples/ListsTest/src/products/ProductItemRenderer.as
@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package products
 {	
-	import org.apache.flex.html.staticControls.Label;
-	import org.apache.flex.html.staticControls.Image;
-	import org.apache.flex.html.staticControls.supportClasses.DataItemRenderer;
+	import org.apache.flex.html.Label;
+	import org.apache.flex.html.Image;
+	import org.apache.flex.html.supportClasses.DataItemRenderer;
 
 	public class ProductItemRenderer extends DataItemRenderer
 	{
@@ -75,4 +75,4 @@ package products
 			updateRenderer();
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/StockQuote/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/StockQuote/src/MyInitialView.mxml b/examples/StockQuote/src/MyInitialView.mxml
index 2b52faa..ef54a26 100644
--- a/examples/StockQuote/src/MyInitialView.mxml
+++ b/examples/StockQuote/src/MyInitialView.mxml
@@ -92,11 +92,11 @@ limitations under the License.
         {
 
             .leftSide {
-                iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
+                iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
             }
             
             .rightSide {
-                iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
+                iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
             }
         }
 	</fx:Style>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/TodoListSampleApp/src/sample/todo/renderers/TodoItemRenderer.as
----------------------------------------------------------------------
diff --git a/examples/TodoListSampleApp/src/sample/todo/renderers/TodoItemRenderer.as b/examples/TodoListSampleApp/src/sample/todo/renderers/TodoItemRenderer.as
index 0158513..a4fa9f1 100644
--- a/examples/TodoListSampleApp/src/sample/todo/renderers/TodoItemRenderer.as
+++ b/examples/TodoListSampleApp/src/sample/todo/renderers/TodoItemRenderer.as
@@ -17,10 +17,10 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 package sample.todo.renderers {
-    import org.apache.flex.html.staticControls.Button;
-    import org.apache.flex.html.staticControls.CheckBox;
-    import org.apache.flex.html.staticControls.Label;
-    import org.apache.flex.html.staticControls.supportClasses.DataItemRenderer;
+    import org.apache.flex.html.Button;
+    import org.apache.flex.html.CheckBox;
+    import org.apache.flex.html.Label;
+    import org.apache.flex.html.supportClasses.DataItemRenderer;
 
     public class TodoItemRenderer extends DataItemRenderer {
         public function TodoItemRenderer() {
@@ -66,4 +66,4 @@ package sample.todo.renderers {
             updateRenderer();
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/TodoListSampleApp/src/sample/todo/views/TodoListView.mxml
----------------------------------------------------------------------
diff --git a/examples/TodoListSampleApp/src/sample/todo/views/TodoListView.mxml b/examples/TodoListSampleApp/src/sample/todo/views/TodoListView.mxml
index 844158e..7bbe027 100644
--- a/examples/TodoListSampleApp/src/sample/todo/views/TodoListView.mxml
+++ b/examples/TodoListSampleApp/src/sample/todo/views/TodoListView.mxml
@@ -96,13 +96,13 @@ limitations under the License.
          * the itemRenderer in a style definition along with other settings.
          */
         .todoList {
-            IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData");
+            IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
             IItemRenderer: ClassReference("sample.todo.renderers.TodoItemRenderer");
         }
 
         renderers|TodoItemRenderer {
             height: 40;
-            IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController");
+            IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
         }
     </fx:Style>
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/basic-manifest.xml b/frameworks/as/projects/FlexJSJX/basic-manifest.xml
index 85135bf..9630ad6 100644
--- a/frameworks/as/projects/FlexJSJX/basic-manifest.xml
+++ b/frameworks/as/projects/FlexJSJX/basic-manifest.xml
@@ -21,14 +21,14 @@
 
 <componentPackage>
 
-    <component id="DataGrid" class="org.apache.flex.html.staticControls.DataGrid"/>
-    <component id="DataGridColumn" class="org.apache.flex.html.staticControls.supportClasses.DataGridColumn"/>
-    <component id="FormatableLabelView" class="org.apache.flex.html.staticControls.beads.FormatableLabelView"/>
-    <component id="FormatableTextInputView" class="org.apache.flex.html.staticControls.beads.FormatableTextInputView"/>
-    <component id="DataGridPresentationModel" class="org.apache.flex.html.staticControls.beads.models.DataGridPresentationModel" />
-
-    <component id="DateChooser" class="org.apache.flex.html.staticControls.DateChooser"/>
-    <component id="DateField" class="org.apache.flex.html.staticControls.DateField"/>
+    <component id="DataGrid" class="org.apache.flex.html.DataGrid"/>
+    <component id="DataGridColumn" class="org.apache.flex.html.supportClasses.DataGridColumn"/>
+    <component id="FormatableLabelView" class="org.apache.flex.html.beads.FormatableLabelView"/>
+    <component id="FormatableTextInputView" class="org.apache.flex.html.beads.FormatableTextInputView"/>
+    <component id="DataGridPresentationModel" class="org.apache.flex.html.beads.models.DataGridPresentationModel" />
+
+    <component id="DateChooser" class="org.apache.flex.html.DateChooser"/>
+    <component id="DateField" class="org.apache.flex.html.DateField"/>
     <component id="BarChart" class="org.apache.flex.charts.BarChart" />
     <component id="BarChartSeries" class="org.apache.flex.charts.supportClasses.BarChartSeries" />
     <component id="BoxItemRenderer" class="org.apache.flex.charts.supportClasses.BoxItemRenderer" />

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/defaults.css b/frameworks/as/projects/FlexJSJX/defaults.css
index 3666776..6b0970b 100644
--- a/frameworks/as/projects/FlexJSJX/defaults.css
+++ b/frameworks/as/projects/FlexJSJX/defaults.css
@@ -21,9 +21,9 @@
 
 BarChart
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
     IBeadView:  ClassReference("org.apache.flex.charts.beads.BarChartView");			
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController");
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
     IBeadLayout: ClassReference("org.apache.flex.charts.beads.layouts.BarChartLayout");
     IDataProviderItemRendererMapper: ClassReference("org.apache.flex.charts.beads.ChartItemRendererFactory");
     IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
@@ -32,26 +32,26 @@ BarChart
 
 DataGrid
 {
-    IDataGridPresentationModel: ClassReference("org.apache.flex.html.staticControls.beads.models.DataGridPresentationModel");
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.DataGridView");
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.DataGridModel");
+    IDataGridPresentationModel: ClassReference("org.apache.flex.html.beads.models.DataGridPresentationModel");
+    IBeadView: ClassReference("org.apache.flex.html.beads.DataGridView");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.DataGridModel");
     IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-    IItemRenderer: ClassReference("org.apache.flex.html.staticControls.supportClasses.StringItemRenderer");
+    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
 
     background-color: #FFFFFF;
 }
 
 DateChooser {
-    IBeadView:   ClassReference("org.apache.flex.html.staticControls.beads.DateChooserView");
-    IBeadModel:  ClassReference("org.apache.flex.html.staticControls.beads.models.DateChooserModel");
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.DateChooserMouseController");
+    IBeadView:   ClassReference("org.apache.flex.html.beads.DateChooserView");
+    IBeadModel:  ClassReference("org.apache.flex.html.beads.models.DateChooserModel");
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DateChooserMouseController");
     width:  280px;
     height: 240px;
 }
 
 DateField {
-    IBeadView:   ClassReference("org.apache.flex.html.staticControls.beads.DateFieldView");
-    IBeadModel:  ClassReference("org.apache.flex.html.staticControls.beads.models.DateChooserModel");
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.DateFieldMouseController");
-    IFormatBead: ClassReference("org.apache.flex.html.staticControls.accessories.DateFormatMMDDYYYYBead");
+    IBeadView:   ClassReference("org.apache.flex.html.beads.DateFieldView");
+    IBeadModel:  ClassReference("org.apache.flex.html.beads.models.DateChooserModel");
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DateFieldMouseController");
+    IFormatBead: ClassReference("org.apache.flex.html.accessories.DateFormatMMDDYYYYBead");
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as b/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
index 7ca0481..5e8608a 100644
--- a/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
+++ b/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
@@ -34,20 +34,21 @@ internal class FlexJSJXClasses
 	import org.apache.flex.charts.supportClasses.BarChartSeries; BarChartSeries;
 	import org.apache.flex.charts.supportClasses.BoxItemRenderer; BoxItemRenderer;
 	
-	import org.apache.flex.html.staticControls.accessories.DateFormatMMDDYYYYBead; DateFormatMMDDYYYYBead;
-	import org.apache.flex.html.staticControls.beads.DataGridColumnView; DataGridColumnView;
-	import org.apache.flex.html.staticControls.beads.DataGridView; DataGridView;
-	import org.apache.flex.html.staticControls.beads.DateChooserView; DateChooserView;
-	import org.apache.flex.html.staticControls.beads.DateFieldView; DateFieldView;
-	import org.apache.flex.html.staticControls.beads.FormatableLabelView; FormatableLabelView;
-	import org.apache.flex.html.staticControls.beads.FormatableTextInputView; FormatableTextInputView;
-	import org.apache.flex.html.staticControls.beads.models.DataGridModel; DataGridModel;
-	import org.apache.flex.html.staticControls.beads.models.DateChooserModel; DateChooserModel;
-	import org.apache.flex.html.staticControls.beads.models.DataGridPresentationModel; DataGridPresentationModel;
-	import org.apache.flex.html.staticControls.beads.controllers.DateChooserMouseController; DateChooserMouseController;
-	import org.apache.flex.html.staticControls.beads.controllers.DateFieldMouseController; DateFieldMouseController;
-	import org.apache.flex.html.staticControls.supportClasses.DataGridColumn; DataGridColumn;
-	import org.apache.flex.html.staticControls.supportClasses.DateChooserButton; DateChooserButton;
+	import org.apache.flex.html.accessories.DateFormatMMDDYYYYBead; DateFormatMMDDYYYYBead;
+	import org.apache.flex.html.beads.DataGridColumnView; DataGridColumnView;
+	import org.apache.flex.html.beads.DataGridView; DataGridView;
+	import org.apache.flex.html.beads.DateChooserView; DateChooserView;
+	import org.apache.flex.html.beads.DateFieldView; DateFieldView;
+	import org.apache.flex.html.beads.FormatableLabelView; FormatableLabelView;
+	import org.apache.flex.html.beads.FormatableTextInputView; FormatableTextInputView;
+	import org.apache.flex.html.beads.models.DataGridModel; DataGridModel;
+	import org.apache.flex.html.beads.models.DateChooserModel; DateChooserModel;
+	import org.apache.flex.html.beads.models.DataGridPresentationModel; DataGridPresentationModel;
+	import org.apache.flex.html.beads.controllers.DateChooserMouseController; DateChooserMouseController;
+	import org.apache.flex.html.beads.controllers.DateFieldMouseController; DateFieldMouseController;
+	import org.apache.flex.html.supportClasses.DataGridColumn; DataGridColumn;
+	import org.apache.flex.html.supportClasses.DateChooserButton; DateChooserButton;
 }
 
 }
+

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/BarChart.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/BarChart.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/BarChart.as
index 4151634..0048ad2 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/BarChart.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/BarChart.as
@@ -20,7 +20,7 @@ package org.apache.flex.charts
 {
 	import org.apache.flex.charts.core.IChart;
 	import org.apache.flex.events.Event;
-	import org.apache.flex.html.staticControls.List;
+	import org.apache.flex.html.List;
 	
 	/**
 	 *  The BarChart class draws a multi-series graph of data using vertical
@@ -68,4 +68,4 @@ package org.apache.flex.charts
 			dispatchEvent(new Event("seriesChanged"));
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/BarChartView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/BarChartView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/BarChartView.as
index 86aa397..bd79026 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/BarChartView.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/BarChartView.as
@@ -20,7 +20,7 @@ package org.apache.flex.charts.beads
 {
 	import org.apache.flex.core.ISelectionModel;
 	import org.apache.flex.core.IStrand;
-	import org.apache.flex.html.staticControls.beads.ListView;
+	import org.apache.flex.html.beads.ListView;
 	
 	/**
 	 *  The BarChartView class is the visual bead for a BarChart. This class makes
@@ -64,4 +64,4 @@ package org.apache.flex.charts.beads
 			super.strand = value;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
index 4204811..8820f7e 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
@@ -29,7 +29,7 @@ package org.apache.flex.charts.beads
 	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.IListView;
+	import org.apache.flex.html.beads.IListView;
 	
 	/**
 	 *  The ChartItemRendererFactory class implements IDataProviderItemRendererMapper
@@ -143,4 +143,4 @@ package org.apache.flex.charts.beads
 		{
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/XAxisBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/XAxisBead.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/XAxisBead.as
index 1763fce..c3af014 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/XAxisBead.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/XAxisBead.as
@@ -30,8 +30,8 @@ package org.apache.flex.charts.beads
 	import org.apache.flex.core.UIBase;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.Label;
-	import org.apache.flex.html.staticControls.beads.models.ArraySelectionModel;
+	import org.apache.flex.html.Label;
+	import org.apache.flex.html.beads.models.ArraySelectionModel;
 	
 	/**
 	 *  The BoxItemRenderer displays a colored rectangular area suitable for use as
@@ -150,4 +150,4 @@ package org.apache.flex.charts.beads
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as
index 67f5978..1062371 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as
@@ -21,7 +21,7 @@ package org.apache.flex.charts.supportClasses
 	import org.apache.flex.charts.core.IChartItemRenderer;
 	import org.apache.flex.core.FilledRectangle;
 	import org.apache.flex.core.UIBase;
-	import org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase;
+	import org.apache.flex.html.supportClasses.UIItemRendererBase;
 	
 	/**
 	 *  The BoxItemRenderer displays a colored rectangular area suitable for use as
@@ -129,7 +129,7 @@ package org.apache.flex.charts.supportClasses
 		}
 		
 		/**
-		 *  @copy org.apache.flex.staticControls.supportClasses.UIItemRendererBase#data
+		 *  @copy org.apache.flex.supportClasses.UIItemRendererBase#data
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -185,4 +185,4 @@ package org.apache.flex.charts.supportClasses
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/IDataGridPresentationModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/IDataGridPresentationModel.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/IDataGridPresentationModel.as
index 4603eaa..2e4fa90 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/IDataGridPresentationModel.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/IDataGridPresentationModel.as
@@ -43,7 +43,7 @@ package org.apache.flex.core
 		function set columnLabels(value:Array):void;
 		
 		/**
-		 *  The height of all of the rows in the org.apache.flex.html.staticControls.DataGrid.
+		 *  The height of all of the rows in the org.apache.flex.html.DataGrid.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -53,4 +53,4 @@ package org.apache.flex.core
 		function get rowHeight():Number;
 		function set rowHeight(value:Number):void;
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/tests/flexUnitTests/DataGridColumnTesterTest.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/tests/flexUnitTests/DataGridColumnTesterTest.as b/frameworks/as/projects/FlexJSJX/tests/flexUnitTests/DataGridColumnTesterTest.as
index 9720119..275b2a3 100644
--- a/frameworks/as/projects/FlexJSJX/tests/flexUnitTests/DataGridColumnTesterTest.as
+++ b/frameworks/as/projects/FlexJSJX/tests/flexUnitTests/DataGridColumnTesterTest.as
@@ -2,7 +2,7 @@ package flexUnitTests
 {
     import flexunit.framework.Assert;
     
-    import org.apache.flex.html.staticControls.supportClasses.DataGridColumn;
+    import org.apache.flex.html.supportClasses.DataGridColumn;
     
     public class DataGridColumnTesterTest
     {		
@@ -34,4 +34,4 @@ package flexUnitTests
             Assert.assertEquals("Error testing DataGridColumn.label", column.label, "foo");
         }        
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/basic-manifest.xml b/frameworks/as/projects/FlexJSUI/basic-manifest.xml
index 01b7a46..7ac02b3 100644
--- a/frameworks/as/projects/FlexJSUI/basic-manifest.xml
+++ b/frameworks/as/projects/FlexJSUI/basic-manifest.xml
@@ -27,49 +27,49 @@
     <component id="ViewBase" class="org.apache.flex.core.ViewBase"/>
     <component id="ConstantBinding" class="org.apache.flex.binding.ConstantBinding"/>
     <component id="SimpleBinding" class="org.apache.flex.binding.SimpleBinding"/>
-    <component id="Button" class="org.apache.flex.html.staticControls.Button"/>
-    <component id="ButtonBar" class="org.apache.flex.html.staticControls.ButtonBar"/>
-    <component id="DropDownList" class="org.apache.flex.html.staticControls.DropDownList"/>
-    <component id="DropDownListList" class="org.apache.flex.html.staticControls.supportClasses.DropDownListList"/>
-    <component id="Image" class="org.apache.flex.html.staticControls.Image"/>
-    <component id="Label" class="org.apache.flex.html.staticControls.Label"/>
-    <component id="TextButton" class="org.apache.flex.html.staticControls.TextButton"/>
-    <component id="TextInput" class="org.apache.flex.html.staticControls.TextInput"/>
-    <component id="TextArea" class="org.apache.flex.html.staticControls.TextArea"/>
-    <component id="List" class="org.apache.flex.html.staticControls.List"/>
-    <component id="SimpleList" class="org.apache.flex.html.staticControls.SimpleList"/>
-    <component id="CheckBox" class="org.apache.flex.html.staticControls.CheckBox"/>
-    <component id="RadioButton" class="org.apache.flex.html.staticControls.RadioButton"/>
-    <component id="ComboBox" class="org.apache.flex.html.staticControls.ComboBox"/>
+    <component id="Button" class="org.apache.flex.html.Button"/>
+    <component id="ButtonBar" class="org.apache.flex.html.ButtonBar"/>
+    <component id="DropDownList" class="org.apache.flex.html.DropDownList"/>
+    <component id="DropDownListList" class="org.apache.flex.html.supportClasses.DropDownListList"/>
+    <component id="Image" class="org.apache.flex.html.Image"/>
+    <component id="Label" class="org.apache.flex.html.Label"/>
+    <component id="TextButton" class="org.apache.flex.html.TextButton"/>
+    <component id="TextInput" class="org.apache.flex.html.TextInput"/>
+    <component id="TextArea" class="org.apache.flex.html.TextArea"/>
+    <component id="List" class="org.apache.flex.html.List"/>
+    <component id="SimpleList" class="org.apache.flex.html.SimpleList"/>
+    <component id="CheckBox" class="org.apache.flex.html.CheckBox"/>
+    <component id="RadioButton" class="org.apache.flex.html.RadioButton"/>
+    <component id="ComboBox" class="org.apache.flex.html.ComboBox"/>
     <component id="HTTPService" class="org.apache.flex.net.HTTPService"/>
     <component id="LazyCollection" class="org.apache.flex.net.dataConverters.LazyCollection"/>
     <component id="JSONInputParser" class="org.apache.flex.net.JSONInputParser"/>
     <component id="JSONItemConverter" class="org.apache.flex.net.JSONItemConverter"/>
     <component id="ViewSourceContextMenuOption" class="org.apache.flex.utils.ViewSourceContextMenuOption"/>
     <component id="BinaryUploader" class="org.apache.flex.net.BinaryUploader"/>
-    <component id="Container" class="org.apache.flex.html.staticControls.Container"/>
-    <component id="Panel" class="org.apache.flex.html.staticControls.Panel"/>
-    <component id="ControlBar" class="org.apache.flex.html.staticControls.ControlBar"/>
-    <component id="TitleBar" class="org.apache.flex.html.staticControls.TitleBar"/>
-    <component id="TitleBarModel" class="org.apache.flex.html.staticControls.beads.models.TitleBarModel"/>
-    <component id="NonVirtualVerticalLayout" class="org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout"/>
-    <component id="NonVirtualHorizontalLayout" class="org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout"/>
-    <component id="TileLayout" class="org.apache.flex.html.staticControls.beads.layouts.TileLayout"/>
-    <component id="SimpleAlert" class="org.apache.flex.html.staticControls.SimpleAlert"/>
-    <component id="Alert" class="org.apache.flex.html.staticControls.Alert"/>
-    <component id="Spinner" class="org.apache.flex.html.staticControls.Spinner"/>
-    <component id="Slider" class="org.apache.flex.html.staticControls.Slider"/>
-    <component id="SolidBackgroundBead" class="org.apache.flex.html.staticControls.beads.SolidBackgroundBead"/>
+    <component id="Container" class="org.apache.flex.html.Container"/>
+    <component id="Panel" class="org.apache.flex.html.Panel"/>
+    <component id="ControlBar" class="org.apache.flex.html.ControlBar"/>
+    <component id="TitleBar" class="org.apache.flex.html.TitleBar"/>
+    <component id="TitleBarModel" class="org.apache.flex.html.beads.models.TitleBarModel"/>
+    <component id="NonVirtualVerticalLayout" class="org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout"/>
+    <component id="NonVirtualHorizontalLayout" class="org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout"/>
+    <component id="TileLayout" class="org.apache.flex.html.beads.layouts.TileLayout"/>
+    <component id="SimpleAlert" class="org.apache.flex.html.SimpleAlert"/>
+    <component id="Alert" class="org.apache.flex.html.Alert"/>
+    <component id="Spinner" class="org.apache.flex.html.Spinner"/>
+    <component id="Slider" class="org.apache.flex.html.Slider"/>
+    <component id="SolidBackgroundBead" class="org.apache.flex.html.beads.SolidBackgroundBead"/>
     <component id="ViewBaseDataBinding" class="org.apache.flex.core.ViewBaseDataBinding"/>
-    <component id="NumericStepper" class="org.apache.flex.html.staticControls.NumericStepper" />
-    <component id="TextFieldItemRenderer" class="org.apache.flex.html.staticControls.supportClasses.TextFieldItemRenderer"/>
-    <component id="StringItemRenderer" class="org.apache.flex.html.staticControls.supportClasses.StringItemRenderer"/>
-    <component id="DataItemRenderer" class="org.apache.flex.html.staticControls.supportClasses.DataItemRenderer"/>
-    <component id="ButtonBarButtonItemRenderer" class="org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer"/>
-    <component id="ScrollBar" class="org.apache.flex.html.staticControls.supportClasses.ScrollBar"/>
-    <component id="NumericOnlyTextInputBead" class="org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead" />
-    <component id="PasswordInputBead" class="org.apache.flex.html.staticControls.accessories.PasswordInputBead" />
-    <component id="TextPromptBead" class="org.apache.flex.html.staticControls.accessories.TextPromptBead" />
+    <component id="NumericStepper" class="org.apache.flex.html.NumericStepper" />
+    <component id="TextFieldItemRenderer" class="org.apache.flex.html.supportClasses.TextFieldItemRenderer"/>
+    <component id="StringItemRenderer" class="org.apache.flex.html.supportClasses.StringItemRenderer"/>
+    <component id="DataItemRenderer" class="org.apache.flex.html.supportClasses.DataItemRenderer"/>
+    <component id="ButtonBarButtonItemRenderer" class="org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer"/>
+    <component id="ScrollBar" class="org.apache.flex.html.supportClasses.ScrollBar"/>
+    <component id="NumericOnlyTextInputBead" class="org.apache.flex.html.accessories.NumericOnlyTextInputBead" />
+    <component id="PasswordInputBead" class="org.apache.flex.html.accessories.PasswordInputBead" />
+    <component id="TextPromptBead" class="org.apache.flex.html.accessories.TextPromptBead" />
     <component id="MixinManager" class="org.apache.flex.utils.MixinManager" />
 
 </componentPackage>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/createjs-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/createjs-manifest.xml b/frameworks/as/projects/FlexJSUI/createjs-manifest.xml
index c72090c..1c5a5ed 100644
--- a/frameworks/as/projects/FlexJSUI/createjs-manifest.xml
+++ b/frameworks/as/projects/FlexJSUI/createjs-manifest.xml
@@ -24,8 +24,8 @@
     <component id="Application" class="org.apache.flex.createjs.Application"/>
     <component id="UIBase" class="org.apache.flex.createjs.core.UIBase"/>
     <component id="ViewBase" class="org.apache.flex.createjs.core.ViewBase"/>
-    <component id="Label" class="org.apache.flex.createjs.staticControls.Label"/>
-    <component id="TextButton" class="org.apache.flex.createjs.staticControls.TextButton"/>
-    <component id="CheckBox" class="org.apache.flex.createjs.staticControls.CheckBox"/>
+    <component id="Label" class="org.apache.flex.createjs.Label"/>
+    <component id="TextButton" class="org.apache.flex.createjs.TextButton"/>
+    <component id="CheckBox" class="org.apache.flex.createjs.CheckBox"/>
 
 </componentPackage>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/defaults.css b/frameworks/as/projects/FlexJSUI/defaults.css
index 7a4d2f8..e41f815 100644
--- a/frameworks/as/projects/FlexJSUI/defaults.css
+++ b/frameworks/as/projects/FlexJSUI/defaults.css
@@ -53,13 +53,13 @@ Button:active
 
 ButtonBar
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
-    IBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.ButtonBarView");			
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController");
-    IBeadLayout: ClassReference("org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout");
-    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+    IBeadView:  ClassReference("org.apache.flex.html.beads.ButtonBarView");			
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
+    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.ButtonBarLayout");
+    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
     IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-    IItemRenderer: ClassReference("org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer");
+    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer");
 
     border-style: none;
 }
@@ -72,29 +72,29 @@ ButtonBarButtonItemRenderer
 
 List
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
-    IBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.ListView");			
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController");
-    IBeadLayout: ClassReference("org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalScrollingLayout");
-    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+    IBeadView:  ClassReference("org.apache.flex.html.beads.ListView");			
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
+    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout");
+    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
     IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-    IItemRenderer: ClassReference("org.apache.flex.html.staticControls.supportClasses.StringItemRenderer");
+    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
 }
 
 SimpleList
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
-    IBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.ListView");
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController");
-    IBeadLayout: ClassReference("org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalScrollingLayout");
-    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+    IBeadView:  ClassReference("org.apache.flex.html.beads.ListView");
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
+    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout");
+    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
     IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-    IItemRenderer: ClassReference("org.apache.flex.html.staticControls.supportClasses.StringItemRenderer");
+    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
 }
 
 StringItemRenderer
 {
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController");
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
     height: 16;
 }
 
@@ -109,11 +109,11 @@ global
 
 Alert
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.AlertModel");
-    IBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.AlertView");
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.AlertController");
-    iBackgroundBead: ClassReference("org.apache.flex.html.staticControls.beads.SolidBackgroundBead");
-    iBorderBead: ClassReference("org.apache.flex.html.staticControls.beads.SingleLineBorderBead");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
+    IBeadView:  ClassReference("org.apache.flex.html.beads.AlertView");
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AlertController");
+    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
     
     background-color: #FFFFFF;
     border-style: solid;
@@ -123,37 +123,37 @@ Alert
 
 Button
 {
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CSSButtonView");
+    IBeadView: ClassReference("org.apache.flex.html.beads.CSSButtonView");
 }
 
 CheckBox
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.CheckBoxView");			
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
+    IBeadView:  ClassReference("org.apache.flex.html.beads.CheckBoxView");			
 }
 
 ComboBox
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ComboBoxModel");
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.ComboBoxView");
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ComboBoxController");
-    IPopUp: ClassReference("org.apache.flex.html.staticControls.supportClasses.DropDownListList");
-    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ComboBoxModel");
+    IBeadView: ClassReference("org.apache.flex.html.beads.ComboBoxView");
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ComboBoxController");
+    IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
+    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
     IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-    IItemRenderer: ClassReference("org.apache.flex.html.staticControls.supportClasses.StringItemRenderer");
+    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
 }
 
 Container
 {
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.ContainerView")
+    IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView")
 }
 
 ControlBar
 {
-    IBeadLayout: ClassReference("org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout");
-    iMeasurementBead: ClassReference("org.apache.flex.html.staticControls.beads.ControlBarMeasurementBead");
-    iBackgroundBead: ClassReference("org.apache.flex.html.staticControls.beads.SolidBackgroundBead");
-    iBorderBead: ClassReference("org.apache.flex.html.staticControls.beads.SingleLineBorderBead");
+    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout");
+    iMeasurementBead: ClassReference("org.apache.flex.html.beads.ControlBarMeasurementBead");
+    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
     
     background-color: #CECECE;
     border-style: solid;
@@ -163,63 +163,63 @@ ControlBar
 
 DropDownList
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.DropDownListView");
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.DropDownListController");
-    IPopUp: ClassReference("org.apache.flex.html.staticControls.supportClasses.DropDownListList");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+    IBeadView: ClassReference("org.apache.flex.html.beads.DropDownListView");
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DropDownListController");
+    IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
 }
 
 DropDownListList
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
-    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
     IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-    IItemRenderer: ClassReference("org.apache.flex.html.staticControls.supportClasses.StringItemRenderer");
+    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
 }
 
 Image
 {
     width: 64;
     height: 64;
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ImageModel");
-    IBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.ImageView");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ImageModel");
+    IBeadView:  ClassReference("org.apache.flex.html.beads.ImageView");
 }
 
 Label
 {
 	width: 95;
 	height: 18;
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.TextFieldView");
-	iMeasurementBead: ClassReference("org.apache.flex.html.staticControls.beads.TextFieldLabelMeasurementBead");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+    IBeadView: ClassReference("org.apache.flex.html.beads.TextFieldView");
+	iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextFieldLabelMeasurementBead");
 }
 
 List
 {
-    iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
-    iBorderModel: ClassReference('org.apache.flex.html.staticControls.beads.models.SingleLineBorderModel');
+    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+    iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
 }
 
 NumericStepper
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.RangeModel");
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.NumericStepperView");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
+    IBeadView: ClassReference("org.apache.flex.html.beads.NumericStepperView");
     
     padding: 0px;
     border-style: solid;
     border-color: #000000;
     border-thickness: 1;
     background-color: #FFFFFF;
-    iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
-    iBackgroundBead: ClassReference('org.apache.flex.html.staticControls.beads.SolidBackgroundBead');
+    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+    iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
 }
 
 Panel
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.PanelModel");
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.PanelView");
-    iBorderBead: ClassReference("org.apache.flex.html.staticControls.beads.SingleLineBorderBead");
-    iBackgroundBead: ClassReference("org.apache.flex.html.staticControls.beads.SolidBackgroundBead");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.PanelModel");
+    IBeadView: ClassReference("org.apache.flex.html.beads.PanelView");
+    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
     
     background-color: #FFFFFF;
     border-style: solid;
@@ -229,25 +229,25 @@ Panel
 
 RadioButton
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ValueToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.RadioButtonView");			
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
+    IBeadView:  ClassReference("org.apache.flex.html.beads.RadioButtonView");			
 }
 
 ScrollBar
 {
-    IBeadLayout: ClassReference("org.apache.flex.html.staticControls.beads.layouts.VScrollBarLayout");
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ScrollBarModel");
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.ScrollBarView");
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.VScrollBarMouseController");
+    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VScrollBarLayout");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
+    IBeadView: ClassReference("org.apache.flex.html.beads.ScrollBarView");
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.VScrollBarMouseController");
 }
 
 SimpleAlert
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.AlertModel");
-    IBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.SimpleAlertView");
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.AlertController");
-    iBorderBead: ClassReference("org.apache.flex.html.staticControls.beads.SingleLineBorderBead");
-    iBackgroundBead: ClassReference("org.apache.flex.html.staticControls.beads.SolidBackgroundBead");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
+    IBeadView:  ClassReference("org.apache.flex.html.beads.SimpleAlertView");
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AlertController");
+    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
     
     background-color: #FFFFFF;
     border-style: solid;
@@ -257,145 +257,145 @@ SimpleAlert
 
 Slider
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.RangeModel");
-    iBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.SliderView");
-    iBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.SliderMouseController");
-    iThumbView: ClassReference("org.apache.flex.html.staticControls.beads.SliderThumbView");
-    iTrackView: ClassReference("org.apache.flex.html.staticControls.beads.SliderTrackView");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
+    iBeadView:  ClassReference("org.apache.flex.html.beads.SliderView");
+    iBeadController: ClassReference("org.apache.flex.html.beads.controllers.SliderMouseController");
+    iThumbView: ClassReference("org.apache.flex.html.beads.SliderThumbView");
+    iTrackView: ClassReference("org.apache.flex.html.beads.SliderTrackView");
 }
 
 Spinner
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.RangeModel");
-    IBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.SpinnerView");
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
+    IBeadView:  ClassReference("org.apache.flex.html.beads.SpinnerView");
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.SpinnerMouseController");
 }
 
 TextArea
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.TextAreaView");
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.EditableTextKeyboardController");
-    iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
-    iBorderModel: ClassReference('org.apache.flex.html.staticControls.beads.models.SingleLineBorderModel');
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+    IBeadView: ClassReference("org.apache.flex.html.beads.TextAreaView");
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
+    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+    iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
     width: 135;
     height: 20;
 }
 
 TextButton
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CSSTextButtonView");
-    iMeasurementBead: ClassReference("org.apache.flex.html.staticControls.beads.TextButtonMeasurementBead");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+    IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
+    iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
 }
 
 TextFieldItemRenderer
 {
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController");
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
     height: 16;
 }
 
 TextInput
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.TextInputWithBorderView");
-    IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.EditableTextKeyboardController");
-    iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
-    iBorderModel: ClassReference('org.apache.flex.html.staticControls.beads.models.SingleLineBorderModel');
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+    IBeadView: ClassReference("org.apache.flex.html.beads.TextInputWithBorderView");
+    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
+    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+    iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
 	width: 135;
 	height: 20;
 }
 
 TitleBar
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TitleBarModel");
-    IBeadLayout: ClassReference("org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout");
-    iMeasurementBead: ClassReference("org.apache.flex.html.staticControls.beads.TitleBarMeasurementBead");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TitleBarModel");
+    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout");
+    iMeasurementBead: ClassReference("org.apache.flex.html.beads.TitleBarMeasurementBead");
 }
 
 /* HTML5 */
 
 h5|TextButton
 {
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CSSTextButtonView");
+    IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
 }
 
 h5|TextInput
 {
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.TextInputWithBorderView");
+    IBeadView: ClassReference("org.apache.flex.html.beads.TextInputWithBorderView");
 }
 
 h5|CheckBox
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.CheckBoxView");			
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
+    IBeadView:  ClassReference("org.apache.flex.html.beads.CheckBoxView");			
 }
 
 h5|RadioButton
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ValueToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.RadioButtonView");			
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
+    IBeadView:  ClassReference("org.apache.flex.html.beads.RadioButtonView");			
 }
 
 h5|List
 {
-	IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
+	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
 }
 
 h5|DropDownList
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
-    IPopUp: ClassReference("org.apache.flex.html.staticControls.supportClasses.DropDownListList");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+    IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
 }
 
 h5|ComboBox
 {
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.ComboBoxView");
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ComboBoxModel");
-    IPopUp: ClassReference("org.apache.flex.html.staticControls.supportClasses.DropDownListList");
+    IBeadView: ClassReference("org.apache.flex.html.beads.ComboBoxView");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ComboBoxModel");
+    IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
 }
 
 /* jQuery */
 
 jq|TextButton
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.TextButtonView");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+    IBeadView: ClassReference("org.apache.flex.html.beads.TextButtonView");
 }
 
 
 jq|CheckBox
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.CheckBoxView");			
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
+    IBeadView:  ClassReference("org.apache.flex.html.beads.CheckBoxView");			
 }
 
 jq|RadioButton
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ValueToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.staticControls.beads.RadioButtonView");			
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
+    IBeadView:  ClassReference("org.apache.flex.html.beads.RadioButtonView");			
 }
 
 /* createjs */
 
 createjs|TextButton
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.TextButtonView");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+    IBeadView: ClassReference("org.apache.flex.html.beads.TextButtonView");
 }
 
 createjs|CheckBox
 {
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CheckBoxView");
+    IBeadView: ClassReference("org.apache.flex.html.beads.CheckBoxView");
 }
 
 /* SVG */
 
 svg|TextButton
 {
-    IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CSSTextButtonView");
-    iMeasurementBead: ClassReference("org.apache.flex.html.staticControls.beads.TextButtonMeasurementBead");
+    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+    IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
+    iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
 }
 
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/html5-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/html5-manifest.xml b/frameworks/as/projects/FlexJSUI/html5-manifest.xml
index efba2fa..bb0a281 100644
--- a/frameworks/as/projects/FlexJSUI/html5-manifest.xml
+++ b/frameworks/as/projects/FlexJSUI/html5-manifest.xml
@@ -22,14 +22,14 @@
 <componentPackage>
 
     
-    <component id="Label" class="org.apache.flex.html5.staticControls.Label"/>
-    <component id="TextButton" class="org.apache.flex.html5.staticControls.TextButton"/>
-    <component id="TextInput" class="org.apache.flex.html5.staticControls.TextInput"/>
-    <component id="TextArea" class="org.apache.flex.html5.staticControls.TextArea"/>
-    <component id="CheckBox" class="org.apache.flex.html5.staticControls.CheckBox"/>
-    <component id="RadioButton" class="org.apache.flex.html5.staticControls.RadioButton"/>
-    <component id="List" class="org.apache.flex.html5.staticControls.List"/>
-    <component id="DropDownList" class="org.apache.flex.html5.staticControls.DropDownList"/>
-    <component id="ComboBox" class="org.apache.flex.html5.staticControls.ComboBox"/>
+    <component id="Label" class="org.apache.flex.html5.Label"/>
+    <component id="TextButton" class="org.apache.flex.html5.TextButton"/>
+    <component id="TextInput" class="org.apache.flex.html5.TextInput"/>
+    <component id="TextArea" class="org.apache.flex.html5.TextArea"/>
+    <component id="CheckBox" class="org.apache.flex.html5.CheckBox"/>
+    <component id="RadioButton" class="org.apache.flex.html5.RadioButton"/>
+    <component id="List" class="org.apache.flex.html5.List"/>
+    <component id="DropDownList" class="org.apache.flex.html5.DropDownList"/>
+    <component id="ComboBox" class="org.apache.flex.html5.ComboBox"/>
 
 </componentPackage>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/jquery-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/jquery-manifest.xml b/frameworks/as/projects/FlexJSUI/jquery-manifest.xml
index cdb9dd5..e94c165 100644
--- a/frameworks/as/projects/FlexJSUI/jquery-manifest.xml
+++ b/frameworks/as/projects/FlexJSUI/jquery-manifest.xml
@@ -22,8 +22,8 @@
 <componentPackage>
 
     <component id="Application" class="org.apache.flex.jquery.Application"/>
-    <component id="TextButton" class="org.apache.flex.jquery.staticControls.TextButton"/>
-    <component id="CheckBox" class="org.apache.flex.jquery.staticControls.CheckBox"/>
-    <component id="RadioButton" class="org.apache.flex.jquery.staticControls.RadioButton"/>
+    <component id="TextButton" class="org.apache.flex.jquery.TextButton"/>
+    <component id="CheckBox" class="org.apache.flex.jquery.CheckBox"/>
+    <component id="RadioButton" class="org.apache.flex.jquery.RadioButton"/>
 
 </componentPackage>


[21/35] git commit: [flex-asjs] [refs/heads/develop] - remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
remove staticControls folders and move components up a level.  Next commit will rename packages inside the files


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

Branch: refs/heads/develop
Commit: 5759d50b5925aa2a6f06f5cd1c66fb3f53b667f0
Parents: a0bd0cd
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 25 10:28:53 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 25 10:28:53 2014 -0700

----------------------------------------------------------------------
 .../src/org/apache/flex/html/DataGrid.as        | 102 ++++++
 .../src/org/apache/flex/html/DateChooser.as     |  74 +++++
 .../src/org/apache/flex/html/DateField.as       |  90 +++++
 .../html/accessories/DateFormatMMDDYYYYBead.as  | 151 +++++++++
 .../flex/html/beads/DataGridColumnView.as       | 104 ++++++
 .../org/apache/flex/html/beads/DataGridView.as  | 213 ++++++++++++
 .../DataItemRendererFactoryForColumnData.as     | 142 ++++++++
 .../apache/flex/html/beads/DateChooserView.as   | 257 ++++++++++++++
 .../org/apache/flex/html/beads/DateFieldView.as | 187 +++++++++++
 .../flex/html/beads/FormatableLabelView.as      |  90 +++++
 .../flex/html/beads/FormatableTextInputView.as  |  89 +++++
 .../org/apache/flex/html/beads/IDataGridView.as |  36 ++
 .../controllers/DateChooserMouseController.as   | 126 +++++++
 .../controllers/DateFieldMouseController.as     |  97 ++++++
 .../flex/html/beads/models/DataGridModel.as     |  72 ++++
 .../beads/models/DataGridPresentationModel.as   | 109 ++++++
 .../flex/html/beads/models/DateChooserModel.as  | 189 +++++++++++
 .../apache/flex/html/staticControls/DataGrid.as | 102 ------
 .../flex/html/staticControls/DateChooser.as     |  74 -----
 .../flex/html/staticControls/DateField.as       |  90 -----
 .../accessories/DateFormatMMDDYYYYBead.as       | 151 ---------
 .../staticControls/beads/DataGridColumnView.as  | 104 ------
 .../html/staticControls/beads/DataGridView.as   | 213 ------------
 .../DataItemRendererFactoryForColumnData.as     | 142 --------
 .../staticControls/beads/DateChooserView.as     | 257 --------------
 .../html/staticControls/beads/DateFieldView.as  | 187 -----------
 .../staticControls/beads/FormatableLabelView.as |  90 -----
 .../beads/FormatableTextInputView.as            |  89 -----
 .../html/staticControls/beads/IDataGridView.as  |  36 --
 .../controllers/DateChooserMouseController.as   | 126 -------
 .../controllers/DateFieldMouseController.as     |  97 ------
 .../beads/models/DataGridModel.as               |  72 ----
 .../beads/models/DataGridPresentationModel.as   | 109 ------
 .../beads/models/DateChooserModel.as            | 189 -----------
 .../supportClasses/DataGridColumn.as            | 127 -------
 .../supportClasses/DateChooserButton.as         |  67 ----
 .../flex/html/supportClasses/DataGridColumn.as  | 127 +++++++
 .../html/supportClasses/DateChooserButton.as    |  67 ++++
 .../FlexJSUI/src/org/apache/flex/html/Alert.as  | 195 +++++++++++
 .../FlexJSUI/src/org/apache/flex/html/Button.as |  74 +++++
 .../src/org/apache/flex/html/ButtonBar.as       |  53 +++
 .../src/org/apache/flex/html/CheckBox.as        | 116 +++++++
 .../src/org/apache/flex/html/ComboBox.as        | 114 +++++++
 .../src/org/apache/flex/html/Container.as       | 188 +++++++++++
 .../src/org/apache/flex/html/ControlBar.as      |  76 +++++
 .../src/org/apache/flex/html/DropDownList.as    | 137 ++++++++
 .../FlexJSUI/src/org/apache/flex/html/Image.as  |  68 ++++
 .../FlexJSUI/src/org/apache/flex/html/Label.as  | 118 +++++++
 .../FlexJSUI/src/org/apache/flex/html/List.as   | 185 +++++++++++
 .../src/org/apache/flex/html/NumericStepper.as  | 143 ++++++++
 .../FlexJSUI/src/org/apache/flex/html/Panel.as  | 123 +++++++
 .../src/org/apache/flex/html/RadioButton.as     | 208 ++++++++++++
 .../src/org/apache/flex/html/SimpleAlert.as     | 132 ++++++++
 .../src/org/apache/flex/html/SimpleList.as      |  46 +++
 .../FlexJSUI/src/org/apache/flex/html/Slider.as | 152 +++++++++
 .../src/org/apache/flex/html/Spinner.as         | 146 ++++++++
 .../src/org/apache/flex/html/TextArea.as        |  91 +++++
 .../src/org/apache/flex/html/TextButton.as      |  90 +++++
 .../src/org/apache/flex/html/TextInput.as       | 115 +++++++
 .../src/org/apache/flex/html/TitleBar.as        | 247 ++++++++++++++
 .../accessories/NumericOnlyTextInputBead.as     | 125 +++++++
 .../flex/html/accessories/PasswordInputBead.as  |  85 +++++
 .../flex/html/accessories/TextPromptBead.as     | 131 ++++++++
 .../flex/html/beads/AlertMeasurementBead.as     |  88 +++++
 .../src/org/apache/flex/html/beads/AlertView.as | 223 +++++++++++++
 .../org/apache/flex/html/beads/ButtonBarView.as |  94 ++++++
 .../org/apache/flex/html/beads/CSSButtonView.as | 155 +++++++++
 .../apache/flex/html/beads/CSSTextButtonView.as | 262 +++++++++++++++
 .../org/apache/flex/html/beads/CheckBoxView.as  | 297 +++++++++++++++++
 .../org/apache/flex/html/beads/ComboBoxView.as  | 248 ++++++++++++++
 .../org/apache/flex/html/beads/ContainerView.as | 253 ++++++++++++++
 .../html/beads/ControlBarMeasurementBead.as     | 116 +++++++
 .../DataItemRendererFactoryForArrayData.as      | 143 ++++++++
 .../flex/html/beads/DownArrowButtonView.as      | 103 ++++++
 .../apache/flex/html/beads/DropDownListView.as  | 283 ++++++++++++++++
 .../apache/flex/html/beads/IBackgroundBead.as   |  35 ++
 .../org/apache/flex/html/beads/IBorderBead.as   |  35 ++
 .../org/apache/flex/html/beads/IComboBoxView.as |  78 +++++
 .../apache/flex/html/beads/IDropDownListView.as |  57 ++++
 .../apache/flex/html/beads/IGraphicsDrawing.as  |  36 ++
 .../src/org/apache/flex/html/beads/IListView.as |  56 ++++
 .../apache/flex/html/beads/IScrollBarView.as    |  80 +++++
 .../org/apache/flex/html/beads/ISliderView.as   |  56 ++++
 .../org/apache/flex/html/beads/ISpinnerView.as  |  56 ++++
 .../apache/flex/html/beads/ITextFieldView.as    |  44 +++
 .../apache/flex/html/beads/ITextItemRenderer.as |  45 +++
 .../src/org/apache/flex/html/beads/ImageView.as | 121 +++++++
 .../src/org/apache/flex/html/beads/ListView.as  | 260 +++++++++++++++
 .../flex/html/beads/NumericStepperView.as       | 216 ++++++++++++
 .../src/org/apache/flex/html/beads/PanelView.as | 180 ++++++++++
 .../apache/flex/html/beads/RadioButtonView.as   | 282 ++++++++++++++++
 .../org/apache/flex/html/beads/ScrollBarView.as | 158 +++++++++
 .../apache/flex/html/beads/SimpleAlertView.as   | 150 +++++++++
 .../flex/html/beads/SingleLineBorderBead.as     |  94 ++++++
 .../apache/flex/html/beads/SliderThumbView.as   | 114 +++++++
 .../apache/flex/html/beads/SliderTrackView.as   | 114 +++++++
 .../org/apache/flex/html/beads/SliderView.as    | 180 ++++++++++
 .../flex/html/beads/SolidBackgroundBead.as      | 145 ++++++++
 .../org/apache/flex/html/beads/SpinnerView.as   | 134 ++++++++
 .../org/apache/flex/html/beads/TextAreaView.as  | 258 ++++++++++++++
 .../html/beads/TextButtonMeasurementBead.as     |  86 +++++
 .../apache/flex/html/beads/TextButtonView.as    | 218 ++++++++++++
 .../html/beads/TextFieldLabelMeasurementBead.as |  92 +++++
 .../org/apache/flex/html/beads/TextFieldView.as |  53 +++
 .../apache/flex/html/beads/TextFieldViewBase.as | 167 ++++++++++
 .../org/apache/flex/html/beads/TextInputView.as |  88 +++++
 .../flex/html/beads/TextInputWithBorderView.as  |  79 +++++
 .../TextItemRendererFactoryForArrayData.as      | 141 ++++++++
 ...extItemRendererFactoryForStringVectorData.as | 128 +++++++
 .../flex/html/beads/TitleBarMeasurementBead.as  | 106 ++++++
 .../apache/flex/html/beads/UpArrowButtonView.as | 103 ++++++
 .../flex/html/beads/VScrollBarThumbView.as      | 127 +++++++
 .../flex/html/beads/VScrollBarTrackView.as      | 112 +++++++
 .../html/beads/controllers/AlertController.as   |  88 +++++
 .../controllers/ButtonAutoRepeatController.as   | 147 ++++++++
 .../beads/controllers/ComboBoxController.as     | 104 ++++++
 .../beads/controllers/DropDownListController.as | 104 ++++++
 .../EditableTextKeyboardController.as           |  86 +++++
 .../controllers/ItemRendererMouseController.as  | 126 +++++++
 .../ListSingleSelectionMouseController.as       | 124 +++++++
 .../controllers/ScrollBarMouseControllerBase.as | 185 +++++++++++
 .../beads/controllers/SliderMouseController.as  | 148 +++++++++
 .../beads/controllers/SpinnerMouseController.as |  98 ++++++
 .../controllers/VScrollBarMouseController.as    | 101 ++++++
 .../flex/html/beads/layouts/ButtonBarLayout.as  | 121 +++++++
 .../beads/layouts/NonVirtualHorizontalLayout.as | 172 ++++++++++
 .../NonVirtualHorizontalScrollingLayout.as      | 136 ++++++++
 .../beads/layouts/NonVirtualVerticalLayout.as   | 191 +++++++++++
 .../NonVirtualVerticalScrollingLayout.as        | 140 ++++++++
 .../flex/html/beads/layouts/TileLayout.as       | 184 ++++++++++
 .../flex/html/beads/layouts/VScrollBarLayout.as | 111 +++++++
 .../apache/flex/html/beads/models/AlertModel.as | 288 ++++++++++++++++
 .../html/beads/models/ArraySelectionModel.as    | 234 +++++++++++++
 .../flex/html/beads/models/ComboBoxModel.as     | 100 ++++++
 .../apache/flex/html/beads/models/ImageModel.as |  89 +++++
 .../apache/flex/html/beads/models/PanelModel.as | 138 ++++++++
 .../apache/flex/html/beads/models/RangeModel.as | 222 +++++++++++++
 .../flex/html/beads/models/ScrollBarModel.as    |  98 ++++++
 .../html/beads/models/SingleLineBorderModel.as  |  85 +++++
 .../html/beads/models/StringSelectionModel.as   | 221 ++++++++++++
 .../apache/flex/html/beads/models/TextModel.as  | 122 +++++++
 .../flex/html/beads/models/TitleBarModel.as     | 133 ++++++++
 .../flex/html/beads/models/ToggleButtonModel.as | 144 ++++++++
 .../html/beads/models/ValueToggleButtonModel.as | 123 +++++++
 .../apache/flex/html/staticControls/Alert.as    | 195 -----------
 .../apache/flex/html/staticControls/Button.as   |  74 -----
 .../flex/html/staticControls/ButtonBar.as       |  53 ---
 .../apache/flex/html/staticControls/CheckBox.as | 116 -------
 .../apache/flex/html/staticControls/ComboBox.as | 114 -------
 .../flex/html/staticControls/Container.as       | 188 -----------
 .../flex/html/staticControls/ControlBar.as      |  76 -----
 .../flex/html/staticControls/DropDownList.as    | 137 --------
 .../apache/flex/html/staticControls/Image.as    |  68 ----
 .../apache/flex/html/staticControls/Label.as    | 118 -------
 .../org/apache/flex/html/staticControls/List.as | 185 -----------
 .../flex/html/staticControls/NumericStepper.as  | 143 --------
 .../apache/flex/html/staticControls/Panel.as    | 123 -------
 .../flex/html/staticControls/RadioButton.as     | 208 ------------
 .../flex/html/staticControls/SimpleAlert.as     | 132 --------
 .../flex/html/staticControls/SimpleList.as      |  46 ---
 .../apache/flex/html/staticControls/Slider.as   | 152 ---------
 .../apache/flex/html/staticControls/Spinner.as  | 146 --------
 .../apache/flex/html/staticControls/TextArea.as |  91 -----
 .../flex/html/staticControls/TextButton.as      |  90 -----
 .../flex/html/staticControls/TextInput.as       | 115 -------
 .../apache/flex/html/staticControls/TitleBar.as | 247 --------------
 .../accessories/NumericOnlyTextInputBead.as     | 125 -------
 .../accessories/PasswordInputBead.as            |  85 -----
 .../accessories/TextPromptBead.as               | 131 --------
 .../beads/AlertMeasurementBead.as               |  88 -----
 .../flex/html/staticControls/beads/AlertView.as | 223 -------------
 .../html/staticControls/beads/ButtonBarView.as  |  94 ------
 .../html/staticControls/beads/CSSButtonView.as  | 155 ---------
 .../staticControls/beads/CSSTextButtonView.as   | 262 ---------------
 .../html/staticControls/beads/CheckBoxView.as   | 297 -----------------
 .../html/staticControls/beads/ComboBoxView.as   | 248 --------------
 .../html/staticControls/beads/ContainerView.as  | 253 --------------
 .../beads/ControlBarMeasurementBead.as          | 116 -------
 .../DataItemRendererFactoryForArrayData.as      | 143 --------
 .../staticControls/beads/DownArrowButtonView.as | 103 ------
 .../staticControls/beads/DropDownListView.as    | 283 ----------------
 .../staticControls/beads/IBackgroundBead.as     |  35 --
 .../html/staticControls/beads/IBorderBead.as    |  35 --
 .../html/staticControls/beads/IComboBoxView.as  |  78 -----
 .../staticControls/beads/IDropDownListView.as   |  57 ----
 .../staticControls/beads/IGraphicsDrawing.as    |  36 --
 .../flex/html/staticControls/beads/IListView.as |  56 ----
 .../html/staticControls/beads/IScrollBarView.as |  80 -----
 .../html/staticControls/beads/ISliderView.as    |  56 ----
 .../html/staticControls/beads/ISpinnerView.as   |  56 ----
 .../html/staticControls/beads/ITextFieldView.as |  44 ---
 .../staticControls/beads/ITextItemRenderer.as   |  45 ---
 .../flex/html/staticControls/beads/ImageView.as | 121 -------
 .../flex/html/staticControls/beads/ListView.as  | 260 ---------------
 .../staticControls/beads/NumericStepperView.as  | 216 ------------
 .../flex/html/staticControls/beads/PanelView.as | 180 ----------
 .../staticControls/beads/RadioButtonView.as     | 282 ----------------
 .../html/staticControls/beads/ScrollBarView.as  | 158 ---------
 .../staticControls/beads/SimpleAlertView.as     | 150 ---------
 .../beads/SingleLineBorderBead.as               |  94 ------
 .../staticControls/beads/SliderThumbView.as     | 114 -------
 .../staticControls/beads/SliderTrackView.as     | 114 -------
 .../html/staticControls/beads/SliderView.as     | 180 ----------
 .../staticControls/beads/SolidBackgroundBead.as | 145 --------
 .../html/staticControls/beads/SpinnerView.as    | 134 --------
 .../html/staticControls/beads/TextAreaView.as   | 258 --------------
 .../beads/TextButtonMeasurementBead.as          |  86 -----
 .../html/staticControls/beads/TextButtonView.as | 218 ------------
 .../beads/TextFieldLabelMeasurementBead.as      |  92 -----
 .../html/staticControls/beads/TextFieldView.as  |  53 ---
 .../staticControls/beads/TextFieldViewBase.as   | 167 ----------
 .../html/staticControls/beads/TextInputView.as  |  88 -----
 .../beads/TextInputWithBorderView.as            |  79 -----
 .../TextItemRendererFactoryForArrayData.as      | 141 --------
 ...extItemRendererFactoryForStringVectorData.as | 128 -------
 .../beads/TitleBarMeasurementBead.as            | 106 ------
 .../staticControls/beads/UpArrowButtonView.as   | 103 ------
 .../staticControls/beads/VScrollBarThumbView.as | 127 -------
 .../staticControls/beads/VScrollBarTrackView.as | 112 -------
 .../beads/controllers/AlertController.as        |  88 -----
 .../controllers/ButtonAutoRepeatController.as   | 147 --------
 .../beads/controllers/ComboBoxController.as     | 104 ------
 .../beads/controllers/DropDownListController.as | 104 ------
 .../EditableTextKeyboardController.as           |  86 -----
 .../controllers/ItemRendererMouseController.as  | 126 -------
 .../ListSingleSelectionMouseController.as       | 124 -------
 .../controllers/ScrollBarMouseControllerBase.as | 185 -----------
 .../beads/controllers/SliderMouseController.as  | 148 ---------
 .../beads/controllers/SpinnerMouseController.as |  98 ------
 .../controllers/VScrollBarMouseController.as    | 101 ------
 .../beads/layouts/ButtonBarLayout.as            | 121 -------
 .../beads/layouts/NonVirtualHorizontalLayout.as | 172 ----------
 .../NonVirtualHorizontalScrollingLayout.as      | 136 --------
 .../beads/layouts/NonVirtualVerticalLayout.as   | 191 -----------
 .../NonVirtualVerticalScrollingLayout.as        | 140 --------
 .../staticControls/beads/layouts/TileLayout.as  | 184 ----------
 .../beads/layouts/VScrollBarLayout.as           | 111 -------
 .../staticControls/beads/models/AlertModel.as   | 288 ----------------
 .../beads/models/ArraySelectionModel.as         | 234 -------------
 .../beads/models/ComboBoxModel.as               | 100 ------
 .../staticControls/beads/models/ImageModel.as   |  89 -----
 .../staticControls/beads/models/PanelModel.as   | 138 --------
 .../staticControls/beads/models/RangeModel.as   | 222 -------------
 .../beads/models/ScrollBarModel.as              |  98 ------
 .../beads/models/SingleLineBorderModel.as       |  85 -----
 .../beads/models/StringSelectionModel.as        | 221 ------------
 .../staticControls/beads/models/TextModel.as    | 122 -------
 .../beads/models/TitleBarModel.as               | 133 --------
 .../beads/models/ToggleButtonModel.as           | 144 --------
 .../beads/models/ValueToggleButtonModel.as      | 123 -------
 .../staticControls/supportClasses/Border.as     |  49 ---
 .../ButtonBarButtonItemRenderer.as              | 135 --------
 .../supportClasses/ContainerContentArea.as      |  48 ---
 .../supportClasses/DataItemRenderer.as          | 131 --------
 .../supportClasses/DropDownListList.as          |  75 -----
 .../supportClasses/NonVirtualDataGroup.as       |  75 -----
 .../staticControls/supportClasses/ScrollBar.as  |  48 ---
 .../supportClasses/StringItemRenderer.as        | 132 --------
 .../supportClasses/TextFieldItemRenderer.as     | 333 -------------------
 .../supportClasses/UIItemRendererBase.as        | 245 --------------
 .../apache/flex/html/supportClasses/Border.as   |  49 +++
 .../ButtonBarButtonItemRenderer.as              | 135 ++++++++
 .../html/supportClasses/ContainerContentArea.as |  48 +++
 .../html/supportClasses/DataItemRenderer.as     | 131 ++++++++
 .../html/supportClasses/DropDownListList.as     |  75 +++++
 .../html/supportClasses/NonVirtualDataGroup.as  |  75 +++++
 .../flex/html/supportClasses/ScrollBar.as       |  48 +++
 .../html/supportClasses/StringItemRenderer.as   | 132 ++++++++
 .../supportClasses/TextFieldItemRenderer.as     | 333 +++++++++++++++++++
 .../html/supportClasses/UIItemRendererBase.as   | 245 ++++++++++++++
 .../src/org/apache/flex/html5/Button.as         |  26 ++
 .../src/org/apache/flex/html5/CheckBox.as       |  26 ++
 .../src/org/apache/flex/html5/ComboBox.as       |  26 ++
 .../src/org/apache/flex/html5/DropDownList.as   |  26 ++
 .../FlexJSUI/src/org/apache/flex/html5/Label.as |  33 ++
 .../FlexJSUI/src/org/apache/flex/html5/List.as  |  33 ++
 .../src/org/apache/flex/html5/RadioButton.as    |  26 ++
 .../src/org/apache/flex/html5/TextArea.as       |  26 ++
 .../src/org/apache/flex/html5/TextButton.as     |  30 ++
 .../src/org/apache/flex/html5/TextInput.as      |  25 ++
 .../apache/flex/html5/staticControls/Button.as  |  26 --
 .../flex/html5/staticControls/CheckBox.as       |  26 --
 .../flex/html5/staticControls/ComboBox.as       |  26 --
 .../flex/html5/staticControls/DropDownList.as   |  26 --
 .../apache/flex/html5/staticControls/Label.as   |  33 --
 .../apache/flex/html5/staticControls/List.as    |  33 --
 .../flex/html5/staticControls/RadioButton.as    |  26 --
 .../flex/html5/staticControls/TextArea.as       |  26 --
 .../flex/html5/staticControls/TextButton.as     |  30 --
 .../flex/html5/staticControls/TextInput.as      |  25 --
 .../js/FlexJS/src/org/apache/flex/html/Alert.js | 213 ++++++++++++
 .../FlexJS/src/org/apache/flex/html/Button.js   |  60 ++++
 .../src/org/apache/flex/html/ButtonBar.js       |  85 +++++
 .../FlexJS/src/org/apache/flex/html/CheckBox.js |  99 ++++++
 .../FlexJS/src/org/apache/flex/html/ComboBox.js | 210 ++++++++++++
 .../src/org/apache/flex/html/Container.js       |  86 +++++
 .../src/org/apache/flex/html/ControlBar.js      |  57 ++++
 .../src/org/apache/flex/html/DropDownList.js    | 114 +++++++
 .../js/FlexJS/src/org/apache/flex/html/Image.js |  86 +++++
 .../js/FlexJS/src/org/apache/flex/html/Label.js |  61 ++++
 .../js/FlexJS/src/org/apache/flex/html/List.js  | 176 ++++++++++
 .../src/org/apache/flex/html/NumericStepper.js  | 185 +++++++++++
 .../js/FlexJS/src/org/apache/flex/html/Panel.js | 186 +++++++++++
 .../src/org/apache/flex/html/RadioButton.js     | 197 +++++++++++
 .../src/org/apache/flex/html/SimpleAlert.js     |  51 +++
 .../src/org/apache/flex/html/SimpleList.js      | 129 +++++++
 .../FlexJS/src/org/apache/flex/html/Slider.js   | 219 ++++++++++++
 .../FlexJS/src/org/apache/flex/html/Spinner.js  | 211 ++++++++++++
 .../FlexJS/src/org/apache/flex/html/TextArea.js |  72 ++++
 .../src/org/apache/flex/html/TextButton.js      |  58 ++++
 .../src/org/apache/flex/html/TextInput.js       |  95 ++++++
 .../FlexJS/src/org/apache/flex/html/TitleBar.js | 150 +++++++++
 .../accessories/NumericOnlyTextInputBead.js     |  91 +++++
 .../flex/html/accessories/PasswordInputBead.js  |  53 +++
 .../flex/html/accessories/TextPromptBead.js     |  72 ++++
 .../org/apache/flex/html/beads/ButtonBarView.js |  55 +++
 .../DataItemRendererFactoryForArrayData.js      | 137 ++++++++
 .../src/org/apache/flex/html/beads/IListView.js |  43 +++
 .../src/org/apache/flex/html/beads/ImageView.js |  63 ++++
 .../src/org/apache/flex/html/beads/ListView.js  | 168 ++++++++++
 .../src/org/apache/flex/html/beads/PanelView.js |  72 ++++
 .../apache/flex/html/beads/SliderThumbView.js   |  61 ++++
 .../apache/flex/html/beads/SliderTrackView.js   |  61 ++++
 .../TextItemRendererFactoryForArrayData.js      |  92 +++++
 .../controllers/ItemRendererMouseController.js  | 124 +++++++
 .../ListSingleSelectionMouseController.js       |  77 +++++
 .../beads/controllers/SliderMouseController.js  | 173 ++++++++++
 .../beads/controllers/SpinnerMouseController.js |  86 +++++
 .../flex/html/beads/layouts/ButtonBarLayout.js  | 113 +++++++
 .../beads/layouts/NonVirtualHorizontalLayout.js |  85 +++++
 .../beads/layouts/NonVirtualVerticalLayout.js   |  76 +++++
 .../NonVirtualVerticalScrollingLayout.js        |  80 +++++
 .../flex/html/beads/layouts/TileLayout.js       | 158 +++++++++
 .../html/beads/models/ArraySelectionModel.js    | 160 +++++++++
 .../flex/html/beads/models/DataGridModel.js     |  79 +++++
 .../apache/flex/html/beads/models/ImageModel.js |  72 ++++
 .../apache/flex/html/beads/models/PanelModel.js | 136 ++++++++
 .../apache/flex/html/beads/models/RangeModel.js | 200 +++++++++++
 .../flex/html/beads/models/TitleBarModel.js     | 136 ++++++++
 .../apache/flex/html/staticControls/Alert.js    | 213 ------------
 .../apache/flex/html/staticControls/Button.js   |  60 ----
 .../flex/html/staticControls/ButtonBar.js       |  85 -----
 .../apache/flex/html/staticControls/CheckBox.js |  99 ------
 .../apache/flex/html/staticControls/ComboBox.js | 210 ------------
 .../flex/html/staticControls/Container.js       |  86 -----
 .../flex/html/staticControls/ControlBar.js      |  57 ----
 .../flex/html/staticControls/DropDownList.js    | 114 -------
 .../apache/flex/html/staticControls/Image.js    |  86 -----
 .../apache/flex/html/staticControls/Label.js    |  61 ----
 .../org/apache/flex/html/staticControls/List.js | 176 ----------
 .../flex/html/staticControls/NumericStepper.js  | 185 -----------
 .../apache/flex/html/staticControls/Panel.js    | 186 -----------
 .../flex/html/staticControls/RadioButton.js     | 197 -----------
 .../flex/html/staticControls/SimpleAlert.js     |  51 ---
 .../flex/html/staticControls/SimpleList.js      | 129 -------
 .../apache/flex/html/staticControls/Slider.js   | 219 ------------
 .../apache/flex/html/staticControls/Spinner.js  | 211 ------------
 .../apache/flex/html/staticControls/TextArea.js |  72 ----
 .../flex/html/staticControls/TextButton.js      |  58 ----
 .../flex/html/staticControls/TextInput.js       |  95 ------
 .../apache/flex/html/staticControls/TitleBar.js | 150 ---------
 .../accessories/NumericOnlyTextInputBead.js     |  91 -----
 .../accessories/PasswordInputBead.js            |  53 ---
 .../accessories/TextPromptBead.js               |  72 ----
 .../html/staticControls/beads/ButtonBarView.js  |  55 ---
 .../DataItemRendererFactoryForArrayData.js      | 137 --------
 .../flex/html/staticControls/beads/IListView.js |  43 ---
 .../flex/html/staticControls/beads/ImageView.js |  63 ----
 .../flex/html/staticControls/beads/ListView.js  | 168 ----------
 .../flex/html/staticControls/beads/PanelView.js |  72 ----
 .../staticControls/beads/SliderThumbView.js     |  61 ----
 .../staticControls/beads/SliderTrackView.js     |  61 ----
 .../TextItemRendererFactoryForArrayData.js      |  92 -----
 .../controllers/ItemRendererMouseController.js  | 124 -------
 .../ListSingleSelectionMouseController.js       |  77 -----
 .../beads/controllers/SliderMouseController.js  | 173 ----------
 .../beads/controllers/SpinnerMouseController.js |  86 -----
 .../beads/layouts/ButtonBarLayout.js            | 113 -------
 .../beads/layouts/NonVirtualHorizontalLayout.js |  85 -----
 .../beads/layouts/NonVirtualVerticalLayout.js   |  76 -----
 .../NonVirtualVerticalScrollingLayout.js        |  80 -----
 .../staticControls/beads/layouts/TileLayout.js  | 158 ---------
 .../beads/models/ArraySelectionModel.js         | 160 ---------
 .../beads/models/DataGridModel.js               |  79 -----
 .../staticControls/beads/models/ImageModel.js   |  72 ----
 .../staticControls/beads/models/PanelModel.js   | 136 --------
 .../staticControls/beads/models/RangeModel.js   | 200 -----------
 .../beads/models/TitleBarModel.js               | 136 --------
 .../ButtonBarButtonItemRenderer.js              | 112 -------
 .../supportClasses/DataGridColumn.js            | 107 ------
 .../supportClasses/DataItemRenderer.js          | 158 ---------
 .../supportClasses/NonVirtualDataGroup.js       | 108 ------
 .../supportClasses/StringItemRenderer.js        | 178 ----------
 .../supportClasses/UIItemRendererBase.js        | 208 ------------
 .../ButtonBarButtonItemRenderer.js              | 112 +++++++
 .../flex/html/supportClasses/DataGridColumn.js  | 107 ++++++
 .../html/supportClasses/DataItemRenderer.js     | 158 +++++++++
 .../html/supportClasses/NonVirtualDataGroup.js  | 108 ++++++
 .../html/supportClasses/StringItemRenderer.js   | 178 ++++++++++
 .../html/supportClasses/UIItemRendererBase.js   | 208 ++++++++++++
 .../src/org/apache/flex/html5/CheckBox.js       |  88 +++++
 .../src/org/apache/flex/html5/ComboBox.js       | 196 +++++++++++
 .../src/org/apache/flex/html5/DropDownList.js   |  29 ++
 .../FlexJS/src/org/apache/flex/html5/Label.js   |  61 ++++
 .../js/FlexJS/src/org/apache/flex/html5/List.js |  42 +++
 .../src/org/apache/flex/html5/RadioButton.js    | 109 ++++++
 .../src/org/apache/flex/html5/TextArea.js       |  61 ++++
 .../src/org/apache/flex/html5/TextButton.js     |  63 ++++
 .../src/org/apache/flex/html5/TextInput.js      |  62 ++++
 .../flex/html5/staticControls/CheckBox.js       |  88 -----
 .../flex/html5/staticControls/ComboBox.js       | 196 -----------
 .../flex/html5/staticControls/DropDownList.js   |  29 --
 .../apache/flex/html5/staticControls/Label.js   |  61 ----
 .../apache/flex/html5/staticControls/List.js    |  42 ---
 .../flex/html5/staticControls/RadioButton.js    | 109 ------
 .../flex/html5/staticControls/TextArea.js       |  61 ----
 .../flex/html5/staticControls/TextButton.js     |  63 ----
 .../flex/html5/staticControls/TextInput.js      |  62 ----
 418 files changed, 25245 insertions(+), 25245 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DataGrid.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DataGrid.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DataGrid.as
new file mode 100644
index 0000000..0bc5281
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DataGrid.as
@@ -0,0 +1,102 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import org.apache.flex.core.IDataGridModel;
+	import org.apache.flex.core.UIBase;
+	
+	[Event(name="change", type="org.apache.flex.events.Event")]
+	
+	/**
+	 *  The DataGrid class displays a collection of data using columns and rows. Each
+	 *  column represents a specific field in the data set; each row represents a specific
+	 *  datum. The DataGrid is a composite component built with a org.apache.flex.html.staticControls.ButtonBar 
+	 *  for the column headers and a org.apache.flex.html.staticControls.List for each column. The DataGrid's 
+	 *  view bead (usually org.apache.flex.html.staticControls.beads.DataGridView) constructs these parts while 
+	 *  itemRenderer factories contruct the elements to display the data in each cell.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DataGrid extends UIBase
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DataGrid()
+		{
+			super();
+		}
+		
+		/**
+		 *  The array of org.apache.flex.html.staticControls.supportClasses.DataGridColumns used to 
+		 *  describe each column.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get columns():Array
+		{
+			return IDataGridModel(model).columns;
+		}
+		public function set columns(value:Array):void
+		{
+			IDataGridModel(model).columns = value;
+		}
+		
+		/**
+		 *  The object used to provide data to the org.apache.flex.html.staticControls.DataGrid.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get dataProvider():Object
+		{
+			return IDataGridModel(model).dataProvider;
+		}
+		public function set dataProvider(value:Object):void
+		{
+			IDataGridModel(model).dataProvider = value;
+		}
+		
+		/**
+		 *  The currently selected row.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get selectedIndex():int
+		{
+			return IDataGridModel(model).selectedIndex;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateChooser.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateChooser.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateChooser.as
new file mode 100644
index 0000000..6f36af7
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateChooser.as
@@ -0,0 +1,74 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import org.apache.flex.core.IDateChooserModel;
+	import org.apache.flex.core.UIBase;
+	
+	/**
+	 * The change event is dispatched when the selectedDate is changed.
+	 */
+	[Event(name="change", type="org.apache.flex.events.Event")]
+	
+	/**
+	 *  The DateChooser class is a component that displays a calendar.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DateChooser extends UIBase
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DateChooser()
+		{
+			super();
+			className = "DateChooser";
+			
+			// fix the DateChooser's size
+//			width = 280;
+//			height = 240;
+		}
+		
+		/**
+		 *  The currently selected date (or null if no date has been selected).
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get selectedDate():Date
+		{
+			return IDateChooserModel(model).selectedDate;
+		}
+		public function set selectedDate(value:Date):void
+		{
+			IDateChooserModel(model).selectedDate = value;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateField.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateField.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateField.as
new file mode 100644
index 0000000..f5c77f4
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/DateField.as
@@ -0,0 +1,90 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls
+{
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IDateChooserModel;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.ValuesManager;
+	
+	/**
+	 * The DateField class provides an input field where a date can be entered
+	 * and a pop-up calendar control for picking a date as an alternative to
+	 * the text field.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DateField extends UIBase
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DateField()
+		{
+			super();
+			
+			className = "DateField";
+		}
+		
+		/**
+		 * The method called when added to a parent. The DateField class uses
+		 * this opportunity to install additional beads.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		override public function addedToParent():void
+		{
+			super.addedToParent();
+			
+			var klass:* = ValuesManager.valuesImpl.getValue(this,"iFormatBead");
+			var bead:IBead = new klass() as IBead;
+			if (bead) {
+				addBead(bead);
+			}
+		}
+		
+		/**
+		 *  The currently selected date (or null if no date has been selected).
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get selectedDate():Date
+		{
+			return IDateChooserModel(model).selectedDate;
+		}
+		public function set selectedDate(value:Date):void
+		{
+			IDateChooserModel(model).selectedDate = value;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/accessories/DateFormatMMDDYYYYBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/accessories/DateFormatMMDDYYYYBead.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/accessories/DateFormatMMDDYYYYBead.as
new file mode 100644
index 0000000..3b52c40
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/accessories/DateFormatMMDDYYYYBead.as
@@ -0,0 +1,151 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.accessories
+{
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IDateChooserModel;
+	import org.apache.flex.core.IFormatBead;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.EventDispatcher;
+	import org.apache.flex.html.staticControls.TextInput;
+	import org.apache.flex.html.staticControls.beads.DateFieldView;
+	
+	/**
+	 * The DateFormatBead class formats the display of a DateField using MM/DD/YYYY format.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DateFormatMMDDYYYYBead extends EventDispatcher implements IBead, IFormatBead
+	{
+		/**
+		 * constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DateFormatMMDDYYYYBead()
+		{
+		}
+		
+		private var _propertyName:String;
+		private var _eventName:String;
+		private var _formattedResult:String;
+		
+		/**
+		 *  The name of the property on the model holding the value to be formatted.
+		 *  The default is selectedDate.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get propertyName():String
+		{
+			if (_propertyName == null) {
+				return "selectedDate";
+			}
+			return _propertyName;
+		}
+		public function set propertyName(value:String):void
+		{
+			_propertyName = value;
+		}
+		
+		/**
+		 *  The name of the event dispatched when the property changes. The
+		 *  default is selectedDateChanged.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get eventName():String
+		{
+			if (_eventName == null) {
+				return _propertyName+"Changed";
+			}
+			return _eventName;
+		}
+		public function set eventName(value:String):void
+		{
+			_eventName = value;
+		}
+		
+		/**
+		 *  The formatted result.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get formattedString():String
+		{
+			return _formattedResult;
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			var model:IDateChooserModel = _strand.getBeadByType(IDateChooserModel) as IDateChooserModel;
+			model.addEventListener("selectedDateChanged",handleTextChange);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleTextChange(event:Event):void
+		{
+			var model:IDateChooserModel = _strand.getBeadByType(IDateChooserModel) as IDateChooserModel;
+			/*var view:DateFieldView = _strand.getBeadByType(DateFieldView) as DateFieldView;
+			var input:TextInput = view.textInput;*/
+			
+			var d:Date = model.selectedDate;
+			var month:String = String(d.getMonth()+1);
+			if (Number(month)<10) month = "0"+month;
+			var date:String = String(d.getDate());
+			if (Number(date)<10) date = "0"+date;
+			var fmt:String = month+"/"+date+"/"+String(d.getFullYear());
+			/*input.text = fmt;*/
+			_formattedResult = month+"/"+date+"/"+String(d.getFullYear());
+			
+			dispatchEvent( new Event("formatChanged") );
+		}
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridColumnView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridColumnView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridColumnView.as
new file mode 100644
index 0000000..91f81ef
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridColumnView.as
@@ -0,0 +1,104 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.html.staticControls.supportClasses.DataGridColumn;
+	
+	/**
+	 *  The DataGridColumnView class extends org.apache.flex.html.staticControls.beads.ListView and 
+	 *  provides properties to the org.apache.flex.html.staticControls.List that makes a column in 
+	 *  the org.apache.flex.html.staticControls.DataGrid.  
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DataGridColumnView extends ListView
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DataGridColumnView()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		override public function set strand(value:IStrand):void
+		{
+			super.strand = value;
+			_strand = value;
+		}
+		
+		private var _columnIndex:uint;
+		
+		/**
+		 *  The zero-based index for the column.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get columnIndex():uint
+		{
+			return _columnIndex;
+		}
+		public function set columnIndex(value:uint):void
+		{
+			_columnIndex = value;
+		}
+		
+		private var _column:DataGridColumn;
+		
+		/**
+		 *  The org.apache.flex.html.staticControls.support.DataGridColumn containing information used to 
+		 *  present the org.apache.flex.html.staticControls.List as a column in the 
+		 *  org.apache.flex.html.staticControls.DataGrid.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get column():DataGridColumn
+		{
+			return _column;
+		}
+		public function set column(value:DataGridColumn):void
+		{
+			_column = value;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridView.as
new file mode 100644
index 0000000..b1c8205
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataGridView.as
@@ -0,0 +1,213 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{	
+	import org.apache.flex.core.IBeadModel;
+	import org.apache.flex.core.IDataGridModel;
+	import org.apache.flex.core.ISelectionModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.html.staticControls.ButtonBar;
+	import org.apache.flex.html.staticControls.Container;
+	import org.apache.flex.html.staticControls.List;
+	import org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout;
+	import org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout;
+	import org.apache.flex.html.staticControls.beads.models.ArraySelectionModel;
+	import org.apache.flex.html.staticControls.supportClasses.DataGridColumn;
+	
+	/**
+	 *  The DataGridView class is the visual bead for the org.apache.flex.html.staticControls.DataGrid. 
+	 *  This class constructs the items that make the DataGrid: Lists for each column and a 
+	 *  org.apache.flex.html.staticControls.ButtonBar for the column headers.  
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DataGridView implements IDataGridView
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DataGridView()
+		{
+		}
+		
+		//private var background:Shape;
+		private var buttonBar:ButtonBar;
+		private var buttonBarModel:ArraySelectionModel;
+		private var columnContainer:Container;
+		private var columns:Array;
+		
+		/**
+		 *  The array of org.apache.flex.html.staticControls.supportClasses.DataGridColumn instances.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function getColumnLists():Array
+		{
+			return columns;
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel;
+			
+			// create an array of columnLabels for use by the ButtonBar/DataGrid header.
+			var columnLabels:Array = new Array();
+			var buttonWidths:Array = new Array();
+			for(var i:int=0; i < sharedModel.columns.length; i++) {
+				var dgc:DataGridColumn = sharedModel.columns[i] as DataGridColumn;
+				columnLabels.push(dgc.label);
+				buttonWidths.push(dgc.columnWidth);
+			}
+			var bblayout:ButtonBarLayout = new ButtonBarLayout();
+			bblayout.buttonWidths = buttonWidths;
+			
+			buttonBarModel = new ArraySelectionModel();
+			buttonBarModel.dataProvider = columnLabels;
+			
+			buttonBar = new ButtonBar();
+			buttonBar.addBead(buttonBarModel);
+			buttonBar.addBead(bblayout);
+			UIBase(_strand).addElement(buttonBar);
+			
+			columnContainer = new Container();
+			var layout:NonVirtualHorizontalLayout = new NonVirtualHorizontalLayout();
+			columnContainer.addBead(layout);
+			UIBase(_strand).addElement(columnContainer);
+			
+			columns = new Array();
+			for(i=0; i < sharedModel.columns.length; i++) {
+				var listModel:ISelectionModel = new ArraySelectionModel();
+				listModel.dataProvider = sharedModel.dataProvider;
+				
+				var dataGridColumn:DataGridColumn = sharedModel.columns[i] as DataGridColumn;
+				
+				var list:List = new List();
+				list.addBead(listModel);
+				list.itemRenderer = dataGridColumn.itemRenderer;
+				list.labelField = dataGridColumn.dataField;
+				
+				var colWidth:Number = dataGridColumn.columnWidth;
+				if (!isNaN(colWidth)) list.width = colWidth;
+
+				columnContainer.addElement(list);
+				columns.push(list);
+				list.addEventListener('change',columnListChangeHandler);
+				list.addEventListener('rollover',columnListRollOverHandler);
+			}
+			
+			IEventDispatcher(_strand).addEventListener("widthChanged",handleSizeChange);
+			IEventDispatcher(_strand).addEventListener("heightChanged",handleSizeChange);
+			
+			handleSizeChange(null); // initial sizing
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleSizeChange(event:Event):void
+		{
+			var sw:Number = UIBase(_strand).width;
+			var sh:Number = UIBase(_strand).height;
+			
+			var backgroundColor:Number = 0xDDDDDD;
+			var value:Object = ValuesManager.valuesImpl.getValue(_strand, "background-color");
+			if (value != null) backgroundColor = Number(value);
+			
+			buttonBar.x = 0;
+			buttonBar.y = 0;
+			buttonBar.width = sw + (2*columns.length-1);
+			buttonBar.height = 25;
+			
+			columnContainer.x = 0;
+			columnContainer.y = 30;
+			columnContainer.width = sw + columns.length*2;
+			columnContainer.height = sh - 25;
+			
+			for(var i:int=0; i < columns.length; i++) {
+				var column:List = columns[i];
+				column.height = columnContainer.height; // this will actually be Nitem*rowHeight eventually
+			}
+			
+			IEventDispatcher(_strand).dispatchEvent(new Event("layoutComplete"));
+		}
+		
+		/**
+		 * @private
+		 */
+		private function columnListChangeHandler(event:Event):void
+		{
+			var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel;
+			var list:List = event.target as List;
+			sharedModel.selectedIndex = list.selectedIndex;
+			
+			for(var i:int=0; i < columns.length; i++) {
+				if (list != columns[i]) {
+					var otherList:List = columns[i] as List;
+					otherList.selectedIndex = list.selectedIndex;
+				}
+			}
+			
+			IEventDispatcher(_strand).dispatchEvent(new Event('change'));
+		}
+		
+		/**
+		 * @private
+		 */
+		private function columnListRollOverHandler(event:Event):void
+		{
+			var list:List = event.target as List;
+			if (list == null) return;
+			for(var i:int=0; i < columns.length; i++) {
+				if (list != columns[i]) {
+					var otherList:List = columns[i] as List;
+					otherList.rollOverIndex = list.rollOverIndex;
+				}
+			}
+			
+			IEventDispatcher(_strand).dispatchEvent(new Event('rollOver'));
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataItemRendererFactoryForColumnData.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataItemRendererFactoryForColumnData.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataItemRendererFactoryForColumnData.as
new file mode 100644
index 0000000..c33e153
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DataItemRendererFactoryForColumnData.as
@@ -0,0 +1,142 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IDataGridModel;
+	import org.apache.flex.core.IDataProviderItemRendererMapper;
+	import org.apache.flex.core.IItemRendererClassFactory;
+	import org.apache.flex.core.IItemRendererParent;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.html.staticControls.supportClasses.DataItemRenderer;
+	
+	/**
+	 *  The DataItemRendererFactoryForColumnData class implents the 
+	 *  org.apache.flex.core.IDataProviderItemRendererMapper interface and creates the itemRenderers 
+	 *  for each cell in the org.apache.flex.html.staticControls.DataGrid.  
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DataItemRendererFactoryForColumnData implements IBead, IDataProviderItemRendererMapper
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DataItemRendererFactoryForColumnData()
+		{
+		}
+		
+		private var selectionModel:IDataGridModel;
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			selectionModel = value.getBeadByType(IDataGridModel) as IDataGridModel;
+			var listView:IListView = value.getBeadByType(IListView) as IListView;
+			dataGroup = listView.dataGroup;
+			selectionModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
+			
+			if (!itemRendererFactory)
+			{
+				_itemRendererFactory = new (ValuesManager.valuesImpl.getValue(_strand, "iItemRendererClassFactory")) as IItemRendererClassFactory;
+				_strand.addBead(_itemRendererFactory);
+			}
+			
+			dataProviderChangeHandler(null);
+		}
+		
+		private var _itemRendererFactory:IItemRendererClassFactory;
+		
+		/**
+		 *  The factory used to create the itemRenderers.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get itemRendererFactory():IItemRendererClassFactory
+		{
+			return _itemRendererFactory
+		}
+		public function set itemRendererFactory(value:IItemRendererClassFactory):void
+		{
+			_itemRendererFactory = value;
+		}
+		
+		/**
+		 *  The dataGroup that is the pareent for the itemRenderers
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		protected var dataGroup:IItemRendererParent;
+		
+		/**
+		 * @private
+		 */
+		private function dataProviderChangeHandler(event:Event):void
+		{
+			var dp:Array = selectionModel.dataProvider as Array;
+			if (!dp)
+				return;
+			
+			dataGroup.removeAllElements();
+			
+			var view:DataGridColumnView = _strand.getBeadByType(IBeadView) as DataGridColumnView;
+			if (view == null) return;
+						
+			var n:int = dp.length; 
+			for (var i:int = 0; i < n; i++)
+			{
+				var tf:DataItemRenderer = itemRendererFactory.createItemRenderer(dataGroup) as DataItemRenderer;
+				tf.index = i;
+				tf.labelField = view.column.dataField;
+				dataGroup.addElement(tf);
+				tf.data = dp[i];
+			}
+			
+			IEventDispatcher(_strand).dispatchEvent(new Event("itemsCreated"));
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateChooserView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateChooserView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateChooserView.as
new file mode 100644
index 0000000..12cc8f5
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateChooserView.as
@@ -0,0 +1,257 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{	
+	import org.apache.flex.html.staticControls.beads.models.DateChooserModel;
+	import org.apache.flex.html.staticControls.supportClasses.DateChooserButton;
+	
+	import org.apache.flex.core.IBeadModel;
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.html.staticControls.beads.layouts.TileLayout;
+	import org.apache.flex.html.staticControls.Container;
+	import org.apache.flex.html.staticControls.TextButton;
+	
+	/**
+	 * The DateChooserView class is a view bead for the DateChooser. This class
+	 * creates the elements for the DateChooser: the buttons to move between
+	 * months, the labels for the days of the week, and the buttons for each day
+	 * of the month.
+	 */
+	public class DateChooserView implements IBeadView
+	{
+		/**
+		 *  constructor
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DateChooserView()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			// make sure there is a model.
+			model = _strand.getBeadByType(IBeadModel) as DateChooserModel;
+			if (model == null) {
+				model = new (ValuesManager.valuesImpl.getValue(_strand,"iBeadModel")) as DateChooserModel;
+			}
+			model.addEventListener("displayedMonthChanged",handleModelChange);
+			model.addEventListener("displayedYearChanged",handleModelChange);
+			
+			createChildren();
+		}
+		
+		private var _prevMonthButton:TextButton;
+		private var _nextMonthButton:TextButton;
+		private var _dayButtons:Array;
+		private var monthLabel:TextButton;
+		private var dayContainer:Container;
+		
+		private var model:DateChooserModel;
+		
+		/**
+		 *  The button that causes the previous month to be displayed by the DateChooser.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get prevMonthButton():TextButton
+		{
+			return _prevMonthButton;
+		}
+		
+		/**
+		 *  The button that causes the next month to be displayed by the DateChooser.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get nextMonthButton():TextButton
+		{
+			return _nextMonthButton;
+		}
+		
+		/**
+		 * The array of DateChooserButton instances that represent each day of the month.
+		 */
+		public function get dayButtons():Array
+		{
+			return _dayButtons;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function createChildren():void
+		{
+			_prevMonthButton = new TextButton();
+			_prevMonthButton.width = 40;
+			_prevMonthButton.height = 20;
+			_prevMonthButton.x = 0;
+			_prevMonthButton.y = 0;
+			_prevMonthButton.text = "<";
+			UIBase(_strand).addElement(_prevMonthButton);
+			
+			_nextMonthButton = new TextButton();
+			_nextMonthButton.width = 40;
+			_nextMonthButton.height = 20;
+			_nextMonthButton.x = UIBase(_strand).width - _nextMonthButton.width;
+			_nextMonthButton.y = 0;
+			_nextMonthButton.text = ">";
+			UIBase(_strand).addElement(_nextMonthButton);
+			
+			monthLabel = new TextButton();
+			monthLabel.text = "Month Here";
+			monthLabel.width = 100;
+			monthLabel.height = 20;
+			monthLabel.x = (UIBase(_strand).width - monthLabel.width)/2;
+			monthLabel.y = 0;
+			UIBase(_strand).addElement(monthLabel);
+			
+			dayContainer = new Container();
+			var tileLayout:TileLayout = new TileLayout();
+			dayContainer.addBead(tileLayout);
+			tileLayout.numColumns = 7;
+			dayContainer.x = 0;
+			dayContainer.y = monthLabel.y + monthLabel.height + 5;
+			
+			var sw:Number = UIBase(_strand).width;
+			var sh:Number = UIBase(_strand).height;
+			trace("Strand's width x height is "+sw+" x "+sh);
+			dayContainer.width = sw;
+			dayContainer.height = sh - (monthLabel.height+5);
+			
+			// the calendar has 7 columns with 6 rows, the first row are the day names
+			for(var i:int=0; i < 7; i++) {
+				var dayName:DateChooserButton = new DateChooserButton();
+				dayName.text = model.dayNames[i];
+				dayName.dayOfMonth = 0;
+				dayContainer.addElement(dayName);
+			}
+			
+			_dayButtons = new Array();
+			
+			for(i=0; i < 42; i++) {
+				var date:DateChooserButton = new DateChooserButton();
+				date.text = String(i+1);
+				dayContainer.addElement(date);
+				dayButtons.push(date);
+			}
+			
+			UIBase(_strand).addElement(dayContainer);
+			
+			IEventDispatcher(dayContainer).dispatchEvent( new Event("itemsCreated") );			
+			IEventDispatcher(_strand).dispatchEvent( new Event("layoutNeeded") );			
+			IEventDispatcher(dayContainer).dispatchEvent( new Event("layoutNeeded") );
+			
+			updateCalendar();
+		}
+		
+		/**
+		 * @private
+		 */
+		private function updateCalendar():void
+		{
+			monthLabel.text = model.monthNames[model.displayedMonth] + " " +
+				String(model.displayedYear);
+			
+			var firstDay:Date = new Date(model.displayedYear,model.displayedMonth,1);
+			
+			// blank out the labels for the first firstDay.day-1 entries.
+			for(var i:int=0; i < firstDay.getDay(); i++) {
+				var dateButton:DateChooserButton = dayButtons[i] as DateChooserButton;
+				dateButton.dayOfMonth = -1;
+				dateButton.text = "";
+			}
+			
+			// renumber to the last day of the month
+			var dayNumber:int = 1;
+			var numDays:Number = numberOfDaysInMonth(model.displayedMonth, model.displayedYear);
+			
+			for(; i < dayButtons.length && dayNumber <= numDays; i++) {
+				dateButton = dayButtons[i] as DateChooserButton;
+				dateButton.dayOfMonth = dayNumber;
+				dateButton.text = String(dayNumber++);
+			}
+			
+			// blank out the rest
+			for(; i < dayButtons.length; i++) {
+				dateButton = dayButtons[i] as DateChooserButton;
+				dateButton.dayOfMonth = -1;
+				dateButton.text = "";
+			}
+		}
+		
+		/**
+		 * @private
+		 */
+		private function numberOfDaysInMonth(month:Number, year:Number):Number
+		{
+			var n:int;
+			
+			if (month == 1) // Feb
+			{
+				if (((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0)) // leap year
+					n = 29;
+				else
+					n = 28;
+			}
+				
+			else if (month == 3 || month == 5 || month == 8 || month == 10)
+				n = 30;
+				
+			else
+				n = 31;
+			
+			return n;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleModelChange(event:Event):void
+		{
+			updateCalendar();
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateFieldView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateFieldView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateFieldView.as
new file mode 100644
index 0000000..6a9008d
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/DateFieldView.as
@@ -0,0 +1,187 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{	
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IDateChooserModel;
+	import org.apache.flex.core.IFormatBead;
+	import org.apache.flex.core.IParent;
+	import org.apache.flex.core.IPopUpHost;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.utils.UIUtils;
+	import org.apache.flex.html.staticControls.DateChooser;
+	import org.apache.flex.html.staticControls.TextButton;
+	import org.apache.flex.html.staticControls.TextInput;
+	
+	/**
+	 * The DateFieldView class is a bead for DateField that creates the
+	 * input and button controls. This class also handles the pop-up 
+	 * mechanics.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DateFieldView implements IBeadView
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DateFieldView()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+		private var _textInput:TextInput;
+		private var _button:TextButton;
+		
+		/**
+		 *  The TextButton that triggers the display of the DateChooser pop-up.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get menuButton():TextButton
+		{
+			return _button;
+		}
+		
+		/**
+		 *  The TextInput that displays the date selected.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get textInput():TextInput
+		{
+			return _textInput;
+		}
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{	
+			_strand = value;
+			
+			_textInput = new TextInput();
+			UIBase(_strand).addElement(_textInput);
+			_textInput.width = 100;
+			_textInput.height = 18;
+			
+			_button = new TextButton();
+			_button.text = "M";
+			UIBase(_strand).addElement(_button);
+			_button.x = _textInput.width;
+			_button.y = _textInput.y;
+			
+			IEventDispatcher(_strand).addEventListener("beadsAdded",handleBeadsAdded);
+		}
+		
+		private function handleBeadsAdded(event:Event):void
+		{
+			var formatter:IFormatBead = _strand.getBeadByType(IFormatBead) as IFormatBead;
+			formatter.addEventListener("formatChanged",handleFormatChanged);
+		}
+		
+		private function handleFormatChanged(event:Event):void
+		{
+			var formatter:IFormatBead = event.target as IFormatBead;
+			_textInput.text = formatter.formattedString;
+		}
+		
+		private var _popUp:DateChooser;
+		
+		/**
+		 *  The pop-up component that holds the selection list.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get popUp():DateChooser
+		{
+			return _popUp;
+		}
+		
+		private var _popUpVisible:Boolean;
+		
+		/**
+		 *  This property is true if the pop-up selection list is currently visible.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get popUpVisible():Boolean
+		{
+			return _popUpVisible;
+		}
+		public function set popUpVisible(value:Boolean):void
+		{
+			if (value != _popUpVisible)
+			{
+				_popUpVisible = value;
+				if (value)
+				{
+					if (!_popUp)
+					{
+						_popUp = new DateChooser();
+						_popUp.width = 210;
+						_popUp.height = 220;
+						_popUp.x = UIBase(_strand).x;
+						_popUp.y = UIBase(_strand).y + 30;
+					}
+					
+					var model:IDateChooserModel = _strand.getBeadByType(IDateChooserModel) as IDateChooserModel;
+					_popUp.selectedDate = model.selectedDate;
+					
+					var host:IPopUpHost = UIUtils.findPopUpHost(UIBase(_strand));
+					host.addElement(_popUp);
+				}
+				else
+				{
+					UIUtils.removePopUp(_popUp);
+				}
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableLabelView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableLabelView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableLabelView.as
new file mode 100644
index 0000000..1fc8e1a
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableLabelView.as
@@ -0,0 +1,90 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import org.apache.flex.core.IFormatBead;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	
+	/**
+	 *  The FormatableLabelView class is a View bead that is capable of working
+	 *  with a format bead to display a formatted value. When the format bead has
+	 *  created a formatted string, it dispatches a formatChanged event that the
+	 *  FormatableLabelView class intercepts and displays in the label.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class FormatableLabelView extends TextFieldView
+	{
+		/**
+		 *  constructor
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function FormatableLabelView()
+		{
+			super();
+		}
+		
+		private var _formatter:IFormatBead;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		override public function set strand(value:IStrand):void
+		{
+			super.strand = value;
+			IEventDispatcher(value).addEventListener("beadsAdded",handleBeadsAdded);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleBeadsAdded(event:Event):void
+		{
+			_formatter = strand.getBeadByType(IFormatBead) as IFormatBead;
+			_formatter.addEventListener("formatChanged",formatReadyHandler);
+			
+			// process any text set in the label at this moment
+			text = _formatter.formattedString;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function formatReadyHandler(event:Event):void
+		{
+			if (_formatter) {
+				text = _formatter.formattedString;
+			}
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableTextInputView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableTextInputView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableTextInputView.as
new file mode 100644
index 0000000..66fcab4
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/FormatableTextInputView.as
@@ -0,0 +1,89 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import org.apache.flex.core.IFormatBead;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+
+	/**
+	 *  The FormatableTextInputView class is a View bead that extends TextInputWithBorderView
+	 *  and is capable of working with a format bead. When a format bead dispatches a
+	 *  formatChanged event, the FormatableTextInputView bead copies the formatted string to
+	 *  to the text field.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class FormatableTextInputView extends TextInputWithBorderView
+	{
+		/**
+		 *  constructor
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function FormatableTextInputView()
+		{
+			super();
+		}
+		
+		private var _formatter:IFormatBead;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		override public function set strand(value:IStrand):void
+		{
+			super.strand = value;
+			IEventDispatcher(value).addEventListener("beadsAdded",handleBeadsAdded);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleBeadsAdded(event:Event):void
+		{
+			_formatter = strand.getBeadByType(IFormatBead) as IFormatBead;
+			_formatter.addEventListener("formatChanged",formatChangedHandler);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function formatChangedHandler(event:Event):void
+		{
+			this.textField.text = _formatter.formattedString;
+			
+			// move the cursor to the end
+			var l:int = this.textField.text.length;
+			this.textField.setSelection(l,l);
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/IDataGridView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/IDataGridView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/IDataGridView.as
new file mode 100644
index 0000000..f359337
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/IDataGridView.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.html.staticControls.beads
+{
+	import org.apache.flex.core.IBeadView;
+	
+	/**
+	 *  The IDataGridView interface marks as a component as being the bead that
+	 *  can create the visual pieces for a org.apache.flex.html.staticControls.DataGrid. 
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public interface IDataGridView extends IBeadView
+	{
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateChooserMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateChooserMouseController.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateChooserMouseController.as
new file mode 100644
index 0000000..69343eb
--- /dev/null
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/controllers/DateChooserMouseController.as
@@ -0,0 +1,126 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.controllers
+{	
+	import org.apache.flex.html.staticControls.beads.DateChooserView;
+	import org.apache.flex.html.staticControls.beads.models.DateChooserModel;
+	import org.apache.flex.html.staticControls.supportClasses.DateChooserButton;
+	
+	import org.apache.flex.core.IBeadController;
+	import org.apache.flex.core.IBeadModel;
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	
+	/**
+	 *  The DateChooserMouseController class is responsible for listening to
+	 *  mouse event related to the DateChooser. Events such as selecting a date
+	 *  or changing the calendar.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DateChooserMouseController implements IBeadController
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DateChooserMouseController()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			var view:DateChooserView = value.getBeadByType(IBeadView) as DateChooserView;
+			view.prevMonthButton.addEventListener("click", prevMonthClickHandler);
+			view.nextMonthButton.addEventListener("click", nextMonthClickHandler);
+			
+			var dayButtons:Array = view.dayButtons;
+			for(var i:int=0; i < dayButtons.length; i++) {
+				IEventDispatcher(dayButtons[i]).addEventListener("click", dayButtonClickHandler);
+			}
+		}
+		
+		/**
+		 * @private
+		 */
+		private function prevMonthClickHandler(event:Event):void
+		{
+			var model:DateChooserModel = _strand.getBeadByType(IBeadModel) as DateChooserModel;
+			var month:Number = model.displayedMonth - 1;
+			var year:Number  = model.displayedYear;
+			if (month < 0) {
+				month = 11;
+				year--;
+			}
+			model.displayedMonth = month;
+			model.displayedYear = year;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function nextMonthClickHandler(event:Event):void
+		{
+			var model:DateChooserModel = _strand.getBeadByType(IBeadModel) as DateChooserModel;
+			var month:Number = model.displayedMonth + 1;
+			var year:Number  = model.displayedYear;
+			if (month >= 12) {
+				month = 0;
+				year++;
+			}
+			model.displayedMonth = month;
+			model.displayedYear = year;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function dayButtonClickHandler(event:Event):void
+		{
+			var dateButton:DateChooserButton = event.target as DateChooserButton;
+			if (dateButton.dayOfMonth > 0) {
+				var model:DateChooserModel = _strand.getBeadByType(IBeadModel) as DateChooserModel;
+				var newDate:Date = new Date(model.displayedYear,model.displayedMonth,dateButton.dayOfMonth);
+				model.selectedDate = newDate;
+				IEventDispatcher(_strand).dispatchEvent( new Event("change") );
+			}
+		}
+	}
+}
\ No newline at end of file


[12/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Slider.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Slider.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Slider.as
deleted file mode 100644
index 07717a5..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Slider.as
+++ /dev/null
@@ -1,152 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import org.apache.flex.core.IRangeModel;
-	import org.apache.flex.core.UIBase;
-	
-	[Event(name="valueChanged", type="org.apache.flex.events.Event")]
-	
-	/**
-	 *  The Slider class is a component that displays a range of values using a
-	 *  track and a thumb control. The Slider uses the following bead types:
-	 * 
-	 *  org.apache.flex.core.IBeadModel: the data model, typically an IRangeModel, that holds the Slider values.
-	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the Slider.
-	 *  org.apache.flex.core.IBeadController: the bead that handles input.
-	 *  org.apache.flex.core.IThumbValue: the bead responsible for the display of the thumb control.
-	 *  org.apache.flex.core.ITrackView: the bead responsible for the display of the track.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class Slider extends UIBase
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function Slider()
-		{
-			super();
-			
-			className = "Slider";
-			
-			IRangeModel(model).value = 0;
-			IRangeModel(model).minimum = 0;
-			IRangeModel(model).maximum = 100;
-			IRangeModel(model).stepSize = 1;
-			IRangeModel(model).snapInterval = 1;
-		}
-		
-		/**
-		 *  The current value of the Slider.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get value():Number
-		{
-			return IRangeModel(model).value;
-		}
-		public function set value(newValue:Number):void
-		{
-			IRangeModel(model).value = newValue;
-		}
-		
-		/**
-		 *  The minimum value of the Slider.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get minimum():Number
-		{
-			return IRangeModel(model).minimum;
-		}
-		public function set minimum(value:Number):void
-		{
-			IRangeModel(model).minimum = value;
-		}
-		
-		/**
-		 *  The maximum value of the Slider.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get maximum():Number
-		{
-			return IRangeModel(model).maximum;
-		}
-		public function set maximum(value:Number):void
-		{
-			IRangeModel(model).maximum = value;
-		}
-		
-		/**
-		 *  The modulus of the Slider value. The thumb will be positioned
-		 *  at the nearest multiple of this value.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get snapInterval():Number
-		{
-			return IRangeModel(model).snapInterval;
-		}
-		public function set snapInterval(value:Number):void
-		{
-			IRangeModel(model).snapInterval = value;
-		}
-        
-		/**
-		 *  The amount to move the thumb when the track is selected. This value is
-		 *  adjusted to fit the nearest snapInterval.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-        public function get stepSize():Number
-        {
-            return IRangeModel(model).stepSize;
-        }
-        public function set stepSize(value:Number):void
-        {
-            IRangeModel(model).stepSize = value;
-        }
-
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Spinner.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Spinner.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Spinner.as
deleted file mode 100644
index fb77659..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Spinner.as
+++ /dev/null
@@ -1,146 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import org.apache.flex.core.IRangeModel;
-	import org.apache.flex.core.UIBase;
-	
-	[Event(name="valueChanged", type="org.apache.flex.events.Event")]
-	
-	/**
-	 *  The Spinner class is a component that displays a control for incrementing a value
-	 *  and a control for decrementing a value. The org.apache.flex.html.staticControls.NumericStepper 
-	 *  uses a Spinner as part of the component. Spinner uses the following beads:
-	 * 
-	 *  org.apache.flex.core.IBeadModel: an IRangeModel to hold the properties.
-	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the Spinner.
-	 *  org.apache.flex.core.IBeadController: a bead that handles the input events.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class Spinner extends UIBase
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function Spinner()
-		{
-			super();
-			
-			className = "Spinner";
-		}
-		
-		/**
-		 *  The current value of the Spinner.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get value():Number
-		{
-			return IRangeModel(model).value;
-		}
-		public function set value(newValue:Number):void
-		{
-			IRangeModel(model).value = newValue;
-		}
-		
-		/**
-		 *  The minimum value of the Spinner.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get minimum():Number
-		{
-			return IRangeModel(model).minimum;
-		}
-		public function set minimum(value:Number):void
-		{
-			IRangeModel(model).minimum = value;
-		}
-		
-		/**
-		 *  The maximum value of the Spinner.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get maximum():Number
-		{
-			return IRangeModel(model).maximum;
-		}
-		public function set maximum(value:Number):void
-		{
-			IRangeModel(model).maximum = value;
-		}
-		
-		/**
-		 *  The modulus for the value. If this property is set,
-		 *  the value displayed with a muliple of the snapInterval.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get snapInterval():Number
-		{
-			return IRangeModel(model).snapInterval;
-		}
-		public function set snapInterval(value:Number):void
-		{
-			IRangeModel(model).snapInterval = value;
-		}
-		
-		/**
-		 *  The amount to increase or descrease the value. The value
-		 *  will not exceed the minimum or maximum value. The final
-		 *  value is affected by the snapInterval.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get stepSize():Number
-		{
-			return IRangeModel(model).stepSize;
-		}
-		public function set stepSize(value:Number):void
-		{
-			IRangeModel(model).stepSize = value;
-		}
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextArea.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextArea.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextArea.as
deleted file mode 100644
index b1cd581..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextArea.as
+++ /dev/null
@@ -1,91 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import org.apache.flex.core.ITextModel;
-	import org.apache.flex.core.UIBase;
-	
-    /**
-     *  The TextArea class implements the basic control for
-     *  multi-line text input.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */    
-	public class TextArea extends UIBase
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function TextArea()
-		{
-			super();
-		}
-		
-        /**
-         *  @copy org.apache.flex.html.staticControls.Label#text
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get text():String
-		{
-			return ITextModel(model).text;
-		}
-
-        /**
-         *  @private
-         */
-		public function set text(value:String):void
-		{
-			ITextModel(model).text = value;
-		}
-		
-        /**
-         *  @copy org.apache.flex.html.staticControls.Label#html
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get html():String
-		{
-			return ITextModel(model).html;
-		}
-
-        /**
-         *  @private
-         */
-		public function set html(value:String):void
-		{
-			ITextModel(model).html = value;
-		}
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextButton.as
deleted file mode 100644
index 3658005..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextButton.as
+++ /dev/null
@@ -1,90 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import org.apache.flex.core.ITextModel;
-	
-    /**
-     *  The TextButton class implements a basic button that
-     *  displays text.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */    
-	public class TextButton extends Button
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function TextButton()
-		{
-			super();
-		}
-		
-        /**
-         *  @copy org.apache.flex.html.staticControls.Label#text
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get text():String
-		{
-			return ITextModel(model).text;
-		}
-
-        /**
-         *  @private
-         */
-		public function set text(value:String):void
-		{
-			ITextModel(model).text = value;
-		}
-		
-        /**
-         *  @copy org.apache.flex.html.staticControls.Label#html
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get html():String
-		{
-			return ITextModel(model).html;
-		}
-
-        /**
-         *  @private
-         */
-		public function set html(value:String):void
-		{
-			ITextModel(model).html = value;
-		}
-
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextInput.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextInput.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextInput.as
deleted file mode 100644
index ce85fa4..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextInput.as
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-//  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.html.staticControls
-{
-	import org.apache.flex.core.ITextModel;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.events.Event;
-
-	/**
-     *  Dispatched when the user changes the text.
-     *
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	[Event(name="change", type="org.apache.flex.events.Event")]
-
-    /**
-     *  The TextInput class implements the basic control for
-     *  single-line text input.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */    
-	public class TextInput extends UIBase
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function TextInput()
-		{
-			super();
-
-			model.addEventListener("textChange", textChangeHandler);
-		}
-		
-        /**
-         *  @copy org.apache.flex.html.staticControls.Label#text
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get text():String
-		{
-			return ITextModel(model).text;
-		}
-
-        /**
-         *  @private
-         */
-		public function set text(value:String):void
-		{
-			ITextModel(model).text = value;
-		}
-		
-        /**
-         *  @copy org.apache.flex.html.staticControls.Label#html
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get html():String
-		{
-			return ITextModel(model).html;
-		}
-
-        /**
-         *  @private
-         */
-		public function set html(value:String):void
-		{
-			ITextModel(model).html = value;
-		}
-
-		/**
-		 * @dispatch change event in response to a textChange event
-		 *
-		 *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-		 */
-		public function textChangeHandler(event:Event):void
-		{
-            dispatchEvent(new Event(Event.CHANGE));
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TitleBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TitleBar.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TitleBar.as
deleted file mode 100644
index 1b1ec40..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TitleBar.as
+++ /dev/null
@@ -1,247 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls
-{
-	import flash.display.Shape;
-	
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IBeadLayout;
-	import org.apache.flex.core.IChrome;
-	import org.apache.flex.core.ITitleBarModel;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.html.staticControls.Label;
-	
-	/**
-	 *  The TitleBar class is a Container component that displays a title and an
-	 *  optional close button. The TitleBar uses the following bead types:
-	 * 
-	 *  org.apache.flex.core.IBeadModel: the data model, which includes the title and showCloseButton values.
-	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the component.
-	 *  org.apache.flex.core.IBeadLayout: the bead that handles size and position of the component parts 
-	 *  (org.apache.flex.html.staticControls.Label and org.apache.flex.html.staticControls.Button).
-	 *  org.apache.flex.core.IMeasurementBead: a bead that helps determine the size of the 
-	 *  org.apache.flex.html.staticControls.TitleBar for layout.
-	 * 
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class TitleBar extends Container implements IChrome
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function TitleBar()
-		{
-			super();
-			
-			className = "TitleBar";
-		}
-		
-		/**
-		 *  The title string to display.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get title():String
-		{
-			return ITitleBarModel(model).title;
-		}
-		public function set title(value:String):void
-		{
-			ITitleBarModel(model).title = value;
-		}
-		
-		/**
-		 *  The HTML title to display.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get htmlTitle():String
-		{
-			return ITitleBarModel(model).htmlTitle;
-		}
-		public function set htmlTitle(value:String):void
-		{
-			ITitleBarModel(model).htmlTitle = value;
-		}
-		
-		/**
-		 *  Whether or not to show a org.apache.flex.html.staticControls.Button that indicates the component
-		 *  may be closed.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get showCloseButton():Boolean
-		{
-			return ITitleBarModel(model).showCloseButton;
-		}
-		public function set showCloseButton(value:Boolean):void
-		{
-			ITitleBarModel(model).showCloseButton = value;
-		}
-		
-		/**
-		 * @private
-		 */
-		private var _titleLabel:Label;
-		public function get titleLabel():Label
-		{
-			return _titleLabel;
-		}
-		
-		/**
-		 * @private
-		 */
-		private var _closeButton:Button;
-		public function get closeButton():Button
-		{
-			return closeButton;
-		}
-		
-		/**
-		 * @private
-		 */
-		override public function addedToParent():void
-		{
-			super.addedToParent();
-			
-			if( getBeadByType(IBeadLayout) == null )
-				addBead(new (ValuesManager.valuesImpl.getValue(this, "iBeadLayout")) as IBead);
-			
-			// add the label for the title and the button for the close
-			_titleLabel = createTitle();
-			_titleLabel.className = className;
-			_titleLabel.id = "title";
-			addElement(_titleLabel);
-			
-			_closeButton = createCloseButton();
-			_closeButton.className = className;
-			_closeButton.id = "closeButton";
-			addElement(_closeButton);
-			
-			childrenAdded();
-            
-            model.addEventListener('titleChange',handlePropertyChange);
-            model.addEventListener('htmlTitleChange',handlePropertyChange);
-            model.addEventListener('showCloseButtonChange',handlePropertyChange);
-
-			// dispatch this event to force any beads to update
-			dispatchEvent(new Event("widthChanged"));
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handlePropertyChange(event:Event):void
-		{
-			if( event.type == "showCloseButtonChange" ) {
-				if( closeButton ) closeButton.visible = showCloseButton;
-			}
-			else if( event.type == "titleChange" ) {
-				if( titleLabel ) {
-					titleLabel.text = title;
-				}
-			}
-			else if( event.type == "htmlTitleChange" ) {
-				if( titleLabel ) {
-					titleLabel.html = htmlTitle;
-				}
-			}
-			
-			dispatchEvent(new Event("widthChanged"));
-		}
-		
-		/**
-		 * @private
-		 */
-		protected function createTitle() : Label
-		{
-			var label:Label = new Label();
-			label.text = title;
-			return label;
-		}
-		
-		/**
-		 * @private
-		 */
-		protected function createCloseButton() : Button
-		{
-			var upState:Shape = new Shape();
-			upState.graphics.clear();
-			upState.graphics.beginFill(0xCCCCCC);
-			upState.graphics.drawRect(0,0,11,11);
-			upState.graphics.endFill();
-			
-			var overState:Shape = new Shape();
-			overState.graphics.clear();
-			overState.graphics.beginFill(0x999999);
-			overState.graphics.drawRect(0,0,11,11);
-			overState.graphics.endFill();
-			
-			var downState:Shape = new Shape();
-			downState.graphics.clear();
-			downState.graphics.beginFill(0x666666);
-			downState.graphics.drawRect(0, 0, 11, 11);
-			downState.graphics.endFill();
-			
-			var hitArea:Shape = new Shape();
-			hitArea.graphics.clear();
-			hitArea.graphics.beginFill(0x000000);
-			hitArea.graphics.drawRect(0, 0, 11, 11);
-			hitArea.graphics.endFill();
-			
-			var button:Button = new Button();
-            button.upState = upState;
-            button.overState = overState;
-            button.downState = downState;
-            button.hitTestState = hitArea;
-			button.visible = showCloseButton;
-			
-			button.addEventListener('click',closeButtonHandler);
-			
-			return button;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function closeButtonHandler(event:org.apache.flex.events.Event) : void
-		{
-			var newEvent:Event = new Event('close',true);
-			dispatchEvent(newEvent);
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/accessories/NumericOnlyTextInputBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/accessories/NumericOnlyTextInputBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/accessories/NumericOnlyTextInputBead.as
deleted file mode 100644
index b0c7322..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/accessories/NumericOnlyTextInputBead.as
+++ /dev/null
@@ -1,125 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.accessories
-{
-	import flash.events.TextEvent;
-	
-	import org.apache.flex.core.CSSTextField;
-	import org.apache.flex.core.IBead;
-	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.ITextFieldView;
-	
-	/**
-	 *  The NumericOnlyTextInputBead class is a specialty bead that can be used with
-	 *  any TextInput control. The bead prevents non-numeric entry into the text input
-	 *  area.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class NumericOnlyTextInputBead implements IBead
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function NumericOnlyTextInputBead()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			IEventDispatcher(value).addEventListener("viewChanged",viewChangeHandler);
-		}
-		
-		private var _decimalSeparator:String = ".";
-		
-		/**
-		 *  The character used to separate the integer and fraction parts of numbers.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get decimalSeparator():String
-		{
-			return _decimalSeparator;
-		}
-		public function set decimalSeparator(value:String):void
-		{
-			if (_decimalSeparator != value) {
-				_decimalSeparator = value;
-			}
-		}
-		
-		/**
-		 * @private
-		 */
-		private function viewChangeHandler(event:Event):void
-		{			
-			// get the ITextFieldView bead, which is required for this bead to work
-			var textView:ITextFieldView = _strand.getBeadByType(ITextFieldView) as ITextFieldView;
-			if (textView) {
-				var textField:CSSTextField = textView.textField;
-				textField.restrict = "0-9" + decimalSeparator;
-				
-				// listen for changes to this textField and prevent non-numeric values, such
-				// as 34.09.94
-				textField.addEventListener(TextEvent.TEXT_INPUT, handleTextInput);
-			}
-			else {
-				throw new Error("NumericOnlyTextInputBead requires strand to have an ITextFieldView bead");
-			}
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleTextInput(event:TextEvent):void
-		{
-			var insert:String = event.text;
-			var caretIndex:int = (event.target as CSSTextField).caretIndex;
-			var current:String = (event.target as CSSTextField).text;
-			var value:String = current.substring(0,caretIndex) + insert + current.substr(caretIndex);
-			var n:Number = Number(value);
-			if (isNaN(n)) event.preventDefault();
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/accessories/PasswordInputBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/accessories/PasswordInputBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/accessories/PasswordInputBead.as
deleted file mode 100644
index 268ceea..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/accessories/PasswordInputBead.as
+++ /dev/null
@@ -1,85 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.accessories
-{
-	import org.apache.flex.core.CSSTextField;
-	import org.apache.flex.core.IBead;
-	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.ITextFieldView;
-	
-	/**
-	 *  The PasswordInput class is a specialty bead that can be used with
-	 *  any TextInput control. The bead secures the text input area by masking
-	 *  the input as it is typed.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class PasswordInputBead implements IBead
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function PasswordInputBead()
-		{
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			IEventDispatcher(value).addEventListener("viewChanged",viewChangeHandler);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function viewChangeHandler(event:Event):void
-		{			
-			// get the ITextFieldView bead, which is required for this bead to work
-			var textView:ITextFieldView = _strand.getBeadByType(ITextFieldView) as ITextFieldView;
-			if (textView) {
-				var textField:CSSTextField = textView.textField;
-				textField.displayAsPassword = true;
-			}
-			else {
-				throw new Error("PasswordInputBead requires strand to have a TextInputView bead");
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/accessories/TextPromptBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/accessories/TextPromptBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/accessories/TextPromptBead.as
deleted file mode 100644
index 4f41a67..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/accessories/TextPromptBead.as
+++ /dev/null
@@ -1,131 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.accessories
-{
-	import flash.text.TextFieldType;
-	
-	import org.apache.flex.core.CSSTextField;
-	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;
-	
-	/**
-	 *  The TextPromptBead class is a specialty bead that can be used with
-	 *  any TextInput control. The bead places a string into the input field
-	 *  when there is no value associated with the text property.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class TextPromptBead implements IBead
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function TextPromptBead()
-		{
-		}
-		
-		private var _prompt:String;
-		
-		/**
-		 *  The string to use as the placeholder prompt.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get prompt():String
-		{
-			return _prompt;
-		}
-		public function set prompt(value:String):void
-		{
-			_prompt = value;
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			
-			// listen for changes in text to hide or show the prompt
-			var model:Object = UIBase(_strand).model;
-			if (!model.hasOwnProperty("text")) {
-				throw new Error("Model requires a text property when used with TextPromptBead");
-			}
-			IEventDispatcher(model).addEventListener("textChange",handleTextChange);
-			
-			// create a TextField that displays the prompt - it shows
-			// and hides based on the model's content
-			promptField = new CSSTextField();
-			promptField.selectable = false;
-			promptField.type = TextFieldType.DYNAMIC;
-			promptField.mouseEnabled = false;
-			promptField.multiline = false;
-			promptField.wordWrap = false;
-			promptField.textColor = 0xBBBBBB;
-			
-			// trigger the event handler to display if needed
-			handleTextChange(null);
-		}
-		
-		private var promptField:CSSTextField;
-		private var promptAdded:Boolean;
-		
-		/**
-		 * @private
-		 */
-		private function handleTextChange( event:Event ):void
-		{	
-			// see what the model currently has to determine if the prompt should be
-			// displayed or not.
-			var model:Object = UIBase(_strand).model;
-			
-			if (model.text != null && model.text.length > 0 ) {
-				if (promptAdded) UIBase(_strand).removeChild(promptField);
-				promptAdded = false;
-			}
-			else {
-				if (!promptAdded) UIBase(_strand).addChild(promptField);
-				promptField.text = prompt;
-				promptAdded = true;
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/AlertMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/AlertMeasurementBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/AlertMeasurementBead.as
deleted file mode 100644
index f0d315b..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/AlertMeasurementBead.as
+++ /dev/null
@@ -1,88 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.IMeasurementBead;
-	import org.apache.flex.core.IStrand;
-	
-	/**
-	 *  The AlertMeasureBead class provides boundary measurements for an 
-	 *  org.apache.flex.html.staticControls.Alert component.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class AlertMeasurementBead implements IMeasurementBead
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function AlertMeasurementBead()
-		{
-		}
-		
-		/**
-		 *  Returns the overall width of the org.apache.flex.html.staticControls.Alert component.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get measuredWidth():Number
-		{
-			return 0;
-		}
-		
-		/**
-		 *  Returns the overall height of the org.apache.flex.html.staticControls.Alert component.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get measuredHeight():Number
-		{
-			return 0;
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/AlertView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/AlertView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/AlertView.as
deleted file mode 100644
index c43149b..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/AlertView.as
+++ /dev/null
@@ -1,223 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import org.apache.flex.core.IAlertModel;
-	import org.apache.flex.core.IBead;
-    import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IMeasurementBead;
-    import org.apache.flex.core.IParent;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.UIMetrics;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.createjs.staticControls.Label;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.Alert;
-	import org.apache.flex.html.staticControls.ControlBar;
-	import org.apache.flex.html.staticControls.TextButton;
-	import org.apache.flex.html.staticControls.TitleBar;
-	import org.apache.flex.utils.BeadMetrics;
-	
-	/**
-	 *  The AlertView class creates the visual elements of the org.apache.flex.html.staticControls.Alert
-	 *  component. The job of the view bead is to put together the parts of the Alert, such as the 
-	 *  title bar, message, and various buttons, within the space of the Alert component strand.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class AlertView implements IBeadView
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function AlertView()
-		{
-		}
-		
-		private var _titleBar:TitleBar;
-		private var _controlBar:ControlBar;
-		private var _label:Label;
-		private var _okButton:TextButton;
-		private var _cancelButton:TextButton;
-		private var _yesButton:TextButton;
-		private var _noButton:TextButton;
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-
-            var backgroundColor:Object = ValuesManager.valuesImpl.getValue(value, "background-color");
-			var backgroundImage:Object = ValuesManager.valuesImpl.getValue(value, "background-image");
-			if (backgroundColor != null || backgroundImage != null)
-			{
-				if (value.getBeadByType(IBackgroundBead) == null)
-					value.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBackgroundBead")) as IBead);					
-			}
-			
-			var borderStyle:String;
-			var borderStyles:Object = ValuesManager.valuesImpl.getValue(value, "border");
-			if (borderStyles is Array)
-			{
-				borderStyle = borderStyles[1];
-			}
-			if (borderStyle == null)
-			{
-				borderStyle = ValuesManager.valuesImpl.getValue(value, "border-style") as String;
-			}
-			if (borderStyle != null && borderStyle != "none")
-			{
-				if (value.getBeadByType(IBorderBead) == null)
-					value.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBorderBead")) as IBead);	
-			}
-			
-			var flags:uint = IAlertModel(UIBase(_strand).model).flags;
-			if( flags & Alert.OK ) {
-				_okButton = new TextButton();
-				_okButton.text = IAlertModel(UIBase(_strand).model).okLabel;
-				_okButton.addEventListener("click",handleOK);
-			}
-			if( flags & Alert.CANCEL ) {
-				_cancelButton = new TextButton();
-				_cancelButton.text = IAlertModel(UIBase(_strand).model).cancelLabel;
-				_cancelButton.addEventListener("click",handleCancel);
-			}
-			if( flags & Alert.YES ) {
-				_yesButton = new TextButton();
-				_yesButton.text = IAlertModel(UIBase(_strand).model).yesLabel;
-				_yesButton.addEventListener("click",handleYes);
-			}
-			if( flags & Alert.NO ) {
-				_noButton = new TextButton();
-				_noButton.text = IAlertModel(UIBase(_strand).model).noLabel;
-				_noButton.addEventListener("click",handleNo);
-			}
-			
-			_titleBar = new TitleBar();
-			_titleBar.title = IAlertModel(UIBase(_strand).model).title;
-			
-			_label = new Label();
-			_label.text = IAlertModel(UIBase(_strand).model).message;
-			
-			_controlBar = new ControlBar();
-			if( _okButton ) _controlBar.addElement(_okButton);
-			if( _cancelButton ) _controlBar.addElement(_cancelButton);
-			if( _yesButton  ) _controlBar.addElement(_yesButton);
-			if( _noButton ) _controlBar.addElement(_noButton);
-			
-		    IParent(_strand).addElement(_titleBar);
-            IParent(_strand).addElement(_controlBar);
-            IParent(_strand).addElement(_label);
-			
-			sizeHandler(null);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function sizeHandler(event:Event):void
-		{
-			var labelMeasure:IMeasurementBead = _label.measurementBead;
-			var titleMeasure:IMeasurementBead = _titleBar.measurementBead;
-			var ctrlMeasure:IMeasurementBead  = _controlBar.measurementBead;
-			var maxWidth:Number = Math.max(titleMeasure.measuredWidth, ctrlMeasure.measuredWidth, labelMeasure.measuredWidth);
-			
-			var metrics:UIMetrics = BeadMetrics.getMetrics(_strand);
-
-			_titleBar.x = metrics.left;
-			_titleBar.y = metrics.top;
-			_titleBar.width = maxWidth;
-			
-			// content placement here
-			_label.x = metrics.left;
-			_label.y = _titleBar.y + _titleBar.height + 2;
-			_label.width = maxWidth;
-			
-			_controlBar.x = metrics.left;
-			_controlBar.y = _label.y + _label.height + 2;
-			_controlBar.width = maxWidth;
-			
-			UIBase(_strand).width = maxWidth + metrics.left + metrics.right;
-			UIBase(_strand).height = _controlBar.y + _controlBar.height + metrics.bottom + 2;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleOK(event:Event):void
-		{
-			// create some custom event where the detail value
-			// is the OK button flag. Do same for other event handlers
-			dispatchCloseEvent(Alert.OK);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleCancel(event:Event):void
-		{
-			dispatchCloseEvent(Alert.CANCEL);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleYes(event:Event):void
-		{
-			dispatchCloseEvent(Alert.YES);
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleNo(event:Event):void
-		{
-			dispatchCloseEvent(Alert.NO);
-		}
-		
-		/**
-		 * @private
-		 */
-		public function dispatchCloseEvent(buttonFlag:uint):void
-		{
-			// TO DO: buttonFlag should be part of the event
-			var newEvent:Event = new Event("close",true);
-			IEventDispatcher(_strand).dispatchEvent(newEvent);
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ButtonBarView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ButtonBarView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ButtonBarView.as
deleted file mode 100644
index 873d4eb..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ButtonBarView.as
+++ /dev/null
@@ -1,94 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IBeadModel;
-	import org.apache.flex.core.ILayoutParent;
-	import org.apache.flex.core.IParent;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.supportClasses.Border;
-
-	/**
-	 *  The ButtonBarView class creates the visual elements of the org.apache.flex.html.staticControls.ButtonBar 
-	 *  component. A ButtonBar is a type of List and ButtonBarView extends the ListView bead, adding a border.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ButtonBarView extends ListView
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ButtonBarView()
-		{
-			super();
-		}
-		
-		private var _border:Border;
-		
-		/**
-		 *  The ButtonBar's border.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		override public function get border():Border
-		{
-			return _border;
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		override public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			super.strand = value;
-			
-			_border = new Border();
-			_border.model = new (ValuesManager.valuesImpl.getValue(value, "iBorderModel")) as IBeadModel;
-			_border.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBorderBead")) as IBead);
-			IParent(_strand).addElement(_border);
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/CSSButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/CSSButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/CSSButtonView.as
deleted file mode 100644
index 22f7c84..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/CSSButtonView.as
+++ /dev/null
@@ -1,155 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.Loader;
-	import flash.display.Shape;
-	import flash.display.SimpleButton;
-	import flash.display.Sprite;
-	import flash.events.Event;
-	import flash.net.URLRequest;
-	
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.ITextModel;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.utils.SolidBorderUtil;
-
-    /**
-     *  The CSSButtonView class is the default view for
-     *  the org.apache.flex.html.staticControls.Button class.
-     *  It allows the look of the button to be expressed
-     *  in CSS via the background-image style.  This view
-     *  does not display text.  Use CSSTextButtonView and
-     *  TextButton instead.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class CSSButtonView implements IBeadView
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function CSSButtonView()
-		{
-			upSprite = new Sprite();
-			downSprite = new Sprite();
-			overSprite = new Sprite();
-		}
-		
-		private var textModel:ITextModel;
-		
-		private var _strand:IStrand;
-		
-		private var shape:Shape;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			shape = new Shape();
-			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, 10, 10);
-			shape.graphics.endFill();
-			SimpleButton(value).upState = upSprite;
-			SimpleButton(value).downState = downSprite;
-			SimpleButton(value).overState = overSprite;
-			SimpleButton(value).hitTestState = shape;
-
-            setupBackground(overSprite, "hover");
-            setupBackground(downSprite, "active");
-            setupBackground(upSprite);
-		}
-	
-		private function setupSkin(sprite:Sprite, state:String = null):void
-		{
-			var borderColor:uint;
-			var borderThickness:uint;
-			var borderStyle:String;
-			var borderStyles:Object = ValuesManager.valuesImpl.getValue(_strand, "border", state);
-			if (borderStyles is Array)
-			{
-				borderColor = borderStyles[2];
-				borderStyle = borderStyles[1];
-				borderThickness = borderStyles[0];
-			}
-			var value:Object = ValuesManager.valuesImpl.getValue(_strand, "border-style", state);
-			if (value != null)
-				borderStyle = value as String;
-			value = ValuesManager.valuesImpl.getValue(_strand, "border-color", state);
-			if (value != null)
-				borderColor = value as uint;
-			value = ValuesManager.valuesImpl.getValue(_strand, "border-thickness", state);
-			if (value != null)
-				borderThickness = value as uint;
-			var padding:Object = ValuesManager.valuesImpl.getValue(_strand, "padding", state);
-			var backgroundColor:Object = ValuesManager.valuesImpl.getValue(_strand, "background-color", state);
-			if (borderStyle == "solid")
-			{
-				SolidBorderUtil.drawBorder(sprite.graphics, 
-					0, 0, sprite.width + Number(padding) * 2, sprite.height + Number(padding) * 2,
-					borderColor, backgroundColor, borderThickness);
-			}			
-		}
-		
-        private function setupBackground(sprite:Sprite, state:String = null):void
-        {
-            var backgroundImage:Object = ValuesManager.valuesImpl.getValue(_strand, "background-image", state);
-            if (backgroundImage)
-            {
-                var loader:Loader = new Loader();
-                sprite.addChildAt(loader, 0);
-                var url:String = backgroundImage as String;
-                loader.load(new URLRequest(url));
-                loader.contentLoaderInfo.addEventListener(flash.events.Event.COMPLETE, function (e:flash.events.Event):void { 
-                    setupSkin(sprite, state);
-                    updateHitArea();
-                });
-            }
-        }
-        
-		private var upSprite:Sprite;
-		private var downSprite:Sprite;
-		private var overSprite:Sprite;
-				
-		private function updateHitArea():void
-		{
-			shape.graphics.clear();
-			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, upSprite.width, upSprite.height);
-			shape.graphics.endFill();
-			
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/CSSTextButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/CSSTextButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/CSSTextButtonView.as
deleted file mode 100644
index 991fa05..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/CSSTextButtonView.as
+++ /dev/null
@@ -1,262 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	import flash.display.Loader;
-	import flash.display.Shape;
-	import flash.display.SimpleButton;
-	import flash.display.Sprite;
-	import flash.events.Event;
-	import flash.net.URLRequest;
-	import flash.text.TextField;
-	import flash.text.TextFieldType;
-	
-	import org.apache.flex.core.CSSTextField;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.ITextModel;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.utils.SolidBorderUtil;
-
-    /**
-     *  The CSSTextButtonView class is the default view for
-     *  the org.apache.flex.html.staticControls.TextButton class.
-     *  It allows the look of the button to be expressed
-     *  in CSS via the background-image style and displays
-     *  a text label.  This view does not support right-to-left
-     *  text.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class CSSTextButtonView implements IBeadView
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function CSSTextButtonView()
-		{
-			upSprite = new Sprite();
-			downSprite = new Sprite();
-			overSprite = new Sprite();
-			upTextField = new CSSTextField();
-			downTextField = new CSSTextField();
-			overTextField = new CSSTextField();
-			upTextField.selectable = false;
-			upTextField.type = TextFieldType.DYNAMIC;
-			downTextField.selectable = false;
-			downTextField.type = TextFieldType.DYNAMIC;
-			overTextField.selectable = false;
-			overTextField.type = TextFieldType.DYNAMIC;
-			upTextField.autoSize = "left";
-			downTextField.autoSize = "left";
-			overTextField.autoSize = "left";
-			upSprite.addChild(upTextField);
-			downSprite.addChild(downTextField);
-			overSprite.addChild(overTextField);
-		}
-		
-		private var textModel:ITextModel;
-		
-		private var _strand:IStrand;
-		
-		private var shape:Shape;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			textModel = value.getBeadByType(ITextModel) as ITextModel;
-			textModel.addEventListener("textChange", textChangeHandler);
-			textModel.addEventListener("htmlChange", htmlChangeHandler);
-			shape = new Shape();
-			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, 10, 10);
-			shape.graphics.endFill();
-			SimpleButton(value).upState = upSprite;
-			SimpleButton(value).downState = downSprite;
-			SimpleButton(value).overState = overSprite;
-			SimpleButton(value).hitTestState = shape;
-			if (textModel.text !== null)
-				text = textModel.text;
-			if (textModel.html !== null)
-				html = textModel.html;
-
-            setupSkin(overSprite, overTextField, "hover");
-			setupSkin(downSprite, downTextField, "active");
-			setupSkin(upSprite, upTextField);
-			
-			IEventDispatcher(_strand).addEventListener("widthChanged",sizeChangeHandler);
-			IEventDispatcher(_strand).addEventListener("heightChanged",sizeChangeHandler);
-		}
-	
-		private function setupSkin(sprite:Sprite, textField:TextField, state:String = null):void
-		{
-			var sw:uint = DisplayObject(_strand).width;
-			var sh:uint = DisplayObject(_strand).height;
-			
-			var borderColor:uint;
-			var borderThickness:uint;
-			var borderStyle:String;
-			var borderStyles:Object = ValuesManager.valuesImpl.getValue(_strand, "border", state);
-			if (borderStyles is Array)
-			{
-				borderColor = borderStyles[2];
-				borderStyle = borderStyles[1];
-				borderThickness = borderStyles[0];
-			}
-			var value:Object = ValuesManager.valuesImpl.getValue(_strand, "border-style", state);
-			if (value != null)
-				borderStyle = value as String;
-			value = ValuesManager.valuesImpl.getValue(_strand, "border-color", state);
-			if (value != null)
-				borderColor = value as uint;
-			value = ValuesManager.valuesImpl.getValue(_strand, "border-thickness", state);
-			if (value != null)
-				borderThickness = value as uint;
-			var padding:Object = ValuesManager.valuesImpl.getValue(_strand, "padding", state);
-			var backgroundColor:Object = ValuesManager.valuesImpl.getValue(_strand, "background-color", state);
-			if (borderStyle == "solid")
-			{
-				SolidBorderUtil.drawBorder(sprite.graphics, 
-					0, 0, sw, textField.textHeight + Number(padding) * 2,
-					borderColor, backgroundColor, borderThickness);
-				textField.y = (sprite.height - textField.height) / 2;
-				textField.x = (sprite.width - textField.width) / 2;
-			}			
-			var backgroundImage:Object = ValuesManager.valuesImpl.getValue(_strand, "background-image", state);
-			if (backgroundImage)
-			{
-				var loader:Loader = new Loader();
-				sprite.addChildAt(loader, 0);
-				var url:String = backgroundImage as String;
-				loader.load(new URLRequest(url));
-				loader.contentLoaderInfo.addEventListener(flash.events.Event.COMPLETE, function (e:flash.events.Event):void { 
-					textField.y = (sh - textField.height) / 2;
-					textField.x = (sw - textField.width) / 2;
-					updateHitArea();
-				});
-			}
-		}
-		
-		private function drawSkin() : void
-		{
-			setupSkin(overSprite, overTextField, "hover");
-			setupSkin(downSprite, downTextField, "active");
-			setupSkin(upSprite, upTextField);
-			
-			updateHitArea();
-		}
-		
-		private function textChangeHandler(event:org.apache.flex.events.Event):void
-		{
-			text = textModel.text;
-		}
-		
-		private function htmlChangeHandler(event:org.apache.flex.events.Event):void
-		{
-			html = textModel.html;
-		}
-		
-		private function sizeChangeHandler(event:org.apache.flex.events.Event):void
-		{
-			drawSkin();
-		}
-		
-		private var upTextField:CSSTextField;
-		private var downTextField:CSSTextField;
-		private var overTextField:CSSTextField;
-		private var upSprite:Sprite;
-		private var downSprite:Sprite;
-		private var overSprite:Sprite;
-		
-        /**
-         *  The text to be displayed in the button
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get text():String
-		{
-			return upTextField.text;
-		}
-        
-        /**
-         *  @private
-         */
-		public function set text(value:String):void
-		{
-			upTextField.text = value;
-			downTextField.text = value;
-			overTextField.text = value;
-			updateHitArea();
-		}
-		
-		private function updateHitArea():void
-		{
-			shape.graphics.clear();
-			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, upSprite.width, upSprite.height);
-			shape.graphics.endFill();
-			
-		}
-		
-        /**
-         *  The html-formatted text to be displayed in the button
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get html():String
-		{
-			return upTextField.htmlText;
-		}
-		
-        /**
-         *  @private
-         */
-		public function set html(value:String):void
-		{
-			upTextField.htmlText = value;
-			downTextField.htmlText = value;
-			overTextField.htmlText = value;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/CheckBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/CheckBoxView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/CheckBoxView.as
deleted file mode 100644
index 14ef855..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/CheckBoxView.as
+++ /dev/null
@@ -1,297 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.Shape;
-	import flash.display.SimpleButton;
-	import flash.display.Sprite;
-	import flash.text.TextFieldAutoSize;
-	import flash.text.TextFieldType;
-	
-	import org.apache.flex.core.CSSTextField;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.IToggleButtonModel;
-	import org.apache.flex.events.Event;
-	
-    /**
-     *  The CheckBoxView class is the default view for
-     *  the org.apache.flex.html.staticControls.CheckBox class.
-     *  It displays a simple checkbox with an 'x' if checked,
-     *  and a label on the right.  There are no styles or
-     *  properties to configure the look of the 'x' or the
-     *  position of the label relative to the checkbox as
-     *  there are no equivalents in the standard HTML checkbox.
-     * 
-     *  A more complex CheckBox could implement more view
-     *  configuration.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class CheckBoxView implements IBeadView
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function CheckBoxView()
-		{
-			sprites = [ upSprite = new Sprite(),
-				        downSprite = new Sprite(),
-						overSprite = new Sprite(),
-						upAndSelectedSprite = new Sprite(),
-						downAndSelectedSprite = new Sprite(),
-						overAndSelectedSprite = new Sprite() ];
-			
-			for each( var s:Sprite in sprites )
-			{
-				var tf:CSSTextField = new CSSTextField();
-				tf.type = TextFieldType.DYNAMIC;
-				tf.autoSize = TextFieldAutoSize.LEFT;
-				tf.name = "textField";
-				var icon:Shape = new Shape();
-				icon.name = "icon";
-				s.addChild(icon);
-				s.addChild(tf);
-			}
-		}
-		
-		private var upSprite:Sprite;
-		private var downSprite:Sprite;
-		private var overSprite:Sprite;
-		private var upAndSelectedSprite:Sprite;
-		private var downAndSelectedSprite:Sprite;
-		private var overAndSelectedSprite:Sprite;
-		
-		private var sprites:Array;
-		
-		private var _toggleButtonModel:IToggleButtonModel;
-
-        // TODO: Can we remove this?
-		private function get toggleButtonModel() : IToggleButtonModel
-		{
-			return _toggleButtonModel;
-		}
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-            
-			_toggleButtonModel = value.getBeadByType(IToggleButtonModel) as IToggleButtonModel;
-			_toggleButtonModel.addEventListener("textChange", textChangeHandler);
-			_toggleButtonModel.addEventListener("htmlChange", htmlChangeHandler);
-			_toggleButtonModel.addEventListener("selectedChange", selectedChangeHandler);
-			if (_toggleButtonModel.text !== null)
-				text = _toggleButtonModel.text;
-			
-			layoutControl();
-			
-			var hitArea:Shape = new Shape();
-			hitArea.graphics.beginFill(0x000000);
-			hitArea.graphics.drawRect(12,0,upSprite.width, upSprite.height);
-			hitArea.graphics.endFill();
-			
-			SimpleButton(value).upState = upSprite;
-			SimpleButton(value).downState = downSprite;
-			SimpleButton(value).overState = overSprite;
-			SimpleButton(value).hitTestState = hitArea;
-			
-			if (toggleButtonModel.text !== null)
-				text = toggleButtonModel.text;
-			if (toggleButtonModel.html !== null)
-				html = toggleButtonModel.html;
-		}
-		
-        /**
-         *  @copy org.apache.flex.html.staticControls.Label#text
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get text():String
-		{
-			var tf:CSSTextField = upSprite.getChildByName('textField') as CSSTextField;
-			return tf.text;
-		}
-		
-        /**
-         *  @private
-         */
-		public function set text(value:String):void
-		{
-			for each( var s:Sprite in sprites )
-			{
-				var tf:CSSTextField = s.getChildByName('textField') as CSSTextField;
-				tf.text = value;
-			}
-			
-			layoutControl();
-		}
-		
-        /**
-         *  @copy org.apache.flex.html.staticControls.Label#html
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get html():String
-		{
-			var tf:CSSTextField = upSprite.getChildByName('textField') as CSSTextField;
-			return tf.htmlText;
-		}
-		
-        /**
-         *  @private
-         */
-		public function set html(value:String):void
-		{
-			for each(var s:Sprite in sprites)
-			{
-				var tf:CSSTextField = s.getChildByName('textField') as CSSTextField;
-				tf.htmlText = value;
-			}
-			
-			layoutControl();
-		}
-		
-		private function textChangeHandler(event:Event):void
-		{
-			text = toggleButtonModel.text;
-		}
-		
-		private function htmlChangeHandler(event:Event):void
-		{
-			html = toggleButtonModel.html;
-		}
-		
-		private var _selected:Boolean;
-		
-        /**
-         *  @copy org.apache.flex.core.IToggleButtonModel#selected
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get selected():Boolean
-		{
-			return _selected;
-		}
-		
-        /**
-         *  @private
-         */
-		public function set selected(value:Boolean):void
-		{
-			_selected = value;
-			
-			layoutControl();
-			
-			if( value ) {
-				SimpleButton(_strand).upState = upAndSelectedSprite;
-				SimpleButton(_strand).downState = downAndSelectedSprite;
-				SimpleButton(_strand).overState = overAndSelectedSprite;
-				
-			} else {
-				SimpleButton(_strand).upState = upSprite;
-				SimpleButton(_strand).downState = downSprite;
-				SimpleButton(_strand).overState = overSprite;
-			}
-		}
-		
-		private function selectedChangeHandler(event:Event):void
-		{
-			selected = toggleButtonModel.selected;
-		}
-		
-        /**
-         *  Display the icon and text label
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		protected function layoutControl() : void
-		{
-			for each(var s:Sprite in sprites)
-			{
-				var icon:Shape = s.getChildByName("icon") as Shape;
-				var tf:CSSTextField = s.getChildByName("textField") as CSSTextField;
-				
-				drawCheckBox(icon);
-				
-				var mh:Number = Math.max(icon.height,tf.height);
-				
-				icon.x = 0;
-				icon.y = (mh - icon.height)/2;
-				
-				tf.x = icon.x + icon.width + 1;
-				tf.y = (mh - tf.height)/2;
-			}
-			
-		}
-		
-        /**
-         *  Draw the checkbox
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		protected function drawCheckBox(icon:Shape) : void
-		{
-			icon.graphics.clear();
-			icon.graphics.beginFill(0xCCCCCC);
-			icon.graphics.lineStyle(1,0x333333);
-			icon.graphics.drawRect(0,0,10,10);
-			icon.graphics.endFill();
-			
-			if( _toggleButtonModel.selected ) {
-				icon.graphics.moveTo(0,0);
-				icon.graphics.lineTo(10,10);
-				icon.graphics.moveTo(10,0);
-				icon.graphics.lineTo(0,10);
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ComboBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ComboBoxView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ComboBoxView.as
deleted file mode 100644
index f959cd4..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ComboBoxView.as
+++ /dev/null
@@ -1,248 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads
-{
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	import flash.display.Sprite;
-	
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IComboBoxModel;
-	import org.apache.flex.core.IPopUpHost;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.ValuesManager;
-    import org.apache.flex.core.IParent;
-	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.TextInput;
-	
-	/**
-	 *  The ComboBoxView class creates the visual elements of the org.apache.flex.html.staticControls.ComboBox 
-	 *  component. The job of the view bead is to put together the parts of the ComboBox such as the TextInput
-	 *  control and org.apache.flex.html.staticControls.Button to trigger the pop-up.
-	 *  
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ComboBoxView implements IBeadView, IComboBoxView
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ComboBoxView()
-		{
-		}
-		
-		private var textInput:TextInput;
-		private var button:Button;
-		private var selectionModel:IComboBoxModel;
-		
-		/**
-		 *  The value of the TextInput component of the ComboBox.
-		 * 
-		 *  @copy org.apache.flex.html.staticControls.beads.IComboBoxView#text
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get text():String
-		{
-			return textInput.text;
-		}
-		public function set text(value:String):void
-		{
-			textInput.text = value;
-		}
-		
-		/**
-		 *  The HTML value of the TextInput component of the ComboBox.
-		 * 
-		 *  @copy org.apache.flex.html.staticControls.beads.IComboBoxView#html
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get html():String
-		{
-			return textInput.html;
-		}
-		public function set html(value:String):void
-		{
-			textInput.html = value;
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get strand():IStrand
-		{
-			return _strand;
-		}
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-        
-			selectionModel = value.getBeadByType(IComboBoxModel) as IComboBoxModel;
-			selectionModel.addEventListener("selectedIndexChanged", selectionChangeHandler);
-            
-			textInput = new TextInput();
-			IParent(strand).addElement(textInput);
-			textInput.width = 100;
-			textInput.height = 18;
-			
-			upSprite = new Sprite();
-			drawButton( upSprite, "up", 18, 18 );
-			overSprite = new Sprite();
-			drawButton( overSprite, "over", 18, 18 );
-			downSprite = new Sprite();
-			drawButton( downSprite, "down", 18, 18 );
-			
-			button = new Button();
-            button.upState = upSprite;
-            button.overState = overSprite;
-            button.downState = downSprite;
-			DisplayObjectContainer(strand).addChild(button);
-			button.width = 18;
-			button.height = 18;
-			button.x = textInput.width;
-			button.y = textInput.y;
-			
-			// listen for events on the text input and modify the list and selection
-			textInput.addEventListener("change", textChangeHandler,false,0,true);
-		}
-		
-		private var upSprite:Sprite;
-		private var overSprite:Sprite;
-		private var downSprite:Sprite;
-		
-		/**
-		 * @private
-		 */
-		private function drawButton( sprite:Sprite, mode:String, width:Number, height:Number ) : void
-		{
-			sprite.graphics.clear();
-			sprite.graphics.lineStyle(1,0xFFFFFF);
-			sprite.graphics.drawRect(0, 0, width-1, height-1);
-			sprite.graphics.lineStyle(-1);
-			
-			if( mode == "over" ) sprite.graphics.beginFill(0xCCCCCC);
-			else if( mode == "down" ) sprite.graphics.beginFill(0x888888);
-			sprite.graphics.drawRect(0, 0, width-1, height-1);
-			sprite.graphics.endFill();
-			
-			sprite.graphics.beginFill(0x333333);
-			sprite.graphics.moveTo(4,4);
-			sprite.graphics.lineTo(width-4,4);
-			sprite.graphics.lineTo(int(width/2),height-4);
-			sprite.graphics.lineTo(4,4);
-			sprite.graphics.endFill();
-		}
-		
-		private var _popUp:IStrand;
-		
-		/**
-		 *  The pop-up component that holds the selection list.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get popUp():IStrand
-		{
-			return _popUp;
-		}
-		
-		private var _popUpVisible:Boolean;
-		
-		/**
-		 *  This property is true if the pop-up selection list is currently visible.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get popUpVisible():Boolean
-		{
-			return _popUpVisible;
-		}
-		public function set popUpVisible(value:Boolean):void
-		{
-			if (value != _popUpVisible)
-			{
-				_popUpVisible = value;
-				if (value)
-				{
-					if (!_popUp)
-					{
-						var popUpClass:Class = ValuesManager.valuesImpl.getValue(_strand, "iPopUp") as Class;
-						_popUp = new popUpClass() as IStrand;
-					}
-					var root:Object = DisplayObject(_strand).root;
-					var host:DisplayObjectContainer = DisplayObject(_strand).parent;
-					while (host && !(host is IPopUpHost))
-						host = host.parent;
-                    if (host)
-    					IPopUpHost(host).addElement(popUp);
-				}
-				else
-				{
-					DisplayObject(_popUp).parent.removeChild(_popUp as DisplayObject);                    
-				}
-			}
-		}
-		
-		/**
-		 * @private
-		 */
-		private function selectionChangeHandler(event:Event):void
-		{
-			text = selectionModel.selectedItem.toString();
-		}
-		
-		/**
-		 * @private
-		 */
-		private function textChangeHandler(event:Event):void
-		{	
-			var newEvent:Event = new Event("change");
-			IEventDispatcher(strand).dispatchEvent(newEvent);
-		}
-	}
-}
\ No newline at end of file


[24/35] sed removal of staticControls. Now to see what I missed

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/List.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/List.js b/frameworks/js/FlexJS/src/org/apache/flex/html/List.js
index c554129..317fcbc 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/List.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/List.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.List');
+goog.provide('org.apache.flex.html.List');
 
 goog.require('mx.core.IFactory');
 goog.require('org.apache.flex.core.IDataProviderItemRendererMapper');
@@ -20,11 +20,11 @@ goog.require('org.apache.flex.core.IItemRendererClassFactory');
 goog.require('org.apache.flex.core.ItemRendererClassFactory');
 goog.require('org.apache.flex.core.ListBase');
 goog.require('org.apache.flex.core.ValuesManager');
-goog.require('org.apache.flex.html.staticControls.beads.ListView');
-goog.require('org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData');
-goog.require('org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
-goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
+goog.require('org.apache.flex.html.beads.ListView');
+goog.require('org.apache.flex.html.beads.TextItemRendererFactoryForArrayData');
+goog.require('org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController');
+goog.require('org.apache.flex.html.beads.models.ArraySelectionModel');
+goog.require('org.apache.flex.html.supportClasses.DataItemRenderer');
 
 
 
@@ -32,10 +32,10 @@ goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRendere
  * @constructor
  * @extends {org.apache.flex.core.ListBase}
  */
-org.apache.flex.html.staticControls.List = function() {
+org.apache.flex.html.List = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html.staticControls.List,
+goog.inherits(org.apache.flex.html.List,
     org.apache.flex.core.ListBase);
 
 
@@ -44,16 +44,16 @@ goog.inherits(org.apache.flex.html.staticControls.List,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.List.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.List.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'List',
-                qName: 'org.apache.flex.html.staticControls.List' }] };
+                qName: 'org.apache.flex.html.List' }] };
 
 
 /**
  * @expose
  * @return {mx.core.IFactory} The itemRenderer generator.
  */
-org.apache.flex.html.staticControls.List.prototype.get_itemRenderer =
+org.apache.flex.html.List.prototype.get_itemRenderer =
 function() {
   return this.itemRenderer_;
 };
@@ -63,7 +63,7 @@ function() {
  * @expose
  * @param {mx.core.IFactory} value The itemRenderer generator.
  */
-org.apache.flex.html.staticControls.List.prototype.set_itemRenderer =
+org.apache.flex.html.List.prototype.set_itemRenderer =
 function(value) {
   this.itemRenderer_ = value;
 };
@@ -73,7 +73,7 @@ function(value) {
  * @expose
  * @return {String} The name of the field to use as a label.
  */
-org.apache.flex.html.staticControls.List.prototype.get_labelField =
+org.apache.flex.html.List.prototype.get_labelField =
 function() {
   return this.get_model().get_labelField();
 };
@@ -83,7 +83,7 @@ function() {
  * @expose
  * @param {String} value The name of the field to use as a label.
  */
-org.apache.flex.html.staticControls.List.prototype.set_labelField =
+org.apache.flex.html.List.prototype.set_labelField =
 function(value) {
   this.get_model().set_labelField(value);
 };
@@ -92,7 +92,7 @@ function(value) {
 /**
  * @override
  */
-org.apache.flex.html.staticControls.List.prototype.createElement =
+org.apache.flex.html.List.prototype.createElement =
     function() {
   goog.base(this, 'createElement');
   this.set_className('List');
@@ -104,7 +104,7 @@ org.apache.flex.html.staticControls.List.prototype.createElement =
 /**
  * @override
  */
-org.apache.flex.html.staticControls.List.prototype.addedToParent =
+org.apache.flex.html.List.prototype.addedToParent =
     function() {
   goog.base(this, 'addedToParent');
 
@@ -124,10 +124,10 @@ org.apache.flex.html.staticControls.List.prototype.addedToParent =
 //  var c = this.getBeadByType(org.apache.flex.core.IItemRenderer);
 //  if (c == null) {
 //    c = this.getBeadByType(
-//          org.apache.flex.html.staticControls.supportClasses.DataItemRenderer);
+//          org.apache.flex.html.supportClasses.DataItemRenderer);
 //    if (c == null) {
 //      this.addBead(new
-//                   org.apache.flex.html.staticControls.beads.
+//                   org.apache.flex.html.beads.
 //                   TextItemRendererFactoryForArrayData());
 //    }
 //  }
@@ -139,10 +139,10 @@ org.apache.flex.html.staticControls.List.prototype.addedToParent =
  * @return {Array.<Object>} An array of objects that make up the actual
  *                          list (most likely itemRenderers).
  */
-org.apache.flex.html.staticControls.List.prototype.internalChildren =
+org.apache.flex.html.List.prototype.internalChildren =
     function() {
   var listView =
-      this.getBeadByType(org.apache.flex.html.staticControls.beads.ListView);
+      this.getBeadByType(org.apache.flex.html.beads.ListView);
   var dg = listView.get_dataGroup();
   var items = null;
   if (dg.renderers) {
@@ -156,7 +156,7 @@ org.apache.flex.html.staticControls.List.prototype.internalChildren =
  * @expose
  * @param {Object} event The event that triggered the selection.
  */
-org.apache.flex.html.staticControls.List.prototype.selectedHandler =
+org.apache.flex.html.List.prototype.selectedHandler =
     function(event) {
   var itemRenderer = event.currentTarget;
   if (this.renderers) {

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js b/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js
index 66926ef..fbc8645 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js
@@ -12,12 +12,12 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.NumericStepper');
+goog.provide('org.apache.flex.html.NumericStepper');
 
 goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.Spinner');
-goog.require('org.apache.flex.html.staticControls.TextInput');
-goog.require('org.apache.flex.html.staticControls.beads.models.RangeModel');
+goog.require('org.apache.flex.html.Spinner');
+goog.require('org.apache.flex.html.TextInput');
+goog.require('org.apache.flex.html.beads.models.RangeModel');
 
 
 
@@ -25,12 +25,12 @@ goog.require('org.apache.flex.html.staticControls.beads.models.RangeModel');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html.staticControls.NumericStepper = function() {
+org.apache.flex.html.NumericStepper = function() {
   this.model =
-      new org.apache.flex.html.staticControls.beads.models.RangeModel();
+      new org.apache.flex.html.beads.models.RangeModel();
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html.staticControls.NumericStepper,
+goog.inherits(org.apache.flex.html.NumericStepper,
     org.apache.flex.core.UIBase);
 
 
@@ -39,24 +39,24 @@ goog.inherits(org.apache.flex.html.staticControls.NumericStepper,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.NumericStepper.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.NumericStepper.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'NumericStepper',
-                qName: 'org.apache.flex.html.staticControls.NumericStepper' }] };
+                qName: 'org.apache.flex.html.NumericStepper' }] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.NumericStepper.prototype.createElement =
+org.apache.flex.html.NumericStepper.prototype.createElement =
     function() {
   this.element = document.createElement('div');
   this.positioner = this.element;
 
-  this.input = new org.apache.flex.html.staticControls.TextInput();
+  this.input = new org.apache.flex.html.TextInput();
   this.addElement(this.input);
   this.input.positioner.style.display = 'inline-block';
 
-  this.spinner = new org.apache.flex.html.staticControls.Spinner();
+  this.spinner = new org.apache.flex.html.Spinner();
   this.addElement(this.spinner);
   this.spinner.positioner.style.display = 'inline-block';
   goog.events.listen(this.spinner, 'valueChanged',
@@ -74,7 +74,7 @@ org.apache.flex.html.staticControls.NumericStepper.prototype.createElement =
 /**
  * @param {Object} event The input event.
  */
-org.apache.flex.html.staticControls.NumericStepper.prototype.spinnerChange =
+org.apache.flex.html.NumericStepper.prototype.spinnerChange =
     function(event)
     {
   var newValue = this.spinner.get_value();
@@ -88,7 +88,7 @@ org.apache.flex.html.staticControls.NumericStepper.prototype.spinnerChange =
  * @expose
  * @return {Number} The current minimum value.
  */
-org.apache.flex.html.staticControls.NumericStepper.prototype.get_minimum =
+org.apache.flex.html.NumericStepper.prototype.get_minimum =
     function() {
   return this.model.get_minimum();
 };
@@ -98,7 +98,7 @@ org.apache.flex.html.staticControls.NumericStepper.prototype.get_minimum =
  * @expose
  * @param {Number} value The new minimum value.
  */
-org.apache.flex.html.staticControls.NumericStepper.prototype.set_minimum =
+org.apache.flex.html.NumericStepper.prototype.set_minimum =
     function(value) {
   this.model.set_minimum(value);
 };
@@ -108,7 +108,7 @@ org.apache.flex.html.staticControls.NumericStepper.prototype.set_minimum =
  * @expose
  * @return {Number} The current maximum value.
  */
-org.apache.flex.html.staticControls.NumericStepper.prototype.get_maximum =
+org.apache.flex.html.NumericStepper.prototype.get_maximum =
     function() {
   return this.model.get_maximum();
 };
@@ -118,7 +118,7 @@ org.apache.flex.html.staticControls.NumericStepper.prototype.get_maximum =
  * @expose
  * @param {Number} value The new maximum value.
  */
-org.apache.flex.html.staticControls.NumericStepper.prototype.set_maximum =
+org.apache.flex.html.NumericStepper.prototype.set_maximum =
     function(value) {
   this.model.set_maximum(value);
 };
@@ -128,7 +128,7 @@ org.apache.flex.html.staticControls.NumericStepper.prototype.set_maximum =
  * @expose
  * @return {Number} The current value.
  */
-org.apache.flex.html.staticControls.NumericStepper.prototype.get_value =
+org.apache.flex.html.NumericStepper.prototype.get_value =
     function() {
   return this.model.get_value();
 };
@@ -138,7 +138,7 @@ org.apache.flex.html.staticControls.NumericStepper.prototype.get_value =
  * @expose
  * @param {Number} newValue The new value.
  */
-org.apache.flex.html.staticControls.NumericStepper.prototype.set_value =
+org.apache.flex.html.NumericStepper.prototype.set_value =
     function(newValue) {
   this.model.set_value(newValue);
 };
@@ -148,7 +148,7 @@ org.apache.flex.html.staticControls.NumericStepper.prototype.set_value =
  * @expose
  * @return {Number} The current snapInterval value.
  */
-org.apache.flex.html.staticControls.NumericStepper.prototype.get_snapInterval =
+org.apache.flex.html.NumericStepper.prototype.get_snapInterval =
     function() {
   return this.model.get_snapInterval();
 };
@@ -158,7 +158,7 @@ org.apache.flex.html.staticControls.NumericStepper.prototype.get_snapInterval =
  * @expose
  * @param {Number} value The new snapInterval value.
  */
-org.apache.flex.html.staticControls.NumericStepper.prototype.set_snapInterval =
+org.apache.flex.html.NumericStepper.prototype.set_snapInterval =
     function(value) {
   this.model.set_snapInterval(value);
 };
@@ -168,7 +168,7 @@ org.apache.flex.html.staticControls.NumericStepper.prototype.set_snapInterval =
  * @expose
  * @return {Number} The current stepSize value.
  */
-org.apache.flex.html.staticControls.NumericStepper.prototype.get_stepSize =
+org.apache.flex.html.NumericStepper.prototype.get_stepSize =
     function() {
   return this.model.get_stepSize();
 };
@@ -178,7 +178,7 @@ org.apache.flex.html.staticControls.NumericStepper.prototype.get_stepSize =
  * @expose
  * @param {Number} value The new stepSize value.
  */
-org.apache.flex.html.staticControls.NumericStepper.prototype.set_stepSize =
+org.apache.flex.html.NumericStepper.prototype.set_stepSize =
     function(value) {
   this.model.set_stepSize(value);
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js
index 88a22b5..320a595 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js
@@ -12,27 +12,27 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.Panel');
+goog.provide('org.apache.flex.html.Panel');
 
-goog.require('org.apache.flex.html.staticControls.Container');
-goog.require('org.apache.flex.html.staticControls.ControlBar');
-goog.require('org.apache.flex.html.staticControls.TitleBar');
-goog.require('org.apache.flex.html.staticControls.beads.PanelView');
-goog.require('org.apache.flex.html.staticControls.beads.models.PanelModel');
+goog.require('org.apache.flex.html.Container');
+goog.require('org.apache.flex.html.ControlBar');
+goog.require('org.apache.flex.html.TitleBar');
+goog.require('org.apache.flex.html.beads.PanelView');
+goog.require('org.apache.flex.html.beads.models.PanelModel');
 
 
 
 /**
  * @constructor
- * @extends {org.apache.flex.html.staticControls.Container}
+ * @extends {org.apache.flex.html.Container}
  */
-org.apache.flex.html.staticControls.Panel = function() {
+org.apache.flex.html.Panel = function() {
   this.model =
-      new org.apache.flex.html.staticControls.beads.models.PanelModel();
+      new org.apache.flex.html.beads.models.PanelModel();
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html.staticControls.Panel,
-    org.apache.flex.html.staticControls.Container);
+goog.inherits(org.apache.flex.html.Panel,
+    org.apache.flex.html.Container);
 
 
 /**
@@ -40,16 +40,16 @@ goog.inherits(org.apache.flex.html.staticControls.Panel,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.Panel.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.Panel.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'Panel',
-                qName: 'org.apache.flex.html.staticControls.Panel' }] };
+                qName: 'org.apache.flex.html.Panel' }] };
 
 
 /**
  * @override
  * @param {Object} c Element being added.
  */
-org.apache.flex.html.staticControls.Panel.prototype.addElement = function(c) {
+org.apache.flex.html.Panel.prototype.addElement = function(c) {
   if (c == this.titleBar) {
     this.element.insertBefore(this.titleBar.element, this.contentArea);
   }
@@ -68,7 +68,7 @@ org.apache.flex.html.staticControls.Panel.prototype.addElement = function(c) {
  * @param {Object} c The child element.
  * @param {number} index The index.
  */
-org.apache.flex.html.staticControls.Panel.prototype.addElementAt =
+org.apache.flex.html.Panel.prototype.addElementAt =
     function(c, index) {
   var children = this.internalChildren();
   if (index >= children.length)
@@ -87,7 +87,7 @@ org.apache.flex.html.staticControls.Panel.prototype.addElementAt =
  * @param {Object} c The child element.
  * @return {number} The index in parent.
  */
-org.apache.flex.html.staticControls.Panel.prototype.getElementIndex =
+org.apache.flex.html.Panel.prototype.getElementIndex =
     function(c) {
   var children = this.internalChildren();
   var n = children.length;
@@ -104,7 +104,7 @@ org.apache.flex.html.staticControls.Panel.prototype.getElementIndex =
  * @override
  * @param {Object} c The child element.
  */
-org.apache.flex.html.staticControls.Panel.prototype.removeElement =
+org.apache.flex.html.Panel.prototype.removeElement =
     function(c) {
   this.contentArea.removeChild(c.element);
 };
@@ -113,7 +113,7 @@ org.apache.flex.html.staticControls.Panel.prototype.removeElement =
 /**
  * @override
  */
-org.apache.flex.html.staticControls.Panel.prototype.createElement =
+org.apache.flex.html.Panel.prototype.createElement =
     function() {
 
   this.element = document.createElement('div');
@@ -123,7 +123,7 @@ org.apache.flex.html.staticControls.Panel.prototype.createElement =
   this.contentArea.flexjs_wrapper = this;
   this.element.appendChild(this.contentArea);
 
-  this.panelView = new org.apache.flex.html.staticControls.beads.PanelView();
+  this.panelView = new org.apache.flex.html.beads.PanelView();
   this.panelView.set_strand(this);
 
   this.positioner = this.element;
@@ -136,7 +136,7 @@ org.apache.flex.html.staticControls.Panel.prototype.createElement =
 /**
  * @override
  */
-org.apache.flex.html.staticControls.Panel.prototype.addedToParent =
+org.apache.flex.html.Panel.prototype.addedToParent =
     function() {
   goog.base(this, 'addedToParent');
 };
@@ -146,7 +146,7 @@ org.apache.flex.html.staticControls.Panel.prototype.addedToParent =
  * @expose
  * @return {string} The title getter.
  */
-org.apache.flex.html.staticControls.Panel.prototype.get_title = function() {
+org.apache.flex.html.Panel.prototype.get_title = function() {
   return this.model.get_title();
 };
 
@@ -155,7 +155,7 @@ org.apache.flex.html.staticControls.Panel.prototype.get_title = function() {
  * @expose
  * @param {string} value The title setter.
  */
-org.apache.flex.html.staticControls.Panel.prototype.set_title =
+org.apache.flex.html.Panel.prototype.set_title =
     function(value) {
   this.model.set_title(value);
 };
@@ -165,7 +165,7 @@ org.apache.flex.html.staticControls.Panel.prototype.set_title =
  * @expose
  * @return {Array} The controlBar getter.
  */
-org.apache.flex.html.staticControls.Panel.prototype.get_controlBar =
+org.apache.flex.html.Panel.prototype.get_controlBar =
     function() {
   return this.controlBarChildren;
 };
@@ -175,7 +175,7 @@ org.apache.flex.html.staticControls.Panel.prototype.get_controlBar =
  * @expose
  * @param {Array} value The controlBar setter.
  */
-org.apache.flex.html.staticControls.Panel.prototype.set_controlBar =
+org.apache.flex.html.Panel.prototype.set_controlBar =
     function(value) {
   this.controlBarChildren = value;
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/RadioButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/RadioButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html/RadioButton.js
index 5713e3d..3ed7716 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/RadioButton.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/RadioButton.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.RadioButton');
+goog.provide('org.apache.flex.html.RadioButton');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,10 +22,10 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html.staticControls.RadioButton = function() {
+org.apache.flex.html.RadioButton = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html.staticControls.RadioButton,
+goog.inherits(org.apache.flex.html.RadioButton,
     org.apache.flex.core.UIBase);
 
 
@@ -34,15 +34,15 @@ goog.inherits(org.apache.flex.html.staticControls.RadioButton,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.RadioButton.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.RadioButton.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'RadioButton',
-                qName: 'org.apache.flex.html.staticControls.RadioButton'}] };
+                qName: 'org.apache.flex.html.RadioButton'}] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.RadioButton.prototype.createElement =
+org.apache.flex.html.RadioButton.prototype.createElement =
     function() {
   var rb;
 
@@ -63,7 +63,7 @@ org.apache.flex.html.staticControls.RadioButton.prototype.createElement =
 /**
  * @expose
  */
-org.apache.flex.html.staticControls.RadioButton.prototype.initModel =
+org.apache.flex.html.RadioButton.prototype.initModel =
     function() {
 };
 
@@ -71,7 +71,7 @@ org.apache.flex.html.staticControls.RadioButton.prototype.initModel =
 /**
  * @expose
  */
-org.apache.flex.html.staticControls.RadioButton.prototype.initSkin =
+org.apache.flex.html.RadioButton.prototype.initSkin =
     function() {
 };
 
@@ -80,7 +80,7 @@ org.apache.flex.html.staticControls.RadioButton.prototype.initSkin =
  * @expose
  * @return {string} The groupName getter.
  */
-org.apache.flex.html.staticControls.RadioButton.prototype.get_groupName =
+org.apache.flex.html.RadioButton.prototype.get_groupName =
     function() {
   return this.element.childNodes.item(0).name;
 };
@@ -90,7 +90,7 @@ org.apache.flex.html.staticControls.RadioButton.prototype.get_groupName =
  * @expose
  * @param {string} value The groupName setter.
  */
-org.apache.flex.html.staticControls.RadioButton.prototype.set_groupName =
+org.apache.flex.html.RadioButton.prototype.set_groupName =
     function(value) {
   this.element.childNodes.item(0).name = value;
 };
@@ -100,7 +100,7 @@ org.apache.flex.html.staticControls.RadioButton.prototype.set_groupName =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.html.staticControls.RadioButton.prototype.get_text =
+org.apache.flex.html.RadioButton.prototype.get_text =
     function() {
   return this.element.childNodes.item(1).nodeValue;
 };
@@ -110,7 +110,7 @@ org.apache.flex.html.staticControls.RadioButton.prototype.get_text =
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.html.staticControls.RadioButton.prototype.set_text =
+org.apache.flex.html.RadioButton.prototype.set_text =
     function(value) {
   this.element.childNodes.item(1).nodeValue = value;
 };
@@ -120,7 +120,7 @@ org.apache.flex.html.staticControls.RadioButton.prototype.set_text =
  * @expose
  * @return {boolean} The selected getter.
  */
-org.apache.flex.html.staticControls.RadioButton.prototype.get_selected =
+org.apache.flex.html.RadioButton.prototype.get_selected =
     function() {
   return this.element.childNodes.item(0).checked;
 };
@@ -130,7 +130,7 @@ org.apache.flex.html.staticControls.RadioButton.prototype.get_selected =
  * @expose
  * @param {boolean} value The selected setter.
  */
-org.apache.flex.html.staticControls.RadioButton.prototype.set_selected =
+org.apache.flex.html.RadioButton.prototype.set_selected =
     function(value) {
   this.element.childNodes.item(0).checked = value;
 };
@@ -140,7 +140,7 @@ org.apache.flex.html.staticControls.RadioButton.prototype.set_selected =
  * @expose
  * @return {Object} The value getter.
  */
-org.apache.flex.html.staticControls.RadioButton.prototype.get_value =
+org.apache.flex.html.RadioButton.prototype.get_value =
     function() {
   return this.element.childNodes.item(0).value;
 };
@@ -150,7 +150,7 @@ org.apache.flex.html.staticControls.RadioButton.prototype.get_value =
  * @expose
  * @param {Object} value The value setter.
  */
-org.apache.flex.html.staticControls.RadioButton.prototype.set_value =
+org.apache.flex.html.RadioButton.prototype.set_value =
     function(value) {
   this.element.childNodes.item(0).value = value;
 };
@@ -160,7 +160,7 @@ org.apache.flex.html.staticControls.RadioButton.prototype.set_value =
  * @expose
  * @return {Object} The value of the selected RadioButton.
  */
-org.apache.flex.html.staticControls.RadioButton.prototype.get_selectedValue =
+org.apache.flex.html.RadioButton.prototype.get_selectedValue =
     function() {
   var buttons, groupName, i, n;
 
@@ -181,7 +181,7 @@ org.apache.flex.html.staticControls.RadioButton.prototype.get_selectedValue =
  * @expose
  * @param {Object} value The value of the selected RadioButton.
  */
-org.apache.flex.html.staticControls.RadioButton.prototype.set_selectedValue =
+org.apache.flex.html.RadioButton.prototype.set_selectedValue =
     function(value) {
   var buttons, groupName, i, n;
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleAlert.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleAlert.js b/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleAlert.js
index 5fc3530..7028711 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleAlert.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleAlert.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.SimpleAlert');
+goog.provide('org.apache.flex.html.SimpleAlert');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,11 +22,11 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html.staticControls.SimpleAlert = function() {
+org.apache.flex.html.SimpleAlert = function() {
   goog.base(this);
 
 };
-goog.inherits(org.apache.flex.html.staticControls.SimpleAlert,
+goog.inherits(org.apache.flex.html.SimpleAlert,
     org.apache.flex.core.UIBase);
 
 
@@ -35,16 +35,16 @@ goog.inherits(org.apache.flex.html.staticControls.SimpleAlert,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.SimpleAlert.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.SimpleAlert.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'SimpleAlert',
-                qName: 'org.apache.flex.html.staticControls.SimpleAlert'}] };
+                qName: 'org.apache.flex.html.SimpleAlert'}] };
 
 
 /**
  * @param {string} message The message to display in the alert.
  * @param {Object} host The host that should display the alert.
  */
-org.apache.flex.html.staticControls.SimpleAlert.show =
+org.apache.flex.html.SimpleAlert.show =
     function(message, host) {
 
   alert(message);

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js b/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js
index 79e40ef..e6a5c0b 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js
@@ -12,10 +12,10 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.SimpleList');
+goog.provide('org.apache.flex.html.SimpleList');
 
 goog.require('org.apache.flex.core.ListBase');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
+goog.require('org.apache.flex.html.beads.models.ArraySelectionModel');
 
 
 
@@ -23,12 +23,12 @@ goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionMod
  * @constructor
  * @extends {org.apache.flex.core.ListBase}
  */
-org.apache.flex.html.staticControls.SimpleList = function() {
+org.apache.flex.html.SimpleList = function() {
   goog.base(this);
-  this.model = new org.apache.flex.html.staticControls.
+  this.model = new org.apache.flex.html.
       beads.models.ArraySelectionModel();
 };
-goog.inherits(org.apache.flex.html.staticControls.SimpleList,
+goog.inherits(org.apache.flex.html.SimpleList,
     org.apache.flex.core.ListBase);
 
 
@@ -37,15 +37,15 @@ goog.inherits(org.apache.flex.html.staticControls.SimpleList,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.SimpleList.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.SimpleList.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'SimpleList',
-                qName: 'org.apache.flex.html.staticControls.SimpleList'}] };
+                qName: 'org.apache.flex.html.SimpleList'}] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.SimpleList.prototype.
+org.apache.flex.html.SimpleList.prototype.
     createElement = function() {
   this.element = document.createElement('select');
   this.element.size = 5;
@@ -61,7 +61,7 @@ org.apache.flex.html.staticControls.SimpleList.prototype.
 /**
  * @override
  */
-org.apache.flex.html.staticControls.SimpleList.prototype.
+org.apache.flex.html.SimpleList.prototype.
     get_dataProvider = function() {
   return this.model.get_dataProvider();
 };
@@ -70,7 +70,7 @@ org.apache.flex.html.staticControls.SimpleList.prototype.
 /**
  * @override
  */
-org.apache.flex.html.staticControls.SimpleList.prototype.
+org.apache.flex.html.SimpleList.prototype.
     set_dataProvider = function(value) {
   var dp, i, n, opt;
 
@@ -95,7 +95,7 @@ org.apache.flex.html.staticControls.SimpleList.prototype.
 /**
  * @override
  */
-org.apache.flex.html.staticControls.SimpleList.prototype.
+org.apache.flex.html.SimpleList.prototype.
     get_selectedIndex = function() {
   return this.model.get_selectedIndex();
 };
@@ -104,7 +104,7 @@ org.apache.flex.html.staticControls.SimpleList.prototype.
 /**
  * @override
  */
-org.apache.flex.html.staticControls.SimpleList.prototype.
+org.apache.flex.html.SimpleList.prototype.
     set_selectedIndex = function(value) {
   this.model.set_selectedIndex(value);
 };
@@ -113,7 +113,7 @@ org.apache.flex.html.staticControls.SimpleList.prototype.
 /**
  * @override
  */
-org.apache.flex.html.staticControls.SimpleList.prototype.
+org.apache.flex.html.SimpleList.prototype.
     get_selectedItem = function() {
   return this.model.get_selectedItem();
 };
@@ -122,7 +122,7 @@ org.apache.flex.html.staticControls.SimpleList.prototype.
 /**
  * @override
  */
-org.apache.flex.html.staticControls.SimpleList.prototype.
+org.apache.flex.html.SimpleList.prototype.
     set_selectedItem = function(value) {
   this.model.set_selectedItem(value);
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js
index 6a19bd4..afafd9c 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js
@@ -12,13 +12,13 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.Slider');
+goog.provide('org.apache.flex.html.Slider');
 
 goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.beads.SliderThumbView');
-goog.require('org.apache.flex.html.staticControls.beads.SliderTrackView');
-goog.require('org.apache.flex.html.staticControls.beads.controllers.SliderMouseController');
-goog.require('org.apache.flex.html.staticControls.beads.models.RangeModel');
+goog.require('org.apache.flex.html.beads.SliderThumbView');
+goog.require('org.apache.flex.html.beads.SliderTrackView');
+goog.require('org.apache.flex.html.beads.controllers.SliderMouseController');
+goog.require('org.apache.flex.html.beads.models.RangeModel');
 
 
 
@@ -26,12 +26,12 @@ goog.require('org.apache.flex.html.staticControls.beads.models.RangeModel');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html.staticControls.Slider = function() {
+org.apache.flex.html.Slider = function() {
   this.model =
-      new org.apache.flex.html.staticControls.beads.models.RangeModel();
+      new org.apache.flex.html.beads.models.RangeModel();
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html.staticControls.Slider,
+goog.inherits(org.apache.flex.html.Slider,
     org.apache.flex.core.UIBase);
 
 
@@ -40,28 +40,28 @@ goog.inherits(org.apache.flex.html.staticControls.Slider,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.Slider.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.Slider.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'Slider',
-                qName: 'org.apache.flex.html.staticControls.Slider'}] };
+                qName: 'org.apache.flex.html.Slider'}] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.Slider.prototype.createElement =
+org.apache.flex.html.Slider.prototype.createElement =
     function() {
 
   this.element = document.createElement('div');
   this.element.style.width = '200px';
   this.element.style.height = '30px';
 
-  this.track = new org.apache.flex.html.staticControls.beads.SliderTrackView();
+  this.track = new org.apache.flex.html.beads.SliderTrackView();
   this.addBead(this.track);
 
-  this.thumb = new org.apache.flex.html.staticControls.beads.SliderThumbView();
+  this.thumb = new org.apache.flex.html.beads.SliderThumbView();
   this.addBead(this.thumb);
 
-  this.controller = new org.apache.flex.html.staticControls.beads.controllers.
+  this.controller = new org.apache.flex.html.beads.controllers.
                     SliderMouseController();
   this.addBead(this.controller);
 
@@ -78,7 +78,7 @@ org.apache.flex.html.staticControls.Slider.prototype.createElement =
  * @expose
  * @return {number} The value getter.
  */
-org.apache.flex.html.staticControls.Slider.prototype.get_value =
+org.apache.flex.html.Slider.prototype.get_value =
     function() {
   return this.model.get_value();
 };
@@ -89,7 +89,7 @@ org.apache.flex.html.staticControls.Slider.prototype.get_value =
  * @param {Object} newValue The new value.
  * @return {void} The value setter.
  */
-org.apache.flex.html.staticControls.Slider.prototype.set_value =
+org.apache.flex.html.Slider.prototype.set_value =
     function(newValue) {
   this.model.set_value(newValue);
   this.setThumbFromValue(this.model.get_value());
@@ -100,7 +100,7 @@ org.apache.flex.html.staticControls.Slider.prototype.set_value =
  * @expose
  * @return {number} The minimum getter.
  */
-org.apache.flex.html.staticControls.Slider.prototype.get_minimum =
+org.apache.flex.html.Slider.prototype.get_minimum =
     function() {
   return this.model.get_minimum();
 };
@@ -111,7 +111,7 @@ org.apache.flex.html.staticControls.Slider.prototype.get_minimum =
  * @param {Object} value The new minimum value.
  * @return {void} The minimum setter.
  */
-org.apache.flex.html.staticControls.Slider.prototype.set_minimum =
+org.apache.flex.html.Slider.prototype.set_minimum =
     function(value) {
   this.model.set_minimum(value);
 };
@@ -121,7 +121,7 @@ org.apache.flex.html.staticControls.Slider.prototype.set_minimum =
  * @expose
  * @return {number} The maximum getter.
  */
-org.apache.flex.html.staticControls.Slider.prototype.get_maximum =
+org.apache.flex.html.Slider.prototype.get_maximum =
     function() {
   return this.model.get_maximum();
 };
@@ -132,7 +132,7 @@ org.apache.flex.html.staticControls.Slider.prototype.get_maximum =
  * @param {Object} value The new maximum value.
  * @return {void} The maximum setter.
  */
-org.apache.flex.html.staticControls.Slider.prototype.set_maximum =
+org.apache.flex.html.Slider.prototype.set_maximum =
     function(value) {
   this.model.set_maximum(value);
 };
@@ -142,7 +142,7 @@ org.apache.flex.html.staticControls.Slider.prototype.set_maximum =
  * @expose
  * @return {number} The snapInterval getter.
  */
-org.apache.flex.html.staticControls.Slider.prototype.get_snapInterval =
+org.apache.flex.html.Slider.prototype.get_snapInterval =
     function() {
   return this.model.get_snapInterval();
 };
@@ -153,7 +153,7 @@ org.apache.flex.html.staticControls.Slider.prototype.get_snapInterval =
  * @param {Object} value The new snapInterval value.
  * @return {void} The snapInterval setter.
  */
-org.apache.flex.html.staticControls.Slider.prototype.set_snapInterval =
+org.apache.flex.html.Slider.prototype.set_snapInterval =
     function(value) {
   this.model.set_snapInterval(value);
 };
@@ -163,7 +163,7 @@ org.apache.flex.html.staticControls.Slider.prototype.set_snapInterval =
  * @expose
  * @return {number} The stepSize getter.
  */
-org.apache.flex.html.staticControls.Slider.prototype.get_stepSize =
+org.apache.flex.html.Slider.prototype.get_stepSize =
     function() {
   return this.model.get_stepSize();
 };
@@ -174,7 +174,7 @@ org.apache.flex.html.staticControls.Slider.prototype.get_stepSize =
  * @param {Object} value The new stepSize value.
  * @return {void} The stepSize setter.
  */
-org.apache.flex.html.staticControls.Slider.prototype.set_stepSize =
+org.apache.flex.html.Slider.prototype.set_stepSize =
     function(value) {
   this.model.set_stepSize(value);
 };
@@ -184,7 +184,7 @@ org.apache.flex.html.staticControls.Slider.prototype.set_stepSize =
  * @param {Object} value The current value.
  * @return {number} Calculates the new value based snapInterval and stepSize.
  */
-org.apache.flex.html.staticControls.Slider.prototype.snap = function(value)
+org.apache.flex.html.Slider.prototype.snap = function(value)
     {
   var si = this.get_snapInterval();
   var n = Math.round((value - this.get_minimum()) / si) *
@@ -205,7 +205,7 @@ org.apache.flex.html.staticControls.Slider.prototype.snap = function(value)
  * @param {number} value The value used to calculate new position of the thumb.
  * @return {void} Moves the thumb to the corresponding position.
  */
-org.apache.flex.html.staticControls.Slider.prototype.setThumbFromValue =
+org.apache.flex.html.Slider.prototype.setThumbFromValue =
     function(value)
     {
   var min = this.model.get_minimum();

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js
index 8911105..9ba6734 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js
@@ -12,11 +12,11 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.Spinner');
+goog.provide('org.apache.flex.html.Spinner');
 
 goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.TextButton');
-goog.require('org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController');
+goog.require('org.apache.flex.html.TextButton');
+goog.require('org.apache.flex.html.beads.controllers.SpinnerMouseController');
 
 
 
@@ -24,7 +24,7 @@ goog.require('org.apache.flex.html.staticControls.beads.controllers.SpinnerMouse
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html.staticControls.Spinner = function() {
+org.apache.flex.html.Spinner = function() {
   goog.base(this);
 
   this.minimum_ = 0;
@@ -33,7 +33,7 @@ org.apache.flex.html.staticControls.Spinner = function() {
   this.stepSize_ = 1;
   this.snapInterval_ = 1;
 };
-goog.inherits(org.apache.flex.html.staticControls.Spinner,
+goog.inherits(org.apache.flex.html.Spinner,
     org.apache.flex.core.UIBase);
 
 
@@ -42,30 +42,30 @@ goog.inherits(org.apache.flex.html.staticControls.Spinner,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.Spinner.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.Spinner.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'Spinner',
-                qName: 'org.apache.flex.html.staticControls.Spinner'}] };
+                qName: 'org.apache.flex.html.Spinner'}] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.Spinner.prototype.createElement =
+org.apache.flex.html.Spinner.prototype.createElement =
     function() {
   this.element = document.createElement('div');
   this.positioner = this.element;
 
   this.element.style.verticalAlign = 'middle';
 
-  this.incrementButton = new org.apache.flex.html.staticControls.TextButton();
+  this.incrementButton = new org.apache.flex.html.TextButton();
   this.incrementButton.set_text('\u2191');
   this.addElement(this.incrementButton);
 
-  this.decrementButton = new org.apache.flex.html.staticControls.TextButton();
+  this.decrementButton = new org.apache.flex.html.TextButton();
   this.decrementButton.set_text('\u2193');
   this.addElement(this.decrementButton);
 
-  this.controller = new org.apache.flex.html.staticControls.
+  this.controller = new org.apache.flex.html.
       beads.controllers.SpinnerMouseController();
   this.addBead(this.controller);
 
@@ -79,7 +79,7 @@ org.apache.flex.html.staticControls.Spinner.prototype.createElement =
  * @expose
  * @return {number} The current value.
  */
-org.apache.flex.html.staticControls.Spinner.prototype.get_value =
+org.apache.flex.html.Spinner.prototype.get_value =
     function() {
   return this.value_;
 };
@@ -89,7 +89,7 @@ org.apache.flex.html.staticControls.Spinner.prototype.get_value =
  * @expose
  * @param {number} value The new value.
  */
-org.apache.flex.html.staticControls.Spinner.prototype.set_value =
+org.apache.flex.html.Spinner.prototype.set_value =
     function(value) {
   if (value != this.value_) {
     this.value_ = value;
@@ -102,7 +102,7 @@ org.apache.flex.html.staticControls.Spinner.prototype.set_value =
  * @expose
  * @return {number} The minimum value.
  */
-org.apache.flex.html.staticControls.Spinner.prototype.get_minimum = function() {
+org.apache.flex.html.Spinner.prototype.get_minimum = function() {
   return this.minimum_;
 };
 
@@ -111,7 +111,7 @@ org.apache.flex.html.staticControls.Spinner.prototype.get_minimum = function() {
  * @expose
  * @param {number} value The new minimum value.
  */
-org.apache.flex.html.staticControls.Spinner.prototype.set_minimum =
+org.apache.flex.html.Spinner.prototype.set_minimum =
     function(value) {
   if (value != this.minimum_) {
     this.minimum_ = value;
@@ -124,7 +124,7 @@ org.apache.flex.html.staticControls.Spinner.prototype.set_minimum =
  * @expose
  * @return {number} The maximum value.
  */
-org.apache.flex.html.staticControls.Spinner.prototype.get_maximum =
+org.apache.flex.html.Spinner.prototype.get_maximum =
     function() {
   return this.maximum_;
 };
@@ -134,7 +134,7 @@ org.apache.flex.html.staticControls.Spinner.prototype.get_maximum =
  * @expose
  * @param {number} value The new maximum setter.
  */
-org.apache.flex.html.staticControls.Spinner.prototype.set_maximum =
+org.apache.flex.html.Spinner.prototype.set_maximum =
     function(value) {
   if (value != this.maximum_) {
     this.maximum_ = value;
@@ -147,7 +147,7 @@ org.apache.flex.html.staticControls.Spinner.prototype.set_maximum =
  * @expose
  * @return {number} The snapInterval.
  */
-org.apache.flex.html.staticControls.Spinner.prototype.get_snapInterval =
+org.apache.flex.html.Spinner.prototype.get_snapInterval =
     function() {
   return this.snapInterval_;
 };
@@ -157,7 +157,7 @@ org.apache.flex.html.staticControls.Spinner.prototype.get_snapInterval =
  * @expose
  * @param {number} value The new snapInterval value.
  */
-org.apache.flex.html.staticControls.Spinner.prototype.set_snapInterval =
+org.apache.flex.html.Spinner.prototype.set_snapInterval =
     function(value) {
   if (value != this.snapInterval_) {
     this.snapInterval_ = value;
@@ -170,7 +170,7 @@ org.apache.flex.html.staticControls.Spinner.prototype.set_snapInterval =
  * @expose
  * @return {number} The stepSize.
  */
-org.apache.flex.html.staticControls.Spinner.prototype.get_stepSize =
+org.apache.flex.html.Spinner.prototype.get_stepSize =
     function() {
   return this.stepSize_;
 };
@@ -180,7 +180,7 @@ org.apache.flex.html.staticControls.Spinner.prototype.get_stepSize =
  * @expose
  * @param {number} value The new stepSize value.
  */
-org.apache.flex.html.staticControls.Spinner.prototype.set_stepSize =
+org.apache.flex.html.Spinner.prototype.set_stepSize =
     function(value) {
   if (value != this.stepSize_) {
     this.stepSize_ = value;
@@ -194,7 +194,7 @@ org.apache.flex.html.staticControls.Spinner.prototype.set_stepSize =
  * @return {number} The new value based on snapInterval
  * and stepSize.
  */
-org.apache.flex.html.staticControls.Spinner.prototype.snap = function(value)
+org.apache.flex.html.Spinner.prototype.snap = function(value)
     {
   var si = this.snapInterval_;
   var n = Math.round((value - this.minimum_) / si) * si + this.minimum_;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/TextArea.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/TextArea.js b/frameworks/js/FlexJS/src/org/apache/flex/html/TextArea.js
index 2e018e5..f427b46 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/TextArea.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/TextArea.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.TextArea');
+goog.provide('org.apache.flex.html.TextArea');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,10 +22,10 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html.staticControls.TextArea = function() {
+org.apache.flex.html.TextArea = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html.staticControls.TextArea,
+goog.inherits(org.apache.flex.html.TextArea,
     org.apache.flex.core.UIBase);
 
 
@@ -34,15 +34,15 @@ goog.inherits(org.apache.flex.html.staticControls.TextArea,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.TextArea.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.TextArea.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'TextArea',
-                qName: 'org.apache.flex.html.staticControls.TextArea'}] };
+                qName: 'org.apache.flex.html.TextArea'}] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.TextArea.prototype.createElement =
+org.apache.flex.html.TextArea.prototype.createElement =
     function() {
 
   this.element = document.createElement('textarea');
@@ -57,7 +57,7 @@ org.apache.flex.html.staticControls.TextArea.prototype.createElement =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.html.staticControls.TextArea.prototype.get_text = function() {
+org.apache.flex.html.TextArea.prototype.get_text = function() {
   return this.element.value;
 };
 
@@ -66,7 +66,7 @@ org.apache.flex.html.staticControls.TextArea.prototype.get_text = function() {
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.html.staticControls.TextArea.prototype.set_text =
+org.apache.flex.html.TextArea.prototype.set_text =
     function(value) {
   this.element.value = value;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html/TextButton.js
index 882b178..a5fe7fd 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/TextButton.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/TextButton.js
@@ -12,21 +12,21 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.TextButton');
+goog.provide('org.apache.flex.html.TextButton');
 
-goog.require('org.apache.flex.html.staticControls.Button');
+goog.require('org.apache.flex.html.Button');
 
 
 
 /**
  * @constructor
- * @extends {org.apache.flex.html.staticControls.Button}
+ * @extends {org.apache.flex.html.Button}
  */
-org.apache.flex.html.staticControls.TextButton = function() {
+org.apache.flex.html.TextButton = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html.staticControls.TextButton,
-    org.apache.flex.html.staticControls.Button);
+goog.inherits(org.apache.flex.html.TextButton,
+    org.apache.flex.html.Button);
 
 
 /**
@@ -34,16 +34,16 @@ goog.inherits(org.apache.flex.html.staticControls.TextButton,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.TextButton.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.TextButton.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'TextButton',
-                qName: 'org.apache.flex.html.staticControls.TextButton'}] };
+                qName: 'org.apache.flex.html.TextButton'}] };
 
 
 /**
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.html.staticControls.TextButton.prototype.get_text = function() {
+org.apache.flex.html.TextButton.prototype.get_text = function() {
   return this.element.innerHTML;
 };
 
@@ -52,7 +52,7 @@ org.apache.flex.html.staticControls.TextButton.prototype.get_text = function() {
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.html.staticControls.TextButton.prototype.set_text =
+org.apache.flex.html.TextButton.prototype.set_text =
     function(value) {
   this.element.innerHTML = value;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/TextInput.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/TextInput.js b/frameworks/js/FlexJS/src/org/apache/flex/html/TextInput.js
index 48cccab..654ab90 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/TextInput.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/TextInput.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.TextInput');
+goog.provide('org.apache.flex.html.TextInput');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,10 +22,10 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html.staticControls.TextInput = function() {
+org.apache.flex.html.TextInput = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html.staticControls.TextInput,
+goog.inherits(org.apache.flex.html.TextInput,
     org.apache.flex.core.UIBase);
 
 
@@ -34,15 +34,15 @@ goog.inherits(org.apache.flex.html.staticControls.TextInput,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.TextInput.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.TextInput.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'TextInput',
-                qName: 'org.apache.flex.html.staticControls.TextInput'}] };
+                qName: 'org.apache.flex.html.TextInput'}] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.TextInput.prototype.createElement = function() {
+org.apache.flex.html.TextInput.prototype.createElement = function() {
   this.element = document.createElement('input');
   this.element.setAttribute('type', 'input');
 
@@ -61,7 +61,7 @@ org.apache.flex.html.staticControls.TextInput.prototype.createElement = function
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.html.staticControls.TextInput.prototype.get_text = function() {
+org.apache.flex.html.TextInput.prototype.get_text = function() {
   return this.element.value;
 };
 
@@ -70,7 +70,7 @@ org.apache.flex.html.staticControls.TextInput.prototype.get_text = function() {
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.html.staticControls.TextInput.prototype.set_text = function(value) {
+org.apache.flex.html.TextInput.prototype.set_text = function(value) {
   this.element.value = value;
 };
 
@@ -79,7 +79,7 @@ org.apache.flex.html.staticControls.TextInput.prototype.set_text = function(valu
  * @expose
  * @param {Object} event The event.
  */
-/*org.apache.flex.html.staticControls.TextInput.prototype.killChangeHandler = function(event) {
+/*org.apache.flex.html.TextInput.prototype.killChangeHandler = function(event) {
     //event.preventDefault();
 };*/
 
@@ -88,7 +88,7 @@ org.apache.flex.html.staticControls.TextInput.prototype.set_text = function(valu
  * @private
  * @param {Object} event The event.
  */
-org.apache.flex.html.staticControls.TextInput.prototype.inputChangeHandler_ = function(event) {
+org.apache.flex.html.TextInput.prototype.inputChangeHandler_ = function(event) {
   event.stopPropagation();
 
   this.dispatchEvent(new org.apache.flex.events.Event(org.apache.flex.events.Event.EventType.CHANGE));

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js
index 36f9322..7a400b2 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js
@@ -12,28 +12,28 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.TitleBar');
+goog.provide('org.apache.flex.html.TitleBar');
 
-goog.require('org.apache.flex.html.staticControls.Container');
-goog.require('org.apache.flex.html.staticControls.Label');
-goog.require('org.apache.flex.html.staticControls.TextButton');
-goog.require('org.apache.flex.html.staticControls.beads.models.TitleBarModel');
+goog.require('org.apache.flex.html.Container');
+goog.require('org.apache.flex.html.Label');
+goog.require('org.apache.flex.html.TextButton');
+goog.require('org.apache.flex.html.beads.models.TitleBarModel');
 
 
 
 /**
  * @constructor
- * @extends {org.apache.flex.html.staticControls.Container}
+ * @extends {org.apache.flex.html.Container}
  */
-org.apache.flex.html.staticControls.TitleBar = function() {
+org.apache.flex.html.TitleBar = function() {
 
   this.model =
-      new org.apache.flex.html.staticControls.beads.models.TitleBarModel();
+      new org.apache.flex.html.beads.models.TitleBarModel();
 
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html.staticControls.TitleBar,
-    org.apache.flex.html.staticControls.Container);
+goog.inherits(org.apache.flex.html.TitleBar,
+    org.apache.flex.html.Container);
 
 
 /**
@@ -41,26 +41,26 @@ goog.inherits(org.apache.flex.html.staticControls.TitleBar,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.TitleBar.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.TitleBar.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'TitleBar',
-                qName: 'org.apache.flex.html.staticControls.TitleBar'}] };
+                qName: 'org.apache.flex.html.TitleBar'}] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.TitleBar.prototype.createElement =
+org.apache.flex.html.TitleBar.prototype.createElement =
     function() {
 
   this.element = document.createElement('div');
 
-  this.titleLabel = new org.apache.flex.html.staticControls.Label();
+  this.titleLabel = new org.apache.flex.html.Label();
   this.addElement(this.titleLabel);
   this.titleLabel.element.id = 'title';
   this.titleLabel.positioner.style.display = 'inline-block';
   this.titleLabel.set_className('TitleBarLabel');
 
-  this.titleButton = new org.apache.flex.html.staticControls.TextButton();
+  this.titleButton = new org.apache.flex.html.TextButton();
   this.addElement(this.titleButton);
   this.titleButton.element.id = 'closeButton';
   this.titleButton.text = 'Close';
@@ -83,7 +83,7 @@ org.apache.flex.html.staticControls.TitleBar.prototype.createElement =
 /**
  * @override
  */
-org.apache.flex.html.staticControls.TitleBar.prototype.addedToParent =
+org.apache.flex.html.TitleBar.prototype.addedToParent =
     function() {
 
   this.titleLabel.set_text(this.model.get_title());
@@ -99,7 +99,7 @@ org.apache.flex.html.staticControls.TitleBar.prototype.addedToParent =
 /**
  * @param {Object} event The event that triggered this handler.
  */
-org.apache.flex.html.staticControls.TitleBar.prototype.changeHandler =
+org.apache.flex.html.TitleBar.prototype.changeHandler =
     function(event) {
   if (event.type == 'titleChange') {
     this.titleLabel.set_text(this.model.get_title());
@@ -114,7 +114,7 @@ org.apache.flex.html.staticControls.TitleBar.prototype.changeHandler =
  * @expose
  * @return {string} The title getter.
  */
-org.apache.flex.html.staticControls.TitleBar.prototype.get_title =
+org.apache.flex.html.TitleBar.prototype.get_title =
     function() {
   return this.model.get_title();
 };
@@ -124,7 +124,7 @@ org.apache.flex.html.staticControls.TitleBar.prototype.get_title =
  * @expose
  * @param {string} value The title setter.
  */
-org.apache.flex.html.staticControls.TitleBar.prototype.set_title =
+org.apache.flex.html.TitleBar.prototype.set_title =
     function(value) {
   this.model.set_title(value);
 };
@@ -134,7 +134,7 @@ org.apache.flex.html.staticControls.TitleBar.prototype.set_title =
  * @expose
  * @return {string} The showCloseButton getter.
  */
-org.apache.flex.html.staticControls.TitleBar.prototype.get_showCloseButton =
+org.apache.flex.html.TitleBar.prototype.get_showCloseButton =
     function() {
   return this.model.get_showCloseButton();
 };
@@ -144,7 +144,7 @@ org.apache.flex.html.staticControls.TitleBar.prototype.get_showCloseButton =
  * @expose
  * @param {string} value The title setter.
  */
-org.apache.flex.html.staticControls.TitleBar.prototype.set_showCloseButton =
+org.apache.flex.html.TitleBar.prototype.set_showCloseButton =
     function(value) {
   this.model.set_showCloseButton(value);
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.js b/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.js
index 13a5ae9..9d5177d 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/NumericOnlyTextInputBead.js
@@ -12,14 +12,14 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead');
+goog.provide('org.apache.flex.html.accessories.NumericOnlyTextInputBead');
 
 
 
 /**
  * @constructor
  */
-org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead =
+org.apache.flex.html.accessories.NumericOnlyTextInputBead =
     function() {
 
   /**
@@ -35,16 +35,16 @@ org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead =
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.accessories.NumericOnlyTextInputBead.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'NumericOnlyTextInputBead',
-                qName: 'org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead' }] };
+                qName: 'org.apache.flex.html.accessories.NumericOnlyTextInputBead' }] };
 
 
 /**
  * @expose
  * @param {Object} value The new host.
  */
-org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead.
+org.apache.flex.html.accessories.NumericOnlyTextInputBead.
     prototype.set_strand = function(value) {
   if (this.strand_ !== value) {
     this.strand_ = value;
@@ -57,7 +57,7 @@ org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead.
  * @expose
  * @param {Object} event The input to validate?
  */
-org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead.
+org.apache.flex.html.accessories.NumericOnlyTextInputBead.
     prototype.validateInput = function(event) {
 
   var code = event.charCode;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/PasswordInputBead.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/PasswordInputBead.js b/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/PasswordInputBead.js
index cd5baf7..b142764 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/PasswordInputBead.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/PasswordInputBead.js
@@ -12,14 +12,14 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.accessories.PasswordInputBead');
+goog.provide('org.apache.flex.html.accessories.PasswordInputBead');
 
 
 
 /**
  * @constructor
  */
-org.apache.flex.html.staticControls.accessories.PasswordInputBead =
+org.apache.flex.html.accessories.PasswordInputBead =
     function() {
 
   /**
@@ -35,16 +35,16 @@ org.apache.flex.html.staticControls.accessories.PasswordInputBead =
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.accessories.PasswordInputBead.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.accessories.PasswordInputBead.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'PasswordInputBead',
-                qName: 'org.apache.flex.html.staticControls.accessories.PasswordInputBead' }] };
+                qName: 'org.apache.flex.html.accessories.PasswordInputBead' }] };
 
 
 /**
  * @expose
  * @param {Object} value The new host.
  */
-org.apache.flex.html.staticControls.accessories.PasswordInputBead.
+org.apache.flex.html.accessories.PasswordInputBead.
     prototype.set_strand = function(value) {
   if (this.strand_ !== value) {
     this.strand_ = value;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/TextPromptBead.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/TextPromptBead.js b/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/TextPromptBead.js
index 444f370..182c5d3 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/TextPromptBead.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/accessories/TextPromptBead.js
@@ -12,14 +12,14 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.accessories.TextPromptBead');
+goog.provide('org.apache.flex.html.accessories.TextPromptBead');
 
 
 
 /**
  * @constructor
  */
-org.apache.flex.html.staticControls.accessories.TextPromptBead = function() {
+org.apache.flex.html.accessories.TextPromptBead = function() {
 
   /**
    * @protected
@@ -34,16 +34,16 @@ org.apache.flex.html.staticControls.accessories.TextPromptBead = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.accessories.TextPromptBead.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.accessories.TextPromptBead.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'TextPromptBead',
-                qName: 'org.apache.flex.html.staticControls.accessories.TextPromptBead' }] };
+                qName: 'org.apache.flex.html.accessories.TextPromptBead' }] };
 
 
 /**
  * @expose
  * @return {string} value The new prompt.
  */
-org.apache.flex.html.staticControls.accessories.TextPromptBead.prototype.
+org.apache.flex.html.accessories.TextPromptBead.prototype.
     get_prompt = function() {
   return this.prompt;
 };
@@ -53,7 +53,7 @@ org.apache.flex.html.staticControls.accessories.TextPromptBead.prototype.
  * @expose
  * @param {string} value The new prompt.
  */
-org.apache.flex.html.staticControls.accessories.TextPromptBead.prototype.
+org.apache.flex.html.accessories.TextPromptBead.prototype.
     set_prompt = function(value) {
   this.prompt = value;
 };
@@ -63,7 +63,7 @@ org.apache.flex.html.staticControls.accessories.TextPromptBead.prototype.
  * @expose
  * @param {Object} value The new host.
  */
-org.apache.flex.html.staticControls.accessories.TextPromptBead.prototype.
+org.apache.flex.html.accessories.TextPromptBead.prototype.
     set_strand = function(value) {
   if (this.strand_ !== value) {
     this.strand_ = value;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ButtonBarView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ButtonBarView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ButtonBarView.js
index 2801b9f..0b814b1 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ButtonBarView.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ButtonBarView.js
@@ -12,25 +12,25 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.ButtonBarView');
+goog.provide('org.apache.flex.html.beads.ButtonBarView');
 
-goog.require('org.apache.flex.html.staticControls.beads.ListView');
+goog.require('org.apache.flex.html.beads.ListView');
 
 
 
 /**
  * @constructor
- * @extends {org.apache.flex.html.staticControls.beads.ListView}
+ * @extends {org.apache.flex.html.beads.ListView}
  */
-org.apache.flex.html.staticControls.beads.ButtonBarView = function() {
+org.apache.flex.html.beads.ButtonBarView = function() {
   this.lastSelectedIndex = -1;
   goog.base(this);
 
   this.className = 'ButtonBarView';
 };
 goog.inherits(
-    org.apache.flex.html.staticControls.beads.ButtonBarView,
-    org.apache.flex.html.staticControls.beads.ListView);
+    org.apache.flex.html.beads.ButtonBarView,
+    org.apache.flex.html.beads.ListView);
 
 
 /**
@@ -38,16 +38,16 @@ goog.inherits(
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.ButtonBarView.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.beads.ButtonBarView.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'ButtonBarView',
-                qName: 'org.apache.flex.html.staticControls.beads.ButtonBarView' }] };
+                qName: 'org.apache.flex.html.beads.ButtonBarView' }] };
 
 
 /**
  * @expose
  * @param {Object} value The new host.
  */
-org.apache.flex.html.staticControls.beads.ButtonBarView.prototype.set_strand =
+org.apache.flex.html.beads.ButtonBarView.prototype.set_strand =
     function(value) {
 
   goog.base(this, 'set_strand', value);

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js
index f461ef7..d5b263d 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js
@@ -12,13 +12,13 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData');
+goog.provide('org.apache.flex.html.beads.DataItemRendererFactoryForArrayData');
 
 goog.require('org.apache.flex.core.IDataProviderItemRendererMapper');
 goog.require('org.apache.flex.events.EventDispatcher');
-goog.require('org.apache.flex.html.staticControls.beads.ListView');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
-goog.require('org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer');
+goog.require('org.apache.flex.html.beads.ListView');
+goog.require('org.apache.flex.html.beads.models.ArraySelectionModel');
+goog.require('org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer');
 
 
 
@@ -26,7 +26,7 @@ goog.require('org.apache.flex.html.staticControls.supportClasses.ButtonBarButton
  * @constructor
  * @implements {org.apache.flex.core.IDataProviderItemRendererMapper}
  */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData =
+org.apache.flex.html.beads.DataItemRendererFactoryForArrayData =
     function() {
 };
 
@@ -34,7 +34,7 @@ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData =
 /**
  * @expose
  */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.prototype.itemRendererFactory = null;
+org.apache.flex.html.beads.DataItemRendererFactoryForArrayData.prototype.itemRendererFactory = null;
 
 
 /**
@@ -42,10 +42,10 @@ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.pr
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
+org.apache.flex.html.beads.DataItemRendererFactoryForArrayData.
     prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'DataItemRendererFactoryForArrayData',
-                qName: 'org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData' }],
+                qName: 'org.apache.flex.html.beads.DataItemRendererFactoryForArrayData' }],
       interfaces: [org.apache.flex.core.IDataProviderItemRendererMapper] };
 
 
@@ -53,7 +53,7 @@ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
  * @private
  * @type {Object}
  */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
+org.apache.flex.html.beads.DataItemRendererFactoryForArrayData.
     prototype.itemRendererClass_ = null;
 
 
@@ -61,15 +61,15 @@ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
  * @expose
  * @param {Object} value The component strand.
  */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
+org.apache.flex.html.beads.DataItemRendererFactoryForArrayData.
     prototype.set_strand = function(value) {
   this.strand_ = value;
 
   this.model = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
+      org.apache.flex.html.beads.models.ArraySelectionModel);
 
   this.listView = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.ListView);
+      org.apache.flex.html.beads.ListView);
   this.dataGroup = this.listView.get_dataGroup();
 
   this.model.addEventListener('dataProviderChanged',
@@ -93,7 +93,7 @@ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
  * @expose
  * @return {Object} The itemRenderer.
  */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
+org.apache.flex.html.beads.DataItemRendererFactoryForArrayData.
     prototype.get_itemRendererClass = function() {
   if (org.apache.flex.core.ValuesManager.valuesImpl.getValue && !this.itemRendererClass_) {
     var c = org.apache.flex.core.ValuesManager.valuesImpl.getValue(this.strand_, 'iItemRenderer');
@@ -109,7 +109,7 @@ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
  * @expose
  * @param {Object} value class to use for the item renderer.
  */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
+org.apache.flex.html.beads.DataItemRendererFactoryForArrayData.
     prototype.set_itemRendererClass = function(value) {
   this.itemRendererClass_ = value;
 };
@@ -119,7 +119,7 @@ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
  * @expose
  * @param {Object} event The event that triggered the dataProvider change.
  */
-org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData.
+org.apache.flex.html.beads.DataItemRendererFactoryForArrayData.
     prototype.dataProviderChangedHandler = function(event) {
   var dp, i, n, opt;
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/IListView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/IListView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/IListView.js
index 9f4cb33..b1c8458 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/IListView.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/IListView.js
@@ -17,7 +17,7 @@
  * @suppress {checkTypes}
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.IListView');
+goog.provide('org.apache.flex.html.beads.IListView');
 
 goog.require('org.apache.flex.core.IBeadView');
 
@@ -28,7 +28,7 @@ goog.require('org.apache.flex.core.IBeadView');
  *
  * @interface
  */
-org.apache.flex.html.staticControls.beads.IListView = function() {
+org.apache.flex.html.beads.IListView = function() {
 };
 
 
@@ -37,7 +37,7 @@ org.apache.flex.html.staticControls.beads.IListView = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.IListView.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.beads.IListView.prototype.FLEXJS_CLASS_INFO =
 { names: [{ name: 'IListView',
-            qName: 'org.apache.flex.html.staticControls.beads.IListView'}],
+            qName: 'org.apache.flex.html.beads.IListView'}],
   interfaces: [org.apache.flex.core.IBeadView] };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ImageView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ImageView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ImageView.js
index d63cf23..c211975 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ImageView.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ImageView.js
@@ -12,17 +12,17 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.ImageView');
+goog.provide('org.apache.flex.html.beads.ImageView');
 
 
-goog.require('org.apache.flex.html.staticControls.beads.models.ImageModel');
+goog.require('org.apache.flex.html.beads.models.ImageModel');
 
 
 
 /**
  * @constructor
  */
-org.apache.flex.html.staticControls.beads.ImageView = function() {
+org.apache.flex.html.beads.ImageView = function() {
 };
 
 
@@ -31,23 +31,23 @@ org.apache.flex.html.staticControls.beads.ImageView = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.ImageView
+org.apache.flex.html.beads.ImageView
   .prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'ImageView',
-                qName: 'org.apache.flex.html.staticControls.beads.ImageView'}] };
+                qName: 'org.apache.flex.html.beads.ImageView'}] };
 
 
 /**
  * @expose
  * @param {Object} value The new host.
  */
-org.apache.flex.html.staticControls.beads.ImageView.prototype.set_strand =
+org.apache.flex.html.beads.ImageView.prototype.set_strand =
     function(value) {
 
   this.strand_ = value;
 
   this.model = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.models.ImageModel);
+      org.apache.flex.html.beads.models.ImageModel);
   this.model.addEventListener('sourceChanged',
       goog.bind(this.sourceChangeHandler, this));
 };
@@ -57,7 +57,7 @@ org.apache.flex.html.staticControls.beads.ImageView.prototype.set_strand =
  * @expose
  * @param {Object} event The event triggered by the source change.
  */
-org.apache.flex.html.staticControls.beads.ImageView.prototype.
+org.apache.flex.html.beads.ImageView.prototype.
     sourceChangeHandler = function(event) {
   this.strand_.element.src = this.model.get_source();
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js
index 862b94c..e6344b1 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js
@@ -12,26 +12,26 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.ListView');
+goog.provide('org.apache.flex.html.beads.ListView');
 
 goog.require('org.apache.flex.core.IBeadLayout');
 goog.require('org.apache.flex.core.IBeadView');
 goog.require('org.apache.flex.core.IItemRendererParent');
 goog.require('org.apache.flex.core.ILayoutParent');
 goog.require('org.apache.flex.core.ValuesManager');
-goog.require('org.apache.flex.html.staticControls.beads.IListView');
-goog.require('org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
-goog.require('org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup');
+goog.require('org.apache.flex.html.beads.IListView');
+goog.require('org.apache.flex.html.beads.TextItemRendererFactoryForArrayData');
+goog.require('org.apache.flex.html.beads.models.ArraySelectionModel');
+goog.require('org.apache.flex.html.supportClasses.NonVirtualDataGroup');
 
 
 
 /**
  * @constructor
  * @implements {org.apache.flex.core.ILayoutParent}
- * @implements {org.apache.flex.html.staticControls.beads.IListView}
+ * @implements {org.apache.flex.html.beads.IListView}
  */
-org.apache.flex.html.staticControls.beads.ListView = function() {
+org.apache.flex.html.beads.ListView = function() {
   this.lastSelectedIndex = -1;
 
   this.className = 'ListView';
@@ -43,18 +43,18 @@ org.apache.flex.html.staticControls.beads.ListView = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.ListView.prototype.
+org.apache.flex.html.beads.ListView.prototype.
     FLEXJS_CLASS_INFO =
     { names: [{ name: 'ListView',
-                qName: 'org.apache.flex.html.staticControls.beads.ListView' }],
-      interfaces: [org.apache.flex.html.staticControls.beads.IListView, org.apache.flex.core.ILayoutParent] };
+                qName: 'org.apache.flex.html.beads.ListView' }],
+      interfaces: [org.apache.flex.html.beads.IListView, org.apache.flex.core.ILayoutParent] };
 
 
 /**
  * @expose
  * @param {Object} value The new host.
  */
-org.apache.flex.html.staticControls.beads.ListView.prototype.set_strand =
+org.apache.flex.html.beads.ListView.prototype.set_strand =
     function(value) {
 
   this.strand_ = value;
@@ -76,7 +76,7 @@ org.apache.flex.html.staticControls.beads.ListView.prototype.set_strand =
       goog.bind(this.selectionChangeHandler, this));
 
   this.dataGroup_ = new
-      org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup();
+      org.apache.flex.html.supportClasses.NonVirtualDataGroup();
   this.dataGroup_.set_strand(this);
   this.strand_.addElement(this.dataGroup_);
 
@@ -88,7 +88,7 @@ org.apache.flex.html.staticControls.beads.ListView.prototype.set_strand =
  * @expose
  * @return {Object} The DataGroup instance.
  */
-org.apache.flex.html.staticControls.beads.ListView.prototype.get_dataGroup =
+org.apache.flex.html.beads.ListView.prototype.get_dataGroup =
     function() {
   return this.dataGroup_;
 };
@@ -98,7 +98,7 @@ org.apache.flex.html.staticControls.beads.ListView.prototype.get_dataGroup =
  * @expose
  * @param {Object} value The event that triggered the selection.
  */
-org.apache.flex.html.staticControls.beads.ListView.prototype.
+org.apache.flex.html.beads.ListView.prototype.
     selectionChangeHandler = function(value) {
   var ir;
   if (this.lastSelectedIndex != -1) {
@@ -118,7 +118,7 @@ org.apache.flex.html.staticControls.beads.ListView.prototype.
  * @expose
  * @return {Object} The view that contains the layout objects.
  */
-org.apache.flex.html.staticControls.beads.ListView.prototype.get_contentView = function() {
+org.apache.flex.html.beads.ListView.prototype.get_contentView = function() {
   return this;
 };
 
@@ -127,7 +127,7 @@ org.apache.flex.html.staticControls.beads.ListView.prototype.get_contentView = f
  * @expose
  * @return {Object} The border for the layout area.
  */
-org.apache.flex.html.staticControls.beads.ListView.prototype.get_border = function() {
+org.apache.flex.html.beads.ListView.prototype.get_border = function() {
   return null;
 };
 
@@ -136,7 +136,7 @@ org.apache.flex.html.staticControls.beads.ListView.prototype.get_border = functi
  * @expose
  * @return {Object} The vertical scrollbar.
  */
-org.apache.flex.html.staticControls.beads.ListView.prototype.get_vScrollBar = function() {
+org.apache.flex.html.beads.ListView.prototype.get_vScrollBar = function() {
   return null;
 };
 
@@ -145,7 +145,7 @@ org.apache.flex.html.staticControls.beads.ListView.prototype.get_vScrollBar = fu
  * @expose
  * @param {Object} value The vertical scrollbar.
  */
-org.apache.flex.html.staticControls.beads.ListView.prototype.set_vScrollBar = function(value) {
+org.apache.flex.html.beads.ListView.prototype.set_vScrollBar = function(value) {
 };
 
 
@@ -153,7 +153,7 @@ org.apache.flex.html.staticControls.beads.ListView.prototype.set_vScrollBar = fu
  * @expose
  * @return {Object} The view that can be resized.
  */
-org.apache.flex.html.staticControls.beads.ListView.prototype.get_resizeableView = function() {
+org.apache.flex.html.beads.ListView.prototype.get_resizeableView = function() {
   return this;
 };
 
@@ -162,7 +162,7 @@ org.apache.flex.html.staticControls.beads.ListView.prototype.get_resizeableView
  * @expose
  * @param {Object} event The event that triggered the resize.
  */
-org.apache.flex.html.staticControls.beads.ListView.prototype.handleSizeChange = function(event) {
+org.apache.flex.html.beads.ListView.prototype.handleSizeChange = function(event) {
   this.dataGroup_.set_width(this.strand_.get_width());
   this.dataGroup_.set_height(this.strand_.get_height());
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js
index e19e6a0..232efcc 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js
@@ -12,14 +12,14 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.PanelView');
+goog.provide('org.apache.flex.html.beads.PanelView');
 
 
 
 /**
  * @constructor
  */
-org.apache.flex.html.staticControls.beads.PanelView = function() {
+org.apache.flex.html.beads.PanelView = function() {
 
 };
 
@@ -29,28 +29,28 @@ org.apache.flex.html.staticControls.beads.PanelView = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.PanelView
+org.apache.flex.html.beads.PanelView
   .prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'PanelView',
-                qName: 'org.apache.flex.html.staticControls.beads.PanelView'}] };
+                qName: 'org.apache.flex.html.beads.PanelView'}] };
 
 
 /**
  * @expose
  * @param {Object} value The new host.
  */
-org.apache.flex.html.staticControls.beads.PanelView.prototype.set_strand =
+org.apache.flex.html.beads.PanelView.prototype.set_strand =
     function(value) {
 
   this.strand_ = value;
 
-  this.strand_.titleBar = new org.apache.flex.html.staticControls.TitleBar();
+  this.strand_.titleBar = new org.apache.flex.html.TitleBar();
   this.strand_.titleBar.addedToParent();
   this.strand_.titleBar.element.id = 'titleBar';
   this.strand_.addElement(this.strand_.titleBar);
 
   this.strand_.controlBar =
-      new org.apache.flex.html.staticControls.ControlBar();
+      new org.apache.flex.html.ControlBar();
   this.strand_.addElement(this.strand_.controlBar);
 
   // listen for changes to the strand's model so items can be changed
@@ -64,7 +64,7 @@ org.apache.flex.html.staticControls.beads.PanelView.prototype.set_strand =
 /**
  * @param {Object} event The event that triggered this handler.
  */
-org.apache.flex.html.staticControls.beads.PanelView.prototype.changeHandler =
+org.apache.flex.html.beads.PanelView.prototype.changeHandler =
     function(event) {
   if (event.type == 'titleChange') {
     this.strand_.titleBar.set_title(this.strand_.model.get_title());

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderThumbView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderThumbView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderThumbView.js
index 9afc551..0f0af78 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderThumbView.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderThumbView.js
@@ -12,14 +12,14 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.SliderThumbView');
+goog.provide('org.apache.flex.html.beads.SliderThumbView');
 
 
 
 /**
  * @constructor
  */
-org.apache.flex.html.staticControls.beads.SliderThumbView = function() {
+org.apache.flex.html.beads.SliderThumbView = function() {
 };
 
 
@@ -28,17 +28,17 @@ org.apache.flex.html.staticControls.beads.SliderThumbView = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.SliderThumbView
+org.apache.flex.html.beads.SliderThumbView
   .prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'SliderThumbView',
-                qName: 'org.apache.flex.html.staticControls.beads.SliderThumbView'}] };
+                qName: 'org.apache.flex.html.beads.SliderThumbView'}] };
 
 
 /**
  * @expose
  * @param {Object} value The strand.
  */
-org.apache.flex.html.staticControls.beads.SliderThumbView.prototype.
+org.apache.flex.html.beads.SliderThumbView.prototype.
     set_strand = function(value) {
   this.strand_ = value;
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderTrackView.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderTrackView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderTrackView.js
index f1a4152..5ebdc15 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderTrackView.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/SliderTrackView.js
@@ -12,14 +12,14 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.beads.SliderTrackView');
+goog.provide('org.apache.flex.html.beads.SliderTrackView');
 
 
 
 /**
  * @constructor
  */
-org.apache.flex.html.staticControls.beads.SliderTrackView = function() {
+org.apache.flex.html.beads.SliderTrackView = function() {
 };
 
 
@@ -28,17 +28,17 @@ org.apache.flex.html.staticControls.beads.SliderTrackView = function() {
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.beads.SliderTrackView
+org.apache.flex.html.beads.SliderTrackView
   .prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'SliderTrackView',
-                qName: 'org.apache.flex.html.staticControls.beads.SliderTrackView'}] };
+                qName: 'org.apache.flex.html.beads.SliderTrackView'}] };
 
 
 /**
  * @expose
  * @param {Object} value The strand.
  */
-org.apache.flex.html.staticControls.beads.SliderTrackView.prototype.
+org.apache.flex.html.beads.SliderTrackView.prototype.
     set_strand = function(value) {
   this.strand_ = value;
 


[25/35] sed removal of staticControls. Now to see what I missed

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
index 58bec68..c18caf0 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.layouts
+package org.apache.flex.html.beads.layouts
 {
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
@@ -169,4 +169,4 @@ package org.apache.flex.html.staticControls.beads.layouts
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalScrollingLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalScrollingLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalScrollingLayout.as
index 32e3597..c679311 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalScrollingLayout.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalScrollingLayout.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.layouts
+package org.apache.flex.html.beads.layouts
 {
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
@@ -27,8 +27,8 @@ package org.apache.flex.html.staticControls.beads.layouts
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.supportClasses.Border;
-	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
+	import org.apache.flex.html.supportClasses.Border;
+	import org.apache.flex.html.supportClasses.ScrollBar;
 	
     /**
      *  The NonVirtualHorizontalScrollingLayout class is a layout
@@ -133,4 +133,4 @@ package org.apache.flex.html.staticControls.beads.layouts
 			dataGroup.scrollRect = new Rectangle(xpos, 0, xpos + dataGroup.width, dataGroup.height);
 		}*/
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.as
index 33f48e8..cf1d3ce 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.layouts
+package org.apache.flex.html.beads.layouts
 {
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
@@ -188,4 +188,4 @@ package org.apache.flex.html.staticControls.beads.layouts
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as
index 6f2f424..ea34a9e 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.layouts
+package org.apache.flex.html.beads.layouts
 {
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
@@ -29,8 +29,8 @@ package org.apache.flex.html.staticControls.beads.layouts
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
-	import org.apache.flex.html.staticControls.supportClasses.Border;
-	import org.apache.flex.html.staticControls.supportClasses.ScrollBar;
+	import org.apache.flex.html.supportClasses.Border;
+	import org.apache.flex.html.supportClasses.ScrollBar;
 
     /**
      *  The NonVirtualVerticalScrollingLayout class is a layout
@@ -137,4 +137,4 @@ package org.apache.flex.html.staticControls.beads.layouts
 			contentView.scrollRect = new Rectangle(0, vpos, contentView.width, vpos + contentView.height);
         }
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/TileLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/TileLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/TileLayout.as
index b43457a..ac3b837 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/TileLayout.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/TileLayout.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.layouts
+package org.apache.flex.html.beads.layouts
 {	
 	import org.apache.flex.core.IBeadLayout;
 	import org.apache.flex.core.ILayoutParent;
@@ -181,4 +181,4 @@ package org.apache.flex.html.staticControls.beads.layouts
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as
index 7642379..f01b2b4 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.layouts
+package org.apache.flex.html.beads.layouts
 {
 	import flash.display.DisplayObject;
 	
@@ -25,7 +25,7 @@ package org.apache.flex.html.staticControls.beads.layouts
 	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.IScrollBarView;
+	import org.apache.flex.html.beads.IScrollBarView;
 
     /**
      *  The VScrollBarLayout class is a layout
@@ -108,4 +108,4 @@ package org.apache.flex.html.staticControls.beads.layouts
 		}
 						
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/AlertModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/AlertModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/AlertModel.as
index 7ad8f11..caa6215 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/AlertModel.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/AlertModel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {
 	import org.apache.flex.core.IAlertModel;
 	import org.apache.flex.core.IBead;
@@ -26,7 +26,7 @@ package org.apache.flex.html.staticControls.beads.models
 	
 	/**
 	 *  The AlertModel class bead implements the org.apache.flex.core.IAlertModel and holds the properties
-	 *  for an org.apache.flex.html.staticControls.Alert such the buttons to use and message to display.
+	 *  for an org.apache.flex.html.Alert such the buttons to use and message to display.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -285,4 +285,4 @@ package org.apache.flex.html.staticControls.beads.models
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ArraySelectionModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
index 8859ab8..24c383c 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ArraySelectionModel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {
 	import org.apache.flex.core.IRollOverModel;
 	import org.apache.flex.core.ISelectionModel;
@@ -231,4 +231,4 @@ package org.apache.flex.html.staticControls.beads.models
 			dispatchEvent(new Event("selectedIndexChanged"));			
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ComboBoxModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ComboBoxModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ComboBoxModel.as
index 0699c1d..35a60a8 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ComboBoxModel.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ComboBoxModel.as
@@ -16,15 +16,15 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IComboBoxModel;
 	import org.apache.flex.events.Event;
 			
 	/**
-	 *  The ComboBoxModel class bead extends org.apache.flex.html.staticControls.beads.models.ArraySelectionModel 
-	 *  and adds the text being displayed by the org.apache.flex.html.staticControls.ComboBox's input field.
+	 *  The ComboBoxModel class bead extends org.apache.flex.html.beads.models.ArraySelectionModel 
+	 *  and adds the text being displayed by the org.apache.flex.html.ComboBox's input field.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -48,7 +48,7 @@ package org.apache.flex.html.staticControls.beads.models
 		private var _text:String;
 		
 		/**
-		 *  The string to display in the org.apache.flex.html.staticControls.ComboBox input field.
+		 *  The string to display in the org.apache.flex.html.ComboBox input field.
 		 * 
 		 *  @copy org.apache.flex.core.IComboBoxModel#text
 		 *  
@@ -74,7 +74,7 @@ package org.apache.flex.html.staticControls.beads.models
 		private var _html:String;
 		
 		/**
-		 *  The HTML string to display in the org.apache.flex.html.staticControls.ComboBox input field.
+		 *  The HTML string to display in the org.apache.flex.html.ComboBox input field.
 		 * 
 		 *  @copy org.apache.flex.core.IComboBoxModel#html
 		 *  
@@ -97,4 +97,4 @@ package org.apache.flex.html.staticControls.beads.models
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ImageModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ImageModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ImageModel.as
index 1973b09..7742c2b 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ImageModel.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ImageModel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {
 	import org.apache.flex.core.IImageModel;
 	import org.apache.flex.core.IStrand;
@@ -24,7 +24,7 @@ package org.apache.flex.html.staticControls.beads.models
 	import org.apache.flex.events.EventDispatcher;
 	
 	/**
-	 *  The ImageModel class bead defines the data associated with an org.apache.flex.html.staticControls.Image
+	 *  The ImageModel class bead defines the data associated with an org.apache.flex.html.Image
 	 *  component, namely the source of the image.
 	 *
 	 *  @langversion 3.0
@@ -86,4 +86,4 @@ package org.apache.flex.html.staticControls.beads.models
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/PanelModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/PanelModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/PanelModel.as
index 02716c9..23461b8 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/PanelModel.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/PanelModel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IPanelModel;
@@ -25,7 +25,7 @@ package org.apache.flex.html.staticControls.beads.models
 	import org.apache.flex.events.EventDispatcher;
 	
 	/**
-	 *  The PanelModel bead class holds the values for a org.apache.flex.html.staticControls.Panel, such as its
+	 *  The PanelModel bead class holds the values for a org.apache.flex.html.Panel, such as its
 	 *  title.
 	 *
 	 *  @langversion 3.0
@@ -66,7 +66,7 @@ package org.apache.flex.html.staticControls.beads.models
 		private var _title:String;
 		
 		/**
-		 *  The title string for the org.apache.flex.html.staticControls.Panel.
+		 *  The title string for the org.apache.flex.html.Panel.
 		 * 
 		 *  @copy org.apache.flex.core.ITitleBarModel#title
 		 *
@@ -114,7 +114,7 @@ package org.apache.flex.html.staticControls.beads.models
 		private var _showCloseButton:Boolean = false;
 		
 		/**
-		 *  Indicates whether or not there is a Close button for the org.apache.flex.html.staticControls.Panel.
+		 *  Indicates whether or not there is a Close button for the org.apache.flex.html.Panel.
 		 * 
 		 *  @copy org.apache.flex.core.ITitleBarModel#showCloseButton
 		 *
@@ -135,4 +135,4 @@ package org.apache.flex.html.staticControls.beads.models
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/RangeModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/RangeModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/RangeModel.as
index 9a5e421..5e46e41 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/RangeModel.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/RangeModel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IStrand;
@@ -219,4 +219,4 @@ package org.apache.flex.html.staticControls.beads.models
 		}
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ScrollBarModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ScrollBarModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ScrollBarModel.as
index 27fbef0..582df91 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ScrollBarModel.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ScrollBarModel.as
@@ -16,14 +16,14 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {
 	
 	import org.apache.flex.core.IScrollBarModel;
 	import org.apache.flex.events.Event;
 		
 	/**
-	 *  The ScrollBarModel class bead extends the org.apache.flex.html.staticControls.beads.models.RangeModel 
+	 *  The ScrollBarModel class bead extends the org.apache.flex.html.beads.models.RangeModel 
 	 *  and adds page size and page step sizes.
 	 *
 	 *  @langversion 3.0
@@ -48,7 +48,7 @@ package org.apache.flex.html.staticControls.beads.models
 		private var _pageSize:Number;
 		
 		/**
-		 *  The amount represented by the thumb control of the org.apache.flex.html.staticControls.ScrollBar.
+		 *  The amount represented by the thumb control of the org.apache.flex.html.ScrollBar.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -72,7 +72,7 @@ package org.apache.flex.html.staticControls.beads.models
 		private var _pageStepSize:Number;
 		
 		/**
-		 *  The amount to adjust the org.apache.flex.html.staticControls.ScrollBar if the scroll bar's 
+		 *  The amount to adjust the org.apache.flex.html.ScrollBar if the scroll bar's 
 		 *  track area is selected.
 		 *
 		 *  @langversion 3.0
@@ -95,4 +95,4 @@ package org.apache.flex.html.staticControls.beads.models
 		}
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/SingleLineBorderModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/SingleLineBorderModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/SingleLineBorderModel.as
index 64eb045..99c3a0d 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/SingleLineBorderModel.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/SingleLineBorderModel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {
 	import flash.geom.Rectangle;
 	
@@ -82,4 +82,4 @@ package org.apache.flex.html.staticControls.beads.models
         }
 
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/StringSelectionModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/StringSelectionModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/StringSelectionModel.as
index a72dc64..be3d7c8 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/StringSelectionModel.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/StringSelectionModel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {
 	
 	import org.apache.flex.core.ISelectionModel;
@@ -218,4 +218,4 @@ package org.apache.flex.html.staticControls.beads.models
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TextModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TextModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TextModel.as
index 3adf825..65d4447 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TextModel.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TextModel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {	
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IStrand;
@@ -119,4 +119,4 @@ package org.apache.flex.html.staticControls.beads.models
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TitleBarModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TitleBarModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TitleBarModel.as
index 5ce0990..2443224 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TitleBarModel.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/TitleBarModel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IStrand;
@@ -25,7 +25,7 @@ package org.apache.flex.html.staticControls.beads.models
 	import org.apache.flex.events.EventDispatcher;
 	
 	/**
-	 *  The TitleBarModel class bead holds the values for the org.apache.flex.html.staticControls.TitleBar's 
+	 *  The TitleBarModel class bead holds the values for the org.apache.flex.html.TitleBar's 
 	 *  properties.
 	 *
 	 *  @langversion 3.0
@@ -58,7 +58,7 @@ package org.apache.flex.html.staticControls.beads.models
 		private var _title:String;
 		
 		/**
-		 *  The string title for the org.apache.flex.html.staticControls.TitleBar.
+		 *  The string title for the org.apache.flex.html.TitleBar.
 		 * 
 		 *  @copy org.apache.flex.core.ITitleBarModel#title
 		 *
@@ -130,4 +130,4 @@ package org.apache.flex.html.staticControls.beads.models
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ToggleButtonModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ToggleButtonModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ToggleButtonModel.as
index f0b334f..517a545 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ToggleButtonModel.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ToggleButtonModel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {
 	import org.apache.flex.core.IBead;
 	import org.apache.flex.core.IStrand;
@@ -25,7 +25,7 @@ package org.apache.flex.html.staticControls.beads.models
 	import org.apache.flex.events.EventDispatcher;
 	
 	/**
-	 *  The ToggleButtonModel class bead holds values for org.apache.flex.html.staticControls.Buttons 
+	 *  The ToggleButtonModel class bead holds values for org.apache.flex.html.Buttons 
 	 *  that have a state.
 	 *
 	 *  @langversion 3.0
@@ -66,7 +66,7 @@ package org.apache.flex.html.staticControls.beads.models
 		private var _text:String;
 		
 		/**
-		 *  The text string for the org.apache.flex.html.staticControls.Button's label.
+		 *  The text string for the org.apache.flex.html.Button's label.
 		 * 
 		 *  @copy org.apache.flex.core.IToggleButtonModel#text
 		 *
@@ -118,7 +118,7 @@ package org.apache.flex.html.staticControls.beads.models
 		private var _selected:Boolean;
 		
 		/**
-		 *  Whether or not the org.apache.flex.html.staticControls.Button is selected.
+		 *  Whether or not the org.apache.flex.html.Button is selected.
 		 * 
 		 *  @copy org.apache.flex.core.IToggleButtonModel#selected
 		 *
@@ -141,4 +141,4 @@ package org.apache.flex.html.staticControls.beads.models
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ValueToggleButtonModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ValueToggleButtonModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ValueToggleButtonModel.as
index e306ad1..27b0a95 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ValueToggleButtonModel.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/models/ValueToggleButtonModel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads.models
+package org.apache.flex.html.beads.models
 {
 	
 	import org.apache.flex.core.IValueToggleButtonModel;
@@ -24,9 +24,9 @@ package org.apache.flex.html.staticControls.beads.models
 
 	/**
 	 *  The ValueToggleButtonModel class bead extends the 
-	 *  org.apache.flex.html.staticControls.beads.models.ToggleButtonModel and adds
-	 *  value intended to represent a collection of similar org.apache.flex.html.staticControls.Buttons 
-	 *  such as org.apache.flex.html.staticControls.RadioButtons.
+	 *  org.apache.flex.html.beads.models.ToggleButtonModel and adds
+	 *  value intended to represent a collection of similar org.apache.flex.html.Buttons 
+	 *  such as org.apache.flex.html.RadioButtons.
 	 *
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -120,4 +120,4 @@ package org.apache.flex.html.staticControls.beads.models
 			}
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/Border.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/Border.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/Border.as
index dbe183e..f7277d0 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/Border.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/Border.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.supportClasses
+package org.apache.flex.html.supportClasses
 {
 	import org.apache.flex.core.UIBase;
 	
@@ -46,4 +46,4 @@ package org.apache.flex.html.staticControls.supportClasses
 		}		
         
    	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
index a5179da..edc8de0 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
@@ -16,18 +16,18 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.supportClasses
+package org.apache.flex.html.supportClasses
 {
 	import org.apache.flex.core.IItemRenderer;
 	import org.apache.flex.core.IItemRendererParent;
 	import org.apache.flex.events.Event;
-	import org.apache.flex.html.staticControls.TextButton;
-	import org.apache.flex.html.staticControls.beads.ITextItemRenderer;
+	import org.apache.flex.html.TextButton;
+	import org.apache.flex.html.beads.ITextItemRenderer;
 
 	/**
 	 *  The ButtonBarButtonItemRenderer class handles the display of each item for the 
-	 *  org.apache.flex.html.staticControls.ButtonBar component. This class uses a 
-	 *  org.apache.flex.html.staticControls.Button to represent the data.
+	 *  org.apache.flex.html.ButtonBar component. This class uses a 
+	 *  org.apache.flex.html.Button to represent the data.
 	 *
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -132,4 +132,4 @@ package org.apache.flex.html.staticControls.supportClasses
 			updateRenderer();
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ContainerContentArea.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ContainerContentArea.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ContainerContentArea.as
index bbec779..1095ad2 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ContainerContentArea.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ContainerContentArea.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.supportClasses
+package org.apache.flex.html.supportClasses
 {
 	import org.apache.flex.core.UIBase;
 	
@@ -45,4 +45,4 @@ package org.apache.flex.html.staticControls.supportClasses
 			super();
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DataItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DataItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DataItemRenderer.as
index 310f725..bf3f284 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DataItemRenderer.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DataItemRenderer.as
@@ -16,13 +16,13 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.supportClasses
+package org.apache.flex.html.supportClasses
 {
 	import flash.display.Sprite;
 
 	/**
 	 *  The DataItemRenderer class is the base class for most itemRenderers. This class
-	 *  extends org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase and 
+	 *  extends org.apache.flex.html.supportClasses.UIItemRendererBase and 
 	 *  includes row and column index values.
 	 *
 	 *  @langversion 3.0
@@ -128,4 +128,4 @@ package org.apache.flex.html.staticControls.supportClasses
 			background.graphics.endFill();
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DropDownListList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DropDownListList.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DropDownListList.as
index 7ee555f..b2a8a14 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DropDownListList.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DropDownListList.as
@@ -16,11 +16,11 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.supportClasses
+package org.apache.flex.html.supportClasses
 {
     import org.apache.flex.core.IPopUp;
-    import org.apache.flex.html.staticControls.SimpleList;
-    import org.apache.flex.html.staticControls.beads.SolidBackgroundBead;
+    import org.apache.flex.html.SimpleList;
+    import org.apache.flex.html.beads.SolidBackgroundBead;
     
     //--------------------------------------
     //  Events
@@ -72,4 +72,4 @@ package org.apache.flex.html.staticControls.supportClasses
 			addBead(bb);
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.as
index bff939b..9473246 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.supportClasses
+package org.apache.flex.html.supportClasses
 {	
     import org.apache.flex.core.IItemRenderer;
     import org.apache.flex.core.IItemRendererParent;
@@ -24,7 +24,7 @@ package org.apache.flex.html.staticControls.supportClasses
 
     /**
      *  The NonVirtualDataGroup class is the IItemRendererParent used internally
-     *  by org.apache.flex.html.staticControls.List class.
+     *  by org.apache.flex.html.List class.
      *  
      *  @langversion 3.0
      *  @playerversion Flash 10.2
@@ -72,4 +72,4 @@ package org.apache.flex.html.staticControls.supportClasses
 			this.removeChildren(0);
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ScrollBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ScrollBar.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ScrollBar.as
index f826be0..5cf725d 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ScrollBar.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ScrollBar.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.supportClasses
+package org.apache.flex.html.supportClasses
 {
 	import org.apache.flex.core.UIBase;
 	
@@ -45,4 +45,4 @@ package org.apache.flex.html.staticControls.supportClasses
 			super();
 		}		
    	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/StringItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/StringItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/StringItemRenderer.as
index 3811ca5..8dbd73b 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/StringItemRenderer.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/StringItemRenderer.as
@@ -16,14 +16,14 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.supportClasses
+package org.apache.flex.html.supportClasses
 {
 	import flash.text.TextFieldAutoSize;
 	import flash.text.TextFieldType;
 	
 	import org.apache.flex.core.CSSTextField;
 	import org.apache.flex.events.Event;
-	import org.apache.flex.html.staticControls.beads.ITextItemRenderer;
+	import org.apache.flex.html.beads.ITextItemRenderer;
 
 	/**
 	 *  The StringItemRenderer class displays data in string form using the data's toString()
@@ -129,4 +129,4 @@ package org.apache.flex.html.staticControls.supportClasses
 			textField.backgroundColor = backgroundColor;
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
index ceb83a7..1974358 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.supportClasses
+package org.apache.flex.html.supportClasses
 {
     import flash.text.TextFieldType;
     
@@ -28,10 +28,10 @@ package org.apache.flex.html.staticControls.supportClasses
     import org.apache.flex.core.UIBase;
     import org.apache.flex.core.ValuesManager;
     import org.apache.flex.events.Event;
-    import org.apache.flex.html.staticControls.beads.ITextItemRenderer;
+    import org.apache.flex.html.beads.ITextItemRenderer;
 	
 	/**
-	 *  The TextFieldItemRenderer class provides a org.apache.flex.html.staticControls.TextField as an itemRenderer.
+	 *  The TextFieldItemRenderer class provides a org.apache.flex.html.TextField as an itemRenderer.
 	 *
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -330,4 +330,4 @@ package org.apache.flex.html.staticControls.supportClasses
             }
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/UIItemRendererBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/UIItemRendererBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/UIItemRendererBase.as
index b313650..d77ae61 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/UIItemRendererBase.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/UIItemRendererBase.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.supportClasses
+package org.apache.flex.html.supportClasses
 {
 	import org.apache.flex.core.IItemRenderer;
 	import org.apache.flex.core.UIBase;
@@ -242,4 +242,4 @@ package org.apache.flex.html.staticControls.supportClasses
 			// handle in subclass
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Button.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Button.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Button.as
index 4b7731d..f111168 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Button.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Button.as
@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html5.staticControls
 {
-	import org.apache.flex.html.staticControls.Button;
+	import org.apache.flex.html.Button;
 	
-	public class Button extends org.apache.flex.html.staticControls.Button
+	public class Button extends org.apache.flex.html.Button
 	{
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/CheckBox.as
index ec92d72..5b7d875 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/CheckBox.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/CheckBox.as
@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html5.staticControls
 {
-	import org.apache.flex.html.staticControls.CheckBox;
+	import org.apache.flex.html.CheckBox;
 	
-	public class CheckBox extends org.apache.flex.html.staticControls.CheckBox 
+	public class CheckBox extends org.apache.flex.html.CheckBox 
 	{
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/ComboBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/ComboBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/ComboBox.as
index ebeea35..3c8e586 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/ComboBox.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/ComboBox.as
@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html5.staticControls
 {
-	import org.apache.flex.html.staticControls.ComboBox;
+	import org.apache.flex.html.ComboBox;
 	
-	public class ComboBox extends org.apache.flex.html.staticControls.ComboBox
+	public class ComboBox extends org.apache.flex.html.ComboBox
 	{
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/DropDownList.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/DropDownList.as
index 14aa0fe..3d4dfd5 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/DropDownList.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/DropDownList.as
@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html5.staticControls
 {
-    import org.apache.flex.html.staticControls.DropDownList;
+    import org.apache.flex.html.DropDownList;
     
-    public class DropDownList extends org.apache.flex.html.staticControls.DropDownList
+    public class DropDownList extends org.apache.flex.html.DropDownList
 	{
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as
index 8a8ad99..4a730a6 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html5.staticControls
 {
-	import org.apache.flex.html.staticControls.Label;
+	import org.apache.flex.html.Label;
 	
 	/**
 	 *  Label probably should extend TextField directly,
@@ -27,7 +27,7 @@ package org.apache.flex.html5.staticControls
 	 *  Labels to be declared and have their actual
 	 *  view be swapped out.
 	 */
-	public class Label extends org.apache.flex.html.staticControls.Label
+	public class Label extends org.apache.flex.html.Label
 	{
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as
index 86e8ef8..4d3a9aa 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html5.staticControls
 {
-	import org.apache.flex.html.staticControls.List;
+	import org.apache.flex.html.List;
 	
     /**
 	 *  Label probably should extend TextField directly,
@@ -27,7 +27,7 @@ package org.apache.flex.html5.staticControls
 	 *  Labels to be declared and have their actual
 	 *  view be swapped out.
 	 */
-	public class List extends org.apache.flex.html.staticControls.List
+	public class List extends org.apache.flex.html.List
 	{
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/RadioButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/RadioButton.as
index 78f117b..d45440f 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/RadioButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/RadioButton.as
@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html5.staticControls
 {
-	import org.apache.flex.html.staticControls.RadioButton;
+	import org.apache.flex.html.RadioButton;
 	
-	public class RadioButton extends org.apache.flex.html.staticControls.RadioButton
+	public class RadioButton extends org.apache.flex.html.RadioButton
 	{
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextArea.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextArea.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextArea.as
index a2c4f0b..0bb5bc8 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextArea.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextArea.as
@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html5.staticControls
 {
-	import org.apache.flex.html.staticControls.TextArea;
+	import org.apache.flex.html.TextArea;
 
-	public class TextArea extends org.apache.flex.html.staticControls.TextArea
+	public class TextArea extends org.apache.flex.html.TextArea
 	{
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextButton.as
index d23ffb7..00984fc 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextButton.as
@@ -18,13 +18,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html5.staticControls
 {
-	import org.apache.flex.html.staticControls.TextButton;
+	import org.apache.flex.html.TextButton;
 	
-	public class TextButton extends org.apache.flex.html.staticControls.TextButton
+	public class TextButton extends org.apache.flex.html.TextButton
 	{
 		public function TextButton()
 		{
 			super();
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextInput.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextInput.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextInput.as
index adb723f..9bc9a1d 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextInput.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/TextInput.as
@@ -17,9 +17,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html5.staticControls
 {
-	import org.apache.flex.html.staticControls.TextInput;
+	import org.apache.flex.html.TextInput;
 	
-	public class TextInput extends org.apache.flex.html.staticControls.TextInput
+	public class TextInput extends org.apache.flex.html.TextInput
 	{
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js
index 8f27c76..25eda51 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js
@@ -12,25 +12,25 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.Alert');
+goog.provide('org.apache.flex.html.Alert');
 
 goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.Container');
-goog.require('org.apache.flex.html.staticControls.Label');
-goog.require('org.apache.flex.html.staticControls.TextButton');
-goog.require('org.apache.flex.html.staticControls.TitleBar');
+goog.require('org.apache.flex.html.Container');
+goog.require('org.apache.flex.html.Label');
+goog.require('org.apache.flex.html.TextButton');
+goog.require('org.apache.flex.html.TitleBar');
 
 
 
 /**
  * @constructor
- * @extends {org.apache.flex.html.staticControls.Container}
+ * @extends {org.apache.flex.html.Container}
  */
-org.apache.flex.html.staticControls.Alert = function() {
+org.apache.flex.html.Alert = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html.staticControls.Alert,
-    org.apache.flex.html.staticControls.Container);
+goog.inherits(org.apache.flex.html.Alert,
+    org.apache.flex.html.Container);
 
 
 /**
@@ -38,55 +38,55 @@ goog.inherits(org.apache.flex.html.staticControls.Alert,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.Alert.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.Alert.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'Alert',
-                qName: 'org.apache.flex.html.staticControls.Alert'}] };
+                qName: 'org.apache.flex.html.Alert'}] };
 
 
 /**
  * @type {number} The value for the Yes button option.
  */
-org.apache.flex.html.staticControls.Alert.YES = 0x000001;
+org.apache.flex.html.Alert.YES = 0x000001;
 
 
 /**
  * @type {number} The value for the No button option.
  */
-org.apache.flex.html.staticControls.Alert.NO = 0x000002;
+org.apache.flex.html.Alert.NO = 0x000002;
 
 
 /**
  * @type {number} The value for the OK button option.
  */
-org.apache.flex.html.staticControls.Alert.OK = 0x000004;
+org.apache.flex.html.Alert.OK = 0x000004;
 
 
 /**
  * @type {number} The value for the Cancel button option.
  */
-org.apache.flex.html.staticControls.Alert.CANCEL = 0x000008;
+org.apache.flex.html.Alert.CANCEL = 0x000008;
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.Alert.prototype.createElement =
+org.apache.flex.html.Alert.prototype.createElement =
     function() {
   goog.base(this, 'createElement');
 
   this.element.className = 'Alert';
 
   // add in a title bar
-  this.titleBar = new org.apache.flex.html.staticControls.TitleBar();
+  this.titleBar = new org.apache.flex.html.TitleBar();
   this.addElement(this.titleBar);
   this.titleBar.element.id = 'titleBar';
 
-  this.message = new org.apache.flex.html.staticControls.Label();
+  this.message = new org.apache.flex.html.Label();
   this.addElement(this.message);
   this.message.element.id = 'message';
 
   // add a place for the buttons
-  this.buttonArea = new org.apache.flex.html.staticControls.Container();
+  this.buttonArea = new org.apache.flex.html.Container();
   this.addElement(this.buttonArea);
   this.buttonArea.element.id = 'buttonArea';
 
@@ -100,10 +100,10 @@ org.apache.flex.html.staticControls.Alert.prototype.createElement =
  * @param {string} title The message to be displayed in the title bar.
  * @param {number} flags The options for the buttons.
  */
-org.apache.flex.html.staticControls.Alert.show =
+org.apache.flex.html.Alert.show =
     function(message, host, title, flags) {
 
-  var a = new org.apache.flex.html.staticControls.Alert();
+  var a = new org.apache.flex.html.Alert();
   host.addElement(a);
   a.set_title(title);
   a.set_text(message);
@@ -119,7 +119,7 @@ org.apache.flex.html.staticControls.Alert.show =
 /**
  * @return {string} The message to be displayed in the title bar.
  */
-org.apache.flex.html.staticControls.Alert.prototype.get_title = function()
+org.apache.flex.html.Alert.prototype.get_title = function()
     {
   return this.titleBar.get_title();
 };
@@ -128,7 +128,7 @@ org.apache.flex.html.staticControls.Alert.prototype.get_title = function()
 /**
  * @param {string} value The message to be displayed in the title bar.
  */
-org.apache.flex.html.staticControls.Alert.prototype.set_title =
+org.apache.flex.html.Alert.prototype.set_title =
     function(value)
     {
   this.titleBar.set_title(value);
@@ -138,7 +138,7 @@ org.apache.flex.html.staticControls.Alert.prototype.set_title =
 /**
  * @return {string} The message to be displayed.
  */
-org.apache.flex.html.staticControls.Alert.prototype.get_text = function()
+org.apache.flex.html.Alert.prototype.get_text = function()
     {
   return this.message.get_text();
 };
@@ -147,7 +147,7 @@ org.apache.flex.html.staticControls.Alert.prototype.get_text = function()
 /**
  * @param {string} value The message to be displayed.
  */
-org.apache.flex.html.staticControls.Alert.prototype.set_text =
+org.apache.flex.html.Alert.prototype.set_text =
     function(value)
     {
   this.message.set_text(value);
@@ -157,7 +157,7 @@ org.apache.flex.html.staticControls.Alert.prototype.set_text =
 /**
  * @return {number} The button options.
  */
-org.apache.flex.html.staticControls.Alert.prototype.get_flags = function()
+org.apache.flex.html.Alert.prototype.get_flags = function()
     {
   return this.flags;
 };
@@ -166,35 +166,35 @@ org.apache.flex.html.staticControls.Alert.prototype.get_flags = function()
 /**
  * @param {number} value The button options.
  */
-org.apache.flex.html.staticControls.Alert.prototype.set_flags =
+org.apache.flex.html.Alert.prototype.set_flags =
     function(value)
     {
   this.flags = value;
 
   // add buttons based on flags
-  if (this.flags & org.apache.flex.html.staticControls.Alert.OK) {
-    var ok = new org.apache.flex.html.staticControls.TextButton();
+  if (this.flags & org.apache.flex.html.Alert.OK) {
+    var ok = new org.apache.flex.html.TextButton();
     this.buttonArea.addElement(ok);
     ok.set_text('OK');
     goog.events.listen(/** @type {EventTarget} */ (ok.element), 'click',
         goog.bind(this.dismissAlert, this));
   }
-  if (this.flags & org.apache.flex.html.staticControls.Alert.CANCEL) {
-    var cancel = new org.apache.flex.html.staticControls.TextButton();
+  if (this.flags & org.apache.flex.html.Alert.CANCEL) {
+    var cancel = new org.apache.flex.html.TextButton();
     this.buttonArea.addElement(cancel);
     cancel.set_text('Cancel');
     goog.events.listen(/** @type {EventTarget} */ (cancel.element), 'click',
         goog.bind(this.dismissAlert, this));
   }
-  if (this.flags & org.apache.flex.html.staticControls.Alert.YES) {
-    var yes = new org.apache.flex.html.staticControls.TextButton();
+  if (this.flags & org.apache.flex.html.Alert.YES) {
+    var yes = new org.apache.flex.html.TextButton();
     this.buttonArea.addElement(yes);
     yes.set_text('YES');
     goog.events.listen(/** @type {EventTarget} */ (yes.element), 'click',
         goog.bind(this.dismissAlert, this));
   }
-  if (this.flags & org.apache.flex.html.staticControls.Alert.NO) {
-    var nob = new org.apache.flex.html.staticControls.TextButton();
+  if (this.flags & org.apache.flex.html.Alert.NO) {
+    var nob = new org.apache.flex.html.TextButton();
     this.buttonArea.addElement(nob);
     nob.set_text('NO');
     goog.events.listen(/** @type {EventTarget} */ (nob.element), 'click',
@@ -206,7 +206,7 @@ org.apache.flex.html.staticControls.Alert.prototype.set_flags =
 /**
  * @param {Object} event The event object.
  */
-org.apache.flex.html.staticControls.Alert.prototype.dismissAlert =
+org.apache.flex.html.Alert.prototype.dismissAlert =
     function(event)
     {
   this.element.parentElement.removeChild(this.element);

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/Button.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Button.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Button.js
index 5f64d56..9726f34 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/Button.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Button.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.Button');
+goog.provide('org.apache.flex.html.Button');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,10 +22,10 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html.staticControls.Button = function() {
+org.apache.flex.html.Button = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html.staticControls.Button,
+goog.inherits(org.apache.flex.html.Button,
     org.apache.flex.core.UIBase);
 
 
@@ -34,15 +34,15 @@ goog.inherits(org.apache.flex.html.staticControls.Button,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.Button.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.Button.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'Button',
-                qName: 'org.apache.flex.html.staticControls.Button'}] };
+                qName: 'org.apache.flex.html.Button'}] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.Button.prototype.createElement =
+org.apache.flex.html.Button.prototype.createElement =
     function() {
   this.element = document.createElement('button');
   this.element.setAttribute('type', 'button');

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js
index 3181aaa..18da0c8 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js
@@ -12,47 +12,47 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.ButtonBar');
+goog.provide('org.apache.flex.html.ButtonBar');
 
 goog.require('org.apache.flex.core.ListBase');
-goog.require('org.apache.flex.html.staticControls.List');
-goog.require('org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData');
-goog.require('org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout');
-goog.require('org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer');
+goog.require('org.apache.flex.html.List');
+goog.require('org.apache.flex.html.beads.DataItemRendererFactoryForArrayData');
+goog.require('org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout');
+goog.require('org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer');
 
 
 
 /**
  * @constructor
- * @extends {org.apache.flex.html.staticControls.List}
+ * @extends {org.apache.flex.html.List}
  */
-org.apache.flex.html.staticControls.ButtonBar = function() {
+org.apache.flex.html.ButtonBar = function() {
 
   //  this.model = new
-  //        org.apache.flex.html.staticControls.beads.models.ArraySelectionModel();
+  //        org.apache.flex.html.beads.models.ArraySelectionModel();
   //  this.addBead(this.model);
 
   goog.base(this);
 
   //  this.addBead(new
-  //        org.apache.flex.html.staticControls.beads.ListView());
+  //        org.apache.flex.html.beads.ListView());
 
   //  this.addBead(new
-  //org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout());
+  //org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout());
 
   //  this.itemRendererFactory = new
-  //        org.apache.flex.html.staticControls.beads.
+  //        org.apache.flex.html.beads.
   //        DataItemRendererFactoryForArrayData();
   //  this.itemRendererFactory.set_itemRendererClass('org.apache.flex.html.' +
   //        'staticControls.supportClasses.ButtonBarButtonItemRenderer');
   //  this.addBead(this.itemRendererFactory);
 
   //  this.addBead(new
-  //        org.apache.flex.html.staticControls.beads.controllers.
+  //        org.apache.flex.html.beads.controllers.
   //        ListSingleSelectionMouseController());
 };
-goog.inherits(org.apache.flex.html.staticControls.ButtonBar,
-    org.apache.flex.html.staticControls.List);
+goog.inherits(org.apache.flex.html.ButtonBar,
+    org.apache.flex.html.List);
 
 
 /**
@@ -60,15 +60,15 @@ goog.inherits(org.apache.flex.html.staticControls.ButtonBar,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.ButtonBar.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.ButtonBar.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'ButtonBar',
-                qName: 'org.apache.flex.html.staticControls.ButtonBar'}] };
+                qName: 'org.apache.flex.html.ButtonBar'}] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.ButtonBar.prototype.createElement =
+org.apache.flex.html.ButtonBar.prototype.createElement =
     function() {
   //goog.base(this, 'createElement');
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html/CheckBox.js
index 0f63f39..373794a 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/CheckBox.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/CheckBox.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.CheckBox');
+goog.provide('org.apache.flex.html.CheckBox');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,10 +22,10 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html.staticControls.CheckBox = function() {
+org.apache.flex.html.CheckBox = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html.staticControls.CheckBox,
+goog.inherits(org.apache.flex.html.CheckBox,
     org.apache.flex.core.UIBase);
 
 
@@ -34,15 +34,15 @@ goog.inherits(org.apache.flex.html.staticControls.CheckBox,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.CheckBox.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.CheckBox.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'CheckBox',
-                qName: 'org.apache.flex.html.staticControls.CheckBox'}] };
+                qName: 'org.apache.flex.html.CheckBox'}] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.CheckBox.prototype.createElement =
+org.apache.flex.html.CheckBox.prototype.createElement =
     function() {
   var cb;
 
@@ -64,7 +64,7 @@ org.apache.flex.html.staticControls.CheckBox.prototype.createElement =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.html.staticControls.CheckBox.prototype.get_text = function() {
+org.apache.flex.html.CheckBox.prototype.get_text = function() {
   return this.element.childNodes.item(1).nodeValue;
 };
 
@@ -73,7 +73,7 @@ org.apache.flex.html.staticControls.CheckBox.prototype.get_text = function() {
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.html.staticControls.CheckBox.prototype.set_text =
+org.apache.flex.html.CheckBox.prototype.set_text =
     function(value) {
   this.element.childNodes.item(1).nodeValue = value;
 };
@@ -83,7 +83,7 @@ org.apache.flex.html.staticControls.CheckBox.prototype.set_text =
  * @expose
  * @return {boolean} The selected getter.
  */
-org.apache.flex.html.staticControls.CheckBox.prototype.get_selected =
+org.apache.flex.html.CheckBox.prototype.get_selected =
     function() {
   return this.element.childNodes.item(0).checked;
 };
@@ -93,7 +93,7 @@ org.apache.flex.html.staticControls.CheckBox.prototype.get_selected =
  * @expose
  * @param {boolean} value The selected setter.
  */
-org.apache.flex.html.staticControls.CheckBox.prototype.set_selected =
+org.apache.flex.html.CheckBox.prototype.set_selected =
     function(value) {
   this.element.childNodes.item(0).checked = value;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js
index b469b04..f8fd8e4 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.ComboBox');
+goog.provide('org.apache.flex.html.ComboBox');
 
 goog.require('org.apache.flex.core.ListBase');
 
@@ -22,10 +22,10 @@ goog.require('org.apache.flex.core.ListBase');
  * @constructor
  * @extends {org.apache.flex.core.ListBase}
  */
-org.apache.flex.html.staticControls.ComboBox = function() {
+org.apache.flex.html.ComboBox = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html.staticControls.ComboBox,
+goog.inherits(org.apache.flex.html.ComboBox,
     org.apache.flex.core.ListBase);
 
 
@@ -34,15 +34,15 @@ goog.inherits(org.apache.flex.html.staticControls.ComboBox,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.ComboBox.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.ComboBox.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'ComboBox',
-                qName: 'org.apache.flex.html.staticControls.ComboBox'}] };
+                qName: 'org.apache.flex.html.ComboBox'}] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.ComboBox.prototype.createElement =
+org.apache.flex.html.ComboBox.prototype.createElement =
     function() {
   var button, input;
 
@@ -84,7 +84,7 @@ org.apache.flex.html.staticControls.ComboBox.prototype.createElement =
  * @expose
  * @param {Object} event The event.
  */
-org.apache.flex.html.staticControls.ComboBox.prototype.selectChanged =
+org.apache.flex.html.ComboBox.prototype.selectChanged =
     function(event) {
   var select;
 
@@ -103,7 +103,7 @@ org.apache.flex.html.staticControls.ComboBox.prototype.selectChanged =
  * @expose
  * @param {Object=} opt_event The event.
  */
-org.apache.flex.html.staticControls.ComboBox.prototype.dismissPopup =
+org.apache.flex.html.ComboBox.prototype.dismissPopup =
     function(opt_event) {
   // remove the popup if it already exists
   if (this.popup) {
@@ -117,7 +117,7 @@ org.apache.flex.html.staticControls.ComboBox.prototype.dismissPopup =
  * @expose
  * @param {Object} event The event.
  */
-org.apache.flex.html.staticControls.ComboBox.prototype.buttonClicked =
+org.apache.flex.html.ComboBox.prototype.buttonClicked =
     function(event) {
   /**
    * @type {Array.<string>}
@@ -185,7 +185,7 @@ org.apache.flex.html.staticControls.ComboBox.prototype.buttonClicked =
  * @expose
  * @param {Array.<Object>} value The collection of data.
  */
-org.apache.flex.html.staticControls.ComboBox.prototype.set_dataProvider =
+org.apache.flex.html.ComboBox.prototype.set_dataProvider =
     function(value) {
   this.dataProvider = value;
 };
@@ -195,7 +195,7 @@ org.apache.flex.html.staticControls.ComboBox.prototype.set_dataProvider =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.html.staticControls.ComboBox.prototype.get_text = function() {
+org.apache.flex.html.ComboBox.prototype.get_text = function() {
   return this.element.childNodes.item(0).value;
 };
 
@@ -204,7 +204,7 @@ org.apache.flex.html.staticControls.ComboBox.prototype.get_text = function() {
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.html.staticControls.ComboBox.prototype.set_text =
+org.apache.flex.html.ComboBox.prototype.set_text =
     function(value) {
   this.element.childNodes.item(0).value = value;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/Container.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Container.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Container.js
index 22a3840..e8e7715 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/Container.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Container.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.Container');
+goog.provide('org.apache.flex.html.Container');
 
 goog.require('org.apache.flex.core.ContainerBase');
 
@@ -22,10 +22,10 @@ goog.require('org.apache.flex.core.ContainerBase');
  * @constructor
  * @extends {org.apache.flex.core.ContainerBase}
  */
-org.apache.flex.html.staticControls.Container = function() {
+org.apache.flex.html.Container = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html.staticControls.Container,
+goog.inherits(org.apache.flex.html.Container,
     org.apache.flex.core.ContainerBase);
 
 
@@ -34,15 +34,15 @@ goog.inherits(org.apache.flex.html.staticControls.Container,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.Container.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.Container.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'Container',
-                qName: 'org.apache.flex.html.staticControls.Container' }] };
+                qName: 'org.apache.flex.html.Container' }] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.Container.prototype.createElement =
+org.apache.flex.html.Container.prototype.createElement =
     function() {
   var cb;
 
@@ -58,7 +58,7 @@ org.apache.flex.html.staticControls.Container.prototype.createElement =
 /**
  * @override
  */
-org.apache.flex.html.staticControls.Container.prototype.addElement =
+org.apache.flex.html.Container.prototype.addElement =
     function(child) {
   goog.base(this, 'addElement', child);
   this.dispatchEvent('elementAdded');
@@ -68,7 +68,7 @@ org.apache.flex.html.staticControls.Container.prototype.addElement =
 /**
  * @expose
  */
-org.apache.flex.html.staticControls.Container.prototype.childrenAdded =
+org.apache.flex.html.Container.prototype.childrenAdded =
     function() {
   this.dispatchEvent('childrenAdded');
 };
@@ -78,7 +78,7 @@ org.apache.flex.html.staticControls.Container.prototype.childrenAdded =
  * @expose
  * @return {Array} the HTML DOM element children.
  */
-org.apache.flex.html.staticControls.Container.prototype.internalChildren =
+org.apache.flex.html.Container.prototype.internalChildren =
     function() {
   return this.element.children;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/ControlBar.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ControlBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ControlBar.js
index 09b1fa5..c35792d 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/ControlBar.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ControlBar.js
@@ -12,22 +12,22 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.ControlBar');
+goog.provide('org.apache.flex.html.ControlBar');
 
-goog.require('org.apache.flex.html.staticControls.Container');
+goog.require('org.apache.flex.html.Container');
 
 
 
 /**
  * @constructor
- * @extends {org.apache.flex.html.staticControls.Container}
+ * @extends {org.apache.flex.html.Container}
  */
-org.apache.flex.html.staticControls.ControlBar = function() {
+org.apache.flex.html.ControlBar = function() {
   goog.base(this);
 
 };
-goog.inherits(org.apache.flex.html.staticControls.ControlBar,
-    org.apache.flex.html.staticControls.Container);
+goog.inherits(org.apache.flex.html.ControlBar,
+    org.apache.flex.html.Container);
 
 
 /**
@@ -35,15 +35,15 @@ goog.inherits(org.apache.flex.html.staticControls.ControlBar,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.ControlBar.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.ControlBar.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'ControlBar',
-                qName: 'org.apache.flex.html.staticControls.ControlBar'}] };
+                qName: 'org.apache.flex.html.ControlBar'}] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.ControlBar.prototype.createElement =
+org.apache.flex.html.ControlBar.prototype.createElement =
     function() {
 
   this.element = document.createElement('div');

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js b/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js
index e1d2ecf..cd573cb 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.DropDownList');
+goog.provide('org.apache.flex.html.DropDownList');
 
 goog.require('org.apache.flex.core.ListBase');
 
@@ -22,12 +22,12 @@ goog.require('org.apache.flex.core.ListBase');
  * @constructor
  * @extends {org.apache.flex.core.ListBase}
  */
-org.apache.flex.html.staticControls.DropDownList = function() {
+org.apache.flex.html.DropDownList = function() {
   goog.base(this);
-  this.model = new org.apache.flex.html.staticControls.beads.
+  this.model = new org.apache.flex.html.beads.
       models.ArraySelectionModel();
 };
-goog.inherits(org.apache.flex.html.staticControls.DropDownList,
+goog.inherits(org.apache.flex.html.DropDownList,
     org.apache.flex.core.ListBase);
 
 
@@ -36,15 +36,15 @@ goog.inherits(org.apache.flex.html.staticControls.DropDownList,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.DropDownList.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.DropDownList.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'DropDownList',
-                qName: 'org.apache.flex.html.staticControls.DropDownList'}] };
+                qName: 'org.apache.flex.html.DropDownList'}] };
 
 
 /**
  * @override
  */
-org.apache.flex.html.staticControls.DropDownList.prototype.
+org.apache.flex.html.DropDownList.prototype.
     createElement = function() {
   this.element = document.createElement('select');
   this.element.size = 1;
@@ -60,7 +60,7 @@ org.apache.flex.html.staticControls.DropDownList.prototype.
  * @expose
  * @param {Object} value The new dataProvider.
  */
-org.apache.flex.html.staticControls.DropDownList.prototype.
+org.apache.flex.html.DropDownList.prototype.
     set_dataProvider = function(value) {
   var dp, i, n, opt;
 
@@ -85,7 +85,7 @@ org.apache.flex.html.staticControls.DropDownList.prototype.
 /**
  * @protected
  */
-org.apache.flex.html.staticControls.DropDownList.prototype.changeHandler =
+org.apache.flex.html.DropDownList.prototype.changeHandler =
     function() {
   this.model.set_selectedIndex(this.element.selectedIndex);
   this.dispatchEvent('change');
@@ -96,7 +96,7 @@ org.apache.flex.html.staticControls.DropDownList.prototype.changeHandler =
  * @expose
  * @param {number} value The new selected index.
  */
-org.apache.flex.html.staticControls.DropDownList.prototype.
+org.apache.flex.html.DropDownList.prototype.
     set_selectedIndex = function(value) {
   this.model.set_selectedIndex(value);
   this.element.selectedIndex = value;
@@ -107,7 +107,7 @@ org.apache.flex.html.staticControls.DropDownList.prototype.
  * @expose
  * @param {Object} value The new selected item.
  */
-org.apache.flex.html.staticControls.DropDownList.prototype.
+org.apache.flex.html.DropDownList.prototype.
     set_selectedItem = function(value) {
   this.model.set_selectedItem(value);
   this.element.selectedIndex = this.get_selectedIndex();

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js
index 4446917..013ef3a 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js
@@ -12,11 +12,11 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.Image');
+goog.provide('org.apache.flex.html.Image');
 
 goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.beads.ImageView');
-goog.require('org.apache.flex.html.staticControls.beads.models.ImageModel');
+goog.require('org.apache.flex.html.beads.ImageView');
+goog.require('org.apache.flex.html.beads.models.ImageModel');
 
 
 
@@ -24,10 +24,10 @@ goog.require('org.apache.flex.html.staticControls.beads.models.ImageModel');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html.staticControls.Image = function() {
+org.apache.flex.html.Image = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.html.staticControls.Image,
+goog.inherits(org.apache.flex.html.Image,
     org.apache.flex.core.UIBase);
 
 
@@ -36,9 +36,9 @@ goog.inherits(org.apache.flex.html.staticControls.Image,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.Image.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.Image.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'Image',
-                qName: 'org.apache.flex.html.staticControls.Image' }] };
+                qName: 'org.apache.flex.html.Image' }] };
 
 
 /**
@@ -46,7 +46,7 @@ org.apache.flex.html.staticControls.Image.prototype.FLEXJS_CLASS_INFO =
  * @protected
  * @return {Object} The actual element to be parented.
  */
-org.apache.flex.html.staticControls.Image.prototype.createElement =
+org.apache.flex.html.Image.prototype.createElement =
     function() {
 
   this.element = document.createElement('img');
@@ -55,12 +55,12 @@ org.apache.flex.html.staticControls.Image.prototype.createElement =
   this.element.flexjs_wrapper = this;
 
   this.model = new
-          org.apache.flex.html.staticControls.beads.models.ImageModel();
+          org.apache.flex.html.beads.models.ImageModel();
 
   this.addBead(this.model);
 
   this.addBead(new
-      org.apache.flex.html.staticControls.beads.ImageView());
+      org.apache.flex.html.beads.ImageView());
 
   return this.element;
 };
@@ -70,7 +70,7 @@ org.apache.flex.html.staticControls.Image.prototype.createElement =
  * @expose
  * @return {String} The source identifier for the Image.
  */
-org.apache.flex.html.staticControls.Image.prototype.
+org.apache.flex.html.Image.prototype.
     get_source = function() {
   return this.model.get_source();
 };
@@ -80,7 +80,7 @@ org.apache.flex.html.staticControls.Image.prototype.
  * @expose
  * @param {String} value The source identifier for the Image.
  */
-org.apache.flex.html.staticControls.Image.prototype.
+org.apache.flex.html.Image.prototype.
     set_source = function(value) {
   this.model.set_source(value);
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daa3dabc/frameworks/js/FlexJS/src/org/apache/flex/html/Label.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Label.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Label.js
index ec25864..1870d7e 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/Label.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Label.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.html.staticControls.Label');
+goog.provide('org.apache.flex.html.Label');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,14 +22,14 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.html.staticControls.Label = function() {
+org.apache.flex.html.Label = function() {
   goog.base(this);
 
   this.element = document.createElement('div');
   this.positioner = this.element;
   this.element.flexjs_wrapper = this;
 };
-goog.inherits(org.apache.flex.html.staticControls.Label,
+goog.inherits(org.apache.flex.html.Label,
     org.apache.flex.core.UIBase);
 
 
@@ -38,16 +38,16 @@ goog.inherits(org.apache.flex.html.staticControls.Label,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.html.staticControls.Label.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.html.Label.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'Label',
-                qName: 'org.apache.flex.html.staticControls.Label' }] };
+                qName: 'org.apache.flex.html.Label' }] };
 
 
 /**
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.html.staticControls.Label.prototype.get_text = function() {
+org.apache.flex.html.Label.prototype.get_text = function() {
   return this.element.innerHTML;
 };
 
@@ -56,6 +56,6 @@ org.apache.flex.html.staticControls.Label.prototype.get_text = function() {
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.html.staticControls.Label.prototype.set_text = function(value) {
+org.apache.flex.html.Label.prototype.set_text = function(value) {
   this.element.innerHTML = value;
 };


[31/35] git commit: [flex-asjs] [refs/heads/develop] - remove other staticControls folder. Next commit renames packages in the files

Posted by ah...@apache.org.
remove other staticControls folder.  Next commit renames packages in the files


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

Branch: refs/heads/develop
Commit: 15b80b847b09a3daef7287119c2502eab56edd32
Parents: 189fb58
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 25 11:15:49 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 25 11:15:49 2014 -0700

----------------------------------------------------------------------
 .../src/org/apache/flex/createjs/CheckBox.as    |  26 ++
 .../src/org/apache/flex/createjs/Label.as       |  27 ++
 .../src/org/apache/flex/createjs/TextButton.as  |  50 ++++
 .../flex/createjs/staticControls/CheckBox.as    |  26 --
 .../flex/createjs/staticControls/Label.as       |  27 --
 .../flex/createjs/staticControls/TextButton.as  |  50 ----
 .../src/org/apache/flex/jquery/CheckBox.as      |  26 ++
 .../src/org/apache/flex/jquery/RadioButton.as   |  26 ++
 .../src/org/apache/flex/jquery/TextButton.as    |  30 ++
 .../flex/jquery/staticControls/CheckBox.as      |  26 --
 .../flex/jquery/staticControls/RadioButton.as   |  26 --
 .../flex/jquery/staticControls/TextButton.as    |  30 --
 .../src/org/apache/flex/svg/TextButton.as       |  30 ++
 .../flex/svg/staticControls/TextButton.as       |  30 --
 .../src/org/apache/flex/createjs/CheckBox.js    | 144 ++++++++++
 .../src/org/apache/flex/createjs/Label.js       |  67 +++++
 .../src/org/apache/flex/createjs/TextButton.js  |  95 +++++++
 .../flex/createjs/staticControls/CheckBox.js    | 144 ----------
 .../flex/createjs/staticControls/Label.js       |  67 -----
 .../flex/createjs/staticControls/TextButton.js  |  95 -------
 .../src/org/apache/flex/jquery/CheckBox.js      |  96 +++++++
 .../src/org/apache/flex/jquery/RadioButton.js   | 205 ++++++++++++++
 .../src/org/apache/flex/jquery/TextButton.js    |  63 +++++
 .../flex/jquery/staticControls/CheckBox.js      |  96 -------
 .../flex/jquery/staticControls/RadioButton.js   | 205 --------------
 .../flex/jquery/staticControls/TextButton.js    |  63 -----
 .../src/org/apache/flex/svg/TextButton.js       |  94 +++++++
 .../apache/flex/svg/assets/TextButton_Skin.svg  | 279 +++++++++++++++++++
 .../flex/svg/staticControls/TextButton.js       |  94 -------
 .../staticControls/assets/TextButton_Skin.svg   | 279 -------------------
 30 files changed, 1258 insertions(+), 1258 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as
new file mode 100644
index 0000000..b4dc469
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.createjs.staticControls
+{
+	import org.apache.flex.html.staticControls.CheckBox;
+	
+	public class CheckBox extends org.apache.flex.html.staticControls.CheckBox
+	{	
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as
new file mode 100644
index 0000000..fb8fb7e
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as
@@ -0,0 +1,27 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.createjs.staticControls
+{
+	import org.apache.flex.html.staticControls.Label;
+	
+	public class Label extends org.apache.flex.html.staticControls.Label
+	{
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as
new file mode 100644
index 0000000..3ad2e66
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as
@@ -0,0 +1,50 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.createjs.staticControls
+{
+	import org.apache.flex.core.ITextModel;
+	import org.apache.flex.html.staticControls.Button;
+	
+	public class TextButton extends Button
+	{
+		public function TextButton()
+		{
+			super();
+		}
+		
+		public function get text():String
+		{
+			return ITextModel(model).text;
+		}
+		public function set text(value:String):void
+		{
+			ITextModel(model).text = value;
+		}
+		
+		public function get html():String
+		{
+			return ITextModel(model).html;
+		}
+		public function set html(value:String):void
+		{
+			ITextModel(model).html = value;
+		}
+				
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/CheckBox.as
deleted file mode 100644
index b4dc469..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/CheckBox.as
+++ /dev/null
@@ -1,26 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.createjs.staticControls
-{
-	import org.apache.flex.html.staticControls.CheckBox;
-	
-	public class CheckBox extends org.apache.flex.html.staticControls.CheckBox
-	{	
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/Label.as
deleted file mode 100644
index fb8fb7e..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/Label.as
+++ /dev/null
@@ -1,27 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.createjs.staticControls
-{
-	import org.apache.flex.html.staticControls.Label;
-	
-	public class Label extends org.apache.flex.html.staticControls.Label
-	{
-		
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/TextButton.as
deleted file mode 100644
index 3ad2e66..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/TextButton.as
+++ /dev/null
@@ -1,50 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.createjs.staticControls
-{
-	import org.apache.flex.core.ITextModel;
-	import org.apache.flex.html.staticControls.Button;
-	
-	public class TextButton extends Button
-	{
-		public function TextButton()
-		{
-			super();
-		}
-		
-		public function get text():String
-		{
-			return ITextModel(model).text;
-		}
-		public function set text(value:String):void
-		{
-			ITextModel(model).text = value;
-		}
-		
-		public function get html():String
-		{
-			return ITextModel(model).html;
-		}
-		public function set html(value:String):void
-		{
-			ITextModel(model).html = value;
-		}
-				
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as
new file mode 100644
index 0000000..a2f3a01
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.jquery.staticControls
+{
+	import org.apache.flex.html.staticControls.CheckBox;
+	
+	public class CheckBox extends org.apache.flex.html.staticControls.CheckBox 
+	{
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as
new file mode 100644
index 0000000..a94739a
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.jquery.staticControls
+{
+	import org.apache.flex.html.staticControls.RadioButton;
+	
+	public class RadioButton extends org.apache.flex.html.staticControls.RadioButton
+	{
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as
new file mode 100644
index 0000000..fb78c83
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as
@@ -0,0 +1,30 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.jquery.staticControls
+{
+	import org.apache.flex.html.staticControls.TextButton;
+	
+	public class TextButton extends org.apache.flex.html.staticControls.TextButton
+	{
+		public function TextButton()
+		{
+			super();
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/CheckBox.as
deleted file mode 100644
index a2f3a01..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/CheckBox.as
+++ /dev/null
@@ -1,26 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.jquery.staticControls
-{
-	import org.apache.flex.html.staticControls.CheckBox;
-	
-	public class CheckBox extends org.apache.flex.html.staticControls.CheckBox 
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/RadioButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/RadioButton.as
deleted file mode 100644
index a94739a..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/RadioButton.as
+++ /dev/null
@@ -1,26 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.jquery.staticControls
-{
-	import org.apache.flex.html.staticControls.RadioButton;
-	
-	public class RadioButton extends org.apache.flex.html.staticControls.RadioButton
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/TextButton.as
deleted file mode 100644
index fb78c83..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/TextButton.as
+++ /dev/null
@@ -1,30 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.jquery.staticControls
-{
-	import org.apache.flex.html.staticControls.TextButton;
-	
-	public class TextButton extends org.apache.flex.html.staticControls.TextButton
-	{
-		public function TextButton()
-		{
-			super();
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as
new file mode 100644
index 0000000..bb278bf
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as
@@ -0,0 +1,30 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.svg.staticControls
+{
+	import org.apache.flex.html.staticControls.TextButton;
+	
+	public class TextButton extends org.apache.flex.html.staticControls.TextButton
+	{
+		public function TextButton()
+		{
+			super();
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/staticControls/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/staticControls/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/staticControls/TextButton.as
deleted file mode 100644
index bb278bf..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/staticControls/TextButton.as
+++ /dev/null
@@ -1,30 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.svg.staticControls
-{
-	import org.apache.flex.html.staticControls.TextButton;
-	
-	public class TextButton extends org.apache.flex.html.staticControls.TextButton
-	{
-		public function TextButton()
-		{
-			super();
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js
new file mode 100644
index 0000000..f342f1d
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js
@@ -0,0 +1,144 @@
+/**
+ * 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.createjs.staticControls.CheckBox');
+
+goog.require('org.apache.flex.createjs.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.createjs.core.UIBase}
+ */
+org.apache.flex.createjs.staticControls.CheckBox = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.createjs.staticControls.CheckBox,
+    org.apache.flex.createjs.core.UIBase);
+
+
+/**
+ * @expose
+ * @type {Object}
+ */
+org.apache.flex.createjs.staticControls.CheckBox.prototype.checkMark = null;
+
+
+/**
+ * @expose
+ * @type {Object}
+ */
+org.apache.flex.createjs.staticControls.CheckBox.prototype.checkMarkBackground =
+    null;
+
+
+/**
+ * @expose
+ * @type {Object}
+ */
+org.apache.flex.createjs.staticControls.CheckBox.prototype.checkBoxLabel = null;
+
+
+/**
+ * @override
+ */
+org.apache.flex.createjs.staticControls.CheckBox.prototype.createElement =
+    function() {
+  this.checkMarkBackground = new createjs.Shape();
+  this.checkMarkBackground.name = 'checkmarkbackground';
+  this.checkMarkBackground.graphics.beginFill('red').
+      drawRoundRect(0, 0, 40, 40, 8);
+  //this.checkMarkBackground.graphics.setStrokeStyle( 0 ).beginStroke('#000').
+  //  drawRect( 0, 0, this.width, this.height);
+  //var hit = new createjs.Shape();
+  //hit.graphics.beginFill("#000").drawRect(0, 0, this.width, this.height);
+  //this.checkMarkBackground.hitArea = hit;
+
+  this.checkMark = new createjs.Shape();
+  this.checkMark.name = 'checkmark';
+  this.checkMark.graphics.beginFill('white').drawRoundRect(0, 0, 32, 32, 6);
+  this.checkMark.x = 4;
+  this.checkMark.y = 4;
+  this.checkMark.visible = this.selected;
+
+  this.checkBoxLabel = new createjs.Text('checkbox', '20px Arial', '#ff7700');
+  this.checkBoxLabel.name = 'label';
+  this.checkBoxLabel.textAlign = 'left';
+  this.checkBoxLabel.textBaseline = 'middle';
+  this.checkBoxLabel.x = 45;
+  this.checkBoxLabel.y = 40 / 2;
+
+  this.element = new createjs.Container();
+  this.element.name = 'checkbox';
+  this.element.addChild(this.checkMarkBackground, this.checkBoxLabel,
+      this.checkMark);
+  // use bind(this) to avoid loose scope
+  this.element.onClick = this.clickHandler.bind(this);
+
+  this.positioner = this.element;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.createjs.staticControls.CheckBox.prototype.get_text =
+    function() {
+  return this.checkBoxLabel.text;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.createjs.staticControls.CheckBox.prototype.set_text =
+    function(value) {
+  this.checkBoxLabel.text = value;
+};
+
+
+/**
+ * @expose
+ * @return {bool} The selected getter.
+ */
+org.apache.flex.createjs.staticControls.CheckBox.prototype.get_selected =
+    function() {
+  return this.selected;
+};
+
+
+/**
+ * @expose
+ * @param {bool} value The selected setter.
+ */
+org.apache.flex.createjs.staticControls.CheckBox.prototype.set_selected =
+    function(value) {
+  this.checkMark.visible = this.selected = value;
+  this.element.getStage().update();
+};
+
+
+/**
+ * @expose
+ * @param {string|Object|goog.events.Event} event The event.
+ */
+org.apache.flex.createjs.staticControls.CheckBox.prototype.clickHandler =
+    function(event) {
+  this.set_selected(!this.get_selected());
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/createjs/Label.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/Label.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/Label.js
new file mode 100644
index 0000000..c6b5243
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/createjs/Label.js
@@ -0,0 +1,67 @@
+/**
+ * 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.createjs.staticControls.Label');
+
+goog.require('org.apache.flex.createjs.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.createjs.core.UIBase}
+ */
+org.apache.flex.createjs.staticControls.Label = function() {
+  org.apache.flex.createjs.core.UIBase.call(this);
+};
+goog.inherits(org.apache.flex.createjs.staticControls.Label,
+    org.apache.flex.createjs.core.UIBase);
+
+
+/**
+ * @override
+ */
+org.apache.flex.createjs.staticControls.Label.prototype.createElement =
+    function(p) {
+  goog.base(this, 'createElement');
+
+  this.element = new createjs.Text('default text', '20px Arial', '#ff7700');
+  this.element.x = 0;
+  this.element.y = 20;
+  this.element.textBaseline = 'alphabetic';
+  p.addChild(this.element);
+  p.getStage().update();
+
+  this.positioner = this.element;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.createjs.staticControls.Label.prototype.get_text = function() {
+  return this.element.text;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.createjs.staticControls.Label.prototype.set_text =
+    function(value) {
+  this.element.text = value;
+  this.element.getStage().update();
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/createjs/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/TextButton.js
new file mode 100644
index 0000000..147b6f9
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/createjs/TextButton.js
@@ -0,0 +1,95 @@
+/**
+ * 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.createjs.staticControls.TextButton');
+
+goog.require('org.apache.flex.createjs.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.createjs.core.UIBase}
+ */
+org.apache.flex.createjs.staticControls.TextButton = function() {
+  org.apache.flex.createjs.core.UIBase.call(this);
+};
+goog.inherits(org.apache.flex.createjs.staticControls.TextButton,
+    org.apache.flex.createjs.core.UIBase);
+
+
+/**
+ * @expose
+ * @type {Object}
+ */
+org.apache.flex.createjs.staticControls.TextButton.prototype.buttonLabel = null;
+
+
+/**
+ * @expose
+ * @type {Object}
+ */
+org.apache.flex.createjs.staticControls.TextButton.prototype.buttonBackground =
+    null;
+
+
+/**
+ * @override
+ */
+org.apache.flex.createjs.staticControls.TextButton.prototype.createElement =
+    function(p) {
+
+  this.buttonBackground = new createjs.Shape();
+  this.buttonBackground.name = 'background';
+  this.buttonBackground.graphics.beginFill('red').
+      drawRoundRect(0, 0, 200, 60, 10);
+
+  this.buttonLabel = new createjs.Text('button', 'bold 24px Arial',
+      '#FFFFFF');
+  this.buttonLabel.name = 'label';
+  this.buttonLabel.textAlign = 'center';
+  this.buttonLabel.textBaseline = 'middle';
+  this.buttonLabel.x = 200 / 2;
+  this.buttonLabel.y = 60 / 2;
+
+  this.element = new createjs.Container();
+  this.element.name = 'button';
+  this.element.x = 50;
+  this.element.y = 25;
+  this.element.addChild(this.buttonBackground, this.buttonLabel);
+  p.addChild(this.element);
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.createjs.staticControls.TextButton.prototype.get_text =
+    function() {
+  return this.buttonLabel.text;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.createjs.staticControls.TextButton.prototype.set_text =
+    function(value) {
+  this.buttonLabel.text = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/CheckBox.js
deleted file mode 100644
index f342f1d..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/CheckBox.js
+++ /dev/null
@@ -1,144 +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('org.apache.flex.createjs.staticControls.CheckBox');
-
-goog.require('org.apache.flex.createjs.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.createjs.core.UIBase}
- */
-org.apache.flex.createjs.staticControls.CheckBox = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.createjs.staticControls.CheckBox,
-    org.apache.flex.createjs.core.UIBase);
-
-
-/**
- * @expose
- * @type {Object}
- */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.checkMark = null;
-
-
-/**
- * @expose
- * @type {Object}
- */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.checkMarkBackground =
-    null;
-
-
-/**
- * @expose
- * @type {Object}
- */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.checkBoxLabel = null;
-
-
-/**
- * @override
- */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.createElement =
-    function() {
-  this.checkMarkBackground = new createjs.Shape();
-  this.checkMarkBackground.name = 'checkmarkbackground';
-  this.checkMarkBackground.graphics.beginFill('red').
-      drawRoundRect(0, 0, 40, 40, 8);
-  //this.checkMarkBackground.graphics.setStrokeStyle( 0 ).beginStroke('#000').
-  //  drawRect( 0, 0, this.width, this.height);
-  //var hit = new createjs.Shape();
-  //hit.graphics.beginFill("#000").drawRect(0, 0, this.width, this.height);
-  //this.checkMarkBackground.hitArea = hit;
-
-  this.checkMark = new createjs.Shape();
-  this.checkMark.name = 'checkmark';
-  this.checkMark.graphics.beginFill('white').drawRoundRect(0, 0, 32, 32, 6);
-  this.checkMark.x = 4;
-  this.checkMark.y = 4;
-  this.checkMark.visible = this.selected;
-
-  this.checkBoxLabel = new createjs.Text('checkbox', '20px Arial', '#ff7700');
-  this.checkBoxLabel.name = 'label';
-  this.checkBoxLabel.textAlign = 'left';
-  this.checkBoxLabel.textBaseline = 'middle';
-  this.checkBoxLabel.x = 45;
-  this.checkBoxLabel.y = 40 / 2;
-
-  this.element = new createjs.Container();
-  this.element.name = 'checkbox';
-  this.element.addChild(this.checkMarkBackground, this.checkBoxLabel,
-      this.checkMark);
-  // use bind(this) to avoid loose scope
-  this.element.onClick = this.clickHandler.bind(this);
-
-  this.positioner = this.element;
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.get_text =
-    function() {
-  return this.checkBoxLabel.text;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.set_text =
-    function(value) {
-  this.checkBoxLabel.text = value;
-};
-
-
-/**
- * @expose
- * @return {bool} The selected getter.
- */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.get_selected =
-    function() {
-  return this.selected;
-};
-
-
-/**
- * @expose
- * @param {bool} value The selected setter.
- */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.set_selected =
-    function(value) {
-  this.checkMark.visible = this.selected = value;
-  this.element.getStage().update();
-};
-
-
-/**
- * @expose
- * @param {string|Object|goog.events.Event} event The event.
- */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.clickHandler =
-    function(event) {
-  this.set_selected(!this.get_selected());
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/Label.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/Label.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/Label.js
deleted file mode 100644
index c6b5243..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/Label.js
+++ /dev/null
@@ -1,67 +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('org.apache.flex.createjs.staticControls.Label');
-
-goog.require('org.apache.flex.createjs.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.createjs.core.UIBase}
- */
-org.apache.flex.createjs.staticControls.Label = function() {
-  org.apache.flex.createjs.core.UIBase.call(this);
-};
-goog.inherits(org.apache.flex.createjs.staticControls.Label,
-    org.apache.flex.createjs.core.UIBase);
-
-
-/**
- * @override
- */
-org.apache.flex.createjs.staticControls.Label.prototype.createElement =
-    function(p) {
-  goog.base(this, 'createElement');
-
-  this.element = new createjs.Text('default text', '20px Arial', '#ff7700');
-  this.element.x = 0;
-  this.element.y = 20;
-  this.element.textBaseline = 'alphabetic';
-  p.addChild(this.element);
-  p.getStage().update();
-
-  this.positioner = this.element;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.createjs.staticControls.Label.prototype.get_text = function() {
-  return this.element.text;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.createjs.staticControls.Label.prototype.set_text =
-    function(value) {
-  this.element.text = value;
-  this.element.getStage().update();
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/TextButton.js
deleted file mode 100644
index 147b6f9..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/createjs/staticControls/TextButton.js
+++ /dev/null
@@ -1,95 +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('org.apache.flex.createjs.staticControls.TextButton');
-
-goog.require('org.apache.flex.createjs.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.createjs.core.UIBase}
- */
-org.apache.flex.createjs.staticControls.TextButton = function() {
-  org.apache.flex.createjs.core.UIBase.call(this);
-};
-goog.inherits(org.apache.flex.createjs.staticControls.TextButton,
-    org.apache.flex.createjs.core.UIBase);
-
-
-/**
- * @expose
- * @type {Object}
- */
-org.apache.flex.createjs.staticControls.TextButton.prototype.buttonLabel = null;
-
-
-/**
- * @expose
- * @type {Object}
- */
-org.apache.flex.createjs.staticControls.TextButton.prototype.buttonBackground =
-    null;
-
-
-/**
- * @override
- */
-org.apache.flex.createjs.staticControls.TextButton.prototype.createElement =
-    function(p) {
-
-  this.buttonBackground = new createjs.Shape();
-  this.buttonBackground.name = 'background';
-  this.buttonBackground.graphics.beginFill('red').
-      drawRoundRect(0, 0, 200, 60, 10);
-
-  this.buttonLabel = new createjs.Text('button', 'bold 24px Arial',
-      '#FFFFFF');
-  this.buttonLabel.name = 'label';
-  this.buttonLabel.textAlign = 'center';
-  this.buttonLabel.textBaseline = 'middle';
-  this.buttonLabel.x = 200 / 2;
-  this.buttonLabel.y = 60 / 2;
-
-  this.element = new createjs.Container();
-  this.element.name = 'button';
-  this.element.x = 50;
-  this.element.y = 25;
-  this.element.addChild(this.buttonBackground, this.buttonLabel);
-  p.addChild(this.element);
-
-  this.positioner = this.element;
-  this.element.flexjs_wrapper = this;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.createjs.staticControls.TextButton.prototype.get_text =
-    function() {
-  return this.buttonLabel.text;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.createjs.staticControls.TextButton.prototype.set_text =
-    function(value) {
-  this.buttonLabel.text = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/jquery/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/jquery/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/jquery/CheckBox.js
new file mode 100644
index 0000000..0d54eee
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/jquery/CheckBox.js
@@ -0,0 +1,96 @@
+/**
+ * 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.jquery.staticControls.CheckBox');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.jquery.staticControls.CheckBox = function() {
+  goog.base(this);
+
+};
+goog.inherits(org.apache.flex.jquery.staticControls.CheckBox,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * @override
+ */
+org.apache.flex.jquery.staticControls.CheckBox.prototype.createElement =
+    function() {
+  var cb, d, lb;
+
+  d = document.createElement('div');
+  cb = document.createElement('input');
+  cb.type = 'checkbox';
+  cb.id = 'checkbox1';
+
+  lb = document.createElement('label');
+  lb.htmlFor = 'checkbox1';
+
+  d.appendChild(cb);
+  d.appendChild(lb);
+
+  this.element = d;
+
+  $(cb).button();
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.jquery.staticControls.CheckBox.prototype.get_text = function() {
+  return this.element.childNodes.item(1).value;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.jquery.staticControls.CheckBox.prototype.set_text =
+    function(value) {
+  this.element.childNodes.item(1).appendChild(document.createTextNode(value));
+};
+
+
+/**
+ * @expose
+ * @return {bool} The selected getter.
+ */
+org.apache.flex.jquery.staticControls.CheckBox.prototype.get_selected =
+    function() {
+  return this.element.childNodes.item(0).checked;
+};
+
+
+/**
+ * @expose
+ * @param {bool} value The selected setter.
+ */
+org.apache.flex.jquery.staticControls.CheckBox.prototype.set_selected =
+    function(value) {
+  this.element.childNodes.item(0).checked = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/jquery/RadioButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/jquery/RadioButton.js b/frameworks/js/FlexJS/src/org/apache/flex/jquery/RadioButton.js
new file mode 100644
index 0000000..e0d8c29
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/jquery/RadioButton.js
@@ -0,0 +1,205 @@
+/**
+ * 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.jquery.staticControls.RadioButton');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.jquery.staticControls.RadioButton = function() {
+
+  goog.base(this);
+
+  org.apache.flex.core.UIBase.call(this);
+  org.apache.flex.jquery.staticControls.RadioButton.radioCounter++;
+};
+goog.inherits(org.apache.flex.jquery.staticControls.RadioButton,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * @expose
+ * The name of the radioGroup.
+ */
+org.apache.flex.jquery.staticControls.RadioButton.prototype.radioGroupName = null;
+
+
+/**
+ * @expose
+ * Used to provide ids to the radio buttons.
+ */
+org.apache.flex.jquery.staticControls.RadioButton.radioCounter = 0;
+
+
+/**
+ * @expose
+ * Used to manage groups on the radio buttons.
+ */
+org.apache.flex.jquery.staticControls.RadioButton.groups = { };
+
+
+/**
+ * Flag to make sure the event handler is set only once.
+ */
+org.apache.flex.jquery.staticControls.RadioButton.groupHandlerSet = false;
+
+
+/**
+ * @override
+ */
+org.apache.flex.jquery.staticControls.RadioButton.prototype.createElement =
+    function() {
+
+  var input = document.createElement('input');
+  input.type = 'radio';
+  input.name = 'radio';
+  input.id = 'radio' +
+      org.apache.flex.jquery.staticControls.RadioButton.radioCounter;
+
+  var label = document.createElement('label');
+  label.htmlFor = input.id;
+
+  this.element = input;
+  this.labelFor = label;
+
+  this.positioner = this.element;
+  this.flexjs_wrapper = this;
+};
+
+
+/**
+ * @override
+ * @param {Object} doc the document for this item.
+ */
+org.apache.flex.jquery.staticControls.RadioButton.prototype.setDocument =
+    function(doc, id) {
+  if (!org.apache.flex.jquery.staticControls.RadioButton.groupHandlerSet)
+  {
+    org.apache.flex.jquery.staticControls.RadioButton.groupHandlerSet =
+        true;
+    doc.addEventListener('initComplete',
+        goog.bind(this.initHandler, this));
+  }
+};
+
+
+/**
+ * @param {Event} event The event.
+ */
+org.apache.flex.jquery.staticControls.RadioButton.prototype.initHandler =
+    function(event) {
+  var divtags = org.apache.flex.jquery.staticControls.RadioButton.groups;
+  for (var name in divtags)
+  {
+    var div = divtags[name];
+    $(div).buttonset();
+  }
+};
+
+
+/**
+ * @expose
+ * @return {string} The groupName getter.
+ */
+org.apache.flex.jquery.staticControls.RadioButton.prototype.get_groupName =
+    function() {
+  return this.radioGroupName;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The groupName setter.
+ */
+org.apache.flex.jquery.staticControls.RadioButton.prototype.set_groupName =
+    function(value) {
+
+  /*
+ * NOTE: Ideally when a RadioButton was created it would be added to an
+ * existing set of RadioButtons. This is especially true for RadioButtons
+ * added dynamically. However, due to a bug in jQuery
+ * (see http://bugs.jqueryui.com/ticket/8975), it is currently not possible
+ * to add or remove RadioButtons programmatically. For this version the
+ * groups are maintained here in RadioButton and once the application has
+ * finished initializing, the groups are given their buttonset().
+ */
+
+  this.radioGroupName = value;
+
+  this.element.name = value;
+
+  var div;
+
+  if (org.apache.flex.jquery.staticControls.RadioButton.groups[value]) {
+    div = org.apache.flex.jquery.staticControls.RadioButton.groups[value];
+    div.appendChild(this.element);
+    div.appendChild(this.labelFor);
+  }
+  else {
+    div = document.createElement('div');
+    div.id = value;
+    div.appendChild(this.element);
+    div.appendChild(this.labelFor);
+
+    org.apache.flex.jquery.staticControls.
+        RadioButton.groups[String(value)] = div;
+  }
+
+  this.positioner = div;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.jquery.staticControls.RadioButton.prototype.get_text =
+    function() {
+  return this.labelFor.innerHTML;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.jquery.staticControls.RadioButton.prototype.set_text =
+    function(value) {
+  this.labelFor.innerHTML = value;
+};
+
+
+/**
+ * @expose
+ * @return {bool} The selected getter.
+ */
+org.apache.flex.jquery.staticControls.RadioButton.prototype.get_selected =
+    function() {
+  return this.element.checked;
+};
+
+
+/**
+ * @expose
+ * @param {bool} value The selected setter.
+ */
+org.apache.flex.jquery.staticControls.RadioButton.prototype.set_selected =
+    function(value) {
+  this.element.checked = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/jquery/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/jquery/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/jquery/TextButton.js
new file mode 100644
index 0000000..6e98f82
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/jquery/TextButton.js
@@ -0,0 +1,63 @@
+/**
+ * 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.jquery.staticControls.TextButton');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.jquery.staticControls.TextButton = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.jquery.staticControls.TextButton,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * @override
+ */
+org.apache.flex.jquery.staticControls.TextButton.prototype.createElement =
+    function() {
+  this.element = document.createElement('button');
+  this.element.setAttribute('type', 'button');
+  $(this.element).button();
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.jquery.staticControls.TextButton.prototype.get_text =
+    function() {
+  return this.element.innerHTML;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.jquery.staticControls.TextButton.prototype.set_text =
+    function(value) {
+  this.element.innerHTML = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/jquery/staticControls/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/jquery/staticControls/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/jquery/staticControls/CheckBox.js
deleted file mode 100644
index 0d54eee..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/jquery/staticControls/CheckBox.js
+++ /dev/null
@@ -1,96 +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('org.apache.flex.jquery.staticControls.CheckBox');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.jquery.staticControls.CheckBox = function() {
-  goog.base(this);
-
-};
-goog.inherits(org.apache.flex.jquery.staticControls.CheckBox,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * @override
- */
-org.apache.flex.jquery.staticControls.CheckBox.prototype.createElement =
-    function() {
-  var cb, d, lb;
-
-  d = document.createElement('div');
-  cb = document.createElement('input');
-  cb.type = 'checkbox';
-  cb.id = 'checkbox1';
-
-  lb = document.createElement('label');
-  lb.htmlFor = 'checkbox1';
-
-  d.appendChild(cb);
-  d.appendChild(lb);
-
-  this.element = d;
-
-  $(cb).button();
-
-  this.positioner = this.element;
-  this.element.flexjs_wrapper = this;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.jquery.staticControls.CheckBox.prototype.get_text = function() {
-  return this.element.childNodes.item(1).value;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.jquery.staticControls.CheckBox.prototype.set_text =
-    function(value) {
-  this.element.childNodes.item(1).appendChild(document.createTextNode(value));
-};
-
-
-/**
- * @expose
- * @return {bool} The selected getter.
- */
-org.apache.flex.jquery.staticControls.CheckBox.prototype.get_selected =
-    function() {
-  return this.element.childNodes.item(0).checked;
-};
-
-
-/**
- * @expose
- * @param {bool} value The selected setter.
- */
-org.apache.flex.jquery.staticControls.CheckBox.prototype.set_selected =
-    function(value) {
-  this.element.childNodes.item(0).checked = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/jquery/staticControls/RadioButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/jquery/staticControls/RadioButton.js b/frameworks/js/FlexJS/src/org/apache/flex/jquery/staticControls/RadioButton.js
deleted file mode 100644
index e0d8c29..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/jquery/staticControls/RadioButton.js
+++ /dev/null
@@ -1,205 +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('org.apache.flex.jquery.staticControls.RadioButton');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.jquery.staticControls.RadioButton = function() {
-
-  goog.base(this);
-
-  org.apache.flex.core.UIBase.call(this);
-  org.apache.flex.jquery.staticControls.RadioButton.radioCounter++;
-};
-goog.inherits(org.apache.flex.jquery.staticControls.RadioButton,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * @expose
- * The name of the radioGroup.
- */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.radioGroupName = null;
-
-
-/**
- * @expose
- * Used to provide ids to the radio buttons.
- */
-org.apache.flex.jquery.staticControls.RadioButton.radioCounter = 0;
-
-
-/**
- * @expose
- * Used to manage groups on the radio buttons.
- */
-org.apache.flex.jquery.staticControls.RadioButton.groups = { };
-
-
-/**
- * Flag to make sure the event handler is set only once.
- */
-org.apache.flex.jquery.staticControls.RadioButton.groupHandlerSet = false;
-
-
-/**
- * @override
- */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.createElement =
-    function() {
-
-  var input = document.createElement('input');
-  input.type = 'radio';
-  input.name = 'radio';
-  input.id = 'radio' +
-      org.apache.flex.jquery.staticControls.RadioButton.radioCounter;
-
-  var label = document.createElement('label');
-  label.htmlFor = input.id;
-
-  this.element = input;
-  this.labelFor = label;
-
-  this.positioner = this.element;
-  this.flexjs_wrapper = this;
-};
-
-
-/**
- * @override
- * @param {Object} doc the document for this item.
- */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.setDocument =
-    function(doc, id) {
-  if (!org.apache.flex.jquery.staticControls.RadioButton.groupHandlerSet)
-  {
-    org.apache.flex.jquery.staticControls.RadioButton.groupHandlerSet =
-        true;
-    doc.addEventListener('initComplete',
-        goog.bind(this.initHandler, this));
-  }
-};
-
-
-/**
- * @param {Event} event The event.
- */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.initHandler =
-    function(event) {
-  var divtags = org.apache.flex.jquery.staticControls.RadioButton.groups;
-  for (var name in divtags)
-  {
-    var div = divtags[name];
-    $(div).buttonset();
-  }
-};
-
-
-/**
- * @expose
- * @return {string} The groupName getter.
- */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.get_groupName =
-    function() {
-  return this.radioGroupName;
-};
-
-
-/**
- * @expose
- * @param {string} value The groupName setter.
- */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.set_groupName =
-    function(value) {
-
-  /*
- * NOTE: Ideally when a RadioButton was created it would be added to an
- * existing set of RadioButtons. This is especially true for RadioButtons
- * added dynamically. However, due to a bug in jQuery
- * (see http://bugs.jqueryui.com/ticket/8975), it is currently not possible
- * to add or remove RadioButtons programmatically. For this version the
- * groups are maintained here in RadioButton and once the application has
- * finished initializing, the groups are given their buttonset().
- */
-
-  this.radioGroupName = value;
-
-  this.element.name = value;
-
-  var div;
-
-  if (org.apache.flex.jquery.staticControls.RadioButton.groups[value]) {
-    div = org.apache.flex.jquery.staticControls.RadioButton.groups[value];
-    div.appendChild(this.element);
-    div.appendChild(this.labelFor);
-  }
-  else {
-    div = document.createElement('div');
-    div.id = value;
-    div.appendChild(this.element);
-    div.appendChild(this.labelFor);
-
-    org.apache.flex.jquery.staticControls.
-        RadioButton.groups[String(value)] = div;
-  }
-
-  this.positioner = div;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.get_text =
-    function() {
-  return this.labelFor.innerHTML;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.set_text =
-    function(value) {
-  this.labelFor.innerHTML = value;
-};
-
-
-/**
- * @expose
- * @return {bool} The selected getter.
- */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.get_selected =
-    function() {
-  return this.element.checked;
-};
-
-
-/**
- * @expose
- * @param {bool} value The selected setter.
- */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.set_selected =
-    function(value) {
-  this.element.checked = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/jquery/staticControls/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/jquery/staticControls/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/jquery/staticControls/TextButton.js
deleted file mode 100644
index 6e98f82..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/jquery/staticControls/TextButton.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('org.apache.flex.jquery.staticControls.TextButton');
-
-goog.require('org.apache.flex.core.UIBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.jquery.staticControls.TextButton = function() {
-  goog.base(this);
-};
-goog.inherits(org.apache.flex.jquery.staticControls.TextButton,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * @override
- */
-org.apache.flex.jquery.staticControls.TextButton.prototype.createElement =
-    function() {
-  this.element = document.createElement('button');
-  this.element.setAttribute('type', 'button');
-  $(this.element).button();
-
-  this.positioner = this.element;
-  this.element.flexjs_wrapper = this;
-};
-
-
-/**
- * @expose
- * @return {string} The text getter.
- */
-org.apache.flex.jquery.staticControls.TextButton.prototype.get_text =
-    function() {
-  return this.element.innerHTML;
-};
-
-
-/**
- * @expose
- * @param {string} value The text setter.
- */
-org.apache.flex.jquery.staticControls.TextButton.prototype.set_text =
-    function(value) {
-  this.element.innerHTML = value;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js
new file mode 100644
index 0000000..04325ef
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js
@@ -0,0 +1,94 @@
+/**
+ * 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.svg.staticControls.TextButton');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.svg.staticControls.TextButton = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.svg.staticControls.TextButton,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.svg.staticControls.TextButton.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'TextButton',
+                qName: 'org.apache.flex.svg.staticControls.TextButton'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.svg.staticControls.TextButton.prototype.createElement =
+    function() {
+  this.element = document.createElement('embed');
+  this.element.setAttribute('src', 'org/apache/flex/svg/staticControls/assets/TextButton_Skin.svg');
+
+  this.positioner = this.element;
+
+  return this.element;
+};
+
+
+/**
+ * @override
+ */
+org.apache.flex.svg.staticControls.TextButton.prototype.finalizeElement =
+    function() {
+  var listenersArray;
+  if (goog.events.hasListener(this.element, goog.events.EventType.CLICK)) {
+    listenersArray = goog.events.getListeners(this.element, goog.events.EventType.CLICK, false);
+
+    /* As we are assigning an actual function object instead of just the name,
+       make sure to use a unique name ('clickHandler') instead of a native
+       name, like 'click' or 'onclick'.
+
+       Note: use array notation for property assignment so the compiler doesn't
+             rename the property ;-)
+    */
+    this.element['clickHandler'] = listenersArray[0].listener;
+  }
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.svg.staticControls.TextButton.prototype.get_text =
+    function() {
+  return this.element.getAttribute('label');
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.svg.staticControls.TextButton.prototype.set_text =
+    function(value) {
+  this.element.setAttribute('label', value);
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/15b80b84/frameworks/js/FlexJS/src/org/apache/flex/svg/assets/TextButton_Skin.svg
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/svg/assets/TextButton_Skin.svg b/frameworks/js/FlexJS/src/org/apache/flex/svg/assets/TextButton_Skin.svg
new file mode 100644
index 0000000..7986725
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/svg/assets/TextButton_Skin.svg
@@ -0,0 +1,279 @@
+<?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.
+
+-->
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="button" width="100%" height="100%" 
+	onload="return init(evt)"
+	onmouseover="return handleMouseOver(evt)" 
+	onmousedown="return handleMouseDown(evt)" 
+	onmouseup="return handleMouseUp(evt)" 
+	onmouseout="return handleMouseOut(evt)"
+	onclick="handleOnClick(evt)"
+	>
+	<style type="text/css">
+		.button {cursor: pointer;}
+	</style>
+  
+  <script type="text/ecmascript">
+	<![CDATA[
+		
+		var labelStr = "";
+		var clickHandler;
+		
+		function init(event)
+		{
+			//Set Initial button state
+			document.getElementById("button_up").style.display="inline";
+			document.getElementById("button_over").style.display="none";
+			document.getElementById("button_down").style.display="none";
+			
+			//Set label from the embed's frameElement.attributes values
+			labelStr = window.frameElement.attributes["label"].value;
+			var labelElement = document.getElementById("labelDisplay");
+			labelElement.firstChild.nodeValue = labelStr;
+			
+			//Store callbacks
+			clickHandler = window.frameElement.clickHandler;
+		}
+	
+		function handleMouseOver(event)
+		{
+			document.getElementById("button_up").style.display="none";
+			document.getElementById("button_over").style.display="inline";
+			document.getElementById("button_down").style.display="none";
+		}
+		
+		function handleMouseDown(event)
+		{
+			document.getElementById("button_up").style.display="none";
+			document.getElementById("button_over").style.display="none";
+			document.getElementById("button_down").style.display="inline";
+		}
+		
+		function handleMouseUp(event)
+		{
+			document.getElementById("button_up").style.display="none";
+			document.getElementById("button_over").style.display="inline";
+			document.getElementById("button_down").style.display="none";
+		}
+		
+		function handleMouseOut(event)
+		{
+			document.getElementById("button_up").style.display="inline";
+			document.getElementById("button_over").style.display="none";
+			document.getElementById("button_down").style.display="none";
+		}
+		
+		function handleOnClick(evt)
+		{
+			clickHandler(evt,this);
+		}
+
+	]]></script>
+	<svg xmlns="http://www.w3.org/2000/svg" id="button_up" width="100%" height="100%" version="1.1" >
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="-1" right="-1" top="-1" bottom="-1">
+			<defs>
+				<linearGradient id="button_up_idLinearGradientx63x32" gradientTransform="rotate(90)">
+					<stop offset="0" stop-color="#000000" stop-opacity="0.01" />
+					<stop offset="1" stop-color="#000000" stop-opacity="0.07" />
+				</linearGradient>
+			</defs>
+			<rect id="button_up_shadow" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_up_idLinearGradientx63x32)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
+			<defs>
+				<linearGradient id="button_up_idLinearGradientx63x54" gradientTransform="rotate(90)">
+					<stop offset="0" stop-color="#FFFFFF" stop-opacity="0.85" />
+					<stop offset="1" stop-color="#D8D8D8" stop-opacity="0.85" />
+				</linearGradient>
+			</defs>
+			<rect id="button_up_fill" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_up_idLinearGradientx63x54)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
+			<defs>
+				<linearGradient id="button_up_idLinearGradientx63x76" x1="0%" y1="100%" x2="0%" y2="0%">
+					<stop offset="0.0" stop-color="#000000" stop-opacity="0.0627" />
+					<stop offset="0.48" stop-color="#000000" stop-opacity="0.0099" />
+					<stop offset="0.48001" stop-color="#000000" stop-opacity="0" />
+				</linearGradient>
+			</defs>
+			<rect id="button_up_lowlight" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_up_idLinearGradientx63x76)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
+			<defs>
+				<linearGradient id="button_up_idLinearGradientx63x100" gradientTransform="rotate(90)">
+					<stop offset="0.0" stop-color="#FFFFFF" stop-opacity="0.33" />
+					<stop offset="0.48" stop-color="#FFFFFF" stop-opacity="0.33" />
+					<stop offset="0.48001" stop-color="#FFFFFF" stop-opacity="0" />
+				</linearGradient>
+			</defs>
+			<rect id="button_up_highlight" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_up_idLinearGradientx63x100)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
+			<defs>
+				<linearGradient id="button_up_idLinearGradientStrokex63x129" gradientTransform="rotate(90)">
+					<stop offset="0" stop-color="#FFFFFF" />
+					<stop offset="1" stop-color="#D8D8D8" />
+				</linearGradient>
+			</defs>
+			<rect id="button_up_highlightStroke" rx="2" ry="2" width="100%" height="100%" fill="none" style="stroke-width:2;stroke:url(#button_up_idLinearGradientStrokex63x129)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="0" right="0" top="0" bottom="0">
+			<defs>
+				<linearGradient id="button_up_idLinearGradientStrokex63x205" gradientTransform="rotate(90)">
+					<stop offset="0" stop-color="#000000" stop-opacity="0.5625" />
+					<stop offset="1" stop-color="#000000" stop-opacity="0.75" />
+				</linearGradient>
+			</defs>
+			<rect id="button_up_border" rx="2" ry="2" width="100%" height="100%" fill="none" style="stroke-width:2;stroke:url(#button_up_idLinearGradientStrokex63x205)" />
+		</svg>
+	</svg>
+
+	<svg xmlns="http://www.w3.org/2000/svg" id="button_over" width="100%" height="100%" version="1.1" >
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="-1" right="-1" top="-1" bottom="-1">
+			<defs>
+				<linearGradient id="button_over_idLinearGradientx63x32" gradientTransform="rotate(90)">
+					<stop offset="0" stop-color="#000000" stop-opacity="0.01" />
+					<stop offset="1" stop-color="#000000" stop-opacity="0.07" />
+				</linearGradient>
+			</defs>
+			<rect id="button_over_shadow" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_over_idLinearGradientx63x32)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
+			<defs>
+				<linearGradient id="button_over_idLinearGradientx63x54" gradientTransform="rotate(90)">
+					<stop offset="0" stop-color="#BBBDBD" stop-opacity="0.85" />
+					<stop offset="1" stop-color="#9FA0A1" stop-opacity="0.85" />
+				</linearGradient>
+			</defs>
+			<rect id="button_over_fill" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_over_idLinearGradientx63x54)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
+			<defs>
+				<linearGradient id="button_over_idLinearGradientx63x76" x1="0%" y1="100%" x2="0%" y2="0%">
+					<stop offset="0.0" stop-color="#000000" stop-opacity="0.0627" />
+					<stop offset="0.48" stop-color="#000000" stop-opacity="0.0099" />
+					<stop offset="0.48001" stop-color="#000000" stop-opacity="0" />
+				</linearGradient>
+			</defs>
+			<rect id="button_over_lowlight" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_over_idLinearGradientx63x76)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
+			<defs>
+				<linearGradient id="button_over_idLinearGradientx63x100" gradientTransform="rotate(90)">
+					<stop offset="0.0" stop-color="#FFFFFF" stop-opacity="0.22" />
+					<stop offset="0.48" stop-color="#FFFFFF" stop-opacity="0.22" />
+					<stop offset="0.48001" stop-color="#FFFFFF" stop-opacity="0" />
+				</linearGradient>
+			</defs>
+			<rect id="button_over_highlight" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_over_idLinearGradientx63x100)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
+			<defs>
+				<linearGradient id="button_over_idLinearGradientStrokex63x129" gradientTransform="rotate(90)">
+					<stop offset="0" stop-color="#FFFFFF" stop-opacity="0.22" />
+					<stop offset="1" stop-color="#D8D8D8" stop-opacity="0.22" />
+				</linearGradient>
+			</defs>
+			<rect id="button_over_highlightStroke" rx="2" ry="2" width="100%" height="100%" fill="none" style="stroke-width:2;stroke:url(#button_over_idLinearGradientStrokex63x129)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="0" right="0" top="0" bottom="0">
+			<defs>
+				<linearGradient id="button_over_idLinearGradientStrokex63x205" gradientTransform="rotate(90)">
+					<stop offset="0" stop-color="#000000" stop-opacity="0.5625" />
+					<stop offset="1" stop-color="#000000" stop-opacity="0.75" />
+				</linearGradient>
+			</defs>
+			<rect id="button_over_border" width="100%" height="100%" rx="2" ry="2" fill="none" style="stroke-width:2;stroke:url(#button_over_idLinearGradientStrokex63x205)" />
+		</svg>
+	</svg>
+	<svg xmlns="http://www.w3.org/2000/svg" id="button_down" width="100%" height="100%" version="1.1" >
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="-1" right="-1" top="-1" bottom="-1">
+			<defs>
+				<linearGradient id="button_down_idLinearGradientx63x32" gradientTransform="rotate(90)">
+					<stop offset="0" stop-color="#FFFFFF" stop-opacity="0" />
+					<stop offset="1" stop-color="#FFFFFF" stop-opacity="0.5" />
+				</linearGradient>
+			</defs>
+			<rect id="button_down_shadow" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_down_idLinearGradientx63x32)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
+			<defs>
+				<linearGradient id="button_down_idLinearGradientx63x54" gradientTransform="rotate(90)">
+					<stop offset="0" stop-color="#AAAAAA" stop-opacity="0.85" />
+					<stop offset="1" stop-color="#929496" stop-opacity="0.85" />
+				</linearGradient>
+			</defs>
+			<rect id="button_down_fill" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_down_idLinearGradientx63x54)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
+			<defs>
+				<linearGradient id="button_down_idLinearGradientx63x76" x1="0%" y1="100%" x2="0%" y2="0%">
+					<stop offset="0.0" stop-color="#000000" stop-opacity="0.0627" />
+					<stop offset="0.48" stop-color="#000000" stop-opacity="0.0099" />
+					<stop offset="0.48001" stop-color="#000000" stop-opacity="0" />
+				</linearGradient>
+			</defs>
+			<rect id="button_down_lowlight" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_down_idLinearGradientx63x76)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
+			<defs>
+				<linearGradient id="button_down_idLinearGradientx63x100" gradientTransform="rotate(90)">
+					<stop offset="0.0" stop-color="#FFFFFF" stop-opacity="0.12" />
+					<stop offset="0.48" stop-color="#FFFFFF" stop-opacity="0.12" />
+					<stop offset="0.48001" stop-color="#FFFFFF" stop-opacity="0" />
+				</linearGradient>
+			</defs>
+			<rect id="button_down_highlight" rx="2" ry="2" width="100%" height="100%" style="fill:url(#button_down_idLinearGradientx63x100)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="1" right="1" top="1" bottom="1">
+			<defs>
+				<linearGradient id="button_down_idLinearGradientStrokex63x149" gradientTransform="rotate(90)">
+					<stop offset="0.0" stop-color="#000000" stop-opacity="0.25" />
+					<stop offset="0.001" stop-color="#000000" stop-opacity="0.25" />
+					<stop offset="0.0011" stop-color="#000000" stop-opacity="0.07" />
+					<stop offset="0.965" stop-color="#000000" stop-opacity="0.07" />
+					<stop offset="0.9651" stop-color="#000000" stop-opacity="0.00" />
+				</linearGradient>
+			</defs>
+			<rect id="button_down_hldownstroke1" rx="2" ry="2" width="100%" height="100%" fill="none" style="stroke-width:2;stroke:url(#button_down_idLinearGradientStrokex63x149)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="2" right="2" top="2" bottom="2">
+			<defs>
+				<linearGradient id="button_down_idLinearGradientStrokex63x182" gradientTransform="rotate(90)">
+					<stop offset="0.0" stop-color="#000000" stop-opacity="0.09" />
+					<stop offset="0.0001" stop-color="#000000" stop-opacity="0.00" />
+				</linearGradient>
+			</defs>
+			<rect id="button_down_hldownstroke2" rx="2" ry="2" width="100%" height="100%" fill="none" style="stroke-width:2;stroke:url(#button_down_idLinearGradientStrokex63x182)" />
+		</svg>
+		<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" left="0" right="0" top="0" bottom="0">
+			<defs>
+				<linearGradient id="button_down_idLinearGradientStrokex63x205" gradientTransform="rotate(90)">
+					<stop offset="0" stop-color="#000000" stop-opacity="0.6375" />
+					<stop offset="1" stop-color="#000000" stop-opacity="0.85" />
+				</linearGradient>
+			</defs>
+			<rect id="button_down_border" width="100%" height="100%" rx="2" ry="2" fill="none" style="stroke-width:2;stroke:url(#button_down_idLinearGradientStrokex63x205)" />
+		</svg>
+	</svg>
+	<svg id="labelDisplaySVG" xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" version="1.1" >
+		<text id="labelDisplay" text-anchor="middle" font-family="verdana" font-size="12" dy=".3em" x="50%" y="50%" > </text>
+	</svg>
+	<rect id="mouse_catcher" width="100%" height="100%" fill="none" pointer-events="all"/>
+</svg>
\ No newline at end of file


[07/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/TitleBarModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/TitleBarModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/TitleBarModel.as
deleted file mode 100644
index 5ce0990..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/TitleBarModel.as
+++ /dev/null
@@ -1,133 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{
-	import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.ITitleBarModel;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.EventDispatcher;
-	
-	/**
-	 *  The TitleBarModel class bead holds the values for the org.apache.flex.html.staticControls.TitleBar's 
-	 *  properties.
-	 *
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class TitleBarModel extends EventDispatcher implements IBead, ITitleBarModel
-	{
-		public function TitleBarModel()
-		{
-			super();
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-		
-		private var _title:String;
-		
-		/**
-		 *  The string title for the org.apache.flex.html.staticControls.TitleBar.
-		 * 
-		 *  @copy org.apache.flex.core.ITitleBarModel#title
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get title():String
-		{
-			return _title;
-		}
-		
-		public function set title(value:String):void
-		{
-			if( value != _title ) {
-				_title = value;
-				dispatchEvent( new Event('titleChange') );
-			}
-		}
-		
-		private var _htmlTitle:String;
-		
-		/**
-		 *  The HTML string for the title.
-		 * 
-		 *  @copy org.apache.flex.core.ITitleBarModel#htmlTitle
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get htmlTitle():String
-		{
-			return _htmlTitle;
-		}
-		
-		public function set htmlTitle(value:String):void
-		{
-			if( value != _htmlTitle ) {
-				_htmlTitle = value;
-				dispatchEvent( new Event('htmlTitleChange') );
-			}
-		}
-		
-		private var _showCloseButton:Boolean = false;
-		
-		/**
-		 *  Whether or not to show a close button.
-		 * 
-		 *  @copy org.apache.flex.core.ITitleBarModel#showCloseButton
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get showCloseButton():Boolean
-		{
-			return _showCloseButton;
-		}
-		
-		public function set showCloseButton(value:Boolean):void
-		{
-			if( value != _showCloseButton ) {
-				_showCloseButton = value;
-				dispatchEvent( new Event('showCloseButtonChange') );
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ToggleButtonModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ToggleButtonModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ToggleButtonModel.as
deleted file mode 100644
index f0b334f..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ToggleButtonModel.as
+++ /dev/null
@@ -1,144 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{
-	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;
-	
-	/**
-	 *  The ToggleButtonModel class bead holds values for org.apache.flex.html.staticControls.Buttons 
-	 *  that have a state.
-	 *
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ToggleButtonModel extends EventDispatcher implements IBead, IToggleButtonModel
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ToggleButtonModel()
-		{
-			super();
-		}
-		
-		private var _strand:IStrand;
-		
-		/**
-		 *  @copy org.apache.flex.core.IBead#strand
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-		
-		private var _text:String;
-		
-		/**
-		 *  The text string for the org.apache.flex.html.staticControls.Button's label.
-		 * 
-		 *  @copy org.apache.flex.core.IToggleButtonModel#text
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get text():String
-		{
-			return _text;
-		}
-		
-		public function set text(value:String):void
-		{
-			if (value != _text)
-			{
-				_text = value;
-				dispatchEvent(new Event("textChange"));
-			}
-		}
-		
-		private var _html:String;
-		
-		/**
-		 *  The HTML string for the Button's label.
-		 * 
-		 *  @copy org.apache.flex.core.IToggleButtonModel#html
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get html():String
-		{
-			return _html;
-		}
-		
-		public function set html(value:String):void
-		{
-			if( value != html )
-			{
-				_html = value;
-				dispatchEvent(new Event("htmlChange"));
-			}
-		}
-		
-		private var _selected:Boolean;
-		
-		/**
-		 *  Whether or not the org.apache.flex.html.staticControls.Button is selected.
-		 * 
-		 *  @copy org.apache.flex.core.IToggleButtonModel#selected
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get selected():Boolean
-		{
-			return _selected;
-		}
-		
-		public function set selected(value:Boolean):void
-		{
-			if( value != _selected )
-			{
-				_selected = value;
-				dispatchEvent(new Event("selectedChange"));
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ValueToggleButtonModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ValueToggleButtonModel.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ValueToggleButtonModel.as
deleted file mode 100644
index e306ad1..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/models/ValueToggleButtonModel.as
+++ /dev/null
@@ -1,123 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.beads.models
-{
-	
-	import org.apache.flex.core.IValueToggleButtonModel;
-	import org.apache.flex.events.Event;
-
-	/**
-	 *  The ValueToggleButtonModel class bead extends the 
-	 *  org.apache.flex.html.staticControls.beads.models.ToggleButtonModel and adds
-	 *  value intended to represent a collection of similar org.apache.flex.html.staticControls.Buttons 
-	 *  such as org.apache.flex.html.staticControls.RadioButtons.
-	 *
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ValueToggleButtonModel extends ToggleButtonModel implements IValueToggleButtonModel
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ValueToggleButtonModel()
-		{
-			super();
-		}
-		
-		private var _value:Object;
-		
-		/**
-		 *  The current value of the button collection.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get value():Object
-		{
-			return _value;
-		}
-		
-		public function set value(newValue:Object):void
-		{
-			if( newValue != _value )
-			{
-				_value = newValue;
-				dispatchEvent(new Event("valueChange"));
-			}
-		}
-		
-		private var _groupName:String;
-		
-		/**
-		 *  The name of the collection has shared by all of the buttons in the collection.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get groupName():String
-		{
-			return _groupName;
-		}
-		
-		public function set groupName(value:String):void
-		{
-			if( value != _groupName )
-			{
-				_groupName = value;
-				dispatchEvent(new Event("groupNameChange"));
-			}
-		}
-		
-		private var _selectedValue:Object;
-		
-		/**
-		 *  The value that is currently selected.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get selectedValue():Object
-		{
-			return _selectedValue;
-		}
-		
-		public function set selectedValue(newValue:Object):void
-		{
-			if( _selectedValue != newValue )
-			{
-				_selectedValue = newValue;
-				dispatchEvent(new Event("selectedValueChange"));
-			}
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/Border.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/Border.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/Border.as
deleted file mode 100644
index dbe183e..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/Border.as
+++ /dev/null
@@ -1,49 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.supportClasses
-{
-	import org.apache.flex.core.UIBase;
-	
-    /**
-     *  The Border class is a class used internally by many
-     *  controls to draw a border.  The border actually drawn
-     *  is dictated by the IBeadView in the CSS.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class Border extends UIBase
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function Border()
-		{
-			super();
-		}		
-        
-   	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/ButtonBarButtonItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/ButtonBarButtonItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/ButtonBarButtonItemRenderer.as
deleted file mode 100644
index a5179da..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/ButtonBarButtonItemRenderer.as
+++ /dev/null
@@ -1,135 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.supportClasses
-{
-	import org.apache.flex.core.IItemRenderer;
-	import org.apache.flex.core.IItemRendererParent;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.html.staticControls.TextButton;
-	import org.apache.flex.html.staticControls.beads.ITextItemRenderer;
-
-	/**
-	 *  The ButtonBarButtonItemRenderer class handles the display of each item for the 
-	 *  org.apache.flex.html.staticControls.ButtonBar component. This class uses a 
-	 *  org.apache.flex.html.staticControls.Button to represent the data.
-	 *
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ButtonBarButtonItemRenderer extends UIItemRendererBase implements ITextItemRenderer
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ButtonBarButtonItemRenderer()
-		{
-			super();
-		}
-		
-		private var textButton:TextButton;
-		
-		/**
-		 * @private
-		 */
-		override public function addedToParent():void
-		{
-			super.addedToParent();
-		}
-		
-		/**
-		 * @private
-		 */
-		private function handleClickEvent(event:Event):void
-		{
-			this.dispatchEvent(new Event("selected"));
-		}
-		
-		/**
-		 *  The string version of the data associated with the instance of the itemRenderer.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get text():String
-		{
-			return data as String;
-		}
-		public function set text(value:String):void
-		{
-			data = value;
-		}
-		
-		/**
-		 *  The data to be displayed by the itemRenderer instance. For ButtonBarItemRenderer, the
-		 *  data's string version is used as the label for the Button.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		override public function set data(value:Object):void
-		{
-			super.data = value;
-			
-			var added:Boolean = false;
-			if (textButton == null) {
-				textButton = new TextButton();
-				textButton.addEventListener('click',handleClickEvent);
-				added = true;
-			}
-			
-			var valueAsString:String;
-			
-			if (value is String) {
-				valueAsString = value as String;
-			}
-			else if (value.hasOwnProperty("label")) {
-				valueAsString = String(value["label"]);
-			}
-			else if (value.hasOwnProperty("title")) {
-				valueAsString = String(value["title"]);
-			}
-			
-			if (valueAsString) textButton.text = valueAsString;
-			
-			if (added) addElement(textButton);
-		}
-		
-		/**
-		 * @private
-		 */
-		override public function adjustSize():void
-		{
-			textButton.width = this.width;
-			textButton.height = this.height;
-			
-			updateRenderer();
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/ContainerContentArea.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/ContainerContentArea.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/ContainerContentArea.as
deleted file mode 100644
index bbec779..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/ContainerContentArea.as
+++ /dev/null
@@ -1,48 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.supportClasses
-{
-	import org.apache.flex.core.UIBase;
-	
-    /**
-     *  The ContainerContentArea class implements the actualParent for
-     *  a Container.  Container's don't always parent their children directly as
-     *  that makes it harder to handle scrolling.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class ContainerContentArea extends UIBase
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function ContainerContentArea()
-		{
-			super();
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/DataItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/DataItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/DataItemRenderer.as
deleted file mode 100644
index 310f725..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/DataItemRenderer.as
+++ /dev/null
@@ -1,131 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.supportClasses
-{
-	import flash.display.Sprite;
-
-	/**
-	 *  The DataItemRenderer class is the base class for most itemRenderers. This class
-	 *  extends org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase and 
-	 *  includes row and column index values.
-	 *
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DataItemRenderer extends UIItemRendererBase
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DataItemRenderer()
-		{
-			super();
-		}
-		
-		private var _columnIndex:int;
-		
-		/**
-		 *  The index of the column the itemRenderer represents.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get columnIndex():int
-		{
-			return _columnIndex;
-		}
-		public function set columnIndex(value:int):void
-		{
-			_columnIndex = value;
-		}
-		
-		private var _rowIndex:int;
-		
-		/**
-		 *  The index of the row the itemRenderer represents.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get rowIndex():int
-		{
-			return _rowIndex;
-		}
-		public function set rowIndex(value:int):void
-		{
-			_rowIndex = value;
-		}
-		
-		private var _dataField:String;
-		
-		/**
-		 *  The name of the field within the data the itemRenderer should use.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get dataField():String
-		{
-			return _dataField;
-		}
-		public function set dataField(value:String):void
-		{
-			_dataField = value;
-		}
-		
-		private var background:Sprite;
-		
-		/**
-		 * @private
-		 */
-		override public function addedToParent():void
-		{
-			super.addedToParent();
-			
-			background = new Sprite();
-			addChild(background);
-		}
-		
-		/**
-		 * @private
-		 */
-		override public function updateRenderer():void
-		{
-			super.updateRenderer();
-			
-			background.graphics.clear();
-			background.graphics.beginFill(backgroundColor, (down||selected||hovered)?1:0);
-			background.graphics.drawRect(0, 0, this.width, this.height);
-			background.graphics.endFill();
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/DropDownListList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/DropDownListList.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/DropDownListList.as
deleted file mode 100644
index 7ee555f..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/DropDownListList.as
+++ /dev/null
@@ -1,75 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.supportClasses
-{
-    import org.apache.flex.core.IPopUp;
-    import org.apache.flex.html.staticControls.SimpleList;
-    import org.apache.flex.html.staticControls.beads.SolidBackgroundBead;
-    
-    //--------------------------------------
-    //  Events
-    //--------------------------------------
-    
-    /**
-     *  @copy org.apache.flex.core.ISelectionModel#change
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-    [Event(name="change", type="org.apache.flex.events.Event")]
-    
-    /**
-     *  The DropDownListList class is the List class used internally
-     *  by DropDownList as the dropdown/popup.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class DropDownListList extends SimpleList implements IPopUp
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function DropDownListList()
-		{
-			super();
-		}
-		
-        /**
-         *  @private
-         */
-		override public function addedToParent():void
-		{
-			super.addedToParent();
-			
-			var bb:SolidBackgroundBead = new SolidBackgroundBead();
-			bb.backgroundColor = 0xffffff;
-			addBead(bb);
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.as
deleted file mode 100644
index bff939b..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.as
+++ /dev/null
@@ -1,75 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.supportClasses
-{	
-    import org.apache.flex.core.IItemRenderer;
-    import org.apache.flex.core.IItemRendererParent;
-    import org.apache.flex.core.UIBase;
-
-    /**
-     *  The NonVirtualDataGroup class is the IItemRendererParent used internally
-     *  by org.apache.flex.html.staticControls.List class.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class NonVirtualDataGroup extends UIBase implements IItemRendererParent
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function NonVirtualDataGroup()
-		{
-			super();
-		}
-
-        /**
-         *  @copy org.apache.flex.core.IItemRendererParent#getItemRendererForIndex()
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function getItemRendererForIndex(index:int):IItemRenderer
-        {
-            return getChildAt(index) as IItemRenderer;
-        }
-		
-        /**
-         *  @copy org.apache.flex.core.IItemRendererParent#removeAllElements()
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function removeAllElements():void
-		{
-			this.removeChildren(0);
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/ScrollBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/ScrollBar.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/ScrollBar.as
deleted file mode 100644
index f826be0..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/ScrollBar.as
+++ /dev/null
@@ -1,48 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.supportClasses
-{
-	import org.apache.flex.core.UIBase;
-	
-	/**
-	 *  The ScrollBar class represents either a vertical or horizontal control
-	 *  that allows the user to quickly scan through a component that does not
-	 *  wholly fit within its container.
-	 *
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class ScrollBar extends UIBase
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function ScrollBar()
-		{
-			super();
-		}		
-   	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/StringItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/StringItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/StringItemRenderer.as
deleted file mode 100644
index 3811ca5..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/StringItemRenderer.as
+++ /dev/null
@@ -1,132 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.supportClasses
-{
-	import flash.text.TextFieldAutoSize;
-	import flash.text.TextFieldType;
-	
-	import org.apache.flex.core.CSSTextField;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.html.staticControls.beads.ITextItemRenderer;
-
-	/**
-	 *  The StringItemRenderer class displays data in string form using the data's toString()
-	 *  function.
-	 *
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class StringItemRenderer extends DataItemRenderer implements ITextItemRenderer
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function StringItemRenderer()
-		{
-			super();
-			
-			textField = new CSSTextField();
-			textField.type = TextFieldType.DYNAMIC;
-			textField.autoSize = TextFieldAutoSize.LEFT;
-			textField.selectable = false;
-		}
-		
-		public var textField:CSSTextField;
-		
-		/**
-		 * @private
-		 */
-		override public function addedToParent():void
-		{
-			super.addedToParent();
-			
-			addChild(textField);
-
-			adjustSize();
-		}
-		
-		/**
-		 * @private
-		 */
-		override public function adjustSize():void
-		{
-			var cy:Number = this.height/2;
-			
-			textField.x = 0;
-			textField.y = cy - textField.height/2;
-			textField.width = this.width;
-			
-			updateRenderer();
-		}
-		
-		/**
-		 *  The text currently displayed by the itemRenderer instance.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get text():String
-		{
-			return textField.text;
-		}
-		
-		public function set text(value:String):void
-		{
-			textField.text = value;
-		}
-		
-		/**
-		 *  Sets the data value and uses the String version of the data for display.
-		 * 
-		 *  @param Object data The object being displayed by the itemRenderer instance.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		override public function set data(value:Object):void
-		{
-			super.data = value;
-			if (labelField) textField.text = String(value[labelField]);
-			else if (dataField) textField.text = String(value[dataField]);
-			else textField.text = String(value);
-		}
-		
-		/**
-		 * @private
-		 */
-		override public function updateRenderer():void
-		{
-			super.updateRenderer();
-			
-			textField.background = (down || selected || hovered);
-			textField.backgroundColor = backgroundColor;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as
deleted file mode 100644
index ceb83a7..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as
+++ /dev/null
@@ -1,333 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.supportClasses
-{
-    import flash.text.TextFieldType;
-    
-    import org.apache.flex.core.CSSTextField;
-    import org.apache.flex.core.IBead;
-    import org.apache.flex.core.IBeadController;
-    import org.apache.flex.core.IStrand;
-    import org.apache.flex.core.IUIBase;
-    import org.apache.flex.core.UIBase;
-    import org.apache.flex.core.ValuesManager;
-    import org.apache.flex.events.Event;
-    import org.apache.flex.html.staticControls.beads.ITextItemRenderer;
-	
-	/**
-	 *  The TextFieldItemRenderer class provides a org.apache.flex.html.staticControls.TextField as an itemRenderer.
-	 *
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class TextFieldItemRenderer extends CSSTextField implements ITextItemRenderer, IStrand, IUIBase
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function TextFieldItemRenderer()
-		{
-			super();
-            type = TextFieldType.DYNAMIC;
-            selectable = false;
-		}
-        
-        public var highlightColor:uint = 0xCEDBEF;
-        public var selectedColor:uint = 0xA8C6EE;
-        public var downColor:uint = 0x808080;
-
-        private var _width:Number;
-		
-		/**
-		 * @private
-		 */
-        override public function get width():Number
-        {
-            if (isNaN(_width))
-            {
-                var value:* = ValuesManager.valuesImpl.getValue(this, "width");
-                if (value === undefined)
-                    return $width;
-                _width = Number(value);
-                super.width = value;
-            }
-            return _width;
-        }
-        override public function set width(value:Number):void
-        {
-            if (_width != value)
-            {
-                _width = value;
-                super.width = value;
-                dispatchEvent(new Event("widthChanged"));
-            }
-        }
-		
-		/**
-		 * @private
-		 */
-        protected function get $width():Number
-        {
-            return super.width;
-        }
-        
-        private var _height:Number;
-		
-		/**
-		 * @private
-		 */
-        override public function get height():Number
-        {
-            if (isNaN(_height))
-            {
-                var value:* = ValuesManager.valuesImpl.getValue(this, "height");
-                if (value === undefined)
-                    return $height;
-                _height = Number(value);
-                super.height = value;
-            }
-            return _height;
-        }
-        override public function set height(value:Number):void
-        {
-            if (_height != value)
-            {
-                _height = value;
-                super.height = value;
-                dispatchEvent(new Event("heightChanged"));
-            }
-        }
-		
-		/**
-		 * @private
-		 */
-        protected function get $height():Number
-        {
-            return super.height;
-        }
-
-		/**
-		 *  The String(data) for the itemRenderer instance.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-        public function get data():Object
-        {
-            return text;
-        }
-        public function set data(value:Object):void
-        {
-            text = String(value);
-        }
-		
-		/**
-		 * @private
-		 */
-		public function get labelField():String
-		{
-			return null;
-		}
-		public function set labelField(value:String):void
-		{
-			// nothing to do for this
-		}
-        
-        private var _index:int;
-        
-		/**
-		 *  An index value for the itemRenderer corresponding the data's position with its dataProvider.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-        public function get index():int
-        {
-            return _index;
-        }
-        public function set index(value:int):void
-        {
-            _index = value;
-        }
-        
-        private var _hovered:Boolean;
-        
-		/**
-		 *  Returns whether or not the itemRenderer is a "hovered" state.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-        public function get hovered():Boolean
-        {
-            return _hovered;
-        }
-        public function set hovered(value:Boolean):void
-        {
-            _hovered = value;
-            updateRenderer();
-        }
-        
-        private var _selected:Boolean;
-        
-		/**
-		 *  Whether or not the itemRenderer should be represented in a selected state.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-        public function get selected():Boolean
-        {
-            return _selected;
-        }
-        public function set selected(value:Boolean):void
-        {
-            _selected = value;
-            updateRenderer();
-        }
-
-        private var _down:Boolean;
-        
-		/**
-		 *  Whether or not the itemRenderer should be represented in a down (or pre-selected) state.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-        public function get down():Boolean
-        {
-            return _down;
-        }
-        public function set down(value:Boolean):void
-        {
-            _down = value;
-            updateRenderer();
-        }
-        
-		/**
-		 * @private
-		 */
-        public function updateRenderer():void
-        {
-            background = (down || selected || hovered);
-            if (down)
-                backgroundColor = downColor;
-            else if (hovered)
-                backgroundColor = highlightColor;
-            else if (selected)
-                backgroundColor = selectedColor;
-        }
-        
-		/**
-		 * @private
-		 */
-        public function get element():Object
-        {
-            return this;
-        }
-
-        // beads declared in MXML are added to the strand.
-        // from AS, just call addBead()
-        public var beads:Array;
-        
-        private var _beads:Vector.<IBead>;
-		
-		/**
-		 * @private
-		 */
-        public function addBead(bead:IBead):void
-        {
-            if (!_beads)
-                _beads = new Vector.<IBead>;
-            _beads.push(bead);
-            bead.strand = this;
-        }
-        
-		/**
-		 * @private
-		 */
-        public function getBeadByType(classOrInterface:Class):IBead
-        {
-            for each (var bead:IBead in _beads)
-            {
-                if (bead is classOrInterface)
-                    return bead;
-            }
-            return null;
-        }
-        
-		/**
-		 * @private
-		 */
-        public function removeBead(value:IBead):IBead	
-        {
-            var n:int = _beads.length;
-            for (var i:int = 0; i < n; i++)
-            {
-                var bead:IBead = _beads[i];
-                if (bead == value)
-                {
-                    _beads.splice(i, 1);
-                    return bead;
-                }
-            }
-            return null;
-        }
-        
-		/**
-		 * @private
-		 */
-        public function addedToParent():void
-        {
-            var c:Class;
-
-            // renderer has a default model (the 'data' property)
-            // and it is essentially a view of that model, so it
-            // only needs an assignable controller
-            
-            if (getBeadByType(IBeadController) == null) 
-            {
-                c = ValuesManager.valuesImpl.getValue(this, "iBeadController") as Class;
-                if (c)
-                {
-                    var controller:IBeadController = new c as IBeadController;
-                    if (controller)
-                        addBead(controller);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/UIItemRendererBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/UIItemRendererBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/UIItemRendererBase.as
deleted file mode 100644
index b313650..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/supportClasses/UIItemRendererBase.as
+++ /dev/null
@@ -1,245 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.html.staticControls.supportClasses
-{
-	import org.apache.flex.core.IItemRenderer;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.utils.MXMLDataInterpreter;
-	
-	/**
-	 *  The UIItemRendererBase class is the base class for all itemRenderers. An itemRenderer is used to
-	 *  display a single datum within a collection of data. Components such as a List use itemRenderers to 
-	 *  show their dataProviders.
-	 *
- 	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class UIItemRendererBase extends UIBase implements IItemRenderer
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function UIItemRendererBase()
-		{
-		}
-		
-		/**
-		 * @private
-		 */
-		override public function addedToParent():void
-		{
-			super.addedToParent();
-			
-            // very common for item renderers to be resized by their containers,
-            addEventListener("widthChanged", sizeChangeHandler);
-            addEventListener("heightChanged", sizeChangeHandler);
-
-            // each MXML file can also have styles in fx:Style block
-            ValuesManager.valuesImpl.init(this);
-            
-            MXMLDataInterpreter.generateMXMLProperties(this, mxmlProperties);
-            MXMLDataInterpreter.generateMXMLInstances(this, this, MXMLDescriptor);
-            
-            dispatchEvent(new Event("initComplete"));
-            
-		}
-		
-		/**
-		 * @private
-		 */
-        public function get MXMLDescriptor():Array
-        {
-            return null;
-        }
-        
-        private var mxmlProperties:Array ;
-        
-		/**
-		 * @private
-		 */
-        public function generateMXMLAttributes(data:Array):void
-        {
-            mxmlProperties = data;
-        }
-        
-		public var backgroundColor:uint = 0xFFFFFF;
-		public var highlightColor:uint = 0xCEDBEF;
-		public var selectedColor:uint = 0xA8C6EE;
-		public var downColor:uint = 0x808080;
-		
-		private var _data:Object;
-		
-		/**
-		 *  The data being represented by this itemRenderer. This can be something simple like a String or
-		 *  a Number or something very complex.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get data():Object
-		{
-			return _data;
-		}
-		public function set data(value:Object):void
-		{
-			_data = value;
-		}
-		
-		private var _labelField:String = "label";
-		
-		/**
-		 * The name of the field within the data to use as a label. Some itemRenderers use this field to
-		 * identify the value they should show while other itemRenderers ignore this if they are showing
-		 * complex information.
-		 */
-		public function get labelField():String
-		{
-			return _labelField;
-		}
-		public function set labelField(value:String):void
-		{
-			_labelField = value;
-		}
-		
-		private var _index:int;
-		
-		/**
-		 *  The position with the dataProvider being shown by the itemRenderer instance.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get index():int
-		{
-			return _index;
-		}
-		public function set index(value:int):void
-		{
-			_index = value;
-		}
-		
-		private var _hovered:Boolean;
-		
-		/**
-		 *  Whether or not the itemRenderer is in a hovered state.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get hovered():Boolean
-		{
-			return _hovered;
-		}
-		public function set hovered(value:Boolean):void
-		{
-			_hovered = value;
-			updateRenderer();
-		}
-		
-		private var _selected:Boolean;
-		
-		/**
-		 *  Whether or not the itemRenderer is in a selected state.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get selected():Boolean
-		{
-			return _selected;
-		}
-		public function set selected(value:Boolean):void
-		{
-			_selected = value;
-			updateRenderer();
-		}
-		
-		private var _down:Boolean;
-		
-		/**
-		 *  Whether or not the itemRenderer is in a down (or pre-selected) state.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get down():Boolean
-		{
-			return _down;
-		}
-		public function set down(value:Boolean):void
-		{
-			_down = value;
-			updateRenderer();
-		}
-		
-		/**
-		 * @private
-		 */
-		public function updateRenderer():void
-		{
-			if (down)
-				backgroundColor = downColor;
-			else if (hovered)
-				backgroundColor = highlightColor;
-			else if (selected)
-				backgroundColor = selectedColor;
-		}
-		
-		/**
-		 * @private
-		 */
-		private function sizeChangeHandler(event:Event):void
-		{
-			adjustSize();
-		}
-		
-		/**
-		 *  This function is called whenever the itemRenderer changes size. Sub-classes should override
-		 *  this method an handle the size change.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function adjustSize():void
-		{
-			// handle in subclass
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/Border.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/Border.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/Border.as
new file mode 100644
index 0000000..dbe183e
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/Border.as
@@ -0,0 +1,49 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.supportClasses
+{
+	import org.apache.flex.core.UIBase;
+	
+    /**
+     *  The Border class is a class used internally by many
+     *  controls to draw a border.  The border actually drawn
+     *  is dictated by the IBeadView in the CSS.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class Border extends UIBase
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function Border()
+		{
+			super();
+		}		
+        
+   	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
new file mode 100644
index 0000000..a5179da
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
@@ -0,0 +1,135 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.supportClasses
+{
+	import org.apache.flex.core.IItemRenderer;
+	import org.apache.flex.core.IItemRendererParent;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.html.staticControls.TextButton;
+	import org.apache.flex.html.staticControls.beads.ITextItemRenderer;
+
+	/**
+	 *  The ButtonBarButtonItemRenderer class handles the display of each item for the 
+	 *  org.apache.flex.html.staticControls.ButtonBar component. This class uses a 
+	 *  org.apache.flex.html.staticControls.Button to represent the data.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ButtonBarButtonItemRenderer extends UIItemRendererBase implements ITextItemRenderer
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ButtonBarButtonItemRenderer()
+		{
+			super();
+		}
+		
+		private var textButton:TextButton;
+		
+		/**
+		 * @private
+		 */
+		override public function addedToParent():void
+		{
+			super.addedToParent();
+		}
+		
+		/**
+		 * @private
+		 */
+		private function handleClickEvent(event:Event):void
+		{
+			this.dispatchEvent(new Event("selected"));
+		}
+		
+		/**
+		 *  The string version of the data associated with the instance of the itemRenderer.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get text():String
+		{
+			return data as String;
+		}
+		public function set text(value:String):void
+		{
+			data = value;
+		}
+		
+		/**
+		 *  The data to be displayed by the itemRenderer instance. For ButtonBarItemRenderer, the
+		 *  data's string version is used as the label for the Button.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		override public function set data(value:Object):void
+		{
+			super.data = value;
+			
+			var added:Boolean = false;
+			if (textButton == null) {
+				textButton = new TextButton();
+				textButton.addEventListener('click',handleClickEvent);
+				added = true;
+			}
+			
+			var valueAsString:String;
+			
+			if (value is String) {
+				valueAsString = value as String;
+			}
+			else if (value.hasOwnProperty("label")) {
+				valueAsString = String(value["label"]);
+			}
+			else if (value.hasOwnProperty("title")) {
+				valueAsString = String(value["title"]);
+			}
+			
+			if (valueAsString) textButton.text = valueAsString;
+			
+			if (added) addElement(textButton);
+		}
+		
+		/**
+		 * @private
+		 */
+		override public function adjustSize():void
+		{
+			textButton.width = this.width;
+			textButton.height = this.height;
+			
+			updateRenderer();
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ContainerContentArea.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ContainerContentArea.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ContainerContentArea.as
new file mode 100644
index 0000000..bbec779
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ContainerContentArea.as
@@ -0,0 +1,48 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.supportClasses
+{
+	import org.apache.flex.core.UIBase;
+	
+    /**
+     *  The ContainerContentArea class implements the actualParent for
+     *  a Container.  Container's don't always parent their children directly as
+     *  that makes it harder to handle scrolling.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class ContainerContentArea extends UIBase
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function ContainerContentArea()
+		{
+			super();
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DataItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DataItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DataItemRenderer.as
new file mode 100644
index 0000000..310f725
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DataItemRenderer.as
@@ -0,0 +1,131 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.supportClasses
+{
+	import flash.display.Sprite;
+
+	/**
+	 *  The DataItemRenderer class is the base class for most itemRenderers. This class
+	 *  extends org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase and 
+	 *  includes row and column index values.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DataItemRenderer extends UIItemRendererBase
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DataItemRenderer()
+		{
+			super();
+		}
+		
+		private var _columnIndex:int;
+		
+		/**
+		 *  The index of the column the itemRenderer represents.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get columnIndex():int
+		{
+			return _columnIndex;
+		}
+		public function set columnIndex(value:int):void
+		{
+			_columnIndex = value;
+		}
+		
+		private var _rowIndex:int;
+		
+		/**
+		 *  The index of the row the itemRenderer represents.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get rowIndex():int
+		{
+			return _rowIndex;
+		}
+		public function set rowIndex(value:int):void
+		{
+			_rowIndex = value;
+		}
+		
+		private var _dataField:String;
+		
+		/**
+		 *  The name of the field within the data the itemRenderer should use.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get dataField():String
+		{
+			return _dataField;
+		}
+		public function set dataField(value:String):void
+		{
+			_dataField = value;
+		}
+		
+		private var background:Sprite;
+		
+		/**
+		 * @private
+		 */
+		override public function addedToParent():void
+		{
+			super.addedToParent();
+			
+			background = new Sprite();
+			addChild(background);
+		}
+		
+		/**
+		 * @private
+		 */
+		override public function updateRenderer():void
+		{
+			super.updateRenderer();
+			
+			background.graphics.clear();
+			background.graphics.beginFill(backgroundColor, (down||selected||hovered)?1:0);
+			background.graphics.drawRect(0, 0, this.width, this.height);
+			background.graphics.endFill();
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DropDownListList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DropDownListList.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DropDownListList.as
new file mode 100644
index 0000000..7ee555f
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/DropDownListList.as
@@ -0,0 +1,75 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.supportClasses
+{
+    import org.apache.flex.core.IPopUp;
+    import org.apache.flex.html.staticControls.SimpleList;
+    import org.apache.flex.html.staticControls.beads.SolidBackgroundBead;
+    
+    //--------------------------------------
+    //  Events
+    //--------------------------------------
+    
+    /**
+     *  @copy org.apache.flex.core.ISelectionModel#change
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+    [Event(name="change", type="org.apache.flex.events.Event")]
+    
+    /**
+     *  The DropDownListList class is the List class used internally
+     *  by DropDownList as the dropdown/popup.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class DropDownListList extends SimpleList implements IPopUp
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function DropDownListList()
+		{
+			super();
+		}
+		
+        /**
+         *  @private
+         */
+		override public function addedToParent():void
+		{
+			super.addedToParent();
+			
+			var bb:SolidBackgroundBead = new SolidBackgroundBead();
+			bb.backgroundColor = 0xffffff;
+			addBead(bb);
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.as
new file mode 100644
index 0000000..bff939b
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.as
@@ -0,0 +1,75 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.supportClasses
+{	
+    import org.apache.flex.core.IItemRenderer;
+    import org.apache.flex.core.IItemRendererParent;
+    import org.apache.flex.core.UIBase;
+
+    /**
+     *  The NonVirtualDataGroup class is the IItemRendererParent used internally
+     *  by org.apache.flex.html.staticControls.List class.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class NonVirtualDataGroup extends UIBase implements IItemRendererParent
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function NonVirtualDataGroup()
+		{
+			super();
+		}
+
+        /**
+         *  @copy org.apache.flex.core.IItemRendererParent#getItemRendererForIndex()
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        public function getItemRendererForIndex(index:int):IItemRenderer
+        {
+            return getChildAt(index) as IItemRenderer;
+        }
+		
+        /**
+         *  @copy org.apache.flex.core.IItemRendererParent#removeAllElements()
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function removeAllElements():void
+		{
+			this.removeChildren(0);
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ScrollBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ScrollBar.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ScrollBar.as
new file mode 100644
index 0000000..f826be0
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/ScrollBar.as
@@ -0,0 +1,48 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.supportClasses
+{
+	import org.apache.flex.core.UIBase;
+	
+	/**
+	 *  The ScrollBar class represents either a vertical or horizontal control
+	 *  that allows the user to quickly scan through a component that does not
+	 *  wholly fit within its container.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ScrollBar extends UIBase
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ScrollBar()
+		{
+			super();
+		}		
+   	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/StringItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/StringItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/StringItemRenderer.as
new file mode 100644
index 0000000..3811ca5
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/StringItemRenderer.as
@@ -0,0 +1,132 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.supportClasses
+{
+	import flash.text.TextFieldAutoSize;
+	import flash.text.TextFieldType;
+	
+	import org.apache.flex.core.CSSTextField;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.html.staticControls.beads.ITextItemRenderer;
+
+	/**
+	 *  The StringItemRenderer class displays data in string form using the data's toString()
+	 *  function.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class StringItemRenderer extends DataItemRenderer implements ITextItemRenderer
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function StringItemRenderer()
+		{
+			super();
+			
+			textField = new CSSTextField();
+			textField.type = TextFieldType.DYNAMIC;
+			textField.autoSize = TextFieldAutoSize.LEFT;
+			textField.selectable = false;
+		}
+		
+		public var textField:CSSTextField;
+		
+		/**
+		 * @private
+		 */
+		override public function addedToParent():void
+		{
+			super.addedToParent();
+			
+			addChild(textField);
+
+			adjustSize();
+		}
+		
+		/**
+		 * @private
+		 */
+		override public function adjustSize():void
+		{
+			var cy:Number = this.height/2;
+			
+			textField.x = 0;
+			textField.y = cy - textField.height/2;
+			textField.width = this.width;
+			
+			updateRenderer();
+		}
+		
+		/**
+		 *  The text currently displayed by the itemRenderer instance.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get text():String
+		{
+			return textField.text;
+		}
+		
+		public function set text(value:String):void
+		{
+			textField.text = value;
+		}
+		
+		/**
+		 *  Sets the data value and uses the String version of the data for display.
+		 * 
+		 *  @param Object data The object being displayed by the itemRenderer instance.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		override public function set data(value:Object):void
+		{
+			super.data = value;
+			if (labelField) textField.text = String(value[labelField]);
+			else if (dataField) textField.text = String(value[dataField]);
+			else textField.text = String(value);
+		}
+		
+		/**
+		 * @private
+		 */
+		override public function updateRenderer():void
+		{
+			super.updateRenderer();
+			
+			textField.background = (down || selected || hovered);
+			textField.backgroundColor = backgroundColor;
+		}
+	}
+}
\ No newline at end of file


[15/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputWithBorderView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputWithBorderView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputWithBorderView.as
new file mode 100644
index 0000000..4fd1566
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextInputWithBorderView.as
@@ -0,0 +1,79 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	
+    import org.apache.flex.core.IBead;
+    import org.apache.flex.core.IBeadModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.IParent;
+    import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.html.staticControls.supportClasses.Border;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+
+    /**
+     *  The TextInputWithBorderView class is the default view for
+     *  the org.apache.flex.html.staticControls.TextInput.
+     *  It displays text using a TextField, so there is no
+     *  right-to-left text support in this view.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class TextInputWithBorderView extends TextInputView
+	{
+		public function TextInputWithBorderView()
+		{
+			super();
+		}
+		
+		private var _border:Border;
+				
+        /**
+         *  @private
+         */        
+		override public function set strand(value:IStrand):void
+		{
+			super.strand = value;
+			
+			// add a border to this
+			_border = new Border();
+			_border.model = new (ValuesManager.valuesImpl.getValue(value, "iBorderModel")) as IBeadModel;
+			_border.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBorderBead")) as IBead);
+            IParent(strand).addElement(_border);
+			
+			IEventDispatcher(strand).addEventListener("widthChanged", sizeChangedHandler);
+			IEventDispatcher(strand).addEventListener("heightChanged", sizeChangedHandler);
+			sizeChangedHandler(null);
+		}
+		
+		private function sizeChangedHandler(event:Event):void
+		{
+			var ww:Number = DisplayObject(strand).width;
+			_border.width = ww;
+			
+			var hh:Number = DisplayObject(strand).height;
+			_border.height = hh;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
new file mode 100644
index 0000000..7f3ecb0
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
@@ -0,0 +1,141 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+    import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IDataProviderItemRendererMapper;
+    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.core.ValuesManager;
+    import org.apache.flex.events.Event;
+    import org.apache.flex.events.IEventDispatcher;
+
+    /**
+     *  The TextItemRendererFactoryForArrayData class is the 
+     *  IDataProviderItemRendererMapper for creating 
+     *  ITextItemRenderers and assigning them data from an array.
+     *  Other IDataProviderItemRendererMapper implementations
+     *  assign specific array or vector types to item
+     *  renderers expecting those types.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class TextItemRendererFactoryForArrayData implements IBead, IDataProviderItemRendererMapper
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function TextItemRendererFactoryForArrayData()
+		{
+		}
+		
+		private var selectionModel:ISelectionModel;
+		
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			selectionModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
+			var listView:IListView = value.getBeadByType(IListView) as IListView;
+			dataGroup = listView.dataGroup;
+			selectionModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
+            
+            if (!itemRendererFactory)
+            {
+                _itemRendererFactory = new (ValuesManager.valuesImpl.getValue(_strand, "iItemRendererClassFactory")) as IItemRendererClassFactory;
+                _strand.addBead(_itemRendererFactory);
+            }
+            
+			dataProviderChangeHandler(null);
+		}
+		
+        private var _itemRendererFactory:IItemRendererClassFactory;
+        
+        /**
+         *  An IItemRendererClassFactory that should generate ITextItemRenderers
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        public function get itemRendererFactory():IItemRendererClassFactory
+        {
+            return _itemRendererFactory
+        }
+        
+        /**
+         *  @private
+         */
+        public function set itemRendererFactory(value:IItemRendererClassFactory):void
+        {
+            _itemRendererFactory = value;
+        }
+        
+        /**
+         *  The IItemRendererParent that should parent the ITextItemRenderers
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		protected var dataGroup:IItemRendererParent;
+		
+		private function dataProviderChangeHandler(event:Event):void
+		{
+			var dp:Array = selectionModel.dataProvider as Array;
+			if (!dp)
+				return;
+			
+			dataGroup.removeAllElements();
+			
+			var n:int = dp.length; 
+			for (var i:int = 0; i < n; i++)
+			{
+				var tf:ITextItemRenderer = itemRendererFactory.createItemRenderer(dataGroup) as ITextItemRenderer;
+                tf.index = i;
+                dataGroup.addElement(tf);
+				tf.text = dp[i];
+			}
+			
+			IEventDispatcher(_strand).dispatchEvent(new Event("itemsCreated"));
+		}
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForStringVectorData.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForStringVectorData.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForStringVectorData.as
new file mode 100644
index 0000000..7e5f41f
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextItemRendererFactoryForStringVectorData.as
@@ -0,0 +1,128 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+    
+    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;
+
+    /**
+     *  The TextItemRendererFactoryForStringVectorData class is the 
+     *  IDataProviderItemRendererMapper for creating 
+     *  ITextItemRenderers and assigning them data from an vector
+     *  of Strings.  Other IDataProviderItemRendererMapper implementations
+     *  assign specific array or vector types to item
+     *  renderers expecting those types.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class TextItemRendererFactoryForStringVectorData implements IBead
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function TextItemRendererFactoryForStringVectorData()
+		{
+		}
+		
+		private var selectionModel:ISelectionModel;
+		
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			selectionModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
+			var listView:IListView = value.getBeadByType(IListView) as IListView;
+			dataGroup = listView.dataGroup;
+			selectionModel.addEventListener("dataProviderChange", dataProviderChangeHandler);
+			dataProviderChangeHandler(null);
+		}
+		
+        private var _itemRendererFactory:IItemRendererClassFactory;
+        
+        /**
+         *  An IItemRendererClassFactory that should generate ITextItemRenderers
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        public function get itemRendererFactory():IItemRendererClassFactory
+        {
+            return _itemRendererFactory
+        }
+        
+        /**
+         *  @private
+         */
+        public function set itemRendererFactory(value:IItemRendererClassFactory):void
+        {
+            _itemRendererFactory = value;
+        }
+        
+        /**
+         *  The IItemRendererParent that should parent the ITextItemRenderers
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        protected var dataGroup:IItemRendererParent;
+		
+		private function dataProviderChangeHandler(event:Event):void
+		{
+			var dp:Vector.<String> = selectionModel.dataProvider as Vector.<String>;
+			
+			dataGroup.removeAllElements();
+			
+			var n:int = dp.length; 
+			for (var i:int = 0; i < n; i++)
+			{
+				var tf:ITextItemRenderer = itemRendererFactory.createItemRenderer(dataGroup) as ITextItemRenderer;
+                tf.index = i;
+                dataGroup.addElement(tf);
+				tf.text = dp[i];
+			}			
+		}
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TitleBarMeasurementBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TitleBarMeasurementBead.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TitleBarMeasurementBead.as
new file mode 100644
index 0000000..9976ea6
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TitleBarMeasurementBead.as
@@ -0,0 +1,106 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import org.apache.flex.core.IMeasurementBead;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.html.staticControls.TitleBar;
+	
+	/**
+	 *  The TitleBarMeasurementBead class measures the overall size of a 
+	 *  org.apache.flex.html.staticControls.TitleBar.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class TitleBarMeasurementBead implements IMeasurementBead
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function TitleBarMeasurementBead()
+		{
+		}
+		
+		/**
+		 *  The overall width of the org.apache.flex.html.staticControls.TitleBar.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get measuredWidth():Number
+		{
+			var mwidth:Number = 0;
+			var titleBar:TitleBar = _strand as TitleBar;
+			var labelMeasure:IMeasurementBead = titleBar.titleLabel.measurementBead;
+			mwidth = labelMeasure.measuredWidth;
+			if( titleBar.showCloseButton ) {
+				var buttonMeasure:IMeasurementBead = titleBar.closeButton.measurementBead;
+				mwidth += buttonMeasure.measuredWidth;
+			}
+			return mwidth;
+		}
+		
+		/**
+		 *  The overall height of the org.apache.flex.html.staticControls.TitleBar.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get measuredHeight():Number
+		{
+			var mheight:Number = 0;
+			var titleBar:TitleBar = _strand as TitleBar;
+			var labelMeasure:IMeasurementBead = titleBar.titleLabel.measurementBead;
+			mheight = labelMeasure.measuredHeight;
+			if( titleBar.showCloseButton ) {
+				var buttonMeasure:IMeasurementBead = titleBar.closeButton.measurementBead;
+				mheight = Math.max(mheight,buttonMeasure.measuredHeight);
+			}
+			return mheight;
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/UpArrowButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/UpArrowButtonView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/UpArrowButtonView.as
new file mode 100644
index 0000000..6ef6efb
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/UpArrowButtonView.as
@@ -0,0 +1,103 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.Graphics;
+	import flash.display.Shape;
+	import flash.display.SimpleButton;
+
+	import org.apache.flex.core.IStrand;
+    import org.apache.flex.core.IBeadView;
+	
+    /**
+     *  The UpArrowButtonView class is the view for
+     *  the up arrow button in a ScrollBar and other controls.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class UpArrowButtonView implements IBeadView
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function UpArrowButtonView()
+		{
+			upView = new Shape();
+			downView = new Shape();
+			overView = new Shape();
+
+			drawView(upView.graphics, 0xCCCCCC);
+			drawView(downView.graphics, 0x808080);
+			drawView(overView.graphics, 0xEEEEEE);
+		}
+		
+		private function drawView(g:Graphics, bgColor:uint):void
+		{
+			g.lineStyle(1);
+			g.beginFill(bgColor);
+			g.drawRect(0, 0, 16, 16);
+			g.endFill();
+			g.lineStyle(0);
+			g.beginFill(0);
+			g.moveTo(4, 12);
+			g.lineTo(12, 12);
+			g.lineTo(8, 4);
+			g.lineTo(4, 12);
+			g.endFill();
+		}
+		
+		private var _strand:IStrand;
+		
+		private var shape:Shape;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			shape = new Shape();
+			shape.graphics.beginFill(0xCCCCCC);
+			shape.graphics.drawRect(0, 0, 16, 16);
+			shape.graphics.endFill();
+			SimpleButton(value).upState = upView;
+			SimpleButton(value).downState = downView;
+			SimpleButton(value).overState = overView;
+			SimpleButton(value).hitTestState = shape;
+		}
+        
+		private var upView:Shape;
+		private var downView:Shape;
+		private var overView:Shape;
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarThumbView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarThumbView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarThumbView.as
new file mode 100644
index 0000000..c147a50
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarThumbView.as
@@ -0,0 +1,127 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.Graphics;
+	import flash.display.Shape;
+	import flash.display.SimpleButton;
+    import flash.display.DisplayObject;
+
+    import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;	
+	
+    /**
+     *  The VScrollBarThumbView class is the view for
+     *  the thumb button in a Vertical ScrollBar.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class VScrollBarThumbView implements IBeadView
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function VScrollBarThumbView()
+		{
+		}
+		
+		private function drawView(g:Graphics, bgColor:uint):void
+		{
+            var hh:Number = DisplayObject(_strand).height;
+            g.clear();
+			g.lineStyle(1);
+			g.beginFill(bgColor);
+			g.drawRect(0, 0, 16, hh);
+			g.endFill();
+            hh = Math.round(hh / 2);
+			g.moveTo(4, hh);
+			g.lineTo(12, hh);
+			g.moveTo(4, hh - 4);
+			g.lineTo(12, hh - 4);
+			g.moveTo(4, hh + 4);
+			g.lineTo(12, hh + 4);
+		}
+		
+		private var _strand:IStrand;
+		
+		private var shape:Shape;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+            
+            upView = new Shape();
+            downView = new Shape();
+            overView = new Shape();
+            
+            drawView(upView.graphics, 0xCCCCCC);
+            drawView(downView.graphics, 0x808080);
+            drawView(overView.graphics, 0xEEEEEE);
+
+            shape = new Shape();
+			shape.graphics.beginFill(0xCCCCCC);
+			shape.graphics.drawRect(0, 0, 16, 16);
+			shape.graphics.endFill();
+			SimpleButton(value).upState = upView;
+			SimpleButton(value).downState = downView;
+			SimpleButton(value).overState = overView;
+			SimpleButton(value).hitTestState = shape;
+            IEventDispatcher(_strand).addEventListener("heightChanged", heightChangedHandler);
+		}
+
+        private function heightChangedHandler(event:Event):void
+        {
+			DisplayObject(_strand).scaleY = 1.0;
+			DisplayObject(_strand).scaleX = 1.0;
+			
+            var hh:Number = DisplayObject(_strand).height;
+            drawView(upView.graphics, 0xCCCCCC);
+            drawView(downView.graphics, 0x808080);
+            drawView(overView.graphics, 0xEEEEEE);
+            
+            shape.graphics.clear();
+            shape.graphics.beginFill(0xCCCCCC);
+            shape.graphics.drawRect(0, 0, 16, hh);
+            shape.graphics.endFill();
+        }
+        
+		private var upView:Shape;
+		private var downView:Shape;
+		private var overView:Shape;
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarTrackView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarTrackView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarTrackView.as
new file mode 100644
index 0000000..7f9dc8d
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/VScrollBarTrackView.as
@@ -0,0 +1,112 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads
+{
+	import flash.display.DisplayObject;
+	import flash.display.Graphics;
+	import flash.display.Shape;
+	import flash.display.SimpleButton;
+	
+	import org.apache.flex.core.IBeadView;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	
+    /**
+     *  The VScrollBarTrackView class is the view for
+     *  the track in a Vertical ScrollBar.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class VScrollBarTrackView implements IBeadView
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function VScrollBarTrackView()
+		{
+			upView = new Shape();
+			downView = new Shape();
+			overView = new Shape();
+
+		}
+		
+		private function drawView(g:Graphics, bgColor:uint, h:Number):void
+		{
+			g.clear();
+			g.lineStyle(1);
+			g.beginFill(bgColor);
+			g.drawRect(0, 0, 16, h);
+			g.endFill();
+			g.lineStyle(0);
+		}
+
+		private function heightChangeHandler(event:Event):void
+		{
+			DisplayObject(_strand).scaleY = 1.0;
+			DisplayObject(_strand).scaleX = 1.0;
+			
+			var h:Number = SimpleButton(_strand).height;
+			
+			drawView(upView.graphics, 0xCCCCCC, h);
+			drawView(downView.graphics, 0x808080, h);
+			drawView(overView.graphics, 0xEEEEEE, h);	
+			shape.graphics.clear();
+			shape.graphics.beginFill(0xCCCCCC);
+			shape.graphics.drawRect(0, 0, 16, h);
+			shape.graphics.endFill();
+			
+		}
+		
+		private var _strand:IStrand;
+		
+		private var shape:Shape;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			SimpleButton(value).addEventListener("heightChanged", heightChangeHandler);
+			shape = new Shape();
+			SimpleButton(value).upState = upView;
+			SimpleButton(value).downState = downView;
+			SimpleButton(value).overState = overView;
+			SimpleButton(value).hitTestState = shape;
+		}
+
+		private var upView:Shape;
+		private var downView:Shape;
+		private var overView:Shape;
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/AlertController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/AlertController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/AlertController.as
new file mode 100644
index 0000000..7622b54
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/AlertController.as
@@ -0,0 +1,88 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.controllers
+{	
+    import flash.display.DisplayObject;
+    
+	import org.apache.flex.core.IBeadController;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+
+	/**
+	 *  The AlertControler class bead handles the close event on the org.apache.flex.html.staticControls.Alert 
+	 *  by removing the org.apache.flex.html.staticControls.Alert from the display.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+    public class AlertController implements IBeadController
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function AlertController()
+		{
+		}
+		
+        private var _strand:IStrand;
+        
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get strand():IStrand
+        {
+            return _strand;
+        }
+        
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function set strand(value:IStrand):void
+        {
+            _strand = value;
+            IEventDispatcher(value).addEventListener("close",handleAlertClose);
+        }
+        
+		/**
+		 * @private
+		 */
+        private function handleAlertClose(event:Event):void
+        {
+            DisplayObject(_strand).parent.removeChild(DisplayObject(_strand));
+        }
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ButtonAutoRepeatController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ButtonAutoRepeatController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ButtonAutoRepeatController.as
new file mode 100644
index 0000000..70b2348
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ButtonAutoRepeatController.as
@@ -0,0 +1,147 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.controllers
+{
+	import flash.events.MouseEvent;
+	import flash.utils.clearInterval;
+	import flash.utils.clearTimeout;
+	import flash.utils.setInterval;
+	import flash.utils.setTimeout;
+	
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IBeadController;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+
+    /**
+     *  The ButtonAutoRepeatController class adds autorepeat
+     *  functionality to a button.  This version is simply waits
+     *  a specified amount of time (default is 250ms), then repeats the button
+     *  event at a specified interval, which defaults to
+     *  125 milliseconds.  Alternate implementations could
+     *  have non-linear repeat timing, look for keyboard modifiers to choose
+     *  different rates, etc.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+    public class ButtonAutoRepeatController implements IBead, IBeadController
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function ButtonAutoRepeatController()
+		{
+		}
+		
+        private var _strand:IStrand;
+        
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        public function set strand(value:IStrand):void
+        {
+            _strand = value;
+            IEventDispatcher(value).addEventListener(MouseEvent.MOUSE_DOWN, mouseDownHandler);
+        }
+        
+        /**
+         *  The number of milliseconds to wait before repeating the event
+         *  for the first time.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        public var delay:int = 250;
+        
+        /**
+         *  The number of milliseconds to wait before repeating the event
+         *  after the first time.  This value is not checked for
+         *  changes after the events start repeating.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        public var interval:int = 100;
+        
+        private var timeout:uint;
+        private var repeater:uint;
+        
+        private function mouseDownHandler(event:MouseEvent):void
+        {
+            event.target.addEventListener(MouseEvent.MOUSE_OUT, mouseOutHandler);   
+            event.target.addEventListener(MouseEvent.MOUSE_UP, mouseUpHandler);
+            timeout = setTimeout(sendFirstRepeat, delay); 
+        }
+        
+        private function mouseOutHandler(event:MouseEvent):void
+        {
+            event.target.removeEventListener(MouseEvent.MOUSE_OUT, mouseOutHandler);   
+            event.target.removeEventListener(MouseEvent.MOUSE_UP, mouseUpHandler); 
+            if (repeater > 0)
+                clearInterval(repeater);
+            repeater = 0;
+            if (timeout > 0)
+                clearTimeout(timeout);
+            timeout = 0;
+        }
+        
+        private function mouseUpHandler(event:MouseEvent):void
+        {
+            event.target.removeEventListener(MouseEvent.MOUSE_OUT, mouseOutHandler);   
+            event.target.removeEventListener(MouseEvent.MOUSE_UP, mouseUpHandler);  
+            if (repeater > 0)
+                clearInterval(repeater);
+            repeater = 0;
+            if (timeout > 0)
+                clearTimeout(timeout);
+            timeout = 0;
+        }
+        
+        private function sendFirstRepeat():void
+        {
+            clearTimeout(timeout);
+            timeout = 0;
+        	repeater = setInterval(sendRepeats, interval);
+        	IEventDispatcher(_strand).dispatchEvent(new Event("buttonRepeat"));
+        }
+        
+        private function sendRepeats():void
+        {
+       	    IEventDispatcher(_strand).dispatchEvent(new Event("buttonRepeat"));
+        }
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ComboBoxController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ComboBoxController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ComboBoxController.as
new file mode 100644
index 0000000..1f333ef
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ComboBoxController.as
@@ -0,0 +1,104 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.controllers
+{
+	import flash.display.DisplayObject;
+	import flash.events.MouseEvent;
+	
+	import org.apache.flex.core.IBeadController;
+	import org.apache.flex.core.ISelectionModel;
+	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.IComboBoxView;
+
+	/**
+	 *  The ComboBoxController class bead handles mouse events on the elements of
+	 *  the org.apache.flex.html.staticControls.ComboBox. This includes selecting the 
+	 *  button to display the selection list pop-up as well as selecting an item from the 
+	 *  pop-up list.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ComboBoxController implements IBeadController
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ComboBoxController()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+            IEventDispatcher(value).addEventListener(MouseEvent.CLICK, clickHandler);
+		}
+		
+		/**
+		 * @private
+		 */
+        private function clickHandler(event:MouseEvent):void
+        {
+            var viewBead:IComboBoxView = _strand.getBeadByType(IComboBoxView) as IComboBoxView;
+            viewBead.popUpVisible = true;
+            var selectionModel:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
+            var popUpModel:ISelectionModel = viewBead.popUp.getBeadByType(ISelectionModel) as ISelectionModel;
+            popUpModel.dataProvider = selectionModel.dataProvider;
+            popUpModel.selectedIndex = selectionModel.selectedIndex;
+			DisplayObject(viewBead.popUp).width = DisplayObject(_strand).width;
+			DisplayObject(viewBead.popUp).height = 200;
+			DisplayObject(viewBead.popUp).x = DisplayObject(_strand).x;
+			DisplayObject(viewBead.popUp).y = DisplayObject(_strand).y;
+            IEventDispatcher(viewBead.popUp).addEventListener("change", changeHandler);
+        }
+        
+		/**
+		 * @private
+		 */
+        private function changeHandler(event:Event):void
+        {
+            var viewBead:IComboBoxView = _strand.getBeadByType(IComboBoxView) as IComboBoxView;
+            viewBead.popUpVisible = false;
+            var selectionModel:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
+            var popUpModel:ISelectionModel = viewBead.popUp.getBeadByType(ISelectionModel) as ISelectionModel;
+            selectionModel.selectedIndex = popUpModel.selectedIndex;
+			IEventDispatcher(_strand).dispatchEvent(new Event("change"));
+        }
+	
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropDownListController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropDownListController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropDownListController.as
new file mode 100644
index 0000000..47287be
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/DropDownListController.as
@@ -0,0 +1,104 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.controllers
+{
+	import flash.display.DisplayObject;
+	import flash.geom.Point;
+	
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IBeadController;
+	import org.apache.flex.core.ISelectionModel;
+	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.IDropDownListView;
+
+    /**
+     *  The DropDownListController class is the controller for
+     *  org.apache.flex.html.staticControls.DropDownList.  Controllers
+     *  watch for events from the interactive portions of a View and
+     *  update the data model or dispatch a semantic event.
+     *  This controller watches for the click event and displays the
+     *  dropdown/popup, and watches the dropdown/popup for change events
+     *  and updates the selection model accordingly.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class DropDownListController implements IBead, IBeadController
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function DropDownListController()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+            IEventDispatcher(value).addEventListener("click", clickHandler);
+		}
+		
+        private function clickHandler(event:Event):void
+        {
+            var viewBead:IDropDownListView = _strand.getBeadByType(IDropDownListView) as IDropDownListView;
+            viewBead.popUpVisible = true;
+            var selectionModel:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
+            var popUpModel:ISelectionModel = viewBead.popUp.getBeadByType(ISelectionModel) as ISelectionModel;
+            popUpModel.dataProvider = selectionModel.dataProvider;
+            popUpModel.selectedIndex = selectionModel.selectedIndex;
+			DisplayObject(viewBead.popUp).width = DisplayObject(_strand).width;
+			DisplayObject(viewBead.popUp).height = 200;
+            var pt:Point = new Point(DisplayObject(_strand).x, DisplayObject(_strand).y);
+            pt = DisplayObject(_strand).parent.localToGlobal(pt);
+			DisplayObject(viewBead.popUp).x = pt.x;
+			DisplayObject(viewBead.popUp).y = pt.y;
+            IEventDispatcher(viewBead.popUp).addEventListener("change", changeHandler);
+        }
+        
+        private function changeHandler(event:Event):void
+        {
+            var viewBead:IDropDownListView = _strand.getBeadByType(IDropDownListView) as IDropDownListView;
+            viewBead.popUpVisible = false;
+            var selectionModel:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
+            var popUpModel:ISelectionModel = viewBead.popUp.getBeadByType(ISelectionModel) as ISelectionModel;
+            selectionModel.selectedIndex = popUpModel.selectedIndex;
+			IEventDispatcher(_strand).dispatchEvent(new Event("change"));
+        }
+	
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/EditableTextKeyboardController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/EditableTextKeyboardController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/EditableTextKeyboardController.as
new file mode 100644
index 0000000..01f8e9f
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/EditableTextKeyboardController.as
@@ -0,0 +1,86 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.controllers
+{
+	import org.apache.flex.core.CSSTextField;
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IBeadController;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.ITextModel;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.html.staticControls.beads.ITextFieldView;
+	
+	/**
+	 *  The EditableTextKeyboardController class bead intercepts keyboard events on the
+	 *  component's text field and emits change events.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class EditableTextKeyboardController implements IBead, IBeadController
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function EditableTextKeyboardController()
+		{
+		}
+		
+		private var model:ITextModel;
+		private var textField:CSSTextField;
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			model = UIBase(_strand).model as ITextModel;
+			
+			var viewBead:ITextFieldView = _strand.getBeadByType(ITextFieldView) as ITextFieldView;
+			textField = viewBead.textField;
+			textField.addEventListener("change", inputChangeHandler);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function inputChangeHandler( event:Object ) : void
+		{
+            // this will otherwise bubble an event of flash.events.Event
+            event.stopImmediatePropagation();
+			model.text = textField.text;
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as
new file mode 100644
index 0000000..d72bbdb
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as
@@ -0,0 +1,126 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.controllers
+{
+	import flash.events.MouseEvent;
+	
+	import org.apache.flex.core.IBeadController;
+	import org.apache.flex.core.IItemRenderer;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.events.Event;
+
+	/**
+	 *  The ItemRendererMouseController class bead handles mouse events in itemRenderers. This
+	 *  includes roll-overs, mouse down, and mouse up. These platform-specific events are then
+	 *  re-dispatched as FlexJS events.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ItemRendererMouseController implements IBeadController
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ItemRendererMouseController()
+		{
+		}
+		
+        private var renderer:IItemRenderer;
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+            renderer = value as IItemRenderer;
+            renderer.addEventListener(MouseEvent.ROLL_OVER, rollOverHandler);
+            renderer.addEventListener(MouseEvent.ROLL_OUT, rollOutHandler);
+            renderer.addEventListener(MouseEvent.MOUSE_DOWN, mouseDownHandler);
+		}
+		
+		/**
+		 * @private
+		 */
+		protected function rollOverHandler(event:MouseEvent):void
+		{
+			var target:IItemRenderer = event.target as IItemRenderer;
+			if (target)
+			{
+                target.hovered = true;
+				target.dispatchEvent(new Event("rollover",true));
+			}
+		}
+		
+		/**
+		 * @private
+		 */
+		protected function rollOutHandler(event:MouseEvent):void
+		{
+			var target:IItemRenderer = event.target as IItemRenderer;
+			if (target)
+			{
+                target.hovered = false;
+                target.down = false;
+			}
+		}
+
+		/**
+		 * @private
+		 */
+		protected function mouseDownHandler(event:MouseEvent):void
+		{
+			var target:IItemRenderer = event.currentTarget as IItemRenderer;
+			if (target)
+			{
+                target.down = true;
+				target.addEventListener(MouseEvent.MOUSE_UP, mouseUpHandler);
+			}
+		}
+		
+		/**
+		 * @private
+		 */
+		protected function mouseUpHandler(event:MouseEvent):void
+		{
+			var target:IItemRenderer = event.currentTarget as IItemRenderer;
+			if (target)
+			{
+                target.removeEventListener(MouseEvent.MOUSE_UP, mouseUpHandler);                
+				target.selected = true;
+				target.dispatchEvent(new Event("selected"));
+			}			
+		}
+	
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.as
new file mode 100644
index 0000000..fe5dfa1
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.as
@@ -0,0 +1,124 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.controllers
+{
+	import org.apache.flex.core.IBeadController;
+	import org.apache.flex.core.IItemRenderer;
+	import org.apache.flex.core.IItemRendererParent;
+	import org.apache.flex.core.IRollOverModel;
+	import org.apache.flex.core.ISelectionModel;
+	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.IListView;
+	
+
+    /**
+     *  The ListSingleSelectionMouseController class is a controller for
+     *  org.apache.flex.html.staticControls.List.  Controllers
+     *  watch for events from the interactive portions of a View and
+     *  update the data model or dispatch a semantic event.
+     *  This controller watches for events from the item renderers
+     *  and updates an ISelectionModel (which only supports single
+     *  selection).  Other controller/model pairs would support
+     *  various kinds of multiple selection.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class ListSingleSelectionMouseController implements IBeadController
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function ListSingleSelectionMouseController()
+		{
+		}
+		
+        /**
+         *  The model.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		protected var listModel:ISelectionModel;
+
+        /**
+         *  The view.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        protected var listView:IListView;
+
+        /**
+         *  The parent of the item renderers.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        protected var dataGroup:IItemRendererParent;
+
+		private var _strand:IStrand;
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			listModel = value.getBeadByType(ISelectionModel) as ISelectionModel;
+			listView = value.getBeadByType(IListView) as IListView;
+			dataGroup = listView.dataGroup;
+            dataGroup.addEventListener("selected", selectedHandler, true);
+            dataGroup.addEventListener("rollover", rolloverHandler, true);
+		}
+		
+        private function selectedHandler(event:Event):void
+        {
+            listModel.selectedIndex = IItemRenderer(event.target).index;
+            IEventDispatcher(listView.strand).dispatchEvent(new Event("change"));
+        }
+		
+        private function rolloverHandler(event:Event):void
+        {
+            IRollOverModel(listModel).rollOverIndex = IItemRenderer(event.target).index;
+            IEventDispatcher(listView.strand).dispatchEvent(new Event("rollover"));
+        }
+	
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ScrollBarMouseControllerBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ScrollBarMouseControllerBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ScrollBarMouseControllerBase.as
new file mode 100644
index 0000000..de4f73c
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/ScrollBarMouseControllerBase.as
@@ -0,0 +1,185 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.controllers
+{
+	import flash.events.MouseEvent;
+	
+	import org.apache.flex.core.IBeadController;
+	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.IScrollBarView;
+
+    /**
+     *  The ScrollBarMouseControllerBase class is the base class
+     *  for ScrollBarMouseControllers such as VScrollBarMouseController.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class ScrollBarMouseControllerBase implements IBeadController
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function ScrollBarMouseControllerBase()
+		{
+		}
+		
+        /**
+         *  The data model
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		protected var sbModel:IScrollBarModel;
+
+        /**
+         *  The view
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		protected var sbView:IScrollBarView;
+		
+		private var _strand:IStrand;
+		
+        /**
+         *  @private
+         */
+		public function get strand():IStrand
+		{
+			return _strand;
+		}
+		
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			sbModel = value.getBeadByType(IScrollBarModel) as IScrollBarModel;
+			sbView = value.getBeadByType(IScrollBarView) as IScrollBarView;
+			sbView.decrement.addEventListener(MouseEvent.CLICK, decrementClickHandler);
+			sbView.increment.addEventListener(MouseEvent.CLICK, incrementClickHandler);
+            sbView.decrement.addEventListener("buttonRepeat", decrementClickHandler);
+            sbView.increment.addEventListener("buttonRepeat", incrementClickHandler);
+			sbView.track.addEventListener(MouseEvent.CLICK, trackClickHandler);
+			sbView.thumb.addEventListener(MouseEvent.MOUSE_DOWN, thumbMouseDownHandler);
+		}
+		
+        /**
+         *  Force the input number to be "snapped" to the snapInterval.
+         *  
+         *  @param value The input number.
+         *  @return The input number "snapped" to the snapInterval.
+         * 
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */	
+		protected function snap(value:Number):Number
+		{
+			var si:Number = sbModel.snapInterval;
+			var n:Number = Math.round((value - sbModel.minimum) / si) * si + sbModel.minimum;
+			if (value > 0)
+			{
+				if (value - n < n + si - value)
+					return n;
+				return n + si;
+				
+			}
+			if (value - n > n + si - value)
+				return n + si;
+			return n;
+		}
+		
+        /**
+         *  Updates the model when the decrement button is clicked.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */	
+		protected function decrementClickHandler(event:Event):void
+		{
+			sbModel.value = snap(Math.max(sbModel.minimum, sbModel.value - sbModel.stepSize));
+			IEventDispatcher(_strand).dispatchEvent(new Event("scroll"));
+		}
+		
+        /**
+         *  Updates the model when the increment button is clicked.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */	
+		protected function incrementClickHandler(event:Event):void
+		{
+			sbModel.value = snap(Math.min(sbModel.maximum - sbModel.pageSize, sbModel.value + sbModel.stepSize));	
+			IEventDispatcher(_strand).dispatchEvent(new Event("scroll"));
+		}
+		
+        /**
+         *  Handles a click in the track.  Must be overridden.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */	
+		protected function trackClickHandler(event:MouseEvent):void
+		{
+		}
+		
+        /**
+         *  Handles a mouse down on the thumb.  Must be overridden.
+         *  Subclasses process the mouseMove and mouseUp events.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */	
+		protected function thumbMouseDownHandler(event:MouseEvent):void
+		{
+		}
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SliderMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SliderMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SliderMouseController.as
new file mode 100644
index 0000000..3b6e295
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SliderMouseController.as
@@ -0,0 +1,148 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.controllers
+{
+	import flash.events.MouseEvent;
+	import flash.geom.Point;
+	
+	import org.apache.flex.core.IBead;
+	import org.apache.flex.core.IBeadController;
+	import org.apache.flex.core.IRangeModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.html.staticControls.beads.ISliderView;
+	
+	/**
+	 *  The SliderMouseController class bead handles mouse events on the 
+	 *  org.apache.flex.html.staticControls.Slider's component parts (thumb and track) and 
+	 *  dispatches change events on behalf of the Slider (as well as co-ordinating visual 
+	 *  changes (such as moving the thumb when the track has been tapped or clicked).
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class SliderMouseController implements IBead, IBeadController
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function SliderMouseController()
+		{
+		}
+		
+		private var rangeModel:IRangeModel;
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			rangeModel = UIBase(value).model as IRangeModel;
+			
+			var sliderView:ISliderView = value.getBeadByType(ISliderView) as ISliderView;
+			sliderView.thumb.addEventListener(MouseEvent.MOUSE_DOWN, thumbDownHandler);
+			
+			// add handler to detect click on track
+			sliderView.track.addEventListener(MouseEvent.CLICK, trackClickHandler, false, 99999);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function thumbDownHandler( event:MouseEvent ) : void
+		{
+			UIBase(_strand).stage.addEventListener(MouseEvent.MOUSE_MOVE, thumbMoveHandler);
+			UIBase(_strand).stage.addEventListener(MouseEvent.MOUSE_UP, thumbUpHandler);
+			
+			var sliderView:ISliderView = _strand.getBeadByType(ISliderView) as ISliderView;
+			
+			origin = new Point(event.stageX, event.stageY);
+			thumb = new Point(sliderView.thumb.x,sliderView.thumb.y);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function thumbUpHandler( event:MouseEvent ) : void
+		{
+			UIBase(_strand).stage.removeEventListener(MouseEvent.MOUSE_MOVE, thumbMoveHandler);
+			UIBase(_strand).stage.removeEventListener(MouseEvent.MOUSE_UP, thumbUpHandler);
+			
+			IEventDispatcher(_strand).dispatchEvent(new Event("valueChanged"));
+		}
+		
+		private var origin:Point;
+		private var thumb:Point;
+		
+		/**
+		 * @private
+		 */
+		private function thumbMoveHandler( event:MouseEvent ) : void
+		{
+			var sliderView:ISliderView = _strand.getBeadByType(ISliderView) as ISliderView;
+			
+			var deltaX:Number = event.stageX - origin.x;
+			var thumbW:Number = sliderView.thumb.width/2;
+			var newX:Number = thumb.x + deltaX;
+			
+			var p:Number = newX/UIBase(_strand).width;
+			var n:Number = p*(rangeModel.maximum - rangeModel.minimum) + rangeModel.minimum;
+		
+			rangeModel.value = n;
+			
+			IEventDispatcher(_strand).dispatchEvent(new Event("valueChanged"));
+		}
+		
+		/**
+		 * @private
+		 */
+		private function trackClickHandler( event:MouseEvent ) : void
+		{
+			event.stopImmediatePropagation();
+			
+			var sliderView:ISliderView = _strand.getBeadByType(ISliderView) as ISliderView;
+			
+			var xloc:Number = event.localX;
+			var p:Number = xloc/UIBase(_strand).width;
+			var n:Number = p*(rangeModel.maximum - rangeModel.minimum) + rangeModel.minimum;
+			
+			rangeModel.value = n;
+			
+			IEventDispatcher(_strand).dispatchEvent(new Event("valueChanged"));
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.as
new file mode 100644
index 0000000..9823184
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.as
@@ -0,0 +1,98 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.controllers
+{
+	import flash.events.MouseEvent;
+	
+	import org.apache.flex.core.IBeadController;
+	import org.apache.flex.core.IRangeModel;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	import org.apache.flex.html.staticControls.beads.ISpinnerView;
+	
+	/**
+	 *  The SpinnerMouseController class bead handles mouse events on the 
+	 *  org.apache.flex.html.staticControls.Spinner's component buttons, changing the 
+	 *  value of the Spinner.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class SpinnerMouseController implements IBeadController
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function SpinnerMouseController()
+		{
+		}
+		
+		private var rangeModel:IRangeModel;
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			rangeModel = UIBase(value).model as IRangeModel;
+			
+			var spinnerBead:ISpinnerView = value.getBeadByType(ISpinnerView) as ISpinnerView;
+			spinnerBead.decrement.addEventListener(MouseEvent.CLICK, decrementClickHandler);
+			spinnerBead.decrement.addEventListener("buttonRepeat", decrementClickHandler);
+			spinnerBead.increment.addEventListener(MouseEvent.CLICK, incrementClickHandler);
+			spinnerBead.increment.addEventListener("buttonRepeat", incrementClickHandler);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function decrementClickHandler( event:Event ) : void
+		{
+			rangeModel.value = Math.max(rangeModel.minimum, rangeModel.value - rangeModel.stepSize);
+			IEventDispatcher(_strand).dispatchEvent(new Event("valueChanged"));
+		}
+		
+		/**
+		 * @private
+		 */
+		private function incrementClickHandler( event:Event ) : void
+		{
+			rangeModel.value = Math.min(rangeModel.maximum, rangeModel.value + rangeModel.stepSize);	
+			IEventDispatcher(_strand).dispatchEvent(new Event("valueChanged"));
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as
new file mode 100644
index 0000000..cc8d29f
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/controllers/VScrollBarMouseController.as
@@ -0,0 +1,101 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.controllers
+{
+	import flash.display.DisplayObject;
+	import flash.events.MouseEvent;
+	
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	
+    /**
+     *  The VScrollBarMouseController class is the controller for
+     *  org.apache.flex.html.staticControls.supportClasses.ScrollBar
+     *  that acts as the Vertical ScrollBar.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class VScrollBarMouseController extends ScrollBarMouseControllerBase
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function VScrollBarMouseController()
+		{
+		}
+		
+        /**
+         *  @private
+         */
+		override protected function trackClickHandler(event:MouseEvent):void
+		{
+			if (sbView.thumb.visible)
+			{
+				if (event.localY < sbView.thumb.y)
+				{
+					sbModel.value = snap(Math.max(sbModel.minimum, sbModel.value - sbModel.pageStepSize));						
+					IEventDispatcher(strand).dispatchEvent(new Event("scroll"));
+				}
+				else
+				{
+					sbModel.value = snap(Math.min(sbModel.maximum - sbModel.pageSize, sbModel.value + sbModel.pageStepSize));
+					IEventDispatcher(strand).dispatchEvent(new Event("scroll"));
+				}
+			}
+		}
+		
+		private var thumbDownY:Number;
+		private var lastThumbY:Number;
+		
+        /**
+         *  @private
+         */
+		override protected function thumbMouseDownHandler(event:MouseEvent):void
+		{
+			sbView.thumb.stage.addEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler);
+			sbView.thumb.stage.addEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler);
+			thumbDownY = event.stageY;
+			lastThumbY = sbView.thumb.y;
+		}
+		
+		private function thumbMouseMoveHandler(event:MouseEvent):void
+		{
+			var thumb:DisplayObject = sbView.thumb;
+			var track:DisplayObject = sbView.track;
+			thumb.y = Math.max(track.y, Math.min(lastThumbY + (event.stageY - thumbDownY), track.y + track.height - thumb.height));
+			var newValue:Number = snap((thumb.y - track.y) / (track.height - thumb.height) * (sbModel.maximum - sbModel.minimum - sbModel.pageSize));
+			sbModel.value = newValue;
+			IEventDispatcher(strand).dispatchEvent(new Event("scroll"));
+		}
+		
+		private function thumbMouseUpHandler(event:MouseEvent):void
+		{
+			sbView.thumb.stage.removeEventListener(MouseEvent.MOUSE_MOVE, thumbMouseMoveHandler);
+			sbView.thumb.stage.removeEventListener(MouseEvent.MOUSE_UP, thumbMouseUpHandler);			
+		}
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
new file mode 100644
index 0000000..d27b2dd
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
@@ -0,0 +1,121 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.html.staticControls.beads.layouts
+{
+	import flash.display.DisplayObject;
+	import flash.display.DisplayObjectContainer;
+	
+	import org.apache.flex.core.IBeadLayout;
+	import org.apache.flex.core.ILayoutParent;
+	import org.apache.flex.core.IStrand;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.events.IEventDispatcher;
+	
+	/**
+	 *  The ButtonBarLayout class bead sizes and positions the org.apache.flex.html.staticControls.Button 
+	 *  elements that make up a org.apache.flex.html.staticControls.ButtonBar. This bead arranges the Buttons 
+	 *  horizontally and makes them all the same width unless the buttonWidths property has been set in which case
+	 *  the values stored in that array are used.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class ButtonBarLayout implements IBeadLayout
+	{
+		/**
+		 *  constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ButtonBarLayout()
+		{
+		}
+		
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			IEventDispatcher(value).addEventListener("widthChanged", changeHandler);
+			IEventDispatcher(value).addEventListener("childrenAdded", changeHandler);
+			IEventDispatcher(value).addEventListener("itemsCreated", changeHandler);
+		}
+		
+		private var _buttonWidths:Array = null;
+		
+		/**
+		 *  An array of widths (Number), one per button. These values supersede the
+		 *  default of equally-sized buttons.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get buttonWidths():Array
+		{
+			return _buttonWidths;
+		}
+		public function set buttonWidths(value:Array):void
+		{
+			_buttonWidths = value;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function changeHandler(event:Event):void
+		{
+			var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
+			var contentView:DisplayObjectContainer = layoutParent.contentView;
+			
+			var n:int = contentView.numChildren;
+			var xpos:Number = 0;
+			var useWidth:Number = DisplayObject(_strand).width / n;
+			var useHeight:Number = DisplayObject(_strand).height;
+			
+			for (var i:int = 0; i < n; i++)
+			{
+				var child:DisplayObject = contentView.getChildAt(i);
+				
+				child.y = 0;
+				child.height = useHeight;
+				child.x = xpos;
+				
+				if (buttonWidths) child.width = Number(buttonWidths[i]);
+				else child.width = useWidth;
+				xpos += child.width;
+			}
+		}
+	}
+}
\ No newline at end of file


[32/35] git commit: [flex-asjs] [refs/heads/develop] - more sed removal of staticControls

Posted by ah...@apache.org.
more sed removal of staticControls


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

Branch: refs/heads/develop
Commit: 9fecc9579646741ce2fda007513794dba2ba0380
Parents: 15b80b8
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 25 11:33:20 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 25 11:33:20 2014 -0700

----------------------------------------------------------------------
 .../src/org/apache/flex/createjs/Application.as |  2 +-
 .../src/org/apache/flex/createjs/CheckBox.as    |  4 +-
 .../src/org/apache/flex/createjs/Label.as       |  4 +-
 .../src/org/apache/flex/createjs/TextButton.as  |  4 +-
 .../src/org/apache/flex/createjs/core/UIBase.as |  2 +-
 .../org/apache/flex/createjs/core/ViewBase.as   |  2 +-
 .../src/org/apache/flex/jquery/Application.as   |  2 +-
 .../src/org/apache/flex/jquery/CheckBox.as      |  4 +-
 .../src/org/apache/flex/jquery/RadioButton.as   |  4 +-
 .../src/org/apache/flex/jquery/TextButton.as    |  4 +-
 .../src/org/apache/flex/svg/TextButton.as       |  4 +-
 .../src/org/apache/flex/createjs/CheckBox.js    | 24 +++++-----
 .../src/org/apache/flex/createjs/Label.js       | 12 ++---
 .../src/org/apache/flex/createjs/TextButton.js  | 16 +++----
 .../src/org/apache/flex/jquery/CheckBox.js      | 16 +++----
 .../src/org/apache/flex/jquery/RadioButton.js   | 48 ++++++++++----------
 .../src/org/apache/flex/jquery/TextButton.js    | 12 ++---
 .../src/org/apache/flex/svg/TextButton.js       | 18 ++++----
 18 files changed, 91 insertions(+), 91 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Application.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Application.as
index dd3ed37..fd78f89 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Application.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Application.as
@@ -137,4 +137,4 @@ package org.apache.flex.createjs
             addChild(c as DisplayObject);
         }
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as
index b4dc469..2a36d05 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as
@@ -16,11 +16,11 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.createjs.staticControls
+package org.apache.flex.createjs
 {
 	import org.apache.flex.html.staticControls.CheckBox;
 	
 	public class CheckBox extends org.apache.flex.html.staticControls.CheckBox
 	{	
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as
index fb8fb7e..099c5b0 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.createjs.staticControls
+package org.apache.flex.createjs
 {
 	import org.apache.flex.html.staticControls.Label;
 	
@@ -24,4 +24,4 @@ package org.apache.flex.createjs.staticControls
 	{
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as
index 3ad2e66..6f4dc74 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.createjs.staticControls
+package org.apache.flex.createjs
 {
 	import org.apache.flex.core.ITextModel;
 	import org.apache.flex.html.staticControls.Button;
@@ -47,4 +47,4 @@ package org.apache.flex.createjs.staticControls
 		}
 				
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/UIBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/UIBase.as
index d0761a0..dcb1e7c 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/UIBase.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/UIBase.as
@@ -138,4 +138,4 @@ package org.apache.flex.createjs.core
 		}
 		
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/ViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/ViewBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/ViewBase.as
index 40c1e14..120d22e 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/ViewBase.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/ViewBase.as
@@ -87,4 +87,4 @@ package org.apache.flex.createjs.core
         }
 
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/Application.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/Application.as
index e2a3113..88e21b3 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/Application.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/Application.as
@@ -28,4 +28,4 @@ package org.apache.flex.jquery
 			super();
 		}
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as
index a2f3a01..83ca32a 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as
@@ -16,11 +16,11 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.jquery.staticControls
+package org.apache.flex.jquery
 {
 	import org.apache.flex.html.staticControls.CheckBox;
 	
 	public class CheckBox extends org.apache.flex.html.staticControls.CheckBox 
 	{
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as
index a94739a..6fc0c8f 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as
@@ -16,11 +16,11 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.jquery.staticControls
+package org.apache.flex.jquery
 {
 	import org.apache.flex.html.staticControls.RadioButton;
 	
 	public class RadioButton extends org.apache.flex.html.staticControls.RadioButton
 	{
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as
index fb78c83..9528f66 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.jquery.staticControls
+package org.apache.flex.jquery
 {
 	import org.apache.flex.html.staticControls.TextButton;
 	
@@ -27,4 +27,4 @@ package org.apache.flex.jquery.staticControls
 			super();
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as
index bb278bf..ae8af52 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.svg.staticControls
+package org.apache.flex.svg
 {
 	import org.apache.flex.html.staticControls.TextButton;
 	
@@ -27,4 +27,4 @@ package org.apache.flex.svg.staticControls
 			super();
 		}
 	}
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js
index f342f1d..284ff7b 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.createjs.staticControls.CheckBox');
+goog.provide('org.apache.flex.createjs.CheckBox');
 
 goog.require('org.apache.flex.createjs.core.UIBase');
 
@@ -22,10 +22,10 @@ goog.require('org.apache.flex.createjs.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.createjs.core.UIBase}
  */
-org.apache.flex.createjs.staticControls.CheckBox = function() {
+org.apache.flex.createjs.CheckBox = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.createjs.staticControls.CheckBox,
+goog.inherits(org.apache.flex.createjs.CheckBox,
     org.apache.flex.createjs.core.UIBase);
 
 
@@ -33,14 +33,14 @@ goog.inherits(org.apache.flex.createjs.staticControls.CheckBox,
  * @expose
  * @type {Object}
  */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.checkMark = null;
+org.apache.flex.createjs.CheckBox.prototype.checkMark = null;
 
 
 /**
  * @expose
  * @type {Object}
  */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.checkMarkBackground =
+org.apache.flex.createjs.CheckBox.prototype.checkMarkBackground =
     null;
 
 
@@ -48,13 +48,13 @@ org.apache.flex.createjs.staticControls.CheckBox.prototype.checkMarkBackground =
  * @expose
  * @type {Object}
  */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.checkBoxLabel = null;
+org.apache.flex.createjs.CheckBox.prototype.checkBoxLabel = null;
 
 
 /**
  * @override
  */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.createElement =
+org.apache.flex.createjs.CheckBox.prototype.createElement =
     function() {
   this.checkMarkBackground = new createjs.Shape();
   this.checkMarkBackground.name = 'checkmarkbackground';
@@ -97,7 +97,7 @@ org.apache.flex.createjs.staticControls.CheckBox.prototype.createElement =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.get_text =
+org.apache.flex.createjs.CheckBox.prototype.get_text =
     function() {
   return this.checkBoxLabel.text;
 };
@@ -107,7 +107,7 @@ org.apache.flex.createjs.staticControls.CheckBox.prototype.get_text =
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.set_text =
+org.apache.flex.createjs.CheckBox.prototype.set_text =
     function(value) {
   this.checkBoxLabel.text = value;
 };
@@ -117,7 +117,7 @@ org.apache.flex.createjs.staticControls.CheckBox.prototype.set_text =
  * @expose
  * @return {bool} The selected getter.
  */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.get_selected =
+org.apache.flex.createjs.CheckBox.prototype.get_selected =
     function() {
   return this.selected;
 };
@@ -127,7 +127,7 @@ org.apache.flex.createjs.staticControls.CheckBox.prototype.get_selected =
  * @expose
  * @param {bool} value The selected setter.
  */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.set_selected =
+org.apache.flex.createjs.CheckBox.prototype.set_selected =
     function(value) {
   this.checkMark.visible = this.selected = value;
   this.element.getStage().update();
@@ -138,7 +138,7 @@ org.apache.flex.createjs.staticControls.CheckBox.prototype.set_selected =
  * @expose
  * @param {string|Object|goog.events.Event} event The event.
  */
-org.apache.flex.createjs.staticControls.CheckBox.prototype.clickHandler =
+org.apache.flex.createjs.CheckBox.prototype.clickHandler =
     function(event) {
   this.set_selected(!this.get_selected());
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/js/FlexJS/src/org/apache/flex/createjs/Label.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/Label.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/Label.js
index c6b5243..d97b38e 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/createjs/Label.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/createjs/Label.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.createjs.staticControls.Label');
+goog.provide('org.apache.flex.createjs.Label');
 
 goog.require('org.apache.flex.createjs.core.UIBase');
 
@@ -22,17 +22,17 @@ goog.require('org.apache.flex.createjs.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.createjs.core.UIBase}
  */
-org.apache.flex.createjs.staticControls.Label = function() {
+org.apache.flex.createjs.Label = function() {
   org.apache.flex.createjs.core.UIBase.call(this);
 };
-goog.inherits(org.apache.flex.createjs.staticControls.Label,
+goog.inherits(org.apache.flex.createjs.Label,
     org.apache.flex.createjs.core.UIBase);
 
 
 /**
  * @override
  */
-org.apache.flex.createjs.staticControls.Label.prototype.createElement =
+org.apache.flex.createjs.Label.prototype.createElement =
     function(p) {
   goog.base(this, 'createElement');
 
@@ -51,7 +51,7 @@ org.apache.flex.createjs.staticControls.Label.prototype.createElement =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.createjs.staticControls.Label.prototype.get_text = function() {
+org.apache.flex.createjs.Label.prototype.get_text = function() {
   return this.element.text;
 };
 
@@ -60,7 +60,7 @@ org.apache.flex.createjs.staticControls.Label.prototype.get_text = function() {
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.createjs.staticControls.Label.prototype.set_text =
+org.apache.flex.createjs.Label.prototype.set_text =
     function(value) {
   this.element.text = value;
   this.element.getStage().update();

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/js/FlexJS/src/org/apache/flex/createjs/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/TextButton.js
index 147b6f9..5ac4f21 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/createjs/TextButton.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/createjs/TextButton.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.createjs.staticControls.TextButton');
+goog.provide('org.apache.flex.createjs.TextButton');
 
 goog.require('org.apache.flex.createjs.core.UIBase');
 
@@ -22,10 +22,10 @@ goog.require('org.apache.flex.createjs.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.createjs.core.UIBase}
  */
-org.apache.flex.createjs.staticControls.TextButton = function() {
+org.apache.flex.createjs.TextButton = function() {
   org.apache.flex.createjs.core.UIBase.call(this);
 };
-goog.inherits(org.apache.flex.createjs.staticControls.TextButton,
+goog.inherits(org.apache.flex.createjs.TextButton,
     org.apache.flex.createjs.core.UIBase);
 
 
@@ -33,21 +33,21 @@ goog.inherits(org.apache.flex.createjs.staticControls.TextButton,
  * @expose
  * @type {Object}
  */
-org.apache.flex.createjs.staticControls.TextButton.prototype.buttonLabel = null;
+org.apache.flex.createjs.TextButton.prototype.buttonLabel = null;
 
 
 /**
  * @expose
  * @type {Object}
  */
-org.apache.flex.createjs.staticControls.TextButton.prototype.buttonBackground =
+org.apache.flex.createjs.TextButton.prototype.buttonBackground =
     null;
 
 
 /**
  * @override
  */
-org.apache.flex.createjs.staticControls.TextButton.prototype.createElement =
+org.apache.flex.createjs.TextButton.prototype.createElement =
     function(p) {
 
   this.buttonBackground = new createjs.Shape();
@@ -79,7 +79,7 @@ org.apache.flex.createjs.staticControls.TextButton.prototype.createElement =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.createjs.staticControls.TextButton.prototype.get_text =
+org.apache.flex.createjs.TextButton.prototype.get_text =
     function() {
   return this.buttonLabel.text;
 };
@@ -89,7 +89,7 @@ org.apache.flex.createjs.staticControls.TextButton.prototype.get_text =
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.createjs.staticControls.TextButton.prototype.set_text =
+org.apache.flex.createjs.TextButton.prototype.set_text =
     function(value) {
   this.buttonLabel.text = value;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/js/FlexJS/src/org/apache/flex/jquery/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/jquery/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/jquery/CheckBox.js
index 0d54eee..ba28a73 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/jquery/CheckBox.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/jquery/CheckBox.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.jquery.staticControls.CheckBox');
+goog.provide('org.apache.flex.jquery.CheckBox');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,18 +22,18 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.jquery.staticControls.CheckBox = function() {
+org.apache.flex.jquery.CheckBox = function() {
   goog.base(this);
 
 };
-goog.inherits(org.apache.flex.jquery.staticControls.CheckBox,
+goog.inherits(org.apache.flex.jquery.CheckBox,
     org.apache.flex.core.UIBase);
 
 
 /**
  * @override
  */
-org.apache.flex.jquery.staticControls.CheckBox.prototype.createElement =
+org.apache.flex.jquery.CheckBox.prototype.createElement =
     function() {
   var cb, d, lb;
 
@@ -61,7 +61,7 @@ org.apache.flex.jquery.staticControls.CheckBox.prototype.createElement =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.jquery.staticControls.CheckBox.prototype.get_text = function() {
+org.apache.flex.jquery.CheckBox.prototype.get_text = function() {
   return this.element.childNodes.item(1).value;
 };
 
@@ -70,7 +70,7 @@ org.apache.flex.jquery.staticControls.CheckBox.prototype.get_text = function() {
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.jquery.staticControls.CheckBox.prototype.set_text =
+org.apache.flex.jquery.CheckBox.prototype.set_text =
     function(value) {
   this.element.childNodes.item(1).appendChild(document.createTextNode(value));
 };
@@ -80,7 +80,7 @@ org.apache.flex.jquery.staticControls.CheckBox.prototype.set_text =
  * @expose
  * @return {bool} The selected getter.
  */
-org.apache.flex.jquery.staticControls.CheckBox.prototype.get_selected =
+org.apache.flex.jquery.CheckBox.prototype.get_selected =
     function() {
   return this.element.childNodes.item(0).checked;
 };
@@ -90,7 +90,7 @@ org.apache.flex.jquery.staticControls.CheckBox.prototype.get_selected =
  * @expose
  * @param {bool} value The selected setter.
  */
-org.apache.flex.jquery.staticControls.CheckBox.prototype.set_selected =
+org.apache.flex.jquery.CheckBox.prototype.set_selected =
     function(value) {
   this.element.childNodes.item(0).checked = value;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/js/FlexJS/src/org/apache/flex/jquery/RadioButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/jquery/RadioButton.js b/frameworks/js/FlexJS/src/org/apache/flex/jquery/RadioButton.js
index e0d8c29..89b6d77 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/jquery/RadioButton.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/jquery/RadioButton.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.jquery.staticControls.RadioButton');
+goog.provide('org.apache.flex.jquery.RadioButton');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,14 +22,14 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.jquery.staticControls.RadioButton = function() {
+org.apache.flex.jquery.RadioButton = function() {
 
   goog.base(this);
 
   org.apache.flex.core.UIBase.call(this);
-  org.apache.flex.jquery.staticControls.RadioButton.radioCounter++;
+  org.apache.flex.jquery.RadioButton.radioCounter++;
 };
-goog.inherits(org.apache.flex.jquery.staticControls.RadioButton,
+goog.inherits(org.apache.flex.jquery.RadioButton,
     org.apache.flex.core.UIBase);
 
 
@@ -37,40 +37,40 @@ goog.inherits(org.apache.flex.jquery.staticControls.RadioButton,
  * @expose
  * The name of the radioGroup.
  */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.radioGroupName = null;
+org.apache.flex.jquery.RadioButton.prototype.radioGroupName = null;
 
 
 /**
  * @expose
  * Used to provide ids to the radio buttons.
  */
-org.apache.flex.jquery.staticControls.RadioButton.radioCounter = 0;
+org.apache.flex.jquery.RadioButton.radioCounter = 0;
 
 
 /**
  * @expose
  * Used to manage groups on the radio buttons.
  */
-org.apache.flex.jquery.staticControls.RadioButton.groups = { };
+org.apache.flex.jquery.RadioButton.groups = { };
 
 
 /**
  * Flag to make sure the event handler is set only once.
  */
-org.apache.flex.jquery.staticControls.RadioButton.groupHandlerSet = false;
+org.apache.flex.jquery.RadioButton.groupHandlerSet = false;
 
 
 /**
  * @override
  */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.createElement =
+org.apache.flex.jquery.RadioButton.prototype.createElement =
     function() {
 
   var input = document.createElement('input');
   input.type = 'radio';
   input.name = 'radio';
   input.id = 'radio' +
-      org.apache.flex.jquery.staticControls.RadioButton.radioCounter;
+      org.apache.flex.jquery.RadioButton.radioCounter;
 
   var label = document.createElement('label');
   label.htmlFor = input.id;
@@ -87,11 +87,11 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.createElement =
  * @override
  * @param {Object} doc the document for this item.
  */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.setDocument =
+org.apache.flex.jquery.RadioButton.prototype.setDocument =
     function(doc, id) {
-  if (!org.apache.flex.jquery.staticControls.RadioButton.groupHandlerSet)
+  if (!org.apache.flex.jquery.RadioButton.groupHandlerSet)
   {
-    org.apache.flex.jquery.staticControls.RadioButton.groupHandlerSet =
+    org.apache.flex.jquery.RadioButton.groupHandlerSet =
         true;
     doc.addEventListener('initComplete',
         goog.bind(this.initHandler, this));
@@ -102,9 +102,9 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.setDocument =
 /**
  * @param {Event} event The event.
  */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.initHandler =
+org.apache.flex.jquery.RadioButton.prototype.initHandler =
     function(event) {
-  var divtags = org.apache.flex.jquery.staticControls.RadioButton.groups;
+  var divtags = org.apache.flex.jquery.RadioButton.groups;
   for (var name in divtags)
   {
     var div = divtags[name];
@@ -117,7 +117,7 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.initHandler =
  * @expose
  * @return {string} The groupName getter.
  */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.get_groupName =
+org.apache.flex.jquery.RadioButton.prototype.get_groupName =
     function() {
   return this.radioGroupName;
 };
@@ -127,7 +127,7 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.get_groupName =
  * @expose
  * @param {string} value The groupName setter.
  */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.set_groupName =
+org.apache.flex.jquery.RadioButton.prototype.set_groupName =
     function(value) {
 
   /*
@@ -146,8 +146,8 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.set_groupName =
 
   var div;
 
-  if (org.apache.flex.jquery.staticControls.RadioButton.groups[value]) {
-    div = org.apache.flex.jquery.staticControls.RadioButton.groups[value];
+  if (org.apache.flex.jquery.RadioButton.groups[value]) {
+    div = org.apache.flex.jquery.RadioButton.groups[value];
     div.appendChild(this.element);
     div.appendChild(this.labelFor);
   }
@@ -157,7 +157,7 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.set_groupName =
     div.appendChild(this.element);
     div.appendChild(this.labelFor);
 
-    org.apache.flex.jquery.staticControls.
+    org.apache.flex.jquery.
         RadioButton.groups[String(value)] = div;
   }
 
@@ -169,7 +169,7 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.set_groupName =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.get_text =
+org.apache.flex.jquery.RadioButton.prototype.get_text =
     function() {
   return this.labelFor.innerHTML;
 };
@@ -179,7 +179,7 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.get_text =
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.set_text =
+org.apache.flex.jquery.RadioButton.prototype.set_text =
     function(value) {
   this.labelFor.innerHTML = value;
 };
@@ -189,7 +189,7 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.set_text =
  * @expose
  * @return {bool} The selected getter.
  */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.get_selected =
+org.apache.flex.jquery.RadioButton.prototype.get_selected =
     function() {
   return this.element.checked;
 };
@@ -199,7 +199,7 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.get_selected =
  * @expose
  * @param {bool} value The selected setter.
  */
-org.apache.flex.jquery.staticControls.RadioButton.prototype.set_selected =
+org.apache.flex.jquery.RadioButton.prototype.set_selected =
     function(value) {
   this.element.checked = value;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/js/FlexJS/src/org/apache/flex/jquery/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/jquery/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/jquery/TextButton.js
index 6e98f82..2518062 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/jquery/TextButton.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/jquery/TextButton.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.jquery.staticControls.TextButton');
+goog.provide('org.apache.flex.jquery.TextButton');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,17 +22,17 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.jquery.staticControls.TextButton = function() {
+org.apache.flex.jquery.TextButton = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.jquery.staticControls.TextButton,
+goog.inherits(org.apache.flex.jquery.TextButton,
     org.apache.flex.core.UIBase);
 
 
 /**
  * @override
  */
-org.apache.flex.jquery.staticControls.TextButton.prototype.createElement =
+org.apache.flex.jquery.TextButton.prototype.createElement =
     function() {
   this.element = document.createElement('button');
   this.element.setAttribute('type', 'button');
@@ -47,7 +47,7 @@ org.apache.flex.jquery.staticControls.TextButton.prototype.createElement =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.jquery.staticControls.TextButton.prototype.get_text =
+org.apache.flex.jquery.TextButton.prototype.get_text =
     function() {
   return this.element.innerHTML;
 };
@@ -57,7 +57,7 @@ org.apache.flex.jquery.staticControls.TextButton.prototype.get_text =
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.jquery.staticControls.TextButton.prototype.set_text =
+org.apache.flex.jquery.TextButton.prototype.set_text =
     function(value) {
   this.element.innerHTML = value;
 };

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js
index 04325ef..d43edd9 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-goog.provide('org.apache.flex.svg.staticControls.TextButton');
+goog.provide('org.apache.flex.svg.TextButton');
 
 goog.require('org.apache.flex.core.UIBase');
 
@@ -22,10 +22,10 @@ goog.require('org.apache.flex.core.UIBase');
  * @constructor
  * @extends {org.apache.flex.core.UIBase}
  */
-org.apache.flex.svg.staticControls.TextButton = function() {
+org.apache.flex.svg.TextButton = function() {
   goog.base(this);
 };
-goog.inherits(org.apache.flex.svg.staticControls.TextButton,
+goog.inherits(org.apache.flex.svg.TextButton,
     org.apache.flex.core.UIBase);
 
 
@@ -34,15 +34,15 @@ goog.inherits(org.apache.flex.svg.staticControls.TextButton,
  *
  * @type {Object.<string, Array.<Object>>}
  */
-org.apache.flex.svg.staticControls.TextButton.prototype.FLEXJS_CLASS_INFO =
+org.apache.flex.svg.TextButton.prototype.FLEXJS_CLASS_INFO =
     { names: [{ name: 'TextButton',
-                qName: 'org.apache.flex.svg.staticControls.TextButton'}] };
+                qName: 'org.apache.flex.svg.TextButton'}] };
 
 
 /**
  * @override
  */
-org.apache.flex.svg.staticControls.TextButton.prototype.createElement =
+org.apache.flex.svg.TextButton.prototype.createElement =
     function() {
   this.element = document.createElement('embed');
   this.element.setAttribute('src', 'org/apache/flex/svg/staticControls/assets/TextButton_Skin.svg');
@@ -56,7 +56,7 @@ org.apache.flex.svg.staticControls.TextButton.prototype.createElement =
 /**
  * @override
  */
-org.apache.flex.svg.staticControls.TextButton.prototype.finalizeElement =
+org.apache.flex.svg.TextButton.prototype.finalizeElement =
     function() {
   var listenersArray;
   if (goog.events.hasListener(this.element, goog.events.EventType.CLICK)) {
@@ -78,7 +78,7 @@ org.apache.flex.svg.staticControls.TextButton.prototype.finalizeElement =
  * @expose
  * @return {string} The text getter.
  */
-org.apache.flex.svg.staticControls.TextButton.prototype.get_text =
+org.apache.flex.svg.TextButton.prototype.get_text =
     function() {
   return this.element.getAttribute('label');
 };
@@ -88,7 +88,7 @@ org.apache.flex.svg.staticControls.TextButton.prototype.get_text =
  * @expose
  * @param {string} value The text setter.
  */
-org.apache.flex.svg.staticControls.TextButton.prototype.set_text =
+org.apache.flex.svg.TextButton.prototype.set_text =
     function(value) {
   this.element.setAttribute('label', value);
 };