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

[24/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/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;