flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [40/43] git commit: [flex-asjs] [refs/heads/dual] - Merge branch 'develop' into dual
Date Fri, 21 Apr 2017 16:36:04 GMT
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1691921e/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
index cad6827,0000000..6fb927d
mode 100644,000000..100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
@@@ -1,264 -1,0 +1,265 @@@
 +////////////////////////////////////////////////////////////////////////////////
 +//
 +//  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.layouts
 +{
 +//	import org.apache.flex.html.beads.layouts.HorizontalLayout;
 +
 +	import org.apache.flex.core.LayoutBase;
 +	import org.apache.flex.core.ILayoutChild;
 +	import org.apache.flex.core.ILayoutHost;
 +	import org.apache.flex.core.ILayoutView;
 +	import org.apache.flex.core.ILayoutParent;
 +	import org.apache.flex.core.IStrand;
 +	import org.apache.flex.core.IParentIUIBase;
 +	import org.apache.flex.core.UIBase;
 +
 +	COMPILE::SWF {
 +		import org.apache.flex.core.IUIBase;
 +		import org.apache.flex.core.ValuesManager;
 +		import org.apache.flex.events.Event;
 +		import org.apache.flex.events.IEventDispatcher;
 +		import org.apache.flex.geom.Rectangle;
 +		import org.apache.flex.utils.CSSUtils;
 +		import org.apache.flex.utils.CSSContainerUtils;
 +	}
 +
 +	public class HorizontalFlexLayout extends LayoutBase
 +	{
 +		/**
 +		 * Constructor.
 +		 *
 +		 *  @langversion 3.0
 +		 *  @playerversion Flash 10.2
 +		 *  @playerversion AIR 2.6
 +		 *  @productversion FlexJS 0.8
 +		 */
 +		public function HorizontalFlexLayout()
 +		{
 +			super();
 +		}
 +
 +		private var _grow:Number = -1;
 +
 +		/**
 +		 * Sets the amount items grow in proportion to other items.
 +		 * The default is 0 which prevents the items from expanding to
 +		 * fit the space. Use a negative value to unset this property.
 +		 *
 +		 *  @langversion 3.0
 +		 *  @playerversion Flash 10.2
 +		 *  @playerversion AIR 2.6
 +		 *  @productversion FlexJS 0.8
 +		 */
 +		public function get grow():Number {
 +			return _grow;
 +		}
 +		public function set grow(value:Number):void {
 +			_grow = value;
 +		}
 +
 +		private var _shrink:Number = -1;
 +
 +		/**
 +		 * Sets the amount an item may shrink in proportion to other items.
 +		 * The default is 1 which allows items to shrink to fit into the space.
 +		 * Set this to 0 if you want to allow scrolling of the space. Use a
 +		 * negative value to unset this property.
 +		 *
 +		 *  @langversion 3.0
 +		 *  @playerversion Flash 10.2
 +		 *  @playerversion AIR 2.6
 +		 *  @productversion FlexJS 0.8
 +		 */
 +		public function get shrink():Number {
 +			return _shrink;
 +		}
 +		public function set shrink(value:Number):void {
 +			_shrink = value;
 +		}
 +
 +		/**
 +		 * @copy org.apache.flex.core.IBeadLayout#layout
 +		 * @flexjsignorecoercion org.apache.flex.core.ILayoutHost
 +		 *
 +		 *  @langversion 3.0
 +		 *  @playerversion Flash 10.2
 +		 *  @playerversion AIR 2.6
 +		 *  @productversion FlexJS 0.8
 +		 */
 +		override public function layout():Boolean
 +		{
 +			COMPILE::SWF {
 +				var contentView:ILayoutView = layoutView;
 +
 +				var n:Number = contentView.numElements;
 +				if (n == 0) return false;
 +
 +				var spacing:String = "none";
 +
 +				var maxWidth:Number = 0;
 +				var maxHeight:Number = 0;
 +				var growCount:Number = 0;
 +				var childData:Array = [];
 +				var hostWidthSizedToContent:Boolean = host.isWidthSizedToContent();
 +				var hostHeightSizedToContent:Boolean = host.isHeightSizedToContent();
 +				var hostWidth:Number = hostWidthSizedToContent ? host.width : contentView.width;
 +				var hostHeight:Number = hostHeightSizedToContent ? host.height : contentView.height;
 +
 +				var ilc:ILayoutChild;
 +				var data:Object;
 +				var canAdjust:Boolean = false;
 +				
 +				var paddingMetrics:Rectangle = CSSContainerUtils.getPaddingMetrics(host);
 +				var borderMetrics:Rectangle = CSSContainerUtils.getBorderMetrics(host);
 +				
 +				// adjust the host's usable size by the metrics. If hostSizedToContent, then the
 +				// resulting adjusted value may be less than zero.
 +				hostWidth -= paddingMetrics.left + paddingMetrics.right + borderMetrics.left + borderMetrics.right;
 +				hostHeight -= paddingMetrics.top + paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
 +				
 +				if ((hostWidth <= 0 && !hostWidthSizedToContent) || (hostHeight <= 0 && !hostHeightSizedToContent)) return false;
 +				
 +				var remainingWidth:Number = hostWidth;
 +
 +				//trace("HorizontalFlexLayout for "+UIBase(host).id+" with remainingWidth: "+remainingWidth);
 +
 +				// First pass determines the data about the child.
 +				for(var i:int=0; i < n; i++)
 +				{
 +					var child:IUIBase = contentView.getElementAt(i) as IUIBase;
 +					if (child == null || !child.visible) {
 +						childData.push({width:0, height:0, mt:0, ml:0, mr:0, mb:0, canAdjust:false});
 +						continue;
 +					}
 +
 +					ilc = child as ILayoutChild;
 +					
 +					var margins:Object = childMargins(child, hostWidth, hostHeight);
 +
 +					var flexGrow:Object = ValuesManager.valuesImpl.getValue(child, "flex-grow");
 +					var growValue:Number = 0;
 +					if (flexGrow != null) {
 +						growValue = Number(flexGrow);
 +						if (!isNaN(growValue) && growValue > 0) growCount++;
 +						else growValue = 0;
 +					}
 +
 +					var useHeight:Number = -1;
 +					if (!hostHeightSizedToContent) {
 +						if (ilc) {
 +							if (!isNaN(ilc.percentHeight)) useHeight = hostHeight * (ilc.percentHeight/100.0);
 +							else if (!isNaN(ilc.explicitHeight)) useHeight = ilc.explicitHeight;
 +							else useHeight = hostHeight;
 +						}
 +					}
 +
 +					var useWidth:Number = -1;
 +					if (ilc) {
 +						if (!isNaN(ilc.explicitWidth)) useWidth = ilc.explicitWidth;
 +						else if (!isNaN(ilc.percentWidth)) useWidth = hostWidth * (ilc.percentWidth/100.0);
 +						else if (ilc.width > 0) useWidth = ilc.width;
 +					}
 +					if (growValue == 0 && useWidth > 0) remainingWidth -= useWidth + margins.left + margins.right;
 +					else remainingWidth -= margins.left + margins.right;
 +
 +					if (maxWidth < useWidth) maxWidth = useWidth;
 +					if (maxHeight < useHeight) maxHeight = useHeight;
 +
 +					childData.push({width:useWidth, height:useHeight, 
 +						            mt:margins.top, ml:margins.left, mr:margins.right, mb:margins.bottom, 
 +									grow:growValue, canAdjust:canAdjust});
 +				}
 +
 +				var xpos:Number = borderMetrics.left + paddingMetrics.left;
 +				var ypos:Number = borderMetrics.top + paddingMetrics.top;
 +
 +				// Second pass sizes and positions the children based on the data gathered.
 +				for(i=0; i < n; i++)
 +				{
 +					child = contentView.getElementAt(i) as IUIBase;
 +					data = childData[i];
 +					//if (data.width == 0 || data.height == 0) continue;
 +
 +					useHeight = (data.height < 0 ? maxHeight : data.height);
 +
 +					var setWidth:Boolean = true;
 +					if (data.width != 0) {
 +						if (data.grow > 0 && growCount > 0) {
 +							useWidth = remainingWidth / growCount;
 +							setWidth = false;
 +						} else {
 +							useWidth = data.width;
 +						}
 +					} else {
 +						useWidth = child.width;
 +					}
 +
 +					ilc = child as ILayoutChild;
 +					if (ilc) {
 +						ilc.setX(xpos + data.ml);
 +						ilc.setY(ypos + data.mt);
 +						if (data.height > 0) {
 +							//ilc.height = useHeight;
 +							ilc.setHeight(useHeight);
 +						}
 +						if (useWidth > 0) {
 +							if (setWidth) ilc.setWidth(useWidth);
 +							else ilc.width = useWidth;
 +						}
 +					} else {
 +						child.x = xpos + data.ml;
 +						child.y = ypos + data.mt;
 +						child.height = useHeight;
 +						if (data.width > 0) {
 +							child.width = useWidth;
 +						}
 +					}
 +
 +					xpos += useWidth + data.mr + data.ml;
 +
 +					//trace("HorizontalFlexLayout: setting child "+i+" to "+child.width+" x "+child.height+" at "+child.x+", "+child.y);
 +				}
 +
 +				//trace("HorizontalFlexLayout: complete");
 +
 +				return true;
 +			}
 +
 +			COMPILE::JS {
 +				var contentView:ILayoutView = layoutView;
 +
 +				// set the display on the contentView
 +				contentView.element.style["display"] = "flex";
 +				contentView.element.style["flex-flow"] = "row";
 +
 +				var n:int = contentView.numElements;
 +				if (n == 0) return false;
 +
 +				for(var i:int=0; i < n; i++) {
 +					var child:UIBase = contentView.getElementAt(i) as UIBase;
 +					if (grow >= 0) child.element.style["flex-grow"] = String(grow);
 +					if (shrink >= 0) child.element.style["flex-shrink"] = String(shrink);
++					child.dispatchEvent(new Event("layoutNeeded"));
 +				}
 +
 +				return true;
 +			}
 +		}
 +	}
 +}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1691921e/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as
