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

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

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
new file mode 100644
index 0000000..ceb83a7
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
@@ -0,0 +1,333 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.html.staticControls.supportClasses
+{
+    import flash.text.TextFieldType;
+    
+    import org.apache.flex.core.CSSTextField;
+    import org.apache.flex.core.IBead;
+    import org.apache.flex.core.IBeadController;
+    import org.apache.flex.core.IStrand;
+    import org.apache.flex.core.IUIBase;
+    import org.apache.flex.core.UIBase;
+    import org.apache.flex.core.ValuesManager;
+    import org.apache.flex.events.Event;
+    import org.apache.flex.html.staticControls.beads.ITextItemRenderer;
+	
+	/**
+	 *  The TextFieldItemRenderer class provides a org.apache.flex.html.staticControls.TextField as an itemRenderer.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class TextFieldItemRenderer extends CSSTextField implements ITextItemRenderer, IStrand, IUIBase
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function TextFieldItemRenderer()
+		{
+			super();
+            type = TextFieldType.DYNAMIC;
+            selectable = false;
+		}
+        
+        public var highlightColor:uint = 0xCEDBEF;
+        public var selectedColor:uint = 0xA8C6EE;
+        public var downColor:uint = 0x808080;
+
+        private var _width:Number;
+		
+		/**
+		 * @private
+		 */
+        override public function get width():Number
+        {
+            if (isNaN(_width))
+            {
+                var value:* = ValuesManager.valuesImpl.getValue(this, "width");
+                if (value === undefined)
+                    return $width;
+                _width = Number(value);
+                super.width = value;
+            }
+            return _width;
+        }
+        override public function set width(value:Number):void
+        {
+            if (_width != value)
+            {
+                _width = value;
+                super.width = value;
+                dispatchEvent(new Event("widthChanged"));
+            }
+        }
+		
+		/**
+		 * @private
+		 */
+        protected function get $width():Number
+        {
+            return super.width;
+        }
+        
+        private var _height:Number;
+		
+		/**
+		 * @private
+		 */
+        override public function get height():Number
+        {
+            if (isNaN(_height))
+            {
+                var value:* = ValuesManager.valuesImpl.getValue(this, "height");
+                if (value === undefined)
+                    return $height;
+                _height = Number(value);
+                super.height = value;
+            }
+            return _height;
+        }
+        override public function set height(value:Number):void
+        {
+            if (_height != value)
+            {
+                _height = value;
+                super.height = value;
+                dispatchEvent(new Event("heightChanged"));
+            }
+        }
+		
+		/**
+		 * @private
+		 */
+        protected function get $height():Number
+        {
+            return super.height;
+        }
+
+		/**
+		 *  The String(data) for the itemRenderer instance.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get data():Object
+        {
+            return text;
+        }
+        public function set data(value:Object):void
+        {
+            text = String(value);
+        }
+		
+		/**
+		 * @private
+		 */
+		public function get labelField():String
+		{
+			return null;
+		}
+		public function set labelField(value:String):void
+		{
+			// nothing to do for this
+		}
+        
+        private var _index:int;
+        
+		/**
+		 *  An index value for the itemRenderer corresponding the data's position with its dataProvider.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get index():int
+        {
+            return _index;
+        }
+        public function set index(value:int):void
+        {
+            _index = value;
+        }
+        
+        private var _hovered:Boolean;
+        
+		/**
+		 *  Returns whether or not the itemRenderer is a "hovered" state.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get hovered():Boolean
+        {
+            return _hovered;
+        }
+        public function set hovered(value:Boolean):void
+        {
+            _hovered = value;
+            updateRenderer();
+        }
+        
+        private var _selected:Boolean;
+        
+		/**
+		 *  Whether or not the itemRenderer should be represented in a selected state.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get selected():Boolean
+        {
+            return _selected;
+        }
+        public function set selected(value:Boolean):void
+        {
+            _selected = value;
+            updateRenderer();
+        }
+
+        private var _down:Boolean;
+        
+		/**
+		 *  Whether or not the itemRenderer should be represented in a down (or pre-selected) state.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        public function get down():Boolean
+        {
+            return _down;
+        }
+        public function set down(value:Boolean):void
+        {
+            _down = value;
+            updateRenderer();
+        }
+        
+		/**
+		 * @private
+		 */
+        public function updateRenderer():void
+        {
+            background = (down || selected || hovered);
+            if (down)
+                backgroundColor = downColor;
+            else if (hovered)
+                backgroundColor = highlightColor;
+            else if (selected)
+                backgroundColor = selectedColor;
+        }
+        
+		/**
+		 * @private
+		 */
+        public function get element():Object
+        {
+            return this;
+        }
+
+        // beads declared in MXML are added to the strand.
+        // from AS, just call addBead()
+        public var beads:Array;
+        
+        private var _beads:Vector.<IBead>;
+		
+		/**
+		 * @private
+		 */
+        public function addBead(bead:IBead):void
+        {
+            if (!_beads)
+                _beads = new Vector.<IBead>;
+            _beads.push(bead);
+            bead.strand = this;
+        }
+        
+		/**
+		 * @private
+		 */
+        public function getBeadByType(classOrInterface:Class):IBead
+        {
+            for each (var bead:IBead in _beads)
+            {
+                if (bead is classOrInterface)
+                    return bead;
+            }
+            return null;
+        }
+        
+		/**
+		 * @private
+		 */
+        public function removeBead(value:IBead):IBead	
+        {
+            var n:int = _beads.length;
+            for (var i:int = 0; i < n; i++)
+            {
+                var bead:IBead = _beads[i];
+                if (bead == value)
+                {
+                    _beads.splice(i, 1);
+                    return bead;
+                }
+            }
+            return null;
+        }
+        
+		/**
+		 * @private
+		 */
+        public function addedToParent():void
+        {
+            var c:Class;
+
+            // renderer has a default model (the 'data' property)
+            // and it is essentially a view of that model, so it
+            // only needs an assignable controller
+            
+            if (getBeadByType(IBeadController) == null) 
+            {
+                c = ValuesManager.valuesImpl.getValue(this, "iBeadController") as Class;
+                if (c)
+                {
+                    var controller:IBeadController = new c as IBeadController;
+                    if (controller)
+                        addBead(controller);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/UIItemRendererBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/UIItemRendererBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/UIItemRendererBase.as
new file mode 100644
index 0000000..b313650
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/supportClasses/UIItemRendererBase.as
@@ -0,0 +1,245 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.html.staticControls.supportClasses
+{
+	import org.apache.flex.core.IItemRenderer;
+	import org.apache.flex.core.UIBase;
+	import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.utils.MXMLDataInterpreter;
+	
+	/**
+	 *  The UIItemRendererBase class is the base class for all itemRenderers. An itemRenderer is used to
+	 *  display a single datum within a collection of data. Components such as a List use itemRenderers to 
+	 *  show their dataProviders.
+	 *
+ 	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class UIItemRendererBase extends UIBase implements IItemRenderer
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function UIItemRendererBase()
+		{
+		}
+		
+		/**
+		 * @private
+		 */
+		override public function addedToParent():void
+		{
+			super.addedToParent();
+			
+            // very common for item renderers to be resized by their containers,
+            addEventListener("widthChanged", sizeChangeHandler);
+            addEventListener("heightChanged", sizeChangeHandler);
+
+            // each MXML file can also have styles in fx:Style block
+            ValuesManager.valuesImpl.init(this);
+            
+            MXMLDataInterpreter.generateMXMLProperties(this, mxmlProperties);
+            MXMLDataInterpreter.generateMXMLInstances(this, this, MXMLDescriptor);
+            
+            dispatchEvent(new Event("initComplete"));
+            
+		}
+		
+		/**
+		 * @private
+		 */
+        public function get MXMLDescriptor():Array
+        {
+            return null;
+        }
+        
+        private var mxmlProperties:Array ;
+        
+		/**
+		 * @private
+		 */
+        public function generateMXMLAttributes(data:Array):void
+        {
+            mxmlProperties = data;
+        }
+        
+		public var backgroundColor:uint = 0xFFFFFF;
+		public var highlightColor:uint = 0xCEDBEF;
+		public var selectedColor:uint = 0xA8C6EE;
+		public var downColor:uint = 0x808080;
+		
+		private var _data:Object;
+		
+		/**
+		 *  The data being represented by this itemRenderer. This can be something simple like a String or
+		 *  a Number or something very complex.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get data():Object
+		{
+			return _data;
+		}
+		public function set data(value:Object):void
+		{
+			_data = value;
+		}
+		
+		private var _labelField:String = "label";
+		
+		/**
+		 * The name of the field within the data to use as a label. Some itemRenderers use this field to
+		 * identify the value they should show while other itemRenderers ignore this if they are showing
+		 * complex information.
+		 */
+		public function get labelField():String
+		{
+			return _labelField;
+		}
+		public function set labelField(value:String):void
+		{
+			_labelField = value;
+		}
+		
+		private var _index:int;
+		
+		/**
+		 *  The position with the dataProvider being shown by the itemRenderer instance.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get index():int
+		{
+			return _index;
+		}
+		public function set index(value:int):void
+		{
+			_index = value;
+		}
+		
+		private var _hovered:Boolean;
+		
+		/**
+		 *  Whether or not the itemRenderer is in a hovered state.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get hovered():Boolean
+		{
+			return _hovered;
+		}
+		public function set hovered(value:Boolean):void
+		{
+			_hovered = value;
+			updateRenderer();
+		}
+		
+		private var _selected:Boolean;
+		
+		/**
+		 *  Whether or not the itemRenderer is in a selected state.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get selected():Boolean
+		{
+			return _selected;
+		}
+		public function set selected(value:Boolean):void
+		{
+			_selected = value;
+			updateRenderer();
+		}
+		
+		private var _down:Boolean;
+		
+		/**
+		 *  Whether or not the itemRenderer is in a down (or pre-selected) state.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get down():Boolean
+		{
+			return _down;
+		}
+		public function set down(value:Boolean):void
+		{
+			_down = value;
+			updateRenderer();
+		}
+		
+		/**
+		 * @private
+		 */
+		public function updateRenderer():void
+		{
+			if (down)
+				backgroundColor = downColor;
+			else if (hovered)
+				backgroundColor = highlightColor;
+			else if (selected)
+				backgroundColor = selectedColor;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function sizeChangeHandler(event:Event):void
+		{
+			adjustSize();
+		}
+		
+		/**
+		 *  This function is called whenever the itemRenderer changes size. Sub-classes should override
+		 *  this method an handle the size change.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function adjustSize():void
+		{
+			// handle in subclass
+		}
+	}
+}
\ No newline at end of file

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

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

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

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

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as
new file mode 100644
index 0000000..8a8ad99
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/Label.as
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.html5.staticControls
+{
+	import org.apache.flex.html.staticControls.Label;
+	
+	/**
+	 *  Label probably should extend TextField directly,
+	 *  but the player's APIs for TextLine do not allow
+	 *  direct instantiation, and we might want to allow
+	 *  Labels to be declared and have their actual
+	 *  view be swapped out.
+	 */
+	public class Label extends org.apache.flex.html.staticControls.Label
+	{
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as
new file mode 100644
index 0000000..86e8ef8
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/List.as
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.html5.staticControls
+{
+	import org.apache.flex.html.staticControls.List;
+	
+    /**
+	 *  Label probably should extend TextField directly,
+	 *  but the player's APIs for TextLine do not allow
+	 *  direct instantiation, and we might want to allow
+	 *  Labels to be declared and have their actual
+	 *  view be swapped out.
+	 */
+	public class List extends org.apache.flex.html.staticControls.List
+	{
+	}
+}
\ No newline at end of file

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

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

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

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

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Button.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Button.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Button.as
deleted file mode 100644
index 4b7731d..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Button.as
+++ /dev/null
@@ -1,26 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.Button;
-	
-	public class Button extends org.apache.flex.html.staticControls.Button
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/CheckBox.as
deleted file mode 100644
index ec92d72..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/CheckBox.as
+++ /dev/null
@@ -1,26 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.CheckBox;
-	
-	public class CheckBox extends org.apache.flex.html.staticControls.CheckBox 
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/ComboBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/ComboBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/ComboBox.as
deleted file mode 100644
index ebeea35..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/ComboBox.as
+++ /dev/null
@@ -1,26 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.ComboBox;
-	
-	public class ComboBox extends org.apache.flex.html.staticControls.ComboBox
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/DropDownList.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/DropDownList.as
deleted file mode 100644
index 14aa0fe..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/DropDownList.as
+++ /dev/null
@@ -1,26 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
-{
-    import org.apache.flex.html.staticControls.DropDownList;
-    
-    public class DropDownList extends org.apache.flex.html.staticControls.DropDownList
-	{
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Label.as
deleted file mode 100644
index 8a8ad99..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/Label.as
+++ /dev/null
@@ -1,33 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.Label;
-	
-	/**
-	 *  Label probably should extend TextField directly,
-	 *  but the player's APIs for TextLine do not allow
-	 *  direct instantiation, and we might want to allow
-	 *  Labels to be declared and have their actual
-	 *  view be swapped out.
-	 */
-	public class Label extends org.apache.flex.html.staticControls.Label
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/List.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/List.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/List.as
deleted file mode 100644
index 86e8ef8..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/List.as
+++ /dev/null
@@ -1,33 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.List;
-	
-    /**
-	 *  Label probably should extend TextField directly,
-	 *  but the player's APIs for TextLine do not allow
-	 *  direct instantiation, and we might want to allow
-	 *  Labels to be declared and have their actual
-	 *  view be swapped out.
-	 */
-	public class List extends org.apache.flex.html.staticControls.List
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/RadioButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/RadioButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/RadioButton.as
deleted file mode 100644
index 78f117b..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/RadioButton.as
+++ /dev/null
@@ -1,26 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.RadioButton;
-	
-	public class RadioButton extends org.apache.flex.html.staticControls.RadioButton
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextArea.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextArea.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextArea.as
deleted file mode 100644
index a2c4f0b..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextArea.as
+++ /dev/null
@@ -1,26 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.TextArea;
-
-	public class TextArea extends org.apache.flex.html.staticControls.TextArea
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextButton.as
deleted file mode 100644
index d23ffb7..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextButton.as
+++ /dev/null
@@ -1,30 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.TextButton;
-	
-	public class TextButton extends org.apache.flex.html.staticControls.TextButton
-	{
-		public function TextButton()
-		{
-			super();
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextInput.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextInput.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextInput.as
deleted file mode 100644
index adb723f..0000000
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextInput.as
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html5.staticControls
-{
-	import org.apache.flex.html.staticControls.TextInput;
-	
-	public class TextInput extends org.apache.flex.html.staticControls.TextInput
-	{
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js
new file mode 100644
index 0000000..8f27c76
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js
@@ -0,0 +1,213 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org.apache.flex.html.staticControls.Alert');
+
+goog.require('org.apache.flex.core.UIBase');
+goog.require('org.apache.flex.html.staticControls.Container');
+goog.require('org.apache.flex.html.staticControls.Label');
+goog.require('org.apache.flex.html.staticControls.TextButton');
+goog.require('org.apache.flex.html.staticControls.TitleBar');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.html.staticControls.Container}
+ */
+org.apache.flex.html.staticControls.Alert = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.Alert,
+    org.apache.flex.html.staticControls.Container);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.Alert.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'Alert',
+                qName: 'org.apache.flex.html.staticControls.Alert'}] };
+
+
+/**
+ * @type {number} The value for the Yes button option.
+ */
+org.apache.flex.html.staticControls.Alert.YES = 0x000001;
+
+
+/**
+ * @type {number} The value for the No button option.
+ */
+org.apache.flex.html.staticControls.Alert.NO = 0x000002;
+
+
+/**
+ * @type {number} The value for the OK button option.
+ */
+org.apache.flex.html.staticControls.Alert.OK = 0x000004;
+
+
+/**
+ * @type {number} The value for the Cancel button option.
+ */
+org.apache.flex.html.staticControls.Alert.CANCEL = 0x000008;
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.Alert.prototype.createElement =
+    function() {
+  goog.base(this, 'createElement');
+
+  this.element.className = 'Alert';
+
+  // add in a title bar
+  this.titleBar = new org.apache.flex.html.staticControls.TitleBar();
+  this.addElement(this.titleBar);
+  this.titleBar.element.id = 'titleBar';
+
+  this.message = new org.apache.flex.html.staticControls.Label();
+  this.addElement(this.message);
+  this.message.element.id = 'message';
+
+  // add a place for the buttons
+  this.buttonArea = new org.apache.flex.html.staticControls.Container();
+  this.addElement(this.buttonArea);
+  this.buttonArea.element.id = 'buttonArea';
+
+  return this.element;
+};
+
+
+/**
+ * @param {string} message The message to be displayed.
+ * @param {Object} host The object to display the alert.
+ * @param {string} title The message to be displayed in the title bar.
+ * @param {number} flags The options for the buttons.
+ */
+org.apache.flex.html.staticControls.Alert.show =
+    function(message, host, title, flags) {
+
+  var a = new org.apache.flex.html.staticControls.Alert();
+  host.addElement(a);
+  a.set_title(title);
+  a.set_text(message);
+  a.set_flags(flags);
+
+  a.positioner.style.position = 'relative';
+  a.positioner.style.width = '200px';
+  a.positioner.style.margin = 'auto';
+  a.positioner.style.top = '100px';
+};
+
+
+/**
+ * @return {string} The message to be displayed in the title bar.
+ */
+org.apache.flex.html.staticControls.Alert.prototype.get_title = function()
+    {
+  return this.titleBar.get_title();
+};
+
+
+/**
+ * @param {string} value The message to be displayed in the title bar.
+ */
+org.apache.flex.html.staticControls.Alert.prototype.set_title =
+    function(value)
+    {
+  this.titleBar.set_title(value);
+};
+
+
+/**
+ * @return {string} The message to be displayed.
+ */
+org.apache.flex.html.staticControls.Alert.prototype.get_text = function()
+    {
+  return this.message.get_text();
+};
+
+
+/**
+ * @param {string} value The message to be displayed.
+ */
+org.apache.flex.html.staticControls.Alert.prototype.set_text =
+    function(value)
+    {
+  this.message.set_text(value);
+};
+
+
+/**
+ * @return {number} The button options.
+ */
+org.apache.flex.html.staticControls.Alert.prototype.get_flags = function()
+    {
+  return this.flags;
+};
+
+
+/**
+ * @param {number} value The button options.
+ */
+org.apache.flex.html.staticControls.Alert.prototype.set_flags =
+    function(value)
+    {
+  this.flags = value;
+
+  // add buttons based on flags
+  if (this.flags & org.apache.flex.html.staticControls.Alert.OK) {
+    var ok = new org.apache.flex.html.staticControls.TextButton();
+    this.buttonArea.addElement(ok);
+    ok.set_text('OK');
+    goog.events.listen(/** @type {EventTarget} */ (ok.element), 'click',
+        goog.bind(this.dismissAlert, this));
+  }
+  if (this.flags & org.apache.flex.html.staticControls.Alert.CANCEL) {
+    var cancel = new org.apache.flex.html.staticControls.TextButton();
+    this.buttonArea.addElement(cancel);
+    cancel.set_text('Cancel');
+    goog.events.listen(/** @type {EventTarget} */ (cancel.element), 'click',
+        goog.bind(this.dismissAlert, this));
+  }
+  if (this.flags & org.apache.flex.html.staticControls.Alert.YES) {
+    var yes = new org.apache.flex.html.staticControls.TextButton();
+    this.buttonArea.addElement(yes);
+    yes.set_text('YES');
+    goog.events.listen(/** @type {EventTarget} */ (yes.element), 'click',
+        goog.bind(this.dismissAlert, this));
+  }
+  if (this.flags & org.apache.flex.html.staticControls.Alert.NO) {
+    var nob = new org.apache.flex.html.staticControls.TextButton();
+    this.buttonArea.addElement(nob);
+    nob.set_text('NO');
+    goog.events.listen(/** @type {EventTarget} */ (nob.element), 'click',
+        goog.bind(this.dismissAlert, this));
+  }
+};
+
+
+/**
+ * @param {Object} event The event object.
+ */
+org.apache.flex.html.staticControls.Alert.prototype.dismissAlert =
+    function(event)
+    {
+  this.element.parentElement.removeChild(this.element);
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/Button.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Button.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Button.js
new file mode 100644
index 0000000..5f64d56
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Button.js
@@ -0,0 +1,60 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org.apache.flex.html.staticControls.Button');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.Button = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.Button,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.Button.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'Button',
+                qName: 'org.apache.flex.html.staticControls.Button'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.Button.prototype.createElement =
+    function() {
+  this.element = document.createElement('button');
+  this.element.setAttribute('type', 'button');
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+
+  if (org.apache.flex.core.ValuesManager.valuesImpl.getValue) {
+    var impl = org.apache.flex.core.ValuesManager.valuesImpl.
+        getValue(this, 'iStatesImpl');
+  }
+
+  return this.element;
+};
+

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js
new file mode 100644
index 0000000..3181aaa
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js
@@ -0,0 +1,85 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org.apache.flex.html.staticControls.ButtonBar');
+
+goog.require('org.apache.flex.core.ListBase');
+goog.require('org.apache.flex.html.staticControls.List');
+goog.require('org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData');
+goog.require('org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout');
+goog.require('org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.html.staticControls.List}
+ */
+org.apache.flex.html.staticControls.ButtonBar = function() {
+
+  //  this.model = new
+  //        org.apache.flex.html.staticControls.beads.models.ArraySelectionModel();
+  //  this.addBead(this.model);
+
+  goog.base(this);
+
+  //  this.addBead(new
+  //        org.apache.flex.html.staticControls.beads.ListView());
+
+  //  this.addBead(new
+  //org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout());
+
+  //  this.itemRendererFactory = new
+  //        org.apache.flex.html.staticControls.beads.
+  //        DataItemRendererFactoryForArrayData();
+  //  this.itemRendererFactory.set_itemRendererClass('org.apache.flex.html.' +
+  //        'staticControls.supportClasses.ButtonBarButtonItemRenderer');
+  //  this.addBead(this.itemRendererFactory);
+
+  //  this.addBead(new
+  //        org.apache.flex.html.staticControls.beads.controllers.
+  //        ListSingleSelectionMouseController());
+};
+goog.inherits(org.apache.flex.html.staticControls.ButtonBar,
+    org.apache.flex.html.staticControls.List);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.ButtonBar.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'ButtonBar',
+                qName: 'org.apache.flex.html.staticControls.ButtonBar'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.ButtonBar.prototype.createElement =
+    function() {
+  //goog.base(this, 'createElement');
+
+  this.element = document.createElement('div');
+  this.element.style.overflow = 'auto';
+  this.element.style.border = 'solid';
+  this.element.style.borderWidth = '1px';
+  this.element.style.borderColor = '#333333';
+  this.positioner = this.element;
+
+  this.set_className('ButtonBar');
+
+  return this.element;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html/CheckBox.js
new file mode 100644
index 0000000..0f63f39
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/CheckBox.js
@@ -0,0 +1,99 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org.apache.flex.html.staticControls.CheckBox');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.CheckBox = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.CheckBox,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.CheckBox.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'CheckBox',
+                qName: 'org.apache.flex.html.staticControls.CheckBox'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.CheckBox.prototype.createElement =
+    function() {
+  var cb;
+
+  this.element = document.createElement('label');
+
+  cb = document.createElement('input');
+  cb.type = 'checkbox';
+  this.element.appendChild(cb);
+  this.element.appendChild(document.createTextNode(''));
+
+  this.positioner = this.element;
+  cb.flexjs_wrapper = this;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html.staticControls.CheckBox.prototype.get_text = function() {
+  return this.element.childNodes.item(1).nodeValue;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html.staticControls.CheckBox.prototype.set_text =
+    function(value) {
+  this.element.childNodes.item(1).nodeValue = value;
+};
+
+
+/**
+ * @expose
+ * @return {boolean} The selected getter.
+ */
+org.apache.flex.html.staticControls.CheckBox.prototype.get_selected =
+    function() {
+  return this.element.childNodes.item(0).checked;
+};
+
+
+/**
+ * @expose
+ * @param {boolean} value The selected setter.
+ */
+org.apache.flex.html.staticControls.CheckBox.prototype.set_selected =
+    function(value) {
+  this.element.childNodes.item(0).checked = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js
new file mode 100644
index 0000000..b469b04
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js
@@ -0,0 +1,210 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org.apache.flex.html.staticControls.ComboBox');
+
+goog.require('org.apache.flex.core.ListBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.ListBase}
+ */
+org.apache.flex.html.staticControls.ComboBox = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.ComboBox,
+    org.apache.flex.core.ListBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'ComboBox',
+                qName: 'org.apache.flex.html.staticControls.ComboBox'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.createElement =
+    function() {
+  var button, input;
+
+  this.element = document.createElement('div');
+
+  input = document.createElement('input');
+  input.style.position = 'absolute';
+  input.style.width = '80px';
+  this.element.appendChild(input);
+
+  button = document.createElement('div');
+  button.style.position = 'absolute';
+  button.style.top = '0px';
+  button.style.right = '0px';
+  button.style.background = '#bbb';
+  button.style.width = '16px';
+  button.style.height = '20px';
+  button.style.margin = '0';
+  button.style.border = 'solid #609 1px';
+  goog.events.listen(button, 'click', goog.bind(this.buttonClicked, this));
+  this.element.appendChild(button);
+
+  this.element.style.position = 'relative';
+
+  this.positioner = this.element;
+
+  // add a click handler so that a click outside of the combo box can
+  // dismiss the pop-up should it be visible.
+  goog.events.listen(document, 'click',
+      goog.bind(this.dismissPopup, this));
+
+  input.flexjs_wrapper = this;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @param {Object} event The event.
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.selectChanged =
+    function(event) {
+  var select;
+
+  select = event.currentTarget;
+
+  this.set_selectedItem(select.options[select.selectedIndex].value);
+
+  this.popup.parentNode.removeChild(this.popup);
+  this.popup = null;
+
+  this.dispatchEvent(event);
+};
+
+
+/**
+ * @expose
+ * @param {Object=} opt_event The event.
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.dismissPopup =
+    function(opt_event) {
+  // remove the popup if it already exists
+  if (this.popup) {
+    this.popup.parentNode.removeChild(this.popup);
+    this.popup = null;
+  }
+};
+
+
+/**
+ * @expose
+ * @param {Object} event The event.
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.buttonClicked =
+    function(event) {
+  /**
+   * @type {Array.<string>}
+   */
+  var dp;
+  var i, input, left, n, opt, opts, pn, popup, select, si, top, width;
+
+  event.stopPropagation();
+
+  if (this.popup) {
+    this.dismissPopup();
+
+    return;
+  }
+
+  input = this.element.childNodes.item(0);
+
+  pn = this.element;
+  top = pn.offsetTop + input.offsetHeight;
+  left = pn.offsetLeft;
+  width = pn.offsetWidth;
+
+  popup = document.createElement('div');
+  popup.className = 'popup';
+  popup.id = 'test';
+  popup.style.position = 'absolute';
+  popup.style.top = top.toString() + 'px';
+  popup.style.left = left.toString() + 'px';
+  popup.style.width = width.toString() + 'px';
+  popup.style.margin = '0px auto';
+  popup.style.padding = '0px';
+  popup.style.zIndex = '10000';
+
+  select = document.createElement('select');
+  select.style.width = width.toString() + 'px';
+  goog.events.listen(select, 'change', goog.bind(this.selectChanged, this));
+  opts = select.options;
+
+  dp = /** @type {Array.<string>} */ (this.get_dataProvider());
+  n = dp.length;
+  for (i = 0; i < n; i++) {
+    opt = document.createElement('option');
+    opt.text = dp[i];
+    opts.add(opt);
+  }
+
+  select.size = n;
+
+  si = this.get_selectedIndex();
+  if (si < 0) {
+    select.value = null;
+  } else {
+    select.value = dp[si];
+  }
+
+  this.popup = popup;
+
+  popup.appendChild(select);
+  document.body.appendChild(popup);
+};
+
+
+/**
+ * @override
+ * @expose
+ * @param {Array.<Object>} value The collection of data.
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.set_dataProvider =
+    function(value) {
+  this.dataProvider = value;
+};
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.get_text = function() {
+  return this.element.childNodes.item(0).value;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html.staticControls.ComboBox.prototype.set_text =
+    function(value) {
+  this.element.childNodes.item(0).value = value;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/Container.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Container.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Container.js
new file mode 100644
index 0000000..22a3840
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Container.js
@@ -0,0 +1,86 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org.apache.flex.html.staticControls.Container');
+
+goog.require('org.apache.flex.core.ContainerBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.ContainerBase}
+ */
+org.apache.flex.html.staticControls.Container = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.Container,
+    org.apache.flex.core.ContainerBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.Container.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'Container',
+                qName: 'org.apache.flex.html.staticControls.Container' }] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.Container.prototype.createElement =
+    function() {
+  var cb;
+
+  this.element = document.createElement('div');
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+
+  return this.element;
+};
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.Container.prototype.addElement =
+    function(child) {
+  goog.base(this, 'addElement', child);
+  this.dispatchEvent('elementAdded');
+};
+
+
+/**
+ * @expose
+ */
+org.apache.flex.html.staticControls.Container.prototype.childrenAdded =
+    function() {
+  this.dispatchEvent('childrenAdded');
+};
+
+
+/**
+ * @expose
+ * @return {Array} the HTML DOM element children.
+ */
+org.apache.flex.html.staticControls.Container.prototype.internalChildren =
+    function() {
+  return this.element.children;
+};
+
+

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/ControlBar.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ControlBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ControlBar.js
new file mode 100644
index 0000000..09b1fa5
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ControlBar.js
@@ -0,0 +1,57 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org.apache.flex.html.staticControls.ControlBar');
+
+goog.require('org.apache.flex.html.staticControls.Container');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.html.staticControls.Container}
+ */
+org.apache.flex.html.staticControls.ControlBar = function() {
+  goog.base(this);
+
+};
+goog.inherits(org.apache.flex.html.staticControls.ControlBar,
+    org.apache.flex.html.staticControls.Container);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.ControlBar.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'ControlBar',
+                qName: 'org.apache.flex.html.staticControls.ControlBar'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.ControlBar.prototype.createElement =
+    function() {
+
+  this.element = document.createElement('div');
+  this.element.className = 'ControlBar';
+  this.element.style.display = 'inline';
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+
+  return this.element;
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js b/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js
new file mode 100644
index 0000000..e1d2ecf
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js
@@ -0,0 +1,114 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org.apache.flex.html.staticControls.DropDownList');
+
+goog.require('org.apache.flex.core.ListBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.ListBase}
+ */
+org.apache.flex.html.staticControls.DropDownList = function() {
+  goog.base(this);
+  this.model = new org.apache.flex.html.staticControls.beads.
+      models.ArraySelectionModel();
+};
+goog.inherits(org.apache.flex.html.staticControls.DropDownList,
+    org.apache.flex.core.ListBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.DropDownList.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'DropDownList',
+                qName: 'org.apache.flex.html.staticControls.DropDownList'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.html.staticControls.DropDownList.prototype.
+    createElement = function() {
+  this.element = document.createElement('select');
+  this.element.size = 1;
+  goog.events.listen(this.element, 'change',
+      goog.bind(this.changeHandler, this));
+  this.positioner = this.element;
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The new dataProvider.
+ */
+org.apache.flex.html.staticControls.DropDownList.prototype.
+    set_dataProvider = function(value) {
+  var dp, i, n, opt;
+
+  this.model.set_dataProvider(value);
+
+  dp = this.element.options;
+  n = dp.length;
+  for (i = 0; i < n; i++) {
+    dp.remove(0);
+  }
+
+  n = value.length;
+  for (i = 0; i < n; i++) {
+    opt = document.createElement('option');
+    opt.text = value[i];
+    dp.add(opt);
+  }
+
+};
+
+
+/**
+ * @protected
+ */
+org.apache.flex.html.staticControls.DropDownList.prototype.changeHandler =
+    function() {
+  this.model.set_selectedIndex(this.element.selectedIndex);
+  this.dispatchEvent('change');
+};
+
+
+/**
+ * @expose
+ * @param {number} value The new selected index.
+ */
+org.apache.flex.html.staticControls.DropDownList.prototype.
+    set_selectedIndex = function(value) {
+  this.model.set_selectedIndex(value);
+  this.element.selectedIndex = value;
+};
+
+
+/**
+ * @expose
+ * @param {Object} value The new selected item.
+ */
+org.apache.flex.html.staticControls.DropDownList.prototype.
+    set_selectedItem = function(value) {
+  this.model.set_selectedItem(value);
+  this.element.selectedIndex = this.get_selectedIndex();
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js
new file mode 100644
index 0000000..4446917
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js
@@ -0,0 +1,86 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org.apache.flex.html.staticControls.Image');
+
+goog.require('org.apache.flex.core.UIBase');
+goog.require('org.apache.flex.html.staticControls.beads.ImageView');
+goog.require('org.apache.flex.html.staticControls.beads.models.ImageModel');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.Image = function() {
+  goog.base(this);
+};
+goog.inherits(org.apache.flex.html.staticControls.Image,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.Image.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'Image',
+                qName: 'org.apache.flex.html.staticControls.Image' }] };
+
+
+/**
+ * @override
+ * @protected
+ * @return {Object} The actual element to be parented.
+ */
+org.apache.flex.html.staticControls.Image.prototype.createElement =
+    function() {
+
+  this.element = document.createElement('img');
+
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+
+  this.model = new
+          org.apache.flex.html.staticControls.beads.models.ImageModel();
+
+  this.addBead(this.model);
+
+  this.addBead(new
+      org.apache.flex.html.staticControls.beads.ImageView());
+
+  return this.element;
+};
+
+
+/**
+ * @expose
+ * @return {String} The source identifier for the Image.
+ */
+org.apache.flex.html.staticControls.Image.prototype.
+    get_source = function() {
+  return this.model.get_source();
+};
+
+
+/**
+ * @expose
+ * @param {String} value The source identifier for the Image.
+ */
+org.apache.flex.html.staticControls.Image.prototype.
+    set_source = function(value) {
+  this.model.set_source(value);
+};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/Label.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Label.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Label.js
new file mode 100644
index 0000000..ec25864
--- /dev/null
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Label.js
@@ -0,0 +1,61 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org.apache.flex.html.staticControls.Label');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.html.staticControls.Label = function() {
+  goog.base(this);
+
+  this.element = document.createElement('div');
+  this.positioner = this.element;
+  this.element.flexjs_wrapper = this;
+};
+goog.inherits(org.apache.flex.html.staticControls.Label,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.html.staticControls.Label.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'Label',
+                qName: 'org.apache.flex.html.staticControls.Label' }] };
+
+
+/**
+ * @expose
+ * @return {string} The text getter.
+ */
+org.apache.flex.html.staticControls.Label.prototype.get_text = function() {
+  return this.element.innerHTML;
+};
+
+
+/**
+ * @expose
+ * @param {string} value The text setter.
+ */
+org.apache.flex.html.staticControls.Label.prototype.set_text = function(value) {
+  this.element.innerHTML = value;
+};