flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [25/36] git commit: [flex-asjs] [refs/heads/develop] - start moving the FlatUI code to its own swc and revert the HTML library back to its basic state
Date Tue, 28 Jul 2015 18:40:51 GMT
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/Flat/as/src/org/apache/flex/flat/supportClasses/DropDownListStringItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/as/src/org/apache/flex/flat/supportClasses/DropDownListStringItemRenderer.as b/frameworks/projects/Flat/as/src/org/apache/flex/flat/supportClasses/DropDownListStringItemRenderer.as
new file mode 100644
index 0000000..e73eef0
--- /dev/null
+++ b/frameworks/projects/Flat/as/src/org/apache/flex/flat/supportClasses/DropDownListStringItemRenderer.as
@@ -0,0 +1,71 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.flat.supportClasses
+{
+	import flash.text.TextFieldAutoSize;
+	import flash.text.TextFieldType;
+	
+	import org.apache.flex.core.CSSTextField;
+    import org.apache.flex.core.ValuesManager;
+	import org.apache.flex.events.Event;
+	import org.apache.flex.html.beads.ITextItemRenderer;
+    import org.apache.flex.html.supportClasses.StringItemRenderer;
+
+	/**
+	 *  The DropDownListStringItemRenderer is a StringItemRenderer with a particular
+     *  className for use in DropDownList.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	public class DropDownListStringItemRenderer extends StringItemRenderer
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function DropDownListStringItemRenderer()
+		{
+			super();
+			
+            className = 'dropdown-menu-item-renderer';
+            percentWidth = 90;
+		}
+		
+		/**
+		 * @private
+		 */
+		override public function updateRenderer():void
+		{
+            className = selected ? 'dropdown-menu-item-renderer-selected' : 'dropdown-menu-item-renderer';
+            if (selected)
+                selectedColor = ValuesManager.valuesImpl.getValue(this, 'background-color');
+            if (hovered)
+                highlightColor = ValuesManager.valuesImpl.getValue(this, 'background-color', "hover");
+            downColor = selectedColor;
+			super.updateRenderer();
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/Flat/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/build.xml b/frameworks/projects/Flat/build.xml
new file mode 100644
index 0000000..54ceacd
--- /dev/null
+++ b/frameworks/projects/Flat/build.xml
@@ -0,0 +1,161 @@
+<?xml version="1.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.
+
+-->
+
+
+<project name="Flat" default="main" basedir=".">
+    <property name="FLEXJS_HOME" location="../../.."/>
+    
+    <property file="${FLEXJS_HOME}/env.properties"/>
+    <property environment="env"/>
+    <property file="${FLEXJS_HOME}/build.properties"/>
+    <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
+    <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
+    <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+    <property name="gjslint" value="gjslint" />
+    <property name="jshint" value="jshint" />
+    <condition property="no.lint" value="true">
+        <os family="windows"/>
+    </condition>
+    
+    <target name="main" depends="clean,compile,test" description="Clean build of Flat.swc">
+    </target>
+    
+    <target name="all" depends="main,compile-asjs,lint-js,test-js" description="Full build of Flat.swc">
+    </target>
+    
+    <target name="test" unless="is.jenkins">
+        <!-- no tests yet
+         <ant dir="as/tests" />
+         <ant dir="asjs/tests" />
+         -->
+    </target>
+    
+    <target name="test-js" unless="is.jenkins">
+        <!-- no tests yet
+         <ant dir="js/tests" />
+         -->
+    </target>
+    
+    <target name="clean">
+        <delete failonerror="false">
+            <fileset dir="${FLEXJS_HOME}/frameworks/libs">
+                <include name="Flat.swc"/>
+            </fileset>
+        </delete>
+        <delete failonerror="false">
+            <fileset dir="${basedir}/js/out">
+                <include name="**/**"/>
+            </fileset>
+        </delete>
+    </target>
+    
+    <path id="lib.path">
+      <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
+    </path>
+
+    <target name="compile" description="Compiles .as files into .swc">
+        <echo message="Compiling libs/Flat"/>
+        <echo message="FLEX_HOME: ${FLEX_HOME}"/>
+        <echo message="FALCON_HOME: ${FALCON_HOME}"/>
+        <!-- make JS output folder now so include-file doesn't error -->
+        <mkdir dir="${basedir}/js/out" />
+
+        <!-- Load the <compc> task. We can't do this at the <project> level -->
+        <!-- because targets that run before flexTasks.jar gets built would fail. -->
+        <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
+        <!--
+            Link in the classes (and their dependencies) for the MXML tags
+            listed in this project's manifest.xml.
+            Also link the additional classes (and their dependencies)
+            listed in FlatClasses.as,
+            because these aren't referenced by the manifest classes.
+            Keep the standard metadata when compiling.
+            Include the appropriate CSS files and assets in the SWC.
+            Don't include any resources in the SWC.
+            Write a bundle list of referenced resource bundles
+            into the file bundles.properties in this directory.
+        -->
+        <compc fork="true"
+               output="${FLEXJS_HOME}/frameworks/libs/Flat.swc">
+            <jvmarg line="${compc.jvm.args}"/>
+            <load-config filename="compile-config.xml" />
+            <arg value="+playerglobal.version=${playerglobal.version}" />
+            <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
+        </compc>
+    </target>
+
+    <target name="compile-asjs" >
+        <echo message="Cross-compiling Flat/asjs"/>
+        <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+        <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
+            <jvmarg value="-Xmx384m" />
+            <jvmarg value="-Dsun.io.useCanonCaches=false" />
+            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
+            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
+            <arg value="+flexlib=${FLEX_HOME}/frameworks" />
+            <arg value="-js-output-type=FLEXJS" />
+            <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
+            <arg value="-output=${basedir}/js/out" />
+            <arg value="-load-config=${basedir}/compile-asjs-config.xml" />
+            <arg value="+playerglobal.version=${playerglobal.version}" />
+            <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+            <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
+        </java>
+    </target>
+
+    <target name="lint-js" depends="gjslint, jshint, copy-js" />
+    <target name="copy-js" >
+        <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
+            <fileset dir="${basedir}/js/src">
+                <include name="**/**" />
+            </fileset>
+            <fileset dir="${basedir}/js/out">
+                <include name="**/**" />
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="gjslint" unless="no.lint">
+        <echo>running gjslint</echo>
+        <exec executable="${gjslint}" dir="${basedir}" failonerror="true">
+            <arg value="--strict" />
+            <arg value="--disable" />
+            <arg value="006,100,214,300" />
+            <!-- 006: wrong indentation -->
+            <!-- 100: cannot have non-primitive value -->
+            <!-- 214: @fileoverview tag missing description -->
+            <!-- 300: missing newline at end of file -->
+            <arg value="--max_line_length" />
+            <arg value="120" />
+            <arg value="-r" />
+            <arg value="${basedir}/js/src" />
+        </exec>
+    </target>
+
+    <target name="jshint" unless="no.lint">
+        <echo>running jshint</echo>
+        <exec executable="${jshint}" dir="${basedir}" failonerror="true">
+            <arg value="--config" />
+            <arg value="${FLEX_HOME}/frameworks/js/jshint.properties" />
+            <arg value="${basedir}/js/src" />
+        </exec>
+    </target>
+
+</project>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/Flat/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/compile-config.xml b/frameworks/projects/Flat/compile-config.xml
new file mode 100644
index 0000000..b8a2f60
--- /dev/null
+++ b/frameworks/projects/Flat/compile-config.xml
@@ -0,0 +1,91 @@
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+<flex-config>
+
+    <compiler>
+        <accessible>false</accessible>
+        
+        <external-library-path>
+            <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
+            <path-element>../../libs/Binding.swc</path-element>
+            <path-element>../../libs/Core.swc</path-element>
+            <path-element>../../libs/Graphics.swc</path-element>
+            <path-element>../../libs/HTML.swc</path-element>
+        </external-library-path>
+        
+		<mxml>
+			<children-as-data>true</children-as-data>
+		</mxml>
+		<binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
+		<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
+		<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+
+        <keep-as3-metadata>
+          <name>Bindable</name>
+          <name>Managed</name>
+          <name>ChangeEvent</name>
+          <name>NonCommittingChangeEvent</name>
+          <name>Transient</name>
+        </keep-as3-metadata>
+	  
+        <locale/>
+        
+        <library-path/>
+
+        <namespaces>
+            <namespace>
+                <uri>library://ns.apache.org/flexjs/flat</uri>
+                <manifest>flat-manifest.xml</manifest>
+            </namespace>
+        </namespaces>
+        
+        <source-path>
+            <path-element>as/src</path-element>
+            <!--<path-element>asjs/src</path-element>-->
+        </source-path>
+        
+        <warn-no-constructor>false</warn-no-constructor>
+    </compiler>
+    
+    <include-file>
+        <name>defaults.css</name>
+        <path>as/defaults.css</path>
+    </include-file>
+    <include-file>
+        <name>js/out/*</name>
+        <path>js/out/*</path>
+    </include-file>
+    <include-file>
+        <name>js/src/*</name>
+        <path>js/src/*</path>
+    </include-file>
+
+    <include-classes>
+        <class>FlatClasses</class>
+        <!--<class>FlatASJSClasses</class>-->
+    </include-classes>
+    
+    <include-namespaces>
+        <uri>library://ns.apache.org/flexjs/flat</uri>
+    </include-namespaces>
+        
+    <target-player>${playerglobal.version}</target-player>
+	
+
+</flex-config>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/Flat/flat-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/flat-manifest.xml b/frameworks/projects/Flat/flat-manifest.xml
new file mode 100644
index 0000000..1677425
--- /dev/null
+++ b/frameworks/projects/Flat/flat-manifest.xml
@@ -0,0 +1,105 @@
+<?xml version="1.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.
+
+-->
+
+
+<componentPackage>
+
+    <component id="Button" class="org.apache.flex.html.Button"  lookupOnly="true" />
+    <component id="ButtonBar" class="org.apache.flex.html.ButtonBar"  lookupOnly="true" />
+    <component id="CloseButton" class="org.apache.flex.html.CloseButton"  lookupOnly="true" />
+    <component id="DropDownList" class="org.apache.flex.flat.DropDownList" />
+    <component id="DropDownListList" class="org.apache.flex.flat.supportClasses.DropDownListList" />
+    <component id="Image" class="org.apache.flex.html.Image"  lookupOnly="true" />
+    <component id="Label" class="org.apache.flex.html.Label"  lookupOnly="true" />
+    <component id="MultilineLabel" class="org.apache.flex.html.MultilineLabel"  lookupOnly="true" />
+    <component id="ImageAndTextButton" class="org.apache.flex.html.ImageAndTextButton"  lookupOnly="true" />
+    <component id="TextButton" class="org.apache.flex.html.TextButton"  lookupOnly="true" />
+    <component id="ToggleTextButton" class="org.apache.flex.html.ToggleTextButton"  lookupOnly="true" />
+    <component id="TextInput" class="org.apache.flex.html.TextInput"  lookupOnly="true" />
+    <component id="TextArea" class="org.apache.flex.html.TextArea"  lookupOnly="true" />
+    <component id="List" class="org.apache.flex.html.List"  lookupOnly="true" />
+    <component id="SimpleList" class="org.apache.flex.html.SimpleList"  lookupOnly="true" />
+    <component id="CheckBox" class="org.apache.flex.flat.CheckBox" />
+    <component id="RadioButton" class="org.apache.flex.flat.RadioButton" />
+    <component id="ComboBox" class="org.apache.flex.html.ComboBox"  lookupOnly="true" />
+    <component id="Container" class="org.apache.flex.html.Container"  lookupOnly="true" />
+    <component id="HContainer" class="org.apache.flex.html.HContainer"  lookupOnly="true" />
+    <component id="VContainer" class="org.apache.flex.html.VContainer"  lookupOnly="true" />
+    <component id="Panel" class="org.apache.flex.html.Panel"  lookupOnly="true" />
+    <component id="PanelView" class="org.apache.flex.html.beads.PanelView" lookupOnly="true" />
+    <component id="PanelWithControlBar" class="org.apache.flex.html.PanelWithControlBar"  lookupOnly="true" />
+    <component id="ControlBar" class="org.apache.flex.html.ControlBar"  lookupOnly="true" />
+    <component id="TitleBar" class="org.apache.flex.html.TitleBar"  lookupOnly="true" />
+    <component id="TitleBarModel" class="org.apache.flex.html.beads.models.TitleBarModel"  lookupOnly="true" />
+    <component id="ToolTip" class="org.apache.flex.html.ToolTip"  lookupOnly="true" />
+    <component id="BasicLayout" class="org.apache.flex.html.beads.layouts.BasicLayout"  lookupOnly="true" />
+    <component id="VerticalLayout" class="org.apache.flex.html.beads.layouts.VerticalLayout"  lookupOnly="true" />
+    <component id="HorizontalLayout" class="org.apache.flex.html.beads.layouts.HorizontalLayout"  lookupOnly="true" />
+    <component id="TileLayout" class="org.apache.flex.html.beads.layouts.TileLayout"  lookupOnly="true" />
+    <component id="ListView" class="org.apache.flex.html.beads.ListView" lookupOnly="true" />
+    <component id="ListViewNoSelectionState" class="org.apache.flex.html.beads.ListViewNoSelectionState" lookupOnly="true" />
+    <component id="MultilineTextFieldView" class="org.apache.flex.html.beads.MultilineTextFieldView" lookupOnly="true" />
+    
+    <component id="SimpleAlert" class="org.apache.flex.html.SimpleAlert" lookupOnly="true" />
+    <component id="Alert" class="org.apache.flex.html.Alert" lookupOnly="true" />
+    <component id="Spinner" class="org.apache.flex.html.Spinner" lookupOnly="true" />
+    <component id="Slider" class="org.apache.flex.html.Slider" lookupOnly="true" />
+    <component id="SolidBackgroundBead" class="org.apache.flex.html.beads.SolidBackgroundBead" lookupOnly="true" />
+    <component id="NumericStepper" class="org.apache.flex.html.NumericStepper"  lookupOnly="true" />
+    <component id="TextFieldItemRenderer" class="org.apache.flex.html.supportClasses.TextFieldItemRenderer" lookupOnly="true" />
+    <component id="StringItemRenderer" class="org.apache.flex.html.supportClasses.StringItemRenderer" lookupOnly="true" />
+    <component id="DataItemRenderer" class="org.apache.flex.html.supportClasses.DataItemRenderer" lookupOnly="true" />
+    <component id="ButtonBarButtonItemRenderer" class="org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer" lookupOnly="true" />
+    <component id="ScrollBar" class="org.apache.flex.html.supportClasses.ScrollBar" lookupOnly="true" />
+    <component id="CSSScrollBarView" class="org.apache.flex.flat.beads.CSSScrollBarView" />
+    <component id="NumericOnlyTextInputBead" class="org.apache.flex.html.accessories.NumericOnlyTextInputBead"  lookupOnly="true" />
+    <component id="PasswordInputBead" class="org.apache.flex.html.accessories.PasswordInputBead"  lookupOnly="true" />
+    <component id="TextPromptBead" class="org.apache.flex.html.accessories.TextPromptBead"  lookupOnly="true" />
+    <component id="HRule" class="org.apache.flex.html.HRule"  lookupOnly="true" />
+    <component id="Spacer" class="org.apache.flex.html.Spacer"  lookupOnly="true" />
+    <component id="ImageAndTextButtonView" class="org.apache.flex.html.beads.ImageAndTextButtonView"  lookupOnly="true" />
+    <component id="CheckboxCSSContentAndTextToggleButtonView" class="org.apache.flex.flat.beads.CheckboxCSSContentAndTextToggleButtonView" />
+    <component id="RadioCSSContentAndTextToggleButtonView" class="org.apache.flex.flat.beads.RadioCSSContentAndTextToggleButtonView" />
+    <component id="ScrollingViewport" class="org.apache.flex.html.supportClasses.ScrollingViewport"  lookupOnly="true" />
+
+    <component id="DataGrid" class="org.apache.flex.html.DataGrid" lookupOnly="true" />
+    <component id="DataGridColumn" class="org.apache.flex.html.supportClasses.DataGridColumn" lookupOnly="true" />
+    <component id="DataGridLayout" class="org.apache.flex.html.beads.layouts.DataGridLayout"  lookupOnly="true" />
+
+    <component id="DateChooser" class="org.apache.flex.html.DateChooser" lookupOnly="true" />
+    <component id="DateField" class="org.apache.flex.html.DateField" lookupOnly="true" />
+    <component id="VerticalColumnLayout" class="org.apache.flex.html.beads.layouts.VerticalColumnLayout"  lookupOnly="true" />
+
+    <component id="ToolTipBead" class="org.apache.flex.html.accessories.ToolTipBead" lookupOnly="true" />
+
+    <component id="LayoutChangeNotifier" class="org.apache.flex.html.beads.layouts.LayoutChangeNotifier" lookupOnly="true" />
+    <component id="ImageButton" class="org.apache.flex.html.ImageButton" lookupOnly="true" />
+    <component id="FlexibleFirstChildHorizontalLayout" class="org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout" lookupOnly="true" />
+    <component id="OneFlexibleChildVerticalLayout" class="org.apache.flex.html.beads.layouts.OneFlexibleChildVerticalLayout" lookupOnly="true" />
+    <component id="OneFlexibleChildHorizontalLayout" class="org.apache.flex.html.beads.layouts.OneFlexibleChildHorizontalLayout" lookupOnly="true" />
+    <component id="MXMLBeadViewBase" class="org.apache.flex.html.MXMLBeadViewBase" lookupOnly="true" />
+
+    <component id="Border" class="org.apache.flex.html.supportClasses.Border" lookupOnly="true" />
+
+    <component id="ViewBase" class="org.apache.flex.core.ViewBase" lookupOnly="true" />
+    <component id="ViewBaseDataBinding" class="org.apache.flex.binding.ViewBaseDataBinding" lookupOnly="true" />
+    <component id="State" class="org.apache.flex.states.State" lookupOnly="true" />
+
+</componentPackage>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/Flat/js/src/org/apache/flex/flat/CheckBox.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/js/src/org/apache/flex/flat/CheckBox.js b/frameworks/projects/Flat/js/src/org/apache/flex/flat/CheckBox.js
new file mode 100644
index 0000000..d5d0a42
--- /dev/null
+++ b/frameworks/projects/Flat/js/src/org/apache/flex/flat/CheckBox.js
@@ -0,0 +1,137 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org.apache.flex.flat.CheckBox');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.flat.CheckBox = function() {
+  org.apache.flex.flat.CheckBox.base(this, 'constructor');
+};
+goog.inherits(org.apache.flex.flat.CheckBox,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.flat.CheckBox.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'CheckBox',
+                qName: 'org.apache.flex.flat.CheckBox'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.flat.CheckBox.prototype.createElement =
+    function() {
+  var cb;
+
+  this.element = document.createElement('label');
+
+  this.input = document.createElement('input');
+  this.input.type = 'checkbox';
+  this.input.className = 'checkbox-input';
+  this.input.addEventListener('change', goog.bind(this.selectionChangeHandler, this));
+  this.element.appendChild(this.input);
+
+  this.checkbox = document.createElement('span');
+  this.checkbox.className = 'checkbox-icon';
+  this.checkbox.addEventListener('mouseover', goog.bind(this.mouseOverHandler, this));
+  this.checkbox.addEventListener('mouseout', goog.bind(this.mouseOutHandler, this));
+  this.element.appendChild(this.checkbox);
+
+  this.textNode = document.createTextNode('');
+  this.element.appendChild(this.textNode);
+  this.element.className = 'CheckBox';
+  this.typeNames = 'CheckBox';
+
+  this.positioner = this.element;
+  this.input.flexjs_wrapper = this;
+  this.checkbox.flexjs_wrapper = this;
+  this.element.flexjs_wrapper = this;
+
+  return this.element;
+};
+
+
+/**
+ * @param {Event} e The event object.
+ */
+org.apache.flex.flat.CheckBox.prototype.mouseOverHandler =
+    function(e) {
+  this.checkbox.className = 'checkbox-icon-hover';
+};
+
+
+/**
+ * @param {Event} e The event object.
+ */
+org.apache.flex.flat.CheckBox.prototype.mouseOutHandler =
+    function(e) {
+  if (this.input.checked)
+    this.checkbox.className = 'checkbox-icon-checked';
+  else
+    this.checkbox.className = 'checkbox-icon';
+};
+
+
+/**
+ * @param {Event} e The event object.
+ */
+org.apache.flex.flat.CheckBox.prototype.selectionChangeHandler =
+    function(e) {
+  if (this.input.checked)
+    this.checkbox.className = 'checkbox-icon-checked';
+  else
+    this.checkbox.className = 'checkbox-icon';
+};
+
+
+Object.defineProperties(org.apache.flex.flat.CheckBox.prototype, {
+    /** @export */
+    text: {
+        /** @this {org.apache.flex.flat.CheckBox} */
+        get: function() {
+            return this.textNode.nodeValue;
+        },
+        /** @this {org.apache.flex.flat.CheckBox} */
+        set: function(value) {
+            this.textNode.nodeValue = value;
+        }
+    },
+    /** @export */
+    selected: {
+        /** @this {org.apache.flex.flat.CheckBox} */
+        get: function() {
+            return this.input.checked;
+        },
+        /** @this {org.apache.flex.flat.CheckBox} */
+        set: function(value) {
+            this.input.checked = value;
+            if (value)
+              this.checkbox.className = 'checkbox-icon-checked';
+            else
+              this.checkbox.className = 'checkbox-icon';
+        }
+    }
+});

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js b/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
new file mode 100644
index 0000000..08cef2e
--- /dev/null
+++ b/frameworks/projects/Flat/js/src/org/apache/flex/flat/DropDownList.js
@@ -0,0 +1,219 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org.apache.flex.flat.DropDownList');
+
+goog.require('org.apache.flex.core.ListBase');
+goog.require('org.apache.flex.html.beads.models.ArraySelectionModel');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.ListBase}
+ */
+org.apache.flex.flat.DropDownList = function() {
+  org.apache.flex.flat.DropDownList.base(this, 'constructor');
+  this.model = new org.apache.flex.html.beads.models.ArraySelectionModel();
+};
+goog.inherits(org.apache.flex.flat.DropDownList,
+    org.apache.flex.core.ListBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.flat.DropDownList.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'DropDownList',
+                qName: 'org.apache.flex.flat.DropDownList'}] };
+
+
+/**
+ * @override
+ */
+org.apache.flex.flat.DropDownList.prototype.createElement =
+    function() {
+  var button, input;
+
+  this.element = document.createElement('div');
+
+  this.button = button = document.createElement('button');
+  button.className = 'dropdown-toggle-open-btn';
+  goog.events.listen(button, 'click', goog.bind(this.buttonClicked, this));
+  this.element.appendChild(button);
+
+  var caret = document.createElement('span');
+  caret.className = 'dropdown-caret';
+
+  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));
+
+  button.flexjs_wrapper = this;
+  this.element.flexjs_wrapper = this;
+  caret.flexjs_wrapper = this;
+
+  return this.element;
+};
+
+
+/**
+ * @export
+ * @param {Object} event The event.
+ */
+org.apache.flex.flat.DropDownList.prototype.selectChanged =
+    function(event) {
+  var select;
+
+  select = event.target;
+
+  this.selectedIndex = parseInt(select.id, 10);
+
+  this.menu.parentNode.removeChild(this.menu);
+  this.menu = null;
+
+  this.dispatchEvent('change');
+};
+
+
+/**
+ * @export
+ * @param {Object=} opt_event The event.
+ */
+org.apache.flex.flat.DropDownList.prototype.dismissPopup =
+    function(opt_event) {
+  // remove the popup if it already exists
+  if (this.menu) {
+    this.menu.parentNode.removeChild(this.menu);
+    this.menu = null;
+  }
+};
+
+
+/**
+ * @export
+ * @param {Object} event The event.
+ */
+org.apache.flex.flat.DropDownList.prototype.buttonClicked =
+    function(event) {
+  /**
+   * @type {Array.<string>}
+   */
+  var dp;
+  var i, button, left, n, opt, opts, pn, popup, select, si, top, width;
+
+  event.stopPropagation();
+
+  if (this.popup) {
+    this.dismissPopup();
+
+    return;
+  }
+
+  button = this.element.childNodes.item(0);
+
+  pn = this.element;
+  top = pn.offsetTop + button.offsetHeight;
+  left = pn.offsetLeft;
+  width = pn.offsetWidth;
+
+  /*
+  popup = document.createElement('div');
+  popup.className = 'dropdown-menu';
+  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';
+  */
+
+  this.menu = select = document.createElement('ul');
+  select.style.width = width.toString() + 'px';
+  goog.events.listen(select, 'click', goog.bind(this.selectChanged, this));
+  select.className = 'dropdown-menu';
+
+  dp = /** @type {Array.<string>} */ (this.dataProvider);
+  n = dp.length;
+  for (i = 0; i < n; i++) {
+    opt = document.createElement('li');
+    opt.style.backgroundColor = 'transparent';
+    var ir = document.createElement('a');
+    ir.innerHTML = dp[i];
+    ir.id = i.toString();
+    if (i == this.selectedIndex)
+      ir.className = 'dropdown-menu-item-renderer-selected';
+    else
+      ir.className = 'dropdown-menu-item-renderer';
+    opt.appendChild(ir);
+    select.appendChild(opt);
+  }
+
+  this.element.appendChild(select);
+};
+
+
+Object.defineProperties(org.apache.flex.flat.DropDownList.prototype, {
+    dataProvider: {
+        /** @this {org.apache.flex.flat.DropDownList} */
+        get: function() {
+            return this.model.dataProvider;
+        },
+        /** @this {org.apache.flex.flat.DropDownList} */
+        set: function(value) {
+            var dp, i, n, opt;
+
+            this.model.dataProvider = value;
+        }
+    },
+    /** @export */
+    selectedIndex: {
+        // TODO: (aharui) copied from ListBase because you
+        // can't just override the setter in a defineProps
+        // structure.
+        /** @this {org.apache.flex.flat.DropDownList} */
+        get: function() {
+            return this.model.selectedIndex;
+        },
+        /** @this {org.apache.flex.flat.DropDownList} */
+        set: function(value) {
+            this.model.selectedIndex = value;
+            this.button.innerHTML = this.selectedItem + '<span class="dropdown-caret"/>';
+        }
+    },
+    /** @export */
+    selectedItem: {
+        // TODO: (aharui) copied from ListBase because you
+        // can't just override the setter in a defineProps
+        // structure.
+        /** @this {org.apache.flex.flat.DropDownList} */
+        get: function() {
+            return this.model.selectedItem;
+        },
+        /** @this {org.apache.flex.flat.DropDownList} */
+        set: function(value) {
+            this.model.selectedItem = value;
+            this.button.innerHTML = this.selectedItem + '<span class="dropdown-caret"/>';
+         }
+    }
+});

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/Flat/js/src/org/apache/flex/flat/RadioButton.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/js/src/org/apache/flex/flat/RadioButton.js b/frameworks/projects/Flat/js/src/org/apache/flex/flat/RadioButton.js
new file mode 100644
index 0000000..461f7f9
--- /dev/null
+++ b/frameworks/projects/Flat/js/src/org/apache/flex/flat/RadioButton.js
@@ -0,0 +1,227 @@
+/**
+ * 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.flat.RadioButton');
+
+goog.require('org.apache.flex.core.UIBase');
+
+
+
+/**
+ * @constructor
+ * @extends {org.apache.flex.core.UIBase}
+ */
+org.apache.flex.flat.RadioButton = function() {
+  org.apache.flex.flat.RadioButton.base(this, 'constructor');
+};
+goog.inherits(org.apache.flex.flat.RadioButton,
+    org.apache.flex.core.UIBase);
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org.apache.flex.flat.RadioButton.prototype.FLEXJS_CLASS_INFO =
+    { names: [{ name: 'RadioButton',
+                qName: 'org.apache.flex.flat.RadioButton'}] };
+
+
+/**
+ * Provides unique name
+ */
+org.apache.flex.flat.RadioButton.radioCounter = 0;
+
+
+/**
+ * @override
+ */
+org.apache.flex.flat.RadioButton.prototype.createElement =
+    function() {
+
+  // hide this eleement
+  this.input = document.createElement('input');
+  this.input.type = 'radio';
+  this.input.className = 'radio-input';
+  this.input.id = '_radio_' + org.apache.flex.flat.RadioButton.radioCounter++;
+  this.input.addEventListener('change', goog.bind(this.selectionChangeHandler, this));
+
+  this.radio = document.createElement('span');
+  this.radio.className = 'radio-icon';
+  this.radio.addEventListener('mouseover', goog.bind(this.mouseOverHandler, this));
+  this.radio.addEventListener('mouseout', goog.bind(this.mouseOutHandler, this));
+
+  this.textNode = document.createTextNode('radio button');
+
+  this.labelFor = document.createElement('label');
+  this.labelFor.appendChild(this.input);
+  this.labelFor.appendChild(this.radio);
+  this.labelFor.appendChild(this.textNode);
+  this.labelFor.style.position = 'relative';
+
+  this.element = this.labelFor;
+  this.element.className = 'RadioButton';
+  this.typeNames = 'RadioButton';
+
+  this.positioner = this.element;
+  this.input.flexjs_wrapper = this;
+  this.radio.flexjs_wrapper = this;
+  this.element.flexjs_wrapper = this;
+  this.textNode.flexjs_wrapper = this;
+
+  return this.element;
+};
+
+
+/**
+ * @param {Event} e The event object.
+ */
+org.apache.flex.flat.RadioButton.prototype.mouseOverHandler =
+    function(e) {
+  this.radio.className = 'radio-icon-hover';
+};
+
+
+/**
+ * @param {Event} e The event object.
+ */
+org.apache.flex.flat.RadioButton.prototype.mouseOutHandler =
+    function(e) {
+  if (this.input.checked)
+    this.radio.className = 'radio-icon-checked';
+  else
+    this.radio.className = 'radio-icon';
+};
+
+
+/**
+ * @param {Event} e The event object.
+ */
+org.apache.flex.flat.RadioButton.prototype.selectionChangeHandler =
+    function(e) {
+  // this should reset the icons in the non-selected radio
+  this.selectedValue = this.value;
+};
+
+
+/**
+ * @export
+ */
+org.apache.flex.flat.RadioButton.prototype.initModel =
+    function() {
+};
+
+
+/**
+ * @export
+ */
+org.apache.flex.flat.RadioButton.prototype.initSkin =
+    function() {
+};
+
+
+Object.defineProperties(org.apache.flex.flat.RadioButton.prototype, {
+    /** @export */
+    id: {
+        /** @this {org.apache.flex.flat.RadioButton} */
+        set: function(value) {
+            org.apache.flex.utils.Language.superSetter(org.apache.flex.flat.RadioButton, this, 'id', value);
+            this.labelFor.id = value;
+            this.input.id = value;
+        }
+    },
+    /** @export */
+    groupName: {
+        /** @this {org.apache.flex.flat.RadioButton} */
+        get: function() {
+            return this.input.name;
+        },
+        /** @this {org.apache.flex.flat.RadioButton} */
+        set: function(value) {
+            this.input.name = value;
+        }
+    },
+    /** @export */
+    text: {
+        /** @this {org.apache.flex.flat.RadioButton} */
+        get: function() {
+            return this.textNode.nodeValue;
+        },
+        /** @this {org.apache.flex.flat.RadioButton} */
+        set: function(value) {
+            this.textNode.nodeValue = value;
+        }
+    },
+    /** @export */
+    selected: {
+        /** @this {org.apache.flex.flat.RadioButton} */
+        get: function() {
+            return this.input.checked;
+        },
+        /** @this {org.apache.flex.flat.RadioButton} */
+        set: function(value) {
+            this.input.checked = value;
+            if (this.input.checked)
+              this.radio.className = 'radio-icon-checked';
+            else
+              this.radio.className = 'radio-icon';
+        }
+    },
+    /** @export */
+    value: {
+        /** @this {org.apache.flex.flat.RadioButton} */
+        get: function() {
+            return this.input.value;
+        },
+        /** @this {org.apache.flex.flat.RadioButton} */
+        set: function(value) {
+            this.input.value = value;
+        }
+    },
+    /** @export */
+    selectedValue: {
+        /** @this {org.apache.flex.flat.RadioButton} */
+        get: function() {
+            var buttons, groupName, i, n;
+
+            groupName = this.input.name;
+            buttons = document.getElementsByName(groupName);
+            n = buttons.length;
+
+            for (i = 0; i < n; i++) {
+              if (buttons[i].checked) {
+                return buttons[i].value;
+              }
+            }
+            return null;
+        },
+        /** @this {org.apache.flex.flat.RadioButton} */
+        set: function(value) {
+            var buttons, groupName, i, n;
+
+            groupName = this.input.name;
+            buttons = document.getElementsByName(groupName);
+            n = buttons.length;
+            for (i = 0; i < n; i++) {
+              if (buttons[i].value === value) {
+                buttons[i].checked = true;
+                buttons[i].flexjs_wrapper.selected = true;
+              }
+              else
+                buttons[i].flexjs_wrapper.selected = false;
+            }
+        }
+    }
+});

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/HTML/as/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/defaults.css b/frameworks/projects/HTML/as/defaults.css
index 0344efc..91ed55a 100644
--- a/frameworks/projects/HTML/as/defaults.css
+++ b/frameworks/projects/HTML/as/defaults.css
@@ -517,7 +517,7 @@ Button
 CheckBox
 {
     IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.CheckboxCSSContentAndTextToggleButtonView");			
+    IBeadView:  ClassReference("org.apache.flex.html.beads.CheckBoxView");			
 }
 
 CloseButton