index f495acc,0000000..c543425
mode 100644,000000..100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as
@@@ -1,260 -1,0 +1,261 @@@
 +////////////////////////////////////////////////////////////////////////////////
 +//
 +//  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.layouts
 +{
 +	//import org.apache.flex.html.beads.layouts.VerticalLayout;
 +
 +	import org.apache.flex.core.LayoutBase;
 +	import org.apache.flex.core.ILayoutChild;
 +	import org.apache.flex.core.ILayoutHost;
 +	import org.apache.flex.core.ILayoutView;
 +	import org.apache.flex.core.ILayoutParent;
 +	import org.apache.flex.core.IStrand;
 +	import org.apache.flex.core.UIBase;
 +	import org.apache.flex.core.IParentIUIBase;
 +
 +	COMPILE::SWF {
 +		import org.apache.flex.core.IUIBase;
 +		import org.apache.flex.core.ValuesManager;
 +		import org.apache.flex.events.Event;
 +		import org.apache.flex.events.IEventDispatcher;
 +		import org.apache.flex.geom.Rectangle;
 +		import org.apache.flex.utils.CSSUtils;
 +		import org.apache.flex.utils.CSSContainerUtils;
 +	}
 +
 +	public class VerticalFlexLayout extends LayoutBase
 +	{
 +		/**
 +		 * Constructor.
 +		 *
 +		 *  @langversion 3.0
 +		 *  @playerversion Flash 10.2
 +		 *  @playerversion AIR 2.6
 +		 *  @productversion FlexJS 0.8
 +		 */
 +		public function VerticalFlexLayout()
 +		{
 +			super();
 +		}
 +
 +		private var _grow:Number = -1;
 +
 +		/**
 +		 * Sets the amount items grow in proportion to other items.
 +		 * The default is 0 which prevents the items from expanding to
 +		 * fit the space. Use a negative value to unset this property.
 +		 *
 +		 *  @langversion 3.0
 +		 *  @playerversion Flash 10.2
 +		 *  @playerversion AIR 2.6
 +		 *  @productversion FlexJS 0.8
 +		 */
 +		public function get grow():Number {
 +			return _grow;
 +		}
 +		public function set grow(value:Number):void {
 +			_grow = value;
 +		}
 +
 +		private var _shrink:Number = -1;
 +
 +		/**
 +		 * Sets the amount an item may shrink in proportion to other items.
 +		 * The default is 1 which allows items to shrink to fit into the space.
 +		 * Set this to 0 if you want to allow scrolling of the space. Use a negative
 +		 * value to unset this property.
 +		 *
 +		 *  @langversion 3.0
 +		 *  @playerversion Flash 10.2
 +		 *  @playerversion AIR 2.6
 +		 *  @productversion FlexJS 0.8
 +		 */
 +		public function get shrink():Number {
 +			return _shrink;
 +		}
 +		public function set shrink(value:Number):void {
 +			_shrink = value;
 +		}
 +
 +		/**
 +		 *
 +		 *  @flexjsignorecoercion org.apache.flex.core.ILayoutHost
 +		 *
 +		 *  @langversion 3.0
 +		 *  @playerversion Flash 10.2
 +		 *  @playerversion AIR 2.6
 +		 *  @productversion FlexJS 0.8
 +		 */
 +		override public function layout():Boolean
 +		{
 +			COMPILE::SWF {
 +				var contentView:ILayoutView = layoutView;
 +
 +				var n:Number = contentView.numElements;
 +				if (n == 0) return false;
 +
 +				var spacing:String = "none";
 +
 +				var maxWidth:Number = 0;
 +				var maxHeight:Number = 0;
 +				var growCount:Number = 0;
 +				var childData:Array = [];
 +				var hostWidthSizedToContent:Boolean = host.isWidthSizedToContent();
 +				var hostHeightSizedToContent:Boolean = host.isHeightSizedToContent();
 +				var hostWidth:Number = hostWidthSizedToContent ? host.width : contentView.width;
 +				var hostHeight:Number = hostHeightSizedToContent ? host.height : contentView.height;
 +
 +				var ilc:ILayoutChild;
 +				var data:Object;
 +				var canAdjust:Boolean = false;
 +				
 +				var paddingMetrics:Rectangle = CSSContainerUtils.getPaddingMetrics(host);
 +				var borderMetrics:Rectangle = CSSContainerUtils.getBorderMetrics(host);
 +				
 +				// adjust the host's usable size by the metrics. If hostSizedToContent, then the
 +				// resulting adjusted value may be less than zero.
 +				hostWidth -= paddingMetrics.left + paddingMetrics.right + borderMetrics.left + borderMetrics.right;
 +				hostHeight -= paddingMetrics.top + paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
 +				
 +				var remainingHeight:Number = hostHeight;
 +
 +				//trace("VerticalFlexLayout for "+UIBase(host).id+" with remainingHeight: "+remainingHeight);
 +
 +				// First pass determines the data about the child.
 +				for(var i:int=0; i < n; i++)
 +				{
 +					var child:IUIBase = contentView.getElementAt(i) as IUIBase;
 +					if (child == null || !child.visible) {
 +						childData.push({width:0, height:0, mt:0, ml:0, mr:0, mb:0, grow:0, canAdjust:false});
 +						continue;
 +					}
 +
 +					ilc = child as ILayoutChild;
 +					
 +					var margins:Object = childMargins(child, hostWidth, hostHeight);
 +
 +					var flexGrow:Object = ValuesManager.valuesImpl.getValue(child, "flex-grow");
 +					var growValue:Number = 0;
 +					if (flexGrow != null) {
 +						growValue = Number(flexGrow);
 +						if (!isNaN(growValue) && growValue > 0) growCount++;
 +						else growValue = 0;
 +					}
 +
 +					var useWidth:Number = -1;
 +					if (!hostWidthSizedToContent) {
 +						if (ilc) {
 +							if (!isNaN(ilc.percentWidth)) useWidth = hostWidth * (ilc.percentWidth/100.0);
 +							else if (!isNaN(ilc.explicitWidth)) useWidth = ilc.explicitWidth;
 +							else useWidth = hostWidth;
 +						}
 +					}
 +
 +					var useHeight:Number = -1;
 +					if (ilc) {
 +						if (!isNaN(ilc.explicitHeight)) useHeight = ilc.explicitHeight;
 +						else if (!isNaN(ilc.percentHeight)) useHeight = hostHeight * (ilc.percentHeight/100.0);
 +						else if (ilc.height > 0) useHeight = ilc.height;
 +					}
 +					if (growValue == 0 && useHeight > 0) remainingHeight -= useHeight + margins.top + margins.bottom;
 +					else remainingHeight -= margins.top + margins.bottom;
 +
 +					if (maxWidth < useWidth) maxWidth = useWidth;
 +					if (maxHeight < useHeight) maxHeight = useHeight;
 +
 +					childData.push({width:useWidth, height:useHeight, 
 +						            mt:margins.top, ml:margins.left, mr:margins.right, mb:margins.bottom, 
 +									grow:growValue, canAdjust:canAdjust});
 +				}
 +
 +				var xpos:Number = borderMetrics.left + paddingMetrics.left;
 +				var ypos:Number = borderMetrics.top + paddingMetrics.top;
 +
 +				// Second pass sizes and positions the children based on the data gathered.
 +				for(i=0; i < n; i++)
 +				{
 +					child = contentView.getElementAt(i) as IUIBase;
 +					data = childData[i];
 +
 +					useWidth = (data.width < 0 ? hostWidth : data.width);
 +
 +					var setHeight:Boolean = true;
 +					if (data.height != 0) {
 +						if (data.grow > 0 && growCount > 0) {
 +							useHeight = remainingHeight / growCount;
 +							setHeight = false;
 +						} else {
 +							useHeight = data.height;
 +						}
 +					} else {
 +						useHeight = child.height;
 +					}
 +
 +					ilc = child as ILayoutChild;
 +					if (ilc) {
 +						ilc.setX(xpos + data.ml);
 +						ilc.setY(ypos + data.mt);
 +						if (data.width > 0) {
 +							//ilc.width = useWidth;
 +							ilc.setWidth(useWidth);
 +						}
 +						if (useHeight > 0) {
 +							if (setHeight) ilc.setHeight(useHeight);
 +							else ilc.height = useHeight;
 +						}
 +					} else {
 +						child.x = xpos + data.ml;
 +						child.y = ypos + data.mt;
 +						child.width = useWidth;
 +						if (useHeight > 0) {
 +							child.height = useHeight;
 +						}
 +					}
 +
 +					ypos += useHeight + data.mt + data.mb;
 +
 +					//trace("VerticalFlexLayout: setting child "+i+" to "+child.width+" x "+child.height+" at "+child.x+", "+child.y);
 +				}
 +
 +				//trace("VerticalFlexLayout: complete");
 +
 +				return true;
 +			}
 +
 +			COMPILE::JS {
 +				var contentView:ILayoutView = layoutView;
 +
 +				contentView.element.style["display"] = "flex";
 +				contentView.element.style["flex-flow"] = "column";
 +
 +				var n:int = contentView.numElements;
 +				if (n == 0) return false;
 +
 +				for(var i:int=0; i < n; i++) {
 +					var child:UIBase = contentView.getElementAt(i) as UIBase;
 +					if (grow >= 0) child.element.style["flex-grow"] = String(grow);
 +					if (shrink >= 0) child.element.style["flex-shrink"] = String(shrink);
++					child.dispatchEvent(new Event("layoutNeeded"));
 +				}
 +
 +				return true;
 +			}
 +		}
 +	}
 +}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1691921e/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/MXMLItemRenderer.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/MXMLItemRenderer.as
