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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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