@@ -563,7 +563,7 @@ DropDownListList
     IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
     IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
     IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.DropDownListStringItemRenderer");
+    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
 }
 
 Image
@@ -631,7 +631,7 @@ PanelWithControlBar
 RadioButton
 {
     IBeadModel: ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.RadioCSSContentAndTextToggleButtonView");			
+    IBeadView:  ClassReference("org.apache.flex.html.beads.RadioButtonView");			
 }
 
 .vscrollbar-uparrow {
@@ -724,7 +724,7 @@ ScrollBar
 {
     IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VScrollBarLayout");
     IBeadModel: ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.CSSScrollBarView");
+    IBeadView: ClassReference("org.apache.flex.html.beads.ScrollBarView");
     IBeadController: ClassReference("org.apache.flex.html.beads.controllers.VScrollBarMouseController");
 }
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/HTML/as/src/HTMLClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/HTMLClasses.as b/frameworks/projects/HTML/as/src/HTMLClasses.as
index b1bf557..e8b2165 100644
--- a/frameworks/projects/HTML/as/src/HTMLClasses.as
+++ b/frameworks/projects/HTML/as/src/HTMLClasses.as
@@ -52,9 +52,7 @@ internal class HTMLClasses
     import org.apache.flex.html.beads.PanelView; PanelView;
     import org.apache.flex.html.beads.PanelWithControlBarView; PanelWithControlBarView;
 	import org.apache.flex.html.beads.RadioButtonView; RadioButtonView;
-    import org.apache.flex.html.beads.CSSScrollBarView; CSSScrollBarView;
     import org.apache.flex.html.beads.ScrollBarView; ScrollBarView;
-    import org.apache.flex.html.beads.CSSScrollBarButtonView; CSSScrollBarButtonView;
 	import org.apache.flex.html.beads.SimpleAlertView; SimpleAlertView;
     import org.apache.flex.html.beads.SingleLineBorderBead; SingleLineBorderBead;
 	import org.apache.flex.html.beads.SliderView; SliderView;
@@ -98,7 +96,6 @@ internal class HTMLClasses
 	import org.apache.flex.html.beads.layouts.TileLayout; TileLayout;
     import org.apache.flex.html.beads.TextItemRendererFactoryForArrayData; TextItemRendererFactoryForArrayData;
 	import org.apache.flex.html.beads.DataItemRendererFactoryForArrayData; DataItemRendererFactoryForArrayData;
-    import org.apache.flex.html.supportClasses.DropDownListStringItemRenderer; DropDownListStringItemRenderer;
 	import org.apache.flex.html.supportClasses.DataGroup; DataGroup;
 	import org.apache.flex.html.supportClasses.Viewport; Viewport;
 	import org.apache.flex.html.supportClasses.ScrollingViewport; ScrollingViewport;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSContentAndTextToggleButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSContentAndTextToggleButtonView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSContentAndTextToggleButtonView.as
deleted file mode 100644
index 40bb0c9..0000000
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSContentAndTextToggleButtonView.as
+++ /dev/null
@@ -1,304 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.beads
-{
-	import flash.display.Shape;
-	import flash.display.SimpleButton;
-	import flash.display.Sprite;
-	import flash.text.TextFieldAutoSize;
-	import flash.text.TextFieldType;
-	
-    import org.apache.flex.core.BeadViewBase;
-	import org.apache.flex.core.CSSTextField;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.IToggleButtonModel;
-    import org.apache.flex.core.StyleableCSSTextField;
-    import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-    import org.apache.flex.utils.CSSUtils;
-	
-    /**
-     *  The CSSContentAndTextToggleButtonView class is the default view for
-     *  the org.apache.flex.html.CheckBox and RadioButton classes.
-     *  It supports CSS content property for the
-     *  icon.
-     * 
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class CSSContentAndTextToggleButtonView extends BeadViewBase implements IBeadView
-	{
-        /**
-         *  map of classname suffixes.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        private static var suffixMap:Object = {
-            "upSprite": "",
-            "downSprite": "-checked",
-            "overSprite": "-hover",
-            "upAndSelectedSprite": "-checked",
-            "downAndSelectedSprite": "-checked",
-            "overAndSelectedSprite": "-checked"
-        }
-        
-        /**
-         *  className to use for styling.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        protected var className:String;
-        
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function CSSContentAndTextToggleButtonView()
-		{
-		}
-		
-		private var upSprite:Sprite;
-		private var downSprite:Sprite;
-		private var overSprite:Sprite;
-		private var upAndSelectedSprite:Sprite;
-		private var downAndSelectedSprite:Sprite;
-		private var overAndSelectedSprite:Sprite;
-		
-		private var sprites:Array = [];
-		
-		private var _toggleButtonModel:IToggleButtonModel;
-
-        // TODO: Can we remove this?
-		private function get toggleButtonModel() : IToggleButtonModel
-		{
-			return _toggleButtonModel;
-		}
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		override public function set strand(value:IStrand):void
-		{
-			super.strand = value;
-            
-            for (var p:String in suffixMap)
-            {
-                var s:Sprite = new Sprite();
-                sprites.push(s);
-                this[p] = s;
-                
-                var tf:CSSTextField = new CSSTextField();
-                tf.type = TextFieldType.DYNAMIC;
-                tf.autoSize = TextFieldAutoSize.LEFT;
-                tf.name = "textField";
-                tf.parentHandlesPadding = true;
-                var icon:StyleableCSSTextField = new StyleableCSSTextField();
-                icon.name = "icon";
-                icon.className = className + suffixMap[p];
-                s.addChild(icon);
-                s.addChild(tf);
-            }
-            
-			_toggleButtonModel = value.getBeadByType(IToggleButtonModel) as IToggleButtonModel;
-			_toggleButtonModel.addEventListener("textChange", textChangeHandler);
-			_toggleButtonModel.addEventListener("htmlChange", htmlChangeHandler);
-			_toggleButtonModel.addEventListener("selectedChange", selectedChangeHandler);
-			if (_toggleButtonModel.text !== null)
-				text = _toggleButtonModel.text;
-			
-			layoutControl();
-			
-			var hitArea:Shape = new Shape();
-			hitArea.graphics.beginFill(0x000000);
-			hitArea.graphics.drawRect(0,0,upSprite.width, upSprite.height);
-			hitArea.graphics.endFill();
-			
-			SimpleButton(value).upState = upSprite;
-			SimpleButton(value).downState = downSprite;
-			SimpleButton(value).overState = overSprite;
-			SimpleButton(value).hitTestState = hitArea;
-			
-			if (toggleButtonModel.text !== null)
-				text = toggleButtonModel.text;
-			if (toggleButtonModel.html !== null)
-				html = toggleButtonModel.html;
-		}
-		
-        /**
-         *  @copy org.apache.flex.html.Label#text
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get text():String
-		{
-			var tf:CSSTextField = upSprite.getChildByName('textField') as CSSTextField;
-			return tf.text;
-		}
-		
-        /**
-         *  @private
-         */
-		public function set text(value:String):void
-		{
-			for each( var s:Sprite in sprites )
-			{
-				var tf:CSSTextField = s.getChildByName('textField') as CSSTextField;
-                tf.styleParent = _strand;
-				tf.text = value;
-			}
-			
-			layoutControl();
-		}
-		
-        /**
-         *  @copy org.apache.flex.html.Label#html
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get html():String
-		{
-			var tf:CSSTextField = upSprite.getChildByName('textField') as CSSTextField;
-			return tf.htmlText;
-		}
-		
-        /**
-         *  @private
-         */
-		public function set html(value:String):void
-		{
-			for each(var s:Sprite in sprites)
-			{
-				var tf:CSSTextField = s.getChildByName('textField') as CSSTextField;
-				tf.htmlText = value;
-			}
-			
-			layoutControl();
-		}
-		
-		private function textChangeHandler(event:Event):void
-		{
-			text = toggleButtonModel.text;
-		}
-		
-		private function htmlChangeHandler(event:Event):void
-		{
-			html = toggleButtonModel.html;
-		}
-		
-		private var _selected:Boolean;
-		
-        /**
-         *  @copy org.apache.flex.core.IToggleButtonModel#selected
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get selected():Boolean
-		{
-			return _selected;
-		}
-		
-        /**
-         *  @private
-         */
-		public function set selected(value:Boolean):void
-		{
-			_selected = value;
-			
-			layoutControl();
-			
-			if( value ) {
-				SimpleButton(_strand).upState = upAndSelectedSprite;
-				SimpleButton(_strand).downState = downAndSelectedSprite;
-				SimpleButton(_strand).overState = overAndSelectedSprite;
-				
-			} else {
-				SimpleButton(_strand).upState = upSprite;
-				SimpleButton(_strand).downState = downSprite;
-				SimpleButton(_strand).overState = overSprite;
-			}
-		}
-		
-		private function selectedChangeHandler(event:Event):void
-		{
-			selected = toggleButtonModel.selected;
-		}
-		
-        /**
-         *  Display the icon and text label
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		protected function layoutControl() : void
-		{
-            // TODO: Layout using descendant selectors (.checkbox .icons)
-			for (var p:String in suffixMap)
-			{
-                var s:Sprite = this[p];
-				var icon:StyleableCSSTextField = s.getChildByName("icon") as StyleableCSSTextField;
-                icon.autoSize = TextFieldAutoSize.LEFT;
-				var tf:CSSTextField = s.getChildByName("textField") as CSSTextField;
-				
-                icon.CSSParent = _strand;
-                var content:String = ValuesManager.valuesImpl.getValue(icon, "content", "before");
-                if (content != null)
-                    icon.text = content;
-				var mh:Number = Math.max(icon.height,tf.height);
-				
-                var padding:Object = ValuesManager.valuesImpl.getValue(_strand, "padding");
-                var paddingLeft:Object = ValuesManager.valuesImpl.getValue(_strand,"padding-left");
-                icon.x = CSSUtils.getLeftValue(paddingLeft, padding, s.width);
-				icon.y = (mh - icon.height)/2;
-				
-				tf.x = icon.x + icon.width + 1;
-				tf.y = (mh - tf.height)/2;
-			}
-			
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSScrollBarButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSScrollBarButtonView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSScrollBarButtonView.as
deleted file mode 100644
index aa3d25e..0000000
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSScrollBarButtonView.as
+++ /dev/null
@@ -1,182 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.beads
-{
-    import flash.display.DisplayObject;
-    import flash.display.Loader;
-    import flash.display.Shape;
-    import flash.display.SimpleButton;
-    import flash.display.Sprite;
-    import flash.events.Event;
-    import flash.net.URLRequest;
-    
-    import org.apache.flex.core.BeadViewBase;
-    import org.apache.flex.core.CSSShape;
-    import org.apache.flex.core.IBeadView;
-    import org.apache.flex.core.IStrand;
-    import org.apache.flex.core.ITextModel;
-    import org.apache.flex.core.ValuesManager;
-    import org.apache.flex.events.Event;
-    import org.apache.flex.events.IEventDispatcher;
-    import org.apache.flex.utils.CSSBorderUtils;
-    import org.apache.flex.utils.CSSUtils;
-    import org.apache.flex.utils.StringTrimmer;
-
-    /**
-     *  The CSSButtonView class is the default view for
-     *  the org.apache.flex.html.Button class.
-     *  It allows the look of the button to be expressed
-     *  in CSS via the background-image style.  This view
-     *  does not display text.  Use CSSTextButtonView and
-     *  TextButton instead.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class CSSScrollBarButtonView extends BeadViewBase implements IBeadView
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function CSSScrollBarButtonView()
-		{
-			upSprite = new Sprite();
-			downSprite = new Sprite();
-			overSprite = new Sprite();
-            upArrowShape = new CSSShape();
-            downArrowShape = new CSSShape();
-            overArrowShape = new CSSShape();
-            overArrowShape.state = "hover";
-            upSprite.addChild(upArrowShape);
-            downSprite.addChild(downArrowShape);
-            overSprite.addChild(overArrowShape);
-		}
-		
-		private var textModel:ITextModel;
-		
-		private var shape:Shape;
-		
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		override public function set strand(value:IStrand):void
-		{
-			super.strand = value;
-			shape = new Shape();
-			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, 10, 10);
-			shape.graphics.endFill();
-			SimpleButton(value).upState = upSprite;
-			SimpleButton(value).downState = downSprite;
-			SimpleButton(value).overState = overSprite;
-			SimpleButton(value).hitTestState = shape;
-
-            setupBackground(overSprite, overArrowShape, "hover");
-            setupBackground(downSprite, downArrowShape, "active");
-            setupBackground(upSprite, upArrowShape);
-            
-            IEventDispatcher(_strand).addEventListener("widthChanged",sizeChangeHandler);
-            IEventDispatcher(_strand).addEventListener("heightChanged",sizeChangeHandler);
-		}
-	
-        private function sizeChangeHandler(event:org.apache.flex.events.Event):void
-        {
-            setupSkins();
-        }
-        
-        protected function setupSkins():void
-        {
-            setupSkin(overSprite, overArrowShape, "hover");
-            setupSkin(downSprite, downArrowShape, "active");
-            setupSkin(upSprite, upArrowShape);
-            updateHitArea();
-        }
-
-		private function setupSkin(sprite:Sprite, shape:CSSShape, state:String = null):void
-		{
-			var padding:Object = ValuesManager.valuesImpl.getValue(_strand, "padding", state);
-			var paddingLeft:Object = ValuesManager.valuesImpl.getValue(_strand, "padding-left", state);
-			var paddingRight:Object = ValuesManager.valuesImpl.getValue(_strand, "padding-right", state);
-			var paddingTop:Object = ValuesManager.valuesImpl.getValue(_strand, "padding-top", state);
-			var paddingBottom:Object = ValuesManager.valuesImpl.getValue(_strand, "padding-bottom", state);
-			var pl:Number = CSSUtils.getLeftValue(paddingLeft, padding, DisplayObject(_strand).width);
-            var pr:Number = CSSUtils.getRightValue(paddingRight, padding, DisplayObject(_strand).width);
-            var pt:Number = CSSUtils.getTopValue(paddingTop, padding, DisplayObject(_strand).height);
-            var pb:Number = CSSUtils.getBottomValue(paddingBottom, padding, DisplayObject(_strand).height);
-			
-            var w:Object = ValuesManager.valuesImpl.getValue(shape, "width", state);
-            var h:Object = ValuesManager.valuesImpl.getValue(shape, "height", state);
-            shape.draw(Number(w), Number(h));
-            
-		    CSSBorderUtils.draw(sprite.graphics, 
-					shape.width + pl + pr, 
-					shape.height + pt + pb,
-                    _strand as DisplayObject,
-                    state, true);
-		}
-		
-        private function setupBackground(sprite:Sprite, shape:CSSShape, state:String = null):void
-        {
-            var backgroundImage:Object = ValuesManager.valuesImpl.getValue(_strand, "background-image", state);
-            if (backgroundImage)
-            {
-                var loader:Loader = new Loader();
-                sprite.addChildAt(loader, 0);
-                var url:String = backgroundImage as String;
-                loader.load(new URLRequest(url));
-                loader.contentLoaderInfo.addEventListener(flash.events.Event.COMPLETE, function (e:flash.events.Event):void { 
-                    setupSkin(sprite, shape, state);
-                    updateHitArea();
-                });
-            }
-            else {
-                setupSkin(sprite, shape, state);
-                updateHitArea();
-            }
-        }
-        
-		private var upSprite:Sprite;
-		private var downSprite:Sprite;
-		private var overSprite:Sprite;
-        public var upArrowShape:CSSShape;
-        public var downArrowShape:CSSShape;
-        public var overArrowShape:CSSShape;
-				
-		private function updateHitArea():void
-		{
-			shape.graphics.clear();
-			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, upSprite.width, upSprite.height);
-			shape.graphics.endFill();
-			
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSScrollBarView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSScrollBarView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSScrollBarView.as
deleted file mode 100644
index 0d48de8..0000000
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSScrollBarView.as
+++ /dev/null
@@ -1,240 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.beads
-{
-	import flash.display.DisplayObject;
-	
-    import org.apache.flex.core.IBead;
-	import org.apache.flex.core.IBeadLayout;
-	import org.apache.flex.core.IBeadView;
-	import org.apache.flex.core.IScrollBarModel;
-	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.IUIBase;
-	import org.apache.flex.core.Strand;
-	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.ValuesManager;
-    import org.apache.flex.events.IEventDispatcher;
-    import org.apache.flex.events.Event;
-	import org.apache.flex.html.Button;
-	import org.apache.flex.html.beads.controllers.ButtonAutoRepeatController;
-
-    /**
-     *  The ScrollBarView class is the default view for
-     *  the org.apache.flex.html.supportClasses.ScrollBar class.
-     *  It implements the classic desktop-like ScrollBar.
-     *  A different view would implement more modern scrollbars that hide themselves
-     *  until hovered over with the mouse.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class CSSScrollBarView extends Strand implements IBeadView, IStrand, IScrollBarView
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function CSSScrollBarView()
-		{
-		}
-				
-		private var sbModel:IScrollBarModel;
-		
-		private var _strand:IStrand;
-		
-        /**
-         *  The layout. 
-         * 
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        private var layout:IBeadLayout;
-        
-        /**
-         *  The host component. 
-         * 
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function get host():IUIBase
-        {
-            return _strand as IUIBase;
-        }
-
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-            
-            for each (var bead:IBead in beads)
-                addBead(bead);
-                        
-			sbModel = value.getBeadByType(IScrollBarModel) as IScrollBarModel;
-            sbModel = _strand.getBeadByType(IScrollBarModel) as IScrollBarModel;
-            sbModel.addEventListener("maximumChange", changeHandler);
-            sbModel.addEventListener("minimumChange", changeHandler);
-            sbModel.addEventListener("snapIntervalChange", changeHandler);
-            sbModel.addEventListener("stepSizeChange", changeHandler);
-            sbModel.addEventListener("pageSizeChange", changeHandler);
-            sbModel.addEventListener("valueChange", changeHandler);
-            
-            // TODO: (aharui) put in values impl
-			_increment = new Button();
-            Button(_increment).className = "vscrollbar-downarrow-btn";
-            var sbView:CSSScrollBarButtonView = new CSSScrollBarButtonView();
-            sbView.upArrowShape.className = "vscrollbar-downarrow";
-            sbView.downArrowShape.className = "vscrollbar-downarrow";
-            sbView.overArrowShape.className = "vscrollbar-downarrow";
-            Button(_increment).addBead(sbView);
-            Button(_increment).addBead(new ButtonAutoRepeatController());
-			_decrement = new Button();
-            Button(_decrement).className = "vscrollbar-uparrow-btn";
-            sbView = new CSSScrollBarButtonView();
-            sbView.upArrowShape.className = "vscrollbar-uparrow";
-            sbView.downArrowShape.className = "vscrollbar-uparrow";
-            sbView.overArrowShape.className = "vscrollbar-uparrow";
-            Button(_decrement).addBead(sbView);
-            Button(_decrement).addBead(new ButtonAutoRepeatController());
-			_track = new Button();
-            Button(_track).className = "vscrollbar-track";
-			_thumb = new Button();				
-            Button(_thumb).className = "vscrollbar-thumb";
-            
-            UIBase(value).addElement(_decrement);
-            UIBase(value).addElement(_increment);
-            UIBase(value).addElement(_track);
-            UIBase(value).addElement(_thumb);
-            
-            IEventDispatcher(_strand).addEventListener("heightChanged", changeHandler);
-            
-            if( _strand.getBeadByType(IBeadLayout) == null ) {
-                layout = new (ValuesManager.valuesImpl.getValue(_strand, "iBeadLayout")) as IBeadLayout;
-                _strand.addBead(layout);
-            }
-            layout.layout();
-		}
-						
-        private function changeHandler(event:Event):void
-        {
-            layout.layout();    
-        }
-        
-		private var _decrement:DisplayObject;
-		private var _increment:DisplayObject;
-		private var _track:DisplayObject;
-		private var _thumb:DisplayObject;
-		
-        /**
-         *  @copy org.apache.flex.html.beads.IScrollBarView#decrement
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get decrement():DisplayObject
-		{
-			return _decrement;
-		}
-
-        /**
-         *  @copy org.apache.flex.html.beads.IScrollBarView#increment
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get increment():DisplayObject
-		{
-			return _increment;
-		}
-        
-        /**
-         *  @copy org.apache.flex.html.beads.IScrollBarView#track
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get track():DisplayObject
-		{
-			return _track;
-		}
-        
-        /**
-         *  @copy org.apache.flex.html.beads.IScrollBarView#thumb
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function get thumb():DisplayObject
-		{
-			return _thumb;
-		}
-		
-        /**
-         *  @copy org.apache.flex.core.IBeadView#viewHeight
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function get viewHeight():Number
-        {
-            // don't want to put $height in an interface
-            return _strand["$height"];
-        }
-        
-        /**
-         *  @copy org.apache.flex.core.IBeadView#viewWidth
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function get viewWidth():Number
-        {
-            // don't want to put $width in an interface
-            return _strand["$width"];
-        }
-	}
-}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CheckboxCSSContentAndTextToggleButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CheckboxCSSContentAndTextToggleButtonView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CheckboxCSSContentAndTextToggleButtonView.as
deleted file mode 100644
index e38fd0d..0000000
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CheckboxCSSContentAndTextToggleButtonView.as
+++ /dev/null
@@ -1,48 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.beads
-{
-	
-    /**
-     *  The CheckboxCSSContentAndTextToggleButtonView class is the default view for
-     *  the org.apache.flex.html.Checkbox class.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class CheckboxCSSContentAndTextToggleButtonView extends CSSContentAndTextToggleButtonView
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function CheckboxCSSContentAndTextToggleButtonView()
-		{
-			super();
-			
-			className = "checkbox-icon";
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/RadioCSSContentAndTextToggleButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/RadioCSSContentAndTextToggleButtonView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/RadioCSSContentAndTextToggleButtonView.as
deleted file mode 100644
index 8d99f32..0000000
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/RadioCSSContentAndTextToggleButtonView.as
+++ /dev/null
@@ -1,47 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.beads
-{
-    /**
-     *  The RadioCSSContentAndTextToggleButtonView class is the default view for
-     *  the org.apache.flex.html.RadioButton class.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class RadioCSSContentAndTextToggleButtonView extends CSSContentAndTextToggleButtonView
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function RadioCSSContentAndTextToggleButtonView()
-		{
-			super();
-			
-			className = "radio-icon";
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/DropDownListStringItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/DropDownListStringItemRenderer.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/DropDownListStringItemRenderer.as
deleted file mode 100644
index e1a95d5..0000000
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/DropDownListStringItemRenderer.as
+++ /dev/null
@@ -1,70 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.supportClasses
-{
-	import flash.text.TextFieldAutoSize;
-	import flash.text.TextFieldType;
-	
-	import org.apache.flex.core.CSSTextField;
-    import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.events.Event;
-	import org.apache.flex.html.beads.ITextItemRenderer;
-
-	/**
-	 *  The DropDownListStringItemRenderer is a StringItemRenderer with a particular
-     *  className for use in DropDownList.
-	 *
-	 *  @langversion 3.0
-	 *  @playerversion Flash 10.2
-	 *  @playerversion AIR 2.6
-	 *  @productversion FlexJS 0.0
-	 */
-	public class DropDownListStringItemRenderer extends StringItemRenderer
-	{
-		/**
-		 *  constructor.
-		 *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function DropDownListStringItemRenderer()
-		{
-			super();
-			
-            className = 'dropdown-menu-item-renderer';
-            percentWidth = 90;
-		}
-		
-		/**
-		 * @private
-		 */
-		override public function updateRenderer():void
-		{
-            className = selected ? 'dropdown-menu-item-renderer-selected' : 'dropdown-menu-item-renderer';
-            if (selected)
-                selectedColor = ValuesManager.valuesImpl.getValue(this, 'background-color');
-            if (hovered)
-                highlightColor = ValuesManager.valuesImpl.getValue(this, 'background-color', "hover");
-            downColor = selectedColor;
-			super.updateRenderer();
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c6408ce/frameworks/projects/HTML/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/basic-manifest.xml b/frameworks/projects/HTML/basic-manifest.xml
index 9066637..1591aed 100644
--- a/frameworks/projects/HTML/basic-manifest.xml
+++ b/frameworks/projects/HTML/basic-manifest.xml
@@ -74,8 +74,6 @@
     <component id="HRule" class="org.apache.flex.html.HRule" />
     <component id="Spacer" class="org.apache.flex.html.Spacer" />
     <component id="ImageAndTextButtonView" class="org.apache.flex.html.beads.ImageAndTextButtonView" />
-    <component id="CheckboxCSSContentAndTextToggleButtonView" class="org.apache.flex.html.beads.CheckboxCSSContentAndTextToggleButtonView"/>
-    <component id="RadioCSSContentAndTextToggleButtonView" class="org.apache.flex.html.beads.RadioCSSContentAndTextToggleButtonView"/>
     <component id="ScrollingViewport" class="org.apache.flex.html.supportClasses.ScrollingViewport" />
 
     <component id="DataGrid" class="org.apache.flex.html.DataGrid"/>


Mime
View raw message