index de1b304,0000000..d9b130e
mode 100644,000000..100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/MXMLItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/MXMLItemRenderer.as
@@@ -1,84 -1,0 +1,94 @@@
 +////////////////////////////////////////////////////////////////////////////////
 +//
 +//  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 org.apache.flex.core.ILayoutHost;
 +	import org.apache.flex.core.ILayoutParent;
 +	import org.apache.flex.core.ILayoutView;
 +	import org.apache.flex.core.IStrand;
 +	import org.apache.flex.core.IBead;
 +	import org.apache.flex.core.IBeadLayout;
 +	import org.apache.flex.core.IParentIUIBase;
 +    import org.apache.flex.events.Event;
 +
 +	/**
 +	 *  The MXMLItemRenderer class is the base class for itemRenderers that are MXML-based
 +	 *  and provides support for a layout and a data object.
 +	 *
 +	 *  @langversion 3.0
 +	 *  @playerversion Flash 10.2
 +	 *  @playerversion AIR 2.6
 +	 *  @productversion FlexJS 0.0
 +	 */
 +	public class MXMLItemRenderer extends DataItemRenderer implements ILayoutParent, ILayoutHost, IStrand, ILayoutView
 +	{
 +		/**
 +		 *  constructor.
 +		 *
 +		 *  @langversion 3.0
 +		 *  @playerversion Flash 10.2
 +		 *  @playerversion AIR 2.6
 +		 *  @productversion FlexJS 0.0
 +		 */
 +		public function MXMLItemRenderer()
 +		{
 +			super();
 +		}
 +
 +        [Bindable("dataChange")]
 +        override public function set data(value:Object):void
 +        {
 +            if (value != data)
 +            {
 +                super.data = value;
 +                dispatchEvent(new Event("dataChange"));
 +            }
 +        }
 +
 +		public function getLayoutHost():ILayoutHost
 +		{
 +			return this;
 +		}
 +
 +		public function get contentView():ILayoutView
 +		{
 +			return this;
 +		}
 +
 +		override public function adjustSize():void
 +		{
 +			var layout:IBeadLayout = getBeadByType(IBeadLayout) as IBeadLayout;
 +			if (layout != null) {
 +				layout.layout();
 +			}
 +		}
++		
++		public function beforeLayout():void
++		{
++			
++		}
++		
++		public function afterLayout():void
++		{
++			
++		}
 +
 +
 +	}
 +}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1691921e/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/TextButtonItemRenderer.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/TextButtonItemRenderer.as
