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:55 UTC

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

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;