index 0000000,0000000..049fe9b
new file mode 100644
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/TextButtonItemRenderer.as
@@@ -1,0 -1,0 +1,244 @@@
++////////////////////////////////////////////////////////////////////////////////
++//
++//  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 org.apache.flex.core.IItemRenderer;
++	import org.apache.flex.core.IItemRendererParent;
++	import org.apache.flex.core.UIBase;
++	import org.apache.flex.core.SimpleCSSStyles;
++	import org.apache.flex.events.Event;
++	import org.apache.flex.events.MouseEvent;
++	import org.apache.flex.html.TextButton;
++	import org.apache.flex.html.beads.ITextItemRenderer;
++	import org.apache.flex.events.ItemClickedEvent;
++	
++	COMPILE::JS
++	{
++		import org.apache.flex.core.WrappedHTMLElement;            
++	}
++	
++	/**
++	 * The TextButtonItemRenderer class extends TextButton and turns it into an itemRenderer
++	 * suitable for use in most DataContainer/List/DataGrid applications.
++		 *
++		 *  @langversion 3.0
++		 *  @playerversion Flash 10.2
++		 *  @playerversion AIR 2.6
++		 *  @productversion FlexJS 0.8
++	 */
++	public class TextButtonItemRenderer extends TextButton implements ITextItemRenderer
++	{
++		public function TextButtonItemRenderer()
++		{
++			super();
++			
++			style = new SimpleCSSStyles();
++			
++			addEventListener('click',handleClickEvent);
++		}
++		
++		private var _data:Object;
++		
++		/**
++		 *  The data to be displayed as the text value. Use this in conjunction with
++		 *  the labelField property to select an item from the dataProvider record to use
++		 *  as the text value of the button.
++		 *
++		 *  @langversion 3.0
++		 *  @playerversion Flash 10.2
++		 *  @playerversion AIR 2.6
++		 *  @productversion FlexJS 0.8
++		 */
++		public function get data():Object
++		{
++			return _data;
++		}
++		public function set data(value:Object):void
++		{
++			_data = value;
++			
++			var valueAsString:String;
++			
++			if (value is String) {
++				valueAsString = value as String;
++			}
++			else if (value.hasOwnProperty("label")) {
++				valueAsString = String(value["label"]);
++			}
++			else if (value.hasOwnProperty("title")) {
++				valueAsString = String(value["title"]);
++			}
++			
++			if (valueAsString) text = valueAsString;
++		}
++		
++		/**
++		 * @private
++		 */
++		protected function handleClickEvent(event:MouseEvent):void
++		{
++			var newEvent:ItemClickedEvent = new ItemClickedEvent("itemClicked");
++			newEvent.multipleSelection = event.shiftKey;
++			newEvent.index = index;
++			newEvent.data = data;
++			dispatchEvent(newEvent);
++		}
++		
++		/*
++		 * IItemRenderer, ISelectableItemRenderer
++		 */
++		
++		private var _itemRendererParent:Object;
++		
++		/**
++		 * The parent container for the itemRenderer instance.
++		 *
++		 *  @langversion 3.0
++		 *  @playerversion Flash 10.2
++		 *  @playerversion AIR 2.6
++		 *  @productversion FlexJS 0.8
++		 */
++		public function get itemRendererParent():Object
++		{
++			return _itemRendererParent;
++		}
++		public function set itemRendererParent(value:Object):void
++		{
++			_itemRendererParent = 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.
++		 *
++		 *  @langversion 3.0
++		 *  @playerversion Flash 10.2
++		 *  @playerversion AIR 2.6
++		 *  @productversion FlexJS 0.8
++		 */
++		public function get labelField():String
++		{
++			return _labelField;
++		}
++		public function set labelField(value:String):void
++		{
++			_labelField = value;
++		}
++		
++		private var _listData:Object;
++		
++		[Bindable("__NoChangeEvent__")]
++		/**
++		 *  Additional data about the list structure the itemRenderer may
++		 *  find useful.
++		 *
++		 *  @langversion 3.0
++		 *  @playerversion Flash 10.2
++		 *  @playerversion AIR 2.6
++		 *  @productversion FlexJS 0.8
++		 */
++		public function get listData():Object
++		{
++			return _listData;
++		}
++		public function set listData(value:Object):void
++		{
++			_listData = 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.8
++		 */
++		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.8
++		 */
++		public function get hovered():Boolean
++		{
++			return _hovered;
++		}
++		public function set hovered(value:Boolean):void
++		{
++			_hovered = value;
++		}
++		
++		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.8
++		 */
++		public function get selected():Boolean
++		{
++			return _selected;
++		}
++		public function set selected(value:Boolean):void
++		{
++			_selected = value;
++		}
++		
++		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.8
++		 */
++		public function get down():Boolean
++		{
++			return _down;
++		}
++		public function set down(value:Boolean):void
++		{
++			_down = value;
++		}
++	}
++}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1691921e/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index 7dbe764,072aed9..d57c592
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@@ -81,20 -70,13 +81,20 @@@
      <component id="Slider" class="org.apache.flex.html.Slider"/>
      <component id="NumericStepper" class="org.apache.flex.html.NumericStepper" />
      <component id="StringItemRenderer" class="org.apache.flex.html.supportClasses.StringItemRenderer"/>
 +    <component id="AccordionItemRenderer" class="org.apache.flex.html.supportClasses.AccordionItemRenderer"/>
 +    <component id="AccordionCollapseBead" class="org.apache.flex.html.beads.AccordionCollapseBead"/>
 +    <component id="DispatchInputFinishedBead" class="org.apache.flex.html.beads.DispatchInputFinishedBead"/>
 +    <component id="DispatchKeyboardEventBead" class="org.apache.flex.html.beads.DispatchKeyboardEventBead"/>
      <component id="TreeItemRenderer" class="org.apache.flex.html.supportClasses.TreeItemRenderer"/>
      <component id="DataItemRenderer" class="org.apache.flex.html.supportClasses.DataItemRenderer"/>
 -    <component id="ButtonBarButtonItemRenderer" class="org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer"/>
 +    <component id="MXMLItemRenderer" class="org.apache.flex.html.supportClasses.MXMLItemRenderer"/>
-     <component id="ButtonBarButtonItemRenderer" class="org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer"/>
 +    <component id="DateItemRenderer" class="org.apache.flex.html.supportClasses.DateItemRenderer"/>
 +    <component id="DayNameItemRenderer" class="org.apache.flex.html.supportClasses.DayNameItemRenderer"/>
++    <component id="TextButtonItemRenderer" class="org.apache.flex.html.supportClasses.TextButtonItemRenderer"/>
      <!--
       <component id="TextFieldItemRenderer" class="org.apache.flex.html.supportClasses.TextFieldItemRenderer"/>
 -    <component id="HScrollBar" class="org.apache.flex.html.supportClasses.HScrollBar"/>
 -    <component id="VScrollBar" class="org.apache.flex.html.supportClasses.VScrollBar"/>
 +     <component id="HScrollBar" class="org.apache.flex.html.supportClasses.HScrollBar"/>
 +     <component id="VScrollBar" class="org.apache.flex.html.supportClasses.VScrollBar"/>
       <component id="HRuleView" class="org.apache.flex.html.beads.HRuleView" />
       <component id="VRuleView" class="org.apache.flex.html.beads.VRuleView" />
       -->

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1691921e/frameworks/projects/Basic/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/resources/defaults.css
index 9ecea43,5ce20fb..02a5bdb
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@@ -23,60 -23,26 +23,37 @@@
  /* Global style declaration */
  *
  {
--    font-family: "Arial";
--    font-size: 12px;
++	font-family: "Arial";
++	font-size: 12px;
  	border-width: 1px;
  }
  
  .flexjs *, . flexjs *:before, . flexjs *:after {
--    -moz-box-sizing: border-box;
--    -webkit-box-sizing: border-box;
--    box-sizing: border-box;
++	-moz-box-sizing: border-box;
++	-webkit-box-sizing: border-box;
++	box-sizing: border-box;
  }
  
- Accordion
- {
- 	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
- 	IBeadView:  ClassReference("org.apache.flex.html.beads.AccordionView");			
- 	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
- 	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.OneFlexibleChildVerticalLayout");
- 	IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
- 	IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
- 	IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
- 	IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.AccordionItemRenderer");
- 	IViewport: ClassReference("org.apache.flex.html.supportClasses.ClippingViewport");
- 	IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
- 	IAccordionCollapseBead: ClassReference("org.apache.flex.html.beads.AccordionCollapseBead");
- 	border-style: solid;
- 	border-color: #222222;
- }
- 
- AccordionItemRenderer
+ .unselectable
  {
- 	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AccordionItemRendererMouseController");
- 	IBeadView: ClassReference("org.apache.flex.html.beads.AccordionItemRendererView");
 -    -moz-user-select: -moz-none;
 -    -khtml-user-select: none;
 -    -webkit-user-select: none;
 -    -o-user-select: none;
 -    user-select: none;
++	-moz-user-select: -moz-none;
++	-khtml-user-select: none;
++	-webkit-user-select: none;
++	-o-user-select: none;
++	user-select: none;
  }
  
 +Alert
 +{
-     IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
-        
-     background-color: #FFFFFF;
-     border-style: solid;
-     border-color: #000000;
-     border-width: 1px;
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
++	
++	background-color: #FFFFFF;
++	border-style: solid;
++	border-color: #000000;
++	border-width: 1px;
 +}
 +
 +
- .unselectable
- {
-     -moz-user-select: -moz-none;
-     -khtml-user-select: none;
-     -webkit-user-select: none;
-     -o-user-select: none;
-     user-select: none;
- }
- 
  Application
  {
  	padding: 0px;
@@@ -85,118 -51,77 +62,113 @@@
  
  Button
  {
--  background-color: #f8f8f8;
--  border: 1px solid #808080;
--  border-radius: 2px;
--  padding: 4px;
--  margin: 0px;
++	background-color: #f8f8f8;
++	border: 1px solid #808080;
++	border-radius: 2px;
++	padding: 4px;
++	margin: 0px;
  }
  
  Button:hover
  {
--  background-color: #e8e8e8;
--  border: 1px solid #808080;
--  padding: 4px;
++	background-color: #e8e8e8;
++	border: 1px solid #808080;
++	padding: 4px;
  }
  
  Button:active
  {
--  background-color: #d8d8d8;
--  border: 1px solid #808080;
--  padding: 4px;
++	background-color: #d8d8d8;
++	border: 1px solid #808080;
++	padding: 4px;
  }
  
  ButtonBar
  {
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
--    IBeadView:  ClassReference("org.apache.flex.html.beads.ButtonBarView");			
--    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
--    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.ButtonBarLayout");
--    IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
--    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
--    IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
--    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer");
- 
-     border-style: none;
- }
- 
- ButtonBarButtonItemRenderer
- {
-     width: 80;
-     height: 30;
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ButtonBarModel");
++	IBeadView:  ClassReference("org.apache.flex.html.beads.ButtonBarView");			
++	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
++	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.ButtonBarLayout");
++	IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
++	IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
++	IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.TextButtonItemRenderer");
++	
++	border-style: none;
 +}
  
 -    border-style: none;
 +ComboBox
 +{
-     IBeadModel: ClassReference("org.apache.flex.html.beads.models.ComboBoxModel");
-     IBeadView: ClassReference("org.apache.flex.html.beads.ComboBoxView");
-     IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ComboBoxController");
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ComboBoxModel");
++	IBeadView: ClassReference("org.apache.flex.html.beads.ComboBoxView");
++	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ComboBoxController");
 +	IPopUp: ClassReference("org.apache.flex.html.supportClasses.ComboBoxList");
  }
  
 -ButtonBarButtonItemRenderer
 +ComboBoxList
  {
 -    width: 80;
 -    height: 30;
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
++	IBeadView:  ClassReference("org.apache.flex.html.beads.ListView");			
++	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
++	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalLayout");
 +	IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
 +	IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
 +	IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
++	IViewport: ClassReference("org.apache.flex.html.supportClasses.ScrollingViewport");
++	IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
 +	border-style: solid;
 +	border-radius: 4px;
 +	border-color: #000000;
 +	border-width: 1px;
 +	background-color: #FFFFFF;
 +}
 +
 +.ComboBoxButton {
 +	padding: 0px;
 +	margin: 0px;
  }
  
  Container
  {
--    IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
--    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.BasicLayout");
--    IContentView: ClassReference("org.apache.flex.html.supportClasses.ContainerContentArea");
++	IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
++	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.BasicLayout");
  	IViewport: ClassReference("org.apache.flex.html.supportClasses.Viewport");
  	IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
  }
  
  ControlBar
  {
--	IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
--	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout");
++	IBeadView: ClassReference("org.apache.flex.html.beads.GroupView");
++	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HorizontalFlexLayout");
  	
--    background-color: #CECECE;
--	border-style: none;
--    /*border-style: solid;
--    border-color: #000000;
--    border-width: 1px;*/
++	padding: 2px;
++	background-color: #E2E2E2;
++	border-top: solid 1px #333333;
++	height: 30px;
 +}
 +
 +DataContainer
 +{
 +	IBeadModel: ClassReference("org.apache.flex.html.beads.models.DataProviderModel");
 +	IBeadView:  ClassReference("org.apache.flex.html.beads.DataContainerView");			
 +	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalLayout");
- 	IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
 +	IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
 +	IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
 +	IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
 +	IViewport: ClassReference("org.apache.flex.html.supportClasses.Viewport");
 +	IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
 +	border-style: solid;
 +	border-color: #222222;
  }
  
- 
  /* ASJS */
  DataGrid
  {
--    IDataGridPresentationModel: ClassReference("org.apache.flex.html.beads.models.DataGridPresentationModel");
--    IBeadView: ClassReference("org.apache.flex.html.beads.DataGridView");
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.DataGridModel");
--	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.DataGridLayout");
--
--    background-color: #FFFFFF;
++	IDataGridPresentationModel: ClassReference("org.apache.flex.html.beads.models.DataGridPresentationModel");
++	IBeadView: ClassReference("org.apache.flex.html.beads.DataGridView");
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.DataGridModel");
++	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalFlexLayout");
++	
++	background-color: #FFFFFF;
  	border-style: solid;
  	border-color: #222222;
  	border-width: 1px;
@@@ -204,14 -129,14 +176,13 @@@
  
  DataGridButtonBar
  {
--	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ButtonBarModel");
  	IBeadView:  ClassReference("org.apache.flex.html.beads.ButtonBarView");			
  	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
  	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.ButtonBarLayout");
--	IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
  	IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
  	IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
--	IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.DataGridButtonBarButtonItemRenderer");
++	IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.TextButtonItemRenderer");
  	
  	border-style: none;
  }
@@@ -221,7 -146,7 +192,6 @@@ DataGridColumnList 
  	IBeadView:  ClassReference("org.apache.flex.html.beads.ListView");			
  	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
  	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalLayout");
--	IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
  	IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayList");
  	IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
  	IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
@@@ -233,61 -158,25 +203,72 @@@
  
  .DataGridListArea {
  	background-color: #FFFFFF;
--	border-style: solid;
--	border-color: #333333;
++	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HorizontalLayout");
++	IViewport: ClassReference("org.apache.flex.html.supportClasses.ScrollingViewport");
++	IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
  }
  
 +/* DateChooser */
 +
  DateChooser {
--    IBeadView:   ClassReference("org.apache.flex.html.beads.DateChooserView");
--    IBeadModel:  ClassReference("org.apache.flex.html.beads.models.DateChooserModel");
--    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DateChooserMouseController");
--    width:  280px;
-     height: 230px;
 -    height: 240px;
++	IBeadView:   ClassReference("org.apache.flex.html.beads.DateChooserView");
++	IBeadModel:  ClassReference("org.apache.flex.html.beads.models.DateChooserModel");			
++	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalFlexLayout");	
++	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DateChooserMouseController");
++	width:  280px;
++	height: 240px;
 +}
 +
 +DateChooserList {
-     IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
++	IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
 +	IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-     IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.DataItemRenderer");
-     border-style: solid;
-     border-radius: 4px;
-     border-color: #000000;
-     border-width: 1px;
-     background-color: #FFFFFF;
++	IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.DateItemRenderer");		
++	border-style: solid;
++	border-color: #000000;
++	border-width: 1px;
++	background-color: #FFFFFF;
++}
++
++DateChooserHeader {	
++	IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.DayNameItemRenderer");
++	height: 20px;
++	border-style: solid;
++	border-color: #000000;
++	border-width: 1px;
++	background-color: #FFFFFF;
 +}
 +
- DateChooserHeader {    
-     IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.DayNameItemRenderer");               
-     border-style: solid;
-     border-color: #000000;
-     border-width: 1px;
-     background-color: #FFFFFF;
++.DateChooserMonthButtons {				
++	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HorizontalFlexLayout");	
++	height: 20px;
 +}
 +
 +DateItemRenderer
 +{
-     IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
-     text-align: center;
++	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
++	text-align: center;
++	flex-shrink: 0;
++	flex-grow: 1;
 +}
 +
 +DayNameItemRenderer
 +{
-     text-align: center;
++	text-align: center;
++	flex-shrink: 0;
++	flex-grow: 1;
  }
-  
+ 
 +/* DateField */
 +
  DateField {
--    IBeadView:   ClassReference("org.apache.flex.html.beads.DateFieldView");
--    IBeadModel:  ClassReference("org.apache.flex.html.beads.models.DateChooserModel");
--    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DateFieldMouseController");
-     IFormatBead: ClassReference("org.apache.flex.html.accessories.DateFormatMMDDYYYYBead");
 -    IFormatBead: ClassReference("org.apache.flex.html.accessories.DateFormatYYYYMMDDBead");
++	IBeadView:   ClassReference("org.apache.flex.html.beads.DateFieldView");
++	IBeadModel:  ClassReference("org.apache.flex.html.beads.models.DateChooserModel");
++	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DateFieldMouseController");
++	IFormatBead: ClassReference("org.apache.flex.html.accessories.DateFormatYYYYMMDDBead");
  }
  
 +/* RangeStepper */
 +
  RangeStepper {
  	IBeadView: ClassReference("org.apache.flex.html.beads.RangeStepperView");
  	IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModelExtended");
@@@ -295,13 -184,13 +276,18 @@@
  }
  
  Form {
--    
++	
++}
++
++Group {
++	IBeadView: ClassReference("org.apache.flex.html.beads.GroupView");
  }
  
  HContainer
  {
--    IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
--    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HorizontalLayout");
++	IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
++	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HorizontalLayout");
++	white-space: nowrap;
  }
  
  Image
@@@ -311,63 -200,55 +297,78 @@@
  	IBeadView:  ClassReference("org.apache.flex.html.beads.ImageView");
  }
  
++BinaryImage
++{
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.BinaryImageModel");
++	IBeadView:  ClassReference("org.apache.flex.html.beads.ImageView");
++	IBinaryImageLoader:  ClassReference("org.apache.flex.html.beads.BinaryImageLoader");
++}
++
  ImageAndTextButton
  {
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ImageAndTextModel");
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ImageAndTextModel");
  }
  
  ImageButton
  {
--    border-style: none;
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ImageModel");
++	border-style: none;
  }
  
  ImageButton:hover
  {
--    border-style: none;
++	border-style: none;
  }
  
  ImageButton:active
  {
--    border-style: none;
- }
- 
- BinaryImage
- {
- 	IBeadModel: ClassReference("org.apache.flex.html.beads.models.BinaryImageModel");
- 	IBeadView:  ClassReference("org.apache.flex.html.beads.ImageView");
- 	IBinaryImageLoader:  ClassReference("org.apache.flex.html.beads.BinaryImageLoader");
++	border-style: none;
  }
  
  VContainer
  {
--    IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
--    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalLayout");
++	IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
++	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalLayout");
  }
  
  List
  {
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
--    IBeadView:  ClassReference("org.apache.flex.html.beads.ListView");			
--    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
--    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalLayout");
--    IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
--    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
--    IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
--    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
--	IViewport: ClassReference("org.apache.flex.html.supportClasses.ScrollingViewport");
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
++	IBeadView:  ClassReference("org.apache.flex.html.beads.ListView");			
++	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
++	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalLayout");
++	IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
++	IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
++	IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
++	IViewport: ClassReference("org.apache.flex.html.supportClasses.Viewport");
  	IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
  	border-style: solid;
  	border-color: #222222;
 +	background-color: #FFFFFF;
  }
  
 -Tree
++Accordion
+ {
+ 	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
++	IBeadView:  ClassReference("org.apache.flex.html.beads.AccordionView");			
++	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
++	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.OneFlexibleChildVerticalLayout");
++	IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
++	IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
++	IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.AccordionItemRenderer");
++	IViewport: ClassReference("org.apache.flex.html.supportClasses.ClippingViewport");
++	IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
++	IAccordionCollapseBead: ClassReference("org.apache.flex.html.beads.AccordionCollapseBead");
++	border-style: solid;
++	border-color: #222222;
++}
++
 +Tree
 +{
 +	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArrayListSelectionModel");
  	IBeadView:  ClassReference("org.apache.flex.html.beads.ListView");			
  	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.TreeSingleSelectionMouseController");
  	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalLayout");
--	IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
  	IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForHierarchicalData");
  	IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
  	IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.TreeItemRenderer");
@@@ -379,141 -260,139 +380,163 @@@
  
  NumericStepper
  {
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
  }
  
  Panel
  {
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.PanelModel");
--    IBeadView: ClassReference("org.apache.flex.html.beads.PanelView");
--    
--    background-color: #FFFFFF;
--    border-style: solid;
--    border-color: #000000;
--    border-width: 1px;
--	padding: 2px;
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.PanelModel");
++	IBeadView: ClassReference("org.apache.flex.html.beads.PanelView");
++	IPanelLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalFlexLayout");
++	
++	background-color: #FFFFFF;
++	border: solid 1px #333333
  }
  
  PanelWithControlBar
  {
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.PanelModel");
--    IBeadView: ClassReference("org.apache.flex.html.beads.PanelWithControlBarView");
--    
--    background-color: #FFFFFF;
--    border-style: solid;
--    border-color: #000000;
--    border-width: 1px;
--	padding: 2px;
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.PanelModel");
++	IBeadView: ClassReference("org.apache.flex.html.beads.PanelWithControlBarView");
++	IPanelLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalFlexLayout");
++	
++	background-color: #FFFFFF;
++	border: solid 1px #333333;
++}
++
++Panel .TitleBar
++{
++	border-bottom: solid 1px #333333;
  }
  
  SimpleList
  {
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
--    IBeadView:  ClassReference("org.apache.flex.html.beads.ListView");
--    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
--    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalLayout");
--    IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
--    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
--    IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
--    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
++	IBeadView:  ClassReference("org.apache.flex.html.beads.ListView");
++	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
++	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalLayout");
++	IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
++	IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
++	IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
  	IViewport: ClassReference("org.apache.flex.html.supportClasses.ScrollingViewport");
  	IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
  }
  
  Slider
  {
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
-     iBeadView:  ClassReference("org.apache.flex.html.beads.SliderView");
-     iBeadController: ClassReference("org.apache.flex.html.beads.controllers.SliderMouseController");
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
++	iBeadView:  ClassReference("org.apache.flex.html.beads.SliderView");
++	iBeadController: ClassReference("org.apache.flex.html.beads.controllers.SliderMouseController");
  }
  
  Spinner
  {
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
--    IBeadView:  ClassReference("org.apache.flex.html.beads.SpinnerView");
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
++	IBeadView:  ClassReference("org.apache.flex.html.beads.SpinnerView");
  }
  
  
  StringItemRenderer
  {
--    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
--    height: 16;
++	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
++	height: 24;
++	flex-shrink: 0;
++	flex-grow: 1;
++}
++
++AccordionItemRenderer
++{
++	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AccordionItemRendererMouseController");
++	IBeadView: ClassReference("org.apache.flex.html.beads.AccordionItemRendererView");
++	flex-shrink: 0;
++	flex-grow: 1;
  }
  
  TreeItemRenderer
  {
  	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
--	height: 16;
++	height: 24;
++	flex-shrink: 0;
++	flex-grow: 1;
  }
  
  TextInput
  {
--  border: 1px solid #808080;
--  border-radius: 2px;
--  padding: 4px;
--  margin: 0px;
++	border: 1px solid #808080;
++	border-radius: 2px;
++	padding: 4px;
++	margin: 0px;
  }
  
  TextArea
  {
--  border: 1px solid #808080;
--  border-radius: 2px;
--  padding: 4px;
--  resize: none;
++	border: 1px solid #808080;
++	border-radius: 2px;
++	padding: 4px;
++	resize: none;
  }
  
  TitleBar
  {
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TitleBarModel");
--    IBeadView: ClassReference("org.apache.flex.html.beads.TitleBarView");
--    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout");
--    iMeasurementBead: ClassReference("org.apache.flex.html.beads.TitleBarMeasurementBead");
--    background-color: #E2E2E2;
--    border-style: solid;
--    border-color: #000000;
--    border-width: 1px;
++	IBeadModel: ClassReference("org.apache.flex.html.beads.models.TitleBarModel");
++	IBeadView: ClassReference("org.apache.flex.html.beads.TitleBarView");
++	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout");
++	iMeasurementBead: ClassReference("org.apache.flex.html.beads.TitleBarMeasurementBead");
++	background-color: #E2E2E2;
++	padding: 2px;
++	height: 30px;
++	flex-grow: 0;
++	min-height: 30px;
++}
++
++TitleBar .TitleBarCloseButton {
++	width: 16px;
++	height: 16px;
++	margin: 0px;
++}
++
++TitleBar .TitleBarTitle {
++	font-weight: bold;
++	padding: 0;
++	margin: 0;
  }
  
  .toggleTextButton
  {
--  background-color: #f8f8f8;
--  border: 1px solid #808080;
--  padding: 4px;
++	background-color: #f8f8f8;
++	border: 1px solid #808080;
++	padding: 4px;
  }
  
  .toggleTextButton:hover
  {
--  background-color: #e8e8e8;
--  border: 1px solid #808080;
--  padding: 4px;
++	background-color: #e8e8e8;
++	border: 1px solid #808080;
++	padding: 4px;
  }
  
  .toggleTextButton_Selected
  {
--  background-color: #d8d8d8;
--  border: 1px solid #808080;
--  padding: 4px;
++	background-color: #d8d8d8;
++	border: 1px solid #808080;
++	padding: 4px;
  }
  
  .toggleTextButton_Selected:hover
  {
--  background-color: #e8e8e8;
--  border: 1px solid #808080;
--  padding: 4px;
++	background-color: #e8e8e8;
++	border: 1px solid #808080;
++	padding: 4px;
  }
  
  ToolTip
  {
--    background-color: #FFFFCC;
++	background-color: #FFFFCC;
  }
  
  View
  {
--    IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
--    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.BasicLayout");
--    IContentView: ClassReference("org.apache.flex.html.supportClasses.ContainerContentArea");
--	IViewport: ClassReference("org.apache.flex.html.supportClasses.Viewport");
--	IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
++	IBeadView: ClassReference("org.apache.flex.html.beads.GroupView");
++	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.BasicLayout");
  }
  
  WebBrowser
@@@ -526,280 -405,277 +549,324 @@@
  /* Global Style Declaration */
  global
  {
--    IStatesImpl: ClassReference("org.apache.flex.core.SimpleStatesImpl");
--    IEffectTimer: ClassReference("org.apache.flex.utils.EffectTimer");
--    effectTimerInterval: 10;
++	IStatesImpl: ClassReference("org.apache.flex.core.SimpleStatesImpl");
++	IEffectTimer: ClassReference("org.apache.flex.utils.EffectTimer");
++	effectTimerInterval: 10;
  }
  
  @media -flex-flash
  {
--
--Alert
--{
 -    IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
--    IBeadView:  ClassReference("org.apache.flex.html.beads.AlertView");
--    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AlertController");
--    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
--    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
--    
 -    background-color: #FFFFFF;
 -    border-style: solid;
 -    border-color: #000000;
 -    border-width: 1px;
--}
--
--Border
--{
--  border-color: inherit;
--  border-style: inherit;
--  border-radius: inherit;
--  border-width: inherit;
--  border: inherit;
--}
--
--Button
--{
--    IBeadView: ClassReference("org.apache.flex.html.beads.CSSButtonView");
--}
--
--CheckBox
--{
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
--    IBeadView:  ClassReference("org.apache.flex.html.beads.CheckBoxView");			
--}
--
--CloseButton
--{
--    IBeadView: ClassReference("org.apache.flex.html.beads.CloseButtonView");
--}
--
- ComboBoxList {
- 	iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
 -ComboBox
 -{
 -    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ComboBoxModel");
 -    IBeadView: ClassReference("org.apache.flex.html.beads.ComboBoxView");
 -    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ComboBoxController");
 -    IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
 -    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
 -    IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
 -    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
--}
--
--Container
--{
--    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
--    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
--}
--
--ControlBar
--{
--	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout");
--    iMeasurementBead: ClassReference("org.apache.flex.html.beads.ControlBarMeasurementBead");
--    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
--    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");    
- }
- 
- DateChooserList {
-    iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
-    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead"); 
- }
-        
- DateChooserHeader {
-     padding-top: 0px;
-     padding-bottom: 5px;
-     iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
-     iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");   
- }
-        
- DateItemRenderer {
-     margin: 0px;
-     padding: 5px;
--}
--
--DropDownList
--{
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
--    IBeadView: ClassReference("org.apache.flex.html.beads.DropDownListView");
--    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DropDownListController");
--    IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
--}
--
--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.StringItemRenderer");
--    iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
--    border-style: solid;
--    border-radius: 4px;
--    border-color: #000000;
--    border-width: 1px;
--    background-color: #FFFFFF;
--}
--
--HRule
--{
--    IBeadView:  ClassReference("org.apache.flex.html.beads.HRuleView");
--}
--
--ImageButton
--{
--    IBeadView: ClassReference("org.apache.flex.html.beads.ImageButtonView");
--}
--
--ImageAndTextButton
--{
--    IBeadView: ClassReference("org.apache.flex.html.beads.CSSImageAndTextButtonView");
--}
--
--Label
--{
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
--    IBeadView: ClassReference("org.apache.flex.html.beads.TextFieldView");
--	iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextFieldLabelMeasurementBead");
--}
--
--List
--{
--    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
--    iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
--}
--
--MultilineLabel
--{
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
--    IBeadView: ClassReference("org.apache.flex.html.beads.MultilineTextFieldView");
--}
--
--NumericStepper
--{
--    IBeadView: ClassReference("org.apache.flex.html.beads.NumericStepperView");
--    
--    padding: 0px;
--    border-style: solid;
--    border-color: #000000;
--    border-width: 1px;
--    background-color: #FFFFFF;
--    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
--    iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
--}
--
--Panel
--{
--    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
--    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");    
--}
--
--PanelWithControlBar
--{
--    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
--    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
--}
--
--RadioButton
--{
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
--    IBeadView:  ClassReference("org.apache.flex.html.beads.RadioButtonView");			
--}
--
--VScrollBar
--{
--    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.VScrollBarView");
--    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.VScrollBarMouseController");
--}
--
--HScrollBar
--{
--	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HScrollBarLayout");
--	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
--	IBeadView: ClassReference("org.apache.flex.html.beads.HScrollBarView");
--	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.HScrollBarMouseController");
--}
--
--SimpleAlert
--{
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
--    IBeadView:  ClassReference("org.apache.flex.html.beads.SimpleAlertView");
--    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AlertController");
--    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
--    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
--    
--    background-color: #FFFFFF;
--    border-style: solid;
--    border-color: #000000;
--    border-width: 1px;
--}
--
--Slider
--{
 -    iBeadView:  ClassReference("org.apache.flex.html.beads.SliderView");
 -    iBeadController: ClassReference("org.apache.flex.html.beads.controllers.SliderMouseController");
--    iThumbView: ClassReference("org.apache.flex.html.beads.SliderThumbView");
--    iTrackView: ClassReference("org.apache.flex.html.beads.SliderTrackView");
--}
--
--Spinner
--{
--    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.SpinnerMouseController");
--}
--
--TextArea
--{
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
--    IBeadView: ClassReference("org.apache.flex.html.beads.TextAreaView");
--    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
--    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
--    iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
--    border-style: solid;
--    border-color: #000000;
--    border-width: 1px;
--    background-color: #FFFFFF;
--}
--
--TextButton
--{
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
--    IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
--    iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
--}
--
--TextFieldItemRenderer
--{
--    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
--    height: 16;
--}
--
--TextInput
--{
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
--    IBeadView: ClassReference("org.apache.flex.html.beads.TextInputWithBorderView");
--    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
--    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
--    iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
--    border-style: solid;
--    border-color: #000000;
--    border-width: 1px;
--    background-color: #FFFFFF;
--}
--
--TitleBar
--{
--    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
--    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
--}
--
--ToggleTextButton
--{
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
--    IBeadView:  ClassReference("org.apache.flex.html.beads.CSSTextToggleButtonView");
--}
--
--View
--{
--    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
--    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
--}
--
--VRule
--{
--    IBeadView:  ClassReference("org.apache.flex.html.beads.VRuleView");
--}
--
--/* SVG */
--
--svg|TextButton
--{
--    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
--    IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
--    iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
--}
++	Accordion {
++		IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
++	}
++	
++	Alert
++	{
++		IBeadView:  ClassReference("org.apache.flex.html.beads.AlertView");
++		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AlertController");
++		IBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
++		IBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
++	}
++	
++	Border
++	{
++		border-color: inherit;
++		border-style: inherit;
++		border-radius: inherit;
++		border-width: inherit;
++		border: inherit;
++	}
++	
++	Button
++	{
++		IBeadView: ClassReference("org.apache.flex.html.beads.CSSButtonView");
++	}
++	
++	ButtonBar
++	{
++		IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
++	}
++	
++	CheckBox
++	{
++		IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
++		IBeadView:  ClassReference("org.apache.flex.html.beads.CheckBoxView");			
++	}
++	
++	CSSCheckBox
++	{
++		IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
++		IBeadView:  ClassReference("org.apache.flex.html.beads.CheckBoxView");			
++	}
++	
++	CloseButton
++	{
++		IBeadView: ClassReference("org.apache.flex.html.beads.CloseButtonView");
++	}
++	
++	Container
++	{
++		IBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
++		IBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
++		IContentView: ClassReference("org.apache.flex.html.supportClasses.ContainerContentArea");
++	}
++	
++	ControlBar
++	{
++		IMeasurementBead: ClassReference("org.apache.flex.html.beads.ControlBarMeasurementBead");
++		IBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
++		IBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");  
++		border: solid 1px #333333;
++	}
++	
++	ComboBoxList {
++		IBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
++	}
++	
++	DataContainer {
++		IBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
++		IBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
++		IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
++	}
++	
++	DataGridButtonBar {
++		IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
++	}
++	
++	DateChooserList {
++		iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
++		iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead"); 
++	}
++	
++	DateChooserHeader {
++		padding-top: 0px;
++		padding-bottom: 5px;
++		iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
++		iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");   
++	}
++	
++	DateItemRenderer {
++		margin: 0px;
++		padding: 5px;
++	}
++	
++	DropDownList
++	{
++		IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
++		IBeadView: ClassReference("org.apache.flex.html.beads.DropDownListView");
++		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DropDownListController");
++		IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
++	}
++	
++	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.StringItemRenderer");
++		iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
++		iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
++		iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
++		border-style: solid;
++		border-radius: 4px;
++		border-color: #333333;
++		border-width: 1px;
++		background-color: #FFFFFF;
++	}
++	
++	Group
++	{
++		iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
++		iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
++		iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
++	}
++	
++	HRule
++	{
++		IBeadView:  ClassReference("org.apache.flex.html.beads.HRuleView");
++	}
++	
++	ImageButton
++	{
++		IBeadView: ClassReference("org.apache.flex.html.beads.ImageButtonView");
++	}
++	
++	ImageAndTextButton
++	{
++		IBeadView: ClassReference("org.apache.flex.html.beads.CSSImageAndTextButtonView");
++	}
++	
++	Label
++	{
++		IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
++		IBeadView: ClassReference("org.apache.flex.html.beads.TextFieldView");
++		iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextFieldLabelMeasurementBead");
++	}
++	
++	List
++	{
++		iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
++		iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
++		iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
++		IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
++	}
++	
++	MultilineLabel
++	{
++		IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
++		IBeadView: ClassReference("org.apache.flex.html.beads.MultilineTextFieldView");
++	}
++	
++	NumericStepper
++	{
++		IBeadView: ClassReference("org.apache.flex.html.beads.NumericStepperView");
++		
++		padding: 0px;
++		border-style: solid;
++		border-color: #000000;
++		border-width: 1px;
++		background-color: #FFFFFF;
++		iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
++		iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
++	}
++	
++	Panel
++	{
++		IContentView: ClassReference("org.apache.flex.html.supportClasses.ContainerContentArea");
++		IBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
++		IBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");    
++	}
++	
++	PanelWithControlBar
++	{
++		IContentView: ClassReference("org.apache.flex.html.supportClasses.ContainerContentArea");
++		IBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
++		IBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
++	}
++	
++	RadioButton
++	{
++		IBeadModel: ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
++		IBeadView:  ClassReference("org.apache.flex.html.beads.RadioButtonView");			
++	}
++	
++	VScrollBar
++	{
++		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.VScrollBarView");
++		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.VScrollBarMouseController");
++	}
++	
++	HScrollBar
++	{
++		IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HScrollBarLayout");
++		IBeadModel: ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
++		IBeadView: ClassReference("org.apache.flex.html.beads.HScrollBarView");
++		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.HScrollBarMouseController");
++	}
++	
++	SimpleAlert
++	{
++		IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
++		IBeadView:  ClassReference("org.apache.flex.html.beads.SimpleAlertView");
++		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AlertController");
++		iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
++		iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
++		
++		background-color: #FFFFFF;
++		border-style: solid;
++		border-color: #000000;
++		border-width: 1px;
++	}
++	
++	Slider
++	{
++		iThumbView: ClassReference("org.apache.flex.html.beads.SliderThumbView");
++		iTrackView: ClassReference("org.apache.flex.html.beads.SliderTrackView");
++	}
++	
++	Spinner
++	{
++		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.SpinnerMouseController");
++	}
++	
++	TextArea
++	{
++		IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
++		IBeadView: ClassReference("org.apache.flex.html.beads.TextAreaView");
++		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
++		IBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
++		IBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
++		border-style: solid;
++		border-color: #000000;
++		border-width: 1px;
++		background-color: #FFFFFF;
++	}
++	
++	TextButton
++	{
++		IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
++		IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
++		iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
++	}
++	
++	Tree {
++		IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
++	}
++	
++	/*
++	TextFieldItemRenderer
++	{
++	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
++	height: 16;
++	}
++	*/
++	
++	TextInput
++	{
++		IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
++		IBeadView: ClassReference("org.apache.flex.html.beads.TextInputWithBorderView");
++		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
++		IBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
++		IBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
++		border-style: solid;
++		border-color: #000000;
++		border-width: 1px;
++		background-color: #FFFFFF;
++	}
++	
++	TitleBar
++	{
++		IBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
++		IBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
++		border: solid 1px #333333;
++	}
++	
++	ToggleTextButton
++	{
++		IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
++		IBeadView:  ClassReference("org.apache.flex.html.beads.CSSTextToggleButtonView");
++	}
++	
++	View
++	{
++		iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
++		iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
++	}
++	
++	VRule
++	{
++		IBeadView:  ClassReference("org.apache.flex.html.beads.VRuleView");
++	}
++	
++	/* SVG */
++	
++	svg|TextButton
++	{
++		IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
++		IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
++		iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
++	}
  
  }


Mime
View raw message