You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xap-commits@incubator.apache.org by mt...@apache.org on 2006/10/27 18:48:44 UTC

svn commit: r468492 [1/2] - in /incubator/xap/trunk: WebContent/examples/widgets/ src/xap/bridges/xap/ src/xap/widgets/ src/xap/widgets/images/

Author: mturyn
Date: Fri Oct 27 11:48:42 2006
New Revision: 468492

URL: http://svn.apache.org/viewvc?view=rev&rev=468492
Log:
(For Y. Wang.)
Event and attribute handling improved for bridges and widgets.  
Images added for disabled states for checkbox and radio button.

Examples brought up to date with new features.

Layout changes in these examples to keep test components in view (M.T. solely responsible for these if they bother you).

Added:
    incubator/xap/trunk/src/xap/widgets/images/checkbox_off_disabled.gif   (with props)
    incubator/xap/trunk/src/xap/widgets/images/checkbox_on_disabled.gif   (with props)
    incubator/xap/trunk/src/xap/widgets/images/radio_off_disabled.gif   (with props)
    incubator/xap/trunk/src/xap/widgets/images/radio_on_disabled.gif   (with props)
Modified:
    incubator/xap/trunk/WebContent/examples/widgets/button.xal
    incubator/xap/trunk/WebContent/examples/widgets/checkBox.xal
    incubator/xap/trunk/WebContent/examples/widgets/label.xal
    incubator/xap/trunk/WebContent/examples/widgets/radioButton.xal
    incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal
    incubator/xap/trunk/src/xap/bridges/xap/ButtonBridge.js
    incubator/xap/trunk/src/xap/bridges/xap/CheckboxBridge.js
    incubator/xap/trunk/src/xap/bridges/xap/LabelBridge.js
    incubator/xap/trunk/src/xap/bridges/xap/RadioButtonBridge.js
    incubator/xap/trunk/src/xap/widgets/Button.js
    incubator/xap/trunk/src/xap/widgets/Checkbox.js
    incubator/xap/trunk/src/xap/widgets/Label.js
    incubator/xap/trunk/src/xap/widgets/RadioButton.js
    incubator/xap/trunk/src/xap/widgets/images/checkbox_off.gif

Modified: incubator/xap/trunk/WebContent/examples/widgets/button.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/button.xal?view=diff&rev=468492&r1=468491&r2=468492
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/button.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/button.xal Fri Oct 27 11:48:42 2006
@@ -1,99 +1,169 @@
-<xal xmlns="http://www.openxal.org/xal" xmlns:xm="http://www.openxal.org/xmodify" xmlns:xal="http://www.openxal.org/xal"> 
-	
-	
-	<mco:mco 
-		xmlns:mco="http://www.openxal.org/mco" 
-		id="attributeSetter" 
-		src="AttributeTester"
-	/>
-	<macro:macro id="createNodes" xmlns:macro="http://www.openxal.org/macro">
-		<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
-			<xm:append select="id('macroButtons')">
-				<include href="buttonComparison.xal" xmlns="http://www.openxal.org/xinclude"/>
-			</xm:append>
-		</xm:modifications>
-	</macro:macro>
-	<macro:macro id="setNodeAttributes" xmlns:macro="http://www.openxal.org/macro">
-		<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
-			<xm:set-attribute select="id('borderButton')">
-				<xm:attribute name="borderWidth" value="10px" />
-			</xm:set-attribute>
-			<xm:set-attribute select="id('disableButton')">
-				<xm:attribute name="disabled" value="true" />
-			</xm:set-attribute>
-		</xm:modifications>
-	</macro:macro>
-	
+<xal xmlns="http://www.openxal.org/xal" xmlns:xal="http://www.openxal.org/xal"> 
+
+	<mco:mco xmlns:mco="http://www.openxal.org/mco" id="attributeSetter" src="AttributeTester" /> 
 	
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 		<xm:append select="/xal">
+
+			<button id="testComponent" width="300px" height="100px" text="Belly Button" 
+				onCommand="mco:attributeSetter.reportEvent(event)"/>
+
+		<horizontalFlowPane width="825px">
+		
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hello World!" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hello World!!!')" />
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="<b>Hear me roar!</b>" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', '<b>Hear me roar!!!</b>')" />		 
 			
-			<horizontalPanel>
-				
-				
-				
-				<verticalPanel>
-					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="Hello World!" 
-						onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hello World!!!')" />
-					
-					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="Hear me roar!" 
-						onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hear me roar!!!')" />		 
-					
-					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = top" 
-						onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'top')" />	
-					
-					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = bottom" 
-						onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'bottom')" />	
-					
-					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = left" 
-						onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'left')" />	
-					
-					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = center" 
-						onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'center')" />	
-					
-					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = right" 
-						onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'right')" />
-					
-					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="alignVertical = top" 
-						onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'top')" />	
-					
-					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="alignVertical = center" 
-						onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'center')" />	
-					
-					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="alignVertical = bottom" 
-						onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'bottom')" />
-					
-					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="disabled: true" 
-						onCommand="mco:attributeSetter.setAttribute(testComponent, 'disabled', 'true')" />
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Very long text" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'XAP is an XML-based declarative framework for building, deploying and maintaining rich, interactive Ajax powered web applications.  It aims to reduce the need for scripting and help solve the development and maintenance challenges associated with large scale JavaScript programming.')" />	
+			
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = top" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'top')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = bottom" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'bottom')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementHorizontal = left" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementHorizontal', 'left')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementHorizontal = right" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementHorizontal', 'right')" />	
+	
 					
-					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="disabled: false" 
-						onCommand="mco:attributeSetter.setAttribute(testComponent, 'disabled', 'false')" />
-				</verticalPanel>		 
-				<verticalPanel>
-					<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-				</verticalPanel>
-				<button id="testComponent" width="300px" height="100px" text="Belly Button" onCommand="mco:attributeSetter.reportEvent(event)" onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)" onKeyChar="mco:attributeSetter.reportEvent(event)" onKeyDown="mco:attributeSetter.reportEvent(event)" onKeyUp="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)" onMouseDrag="mco:attributeSetter.reportEvent(event)" onMouseMove="mco:attributeSetter.reportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMouseOver="mco:attributeSetter.reportEvent(event)" onMouse
 Up="mco:attributeSetter.reportEvent(event)"/>
-				<verticalPanel id="testButtons">
-					<verticalPanel>
-						<label  width="150px" height="20px" text="Loaded"/>
-						<include href="buttonComparison.xal" xmlns="http://www.openxal.org/xinclude"/> 
-					</verticalPanel>
-					<verticalPanel id="macroButtons">
-						<label width="150px" height="20px"  text="Created through macro" onCreate="macro:createNodes.execute()"/>
-					</verticalPanel>
-					<verticalPanel>
-						<label width="150px" height="20px"  text="Set through macro"/>
-						<verticalPanel xmlns="http://www.openxal.org/xal" width="200">	
-							<button text="border 10" id="borderButton"/>
-							<button text="disabled" id="disableButton" onCreate="macro:setNodeAttributes.execute()"/>
-						</verticalPanel>
-					</verticalPanel>
-				</verticalPanel>
-				
-				
-				
-			</horizontalPanel>
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = left" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'left')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = center" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'center')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = right" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'right')" />
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = top" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'top')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = center" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'center')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = bottom" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'bottom')" />
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="autoWrap = true" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'autoWrap', 'true')" />
+			
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="autoWrap = false" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'autoWrap', 'false')" />  
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set background image" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgBackground', '../background.JPG')" />   
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'img', '../foreground.JPG')" />   
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set disabled image" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgDisabled', '../foreground_disabled.JPG')" />  
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set enabled = false" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'enabled', 'false')" />  
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set enabled = true" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'enabled', 'true')" />  
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image width = 50" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgWidth', '50')" />   
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image height = 20" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgHeight', '20')" />   
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selectable = true" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'selectable', 'true')" />   
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selectable = false" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'selectable', 'false')" />  
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="richText = true" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'richText', 'true')" />  
+
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="richText = false" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'richText', 'false')" />  
+
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image over" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgOver', '../background.JPG')" />  	 
+
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image pressed" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgPressed', '../background.JPG')" />  	 
+			 			 
+			<!-- button specific properties -->
+			<button width="200px" height="25px" 
+				text="text -> 'some new text'"
+				onCommand="mco:attributeSetter.setAttribute(testComponent,
+					'text','some new text')"/>
+			</horizontalFlowPane>
+								
+			<!--standard test things -->		
+			<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
+
+			<!--
+			<label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="top" />		
+			<label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+				
+				
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" />
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+			
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" />	  
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+			
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" />		
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />
+				
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+		
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+				
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" />	
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+		
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" />		
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+		
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter"/>		
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+	
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right"/>
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left"/>	
 			
+			-->
+		
 		</xm:append> 	  		
-	</xm:modifications>
+  	</xm:modifications>
 </xal>

Modified: incubator/xap/trunk/WebContent/examples/widgets/checkBox.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/checkBox.xal?view=diff&rev=468492&r1=468491&r2=468492
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/checkBox.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/checkBox.xal Fri Oct 27 11:48:42 2006
@@ -12,53 +12,157 @@
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
 	
-<horizontalPanel>
-	
-
-	 		<verticalPanel>
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hello World!" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hello World!!!')" />
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hear me roar!" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hear me roar!!!')" />		 
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = top" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'top')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = bottom" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'bottom')" />
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementHorizontal = left" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementHorizontal ', 'left')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementHorizontal = right" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementHorizontal ', 'right')" />			 
 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = left" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'left')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = center" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'center')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = right" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'right')" />
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = top" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'top')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = center" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'center')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = bottom" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'bottom')" />
+	<freePanel width="400px" height="150px">	
+	<label x="0px" y="0px"/>
+	  <checkBox id="testComponent" x="80px" y="0px" width="200px" height="30px" text="My Checkbox" onStateChange="mco:attributeSetter.reportEvent(event)"  onSelect="mco:attributeSetter.reportEvent(event)" />
+
+	  <checkBox id="testComponent2" x="100px" y="45px" width="200px" height="30px" text="Checkbox 1 group 1" group="group1" onStateChange="mco:attributeSetter.reportEvent(event)"  onSelect="mco:attributeSetter.reportEvent(event)" />
+	  <checkBox id="testComponent3"  x="100px" y="75px" width="200px" height="30px" text="Checkbox 2 group 1" group="group1" onStateChange="mco:attributeSetter.reportEvent(event)"  onSelect="mco:attributeSetter.reportEvent(event)" />
+	</freePanel>
+	
+	<horizontalFlowPane width="825px">				
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="<b>Hello World!</b>" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', '<b>Hello World!!!</b>')" />
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hear me roar!" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hear me roar!!!')" />		 
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = top" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'top')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = bottom" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'bottom')" />
+			 
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementHorizontal = left" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementHorizontal', 'left')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementHorizontal = right" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementHorizontal', 'right')" />	 
+				
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = left" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'left')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = center" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'center')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = right" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'right')" />
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = top" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'top')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = center" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'center')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = bottom" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'bottom')" />
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="richText = true" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'richText', 'true')" />		 
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set img over" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgOver', '../background.JPG')" />	 
+			 		 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set img over selected" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgOverSelected', '../background.JPG')" />	 
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set img pressed selected" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgPressedSelected', '../background.JPG')" />	 
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set img pressed" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgPressed', '../background.JPG')" />	 
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set img selected" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgSelected', '../background.JPG')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set img" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'img', '../background.JPG')" />				 		 
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="richText = true" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'richText', 'true')" />			 
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="enabled = true" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'enabled', 'true')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="enabled = false" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'enabled', 'false')" />				 
+	
+		
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selected = true" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'selected', 'true')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selected = false" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'selected', 'false')" />	 
+	
+		</horizontalFlowPane>		
 		 
-		 </verticalPanel>
-		 <verticalPanel>
 		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-		</verticalPanel>
-	<verticalPanel><checkBox id="testComponent" width="300px" height="100px" text="My Checkbox" onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onCommand="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)" onKeyChar="mco:attributeSetter.reportEvent(event)" onKeyDown="mco:attributeSetter.reportEvent(event)" onKeyUp="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)" onMouseDrag="mco:attributeSetter.reportEvent(event)" onMouseMove="mco:attributeSetter.reportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMouseOver="mco:attributeSetter.reportEvent(ev
 ent)" onMouseUp="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" onStateChange="mco:attributeSetter.reportEvent(event)"/></verticalPanel>
-</horizontalPanel>
+		 
+		
+<!--
+	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="top" />		
+	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+		
+		
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" />
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+	
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" />	  
+		<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+		
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" />		
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />
+		
+		
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+		
+		
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" />	
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" />		
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter"/>		
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right"/>
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left"/>	
+		
+-->
+		
 	</xm:append> 	  		
   	</xm:modifications>
 </xal>

Modified: incubator/xap/trunk/WebContent/examples/widgets/label.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/label.xal?view=diff&rev=468492&r1=468491&r2=468492
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/label.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/label.xal Fri Oct 27 11:48:42 2006
@@ -1,68 +1,163 @@
 <xal xmlns="http://www.openxal.org/xal" xmlns:xal="http://www.openxal.org/xal"> 
-
-
 	<mco:mco 
 		xmlns:mco="http://www.openxal.org/mco" 
 		id="attributeSetter" 
 		src="AttributeTester"
 	/>
 
-
-
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
-	<xm:append select="/xal">
-	<horizontalPanel>
-
+		<xm:append select="/xal">
+			<label id="testComponent" width="400px" height="100px" alignHorizontal="center" alignVertical="top" 
+				text="MY PRECIOUS LABEL" />
+
+	<horizontalFlowPane width="825px">					
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hello World!" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hello World!!!')" />
+				 
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="<b>Hear me roar!</b>" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', '<b>Hear me roar!!!</b>')" />		 
+				
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Very long text" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'XAP is an XML-based declarative framework for building, deploying and maintaining rich, interactive Ajax powered web applications.  It aims to reduce the need for scripting and help solve the development and maintenance challenges associated with large scale JavaScript programming.')" />	
+				
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = top" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'top')" />	
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = bottom" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'bottom')" />	
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementHorizontal = left" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementHorizontal', 'left')" />	
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementHorizontal = right" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementHorizontal', 'right')" />	
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = left" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'left')" />	
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = center" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'center')" />	
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = right" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'right')" />
+				 
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = top" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'top')" />	
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = center" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'center')" />	
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = bottom" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'bottom')" />
+				 
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="autoWrap = true" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'autoWrap', 'true')" />
+				
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="autoWrap = false" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'autoWrap', 'false')" />  
+				 
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set background image" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgBackground', '../background.JPG')" />   
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'img', '../foreground.JPG')" />   
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set disabled image" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgDisabled', '../foreground_disabled.JPG')" />  
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set enabled = false" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'enabled', 'false')" />  
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set enabled = true" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'enabled', 'true')" />  
+				 
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image width = 50" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgWidth', '50')" />   
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image height = 20" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgHeight', '20')" />   
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selectable = true" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'selectable', 'true')" />   
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selectable = false" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'selectable', 'false')" />  
+		
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="richText = true" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'richText', 'true')" />  
+	
+				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="richText = false" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'richText', 'false')" />  	 
+				 
+				<!-- button specific properties -->
+				<button width="200px" height="25px" 
+					text="text -> 'some new text'"
+					onCommand="mco:attributeSetter.setAttribute(testComponent,
+						'text','some new text')"/>
+						
+				<!--standard test things -->
+			</horizontalFlowPane>					
+			<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
+		
+			<!--
+			<label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="top" />		
+			<label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+				
+				
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" />
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
 			
-		<verticalPanel>
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hello World!" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hello World!!!')" />
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hear me roar!" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hear me roar!!!')" />		 
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = top" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'top')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = bottom" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'bottom')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = left" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'left')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = center" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'center')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = right" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'right')" />
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = top" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'top')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = center" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'center')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = bottom" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'bottom')" />
-		 
-		 
-		<!-- button specific properties -->
-		
-		<button width="200px" height="25px" 
-			text="text -> 'some new text'"
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'text','some new text')"/>
-		</verticalPanel>			
-		<!--standard test things -->
-		
-		<verticalPanel>
-		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-		 </verticalPanel>
-		 
-		<label id="testComponent" width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="MY PRECIOUS LABEL" textPlacementHorizontal="right" textPlacementVertical="top" onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)" onKeyChar="mco:attributeSetter.reportEvent(event)" onKeyDown="mco:attributeSetter.reportEvent(event)" onKeyUp="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)" onMouseDrag="mco:attributeSetter.reportEvent(event)" onMouseMove="mco:attributeSetter.reportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMo
 useOver="mco:attributeSetter.reportEvent(event)" onMouseUp="mco:attributeSetter.reportEvent(event)"/>
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" />	  
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+			
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" />		
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />
+				
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+		
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+				
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" />	
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
 		
-	</horizontalPanel>
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" />		
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+		
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter"/>		
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+	
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right"/>
+			<label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left"/>	
+			
+			-->
 		
-	</xm:append> 	  		
+		</xm:append> 	  		
   	</xm:modifications>
 </xal>

Modified: incubator/xap/trunk/WebContent/examples/widgets/radioButton.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/radioButton.xal?view=diff&rev=468492&r1=468491&r2=468492
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/radioButton.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/radioButton.xal Fri Oct 27 11:48:42 2006
@@ -12,73 +12,162 @@
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
 	
-	<horizontalPanel>
-	
-		
-		<verticalPanel>
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hello World!" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hello World!!!')" />
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hear me roar!" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hear me roar!!!')" />		 
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = top" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'top')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = bottom" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'bottom')" />
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementHorizontal = left" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementHorizontal ', 'left')" />	
 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementHorizontal = right" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementHorizontal ', 'right')" />			 
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = left" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'left')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = center" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'center')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = right" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'right')" />
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = top" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'top')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = center" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'center')" />	
-			
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = bottom" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'bottom')" />
 
+	<freePanel width="1025px" height="125px">	
+		  <radioButton  x="0px" y="10px"  id="testComponent" width="150px" height="20px" text="RADIO 1" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" />
+		  <radioButton  x="150px" y="10px" width="150px" height="20px" text="RADIO 2" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" />
+		  <radioButton x="300px" y="10px" width="150px" height="20px" text="RADIO 3" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" selected="true" />
+		  <radioButton x="450px" y="10px" width="150px" height="20px" text="RADIO 4" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" />		
 			
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selected = true" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'selected', 'true')" />	
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selected = false" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'selected', 'false')" />
+	
+		  <radioButton x="100px"  y="40px" width="150px" height="30px" text="RADIO 5 group 2" group="group2" onStateChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" selected="true" />
+		  <radioButton x="250px" y="40px"  width="150px" height="30px" text="RADIO 6 group 2" group="group2" onStateChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" />		
+		
+		  <radioButton x="10px" y="60px" width="200px" height="50px" text="RADIO 7 no group" onStateChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" />		
+		  <radioButton x="160px" y="60px" width="200px" height="50px" text="RADIO 8 no group" onStateChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" />		
+	</freePanel>
+	
+	<horizontalFlowPane width="825px">			
+		
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hello World!" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hello World!!!')" />
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="<b>Hear me roar!</b>" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', '<b>Hear me roar!!!</b>')" />		 
+			 
+				
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = top" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'top')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = bottom" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'bottom')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementHorizontal = left" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementHorizontal', 'left')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementHorizontal = right" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementHorizontal', 'right')" />	 
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = left" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'left')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = center" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'center')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = right" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'right')" />
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = top" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'top')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = center" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'center')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = bottom" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'bottom')" />
+			 
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set img over" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgOver', '../background.JPG')" />	 
+			 		 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set img over selected" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgOverSelected', '../background.JPG')" />	 
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set img pressed selected" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgPressedSelected', '../background.JPG')" />	 
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set img pressed" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgPressed', '../background.JPG')" />	 
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set img selected" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'imgSelected', '../background.JPG')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set img" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'img', '../background.JPG')" />				 		 
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="richText = true" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'richText', 'true')" />			 
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="enabled = true" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'enabled', 'true')" />	
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="enabled = false" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'enabled', 'false')" />			 		 
+	
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selected = true" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'selected', 'true')" />		
+			 
+			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selected = false" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'selected', 'false')" />		
+	
+		</horizontalFlowPane>	
+		 		 		 
+		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
 		 
 		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="disabled = true" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'disabled', 'true')" />	
-			
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="disabled = false" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'disabled', 'false')" />
 		 
-		 </verticalPanel>
+		
+		<!--
+	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="top" />		
+	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+		
+		
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" />
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+	
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" />	  
+		<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+		
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" />		
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />
+		
+		
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+		
+		
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" />	
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" />		
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter"/>		
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
 
-		<verticalPanel>
-		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-		</verticalPanel>
-		<verticalPanel>
-			<radioButton id="testComponent" width="300px" height="100px" text="Test Component" group="America" onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onCommand="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)" onKeyChar="mco:attributeSetter.reportEvent(event)" onKeyDown="mco:attributeSetter.reportEvent(event)" onKeyUp="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)" onMouseDrag="mco:attributeSetter.reportEvent(event)" onMouseMove="mco:attributeSetter.reportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMouseOver="mco:attributeSetter.repor
 tEvent(event)" onMouseUp="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" onStateChange="mco:attributeSetter.reportEvent(event)"/>
- 			<radioButton width="300px" height="100px" text="SELECTED" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" selected="true"/>
-			<radioButton width="300px" height="100px" text="Selected too" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" selected="true" />
-			<radioButton width="300px" height="100px" text="RADIO 4" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" />		
-			<radioButton width="300px" height="100px" text="Different Group" group="bonk" onStateChange="mco:attributeSetter.reportEvent(event)" />			
-		 </verticalPanel>
-	</horizontalPanel>
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right"/>
+	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left"/>	
+		
+		-->
 		
 	</xm:append> 	  		
   	</xm:modifications>

Modified: incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal?view=diff&rev=468492&r1=468491&r2=468492
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal Fri Oct 27 11:48:42 2006
@@ -1,4 +1,9 @@
-<verticalPanel xmlns="http://www.openxal.org/xal">	
+<horizontalFlowPane width="825px" xmlns="http://www.openxal.org/xal">	
+	<label width="825px" height="25px" 
+			text="Standard tests:"
+			fontWeight="bold"
+	/>	
+
 	<button width="200px" height="25px" 
 			text="print element"
 			onCommand="mco:attributeSetter.printElement(testComponent)"/>	
@@ -93,4 +98,4 @@
 			onCommand="mco:attributeSetter.setAttribute(testComponent,
 				'fontSize' ,'8px')"/>
 		
-</verticalPanel>
\ No newline at end of file
+</horizontalFlowPane>
\ No newline at end of file

Modified: incubator/xap/trunk/src/xap/bridges/xap/ButtonBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/xap/ButtonBridge.js?view=diff&rev=468492&r1=468491&r2=468492
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/xap/ButtonBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/xap/ButtonBridge.js Fri Oct 27 11:48:42 2006
@@ -15,9 +15,10 @@
  *
  */
 
-Xap.provide("xap.bridges.xap.ButtonBridge"); 
-Xap.require("xap.bridges.xap.LabelBridge"); 
+Xap.provide("xap.bridges.xap.ButtonBridge");
+Xap.require("xap.bridges.xap.LabelBridge");
 Xap.require("xap.widgets.Button");
+Xap.require("dojo.event.*");
 
 xap.bridges.xap.ButtonBridge = function() {
 	xap.bridges.xap.LabelBridge.call(this);
@@ -25,31 +26,26 @@
 
 Xap.setupClassAsSubclassOf("xap.bridges.xap.ButtonBridge", "xap.bridges.xap.LabelBridge");
 
-
 xap.bridges.xap.ButtonBridge.prototype.obtainPeer = function() {
-
-	this._peer = new xap.widgets.Button();
-	
-	this._peer.setOnClick(this, 'fireEvent', 'onCommand');  /* hook up the widget's onclick to execute the bridge's oncommand */
-
+	this.setPeer(new xap.widgets.Button());
+	this.getPeer().init();
+	dojo.event.connect(this.getRootDomNode(), "onclick", this, "onclick");
 }
 
-
-
-
-
-/*
-xap.bridges.xap.ButtonBridge.prototype.getRootDomNode = function() {
-	return this._peer._rootDomNode;
-}	
-
+xap.bridges.xap.ButtonBridge.prototype.onclick = function() {
+	if (this.getPeer().enabled) {
+		this.fireEvent("onCommand");
+	}
+}
 
 xap.bridges.xap.ButtonBridge.prototype.getNewAllowedAttributes = function() {
-	return ["text"];
-}	
+	return ["imgOver", "imgPressed"];
+}
 
+xap.bridges.xap.ButtonBridge.prototype.setImgOverAttribute = function(imgOverURL) {
+	this.getPeer().setImgOver(imgOverURL);
+}
 
-xap.bridges.xap.ButtonBridge.prototype.setTextAttribute = function(value) {
-	this._peer.setText(value);
-}	
-*/
+xap.bridges.xap.ButtonBridge.prototype.setImgPressedAttribute = function(imgPressedURL) {
+	this.getPeer().setImgPressed(imgPressedURL);
+}
\ No newline at end of file

Modified: incubator/xap/trunk/src/xap/bridges/xap/CheckboxBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/xap/CheckboxBridge.js?view=diff&rev=468492&r1=468491&r2=468492
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/xap/CheckboxBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/xap/CheckboxBridge.js Fri Oct 27 11:48:42 2006
@@ -15,40 +15,129 @@
  *
  */
 
-Xap.provide("xap.bridges.xap.CheckboxBridge"); 
-Xap.require("xap.bridges.xap.ButtonBridge");
+Xap.provide("xap.bridges.xap.CheckboxBridge");
+Xap.require("xap.bridges.xap.RadioButtonBridge");
 Xap.require("xap.widgets.Checkbox");
 
 xap.bridges.xap.CheckboxBridge = function() {
-	xap.bridges.xap.ButtonBridge(this);
+	xap.bridges.xap.RadioButtonBridge.call(this);
 }
 
-Xap.setupClassAsSubclassOf("xap.bridges.xap.CheckboxBridge", "xap.bridges.xap.ButtonBridge");
+Xap.setupClassAsSubclassOf("xap.bridges.xap.CheckboxBridge", "xap.bridges.xap.RadioButtonBridge");
 
-xap.bridges.xap.CheckboxBridge.prototype.obtainPeer = function() {
-	this._peer = new xap.widgets.Checkbox(this.getSession()._webappContext);
-	this._peer.setOnClick(this, 'doStateChange', null);  /* hook up the widget's onclick to execute the bridge's oncommand */
-}
-
-
-
-
-xap.bridges.xap.CheckboxBridge.prototype.doStateChange = function() {
+xap.bridges.xap.CheckboxBridge.prototype.obtainPeer = function() { 
+	this.setPeer(new xap.widgets.Checkbox());
+	this.getPeer().init(this.getSession()._webappContext); 
+	this.group = this.getElement().getAttribute("group");
 	
-	var selected = this.getPeer().getSelected();
-	this.writeBackAttribute('selected', selected);
-	var clientEvent = new xap.session.ClientEvent(this.getElement(), this.getSession());
-	clientEvent.selected = selected;
-	this.fireEvent("onStateChange", null, null, clientEvent);	
-	
-}	
+	if (this.group) {
+		var session = this.getSession();
+		if (!session.checkboxGroup) {
+			// create a general checkboxGroup attribute in the global session
+			session.checkboxGroup = {};
+		}
+		if (!session.checkboxGroup[this.group]) {
+			// placeholder for the currently clicked checkbox for this radio group
+			session.checkboxGroup[this.group] = {};
+		}
+	}
 
+	this.getPeer().setOnClick(this, "register", null);
+}
 
-xap.bridges.xap.CheckboxBridge.prototype.getNewAllowedAttributes = function() {
-	return ["text", "alignVertical", "alignHorizontal", "textPlacementHorizontal", "textPlacementVertical", "selected"];
-}	
+xap.bridges.xap.CheckboxBridge.prototype.register = function() {
+	if (this.getPeer().enabled) {
+		if (this.group) { 
+			var session = this.getSession();
+			var checkboxGroup = session.checkboxGroup[this.group];
+			var activecheckbox = checkboxGroup.peer;
+	 
+			if (!activecheckbox) {
+				if (this.getPeer().selected) {
+					this.getPeer().setOff(); 
+					this.writeBackAttribute("selected", "true");
+				} else {
+					this.getPeer().setOn(); 
+					this.writeBackAttribute("selected", "false");			
+				}
+
+				checkboxGroup.peer = this.getPeer();
+				checkboxGroup.relatedElement = this;
+						
+				var clientEvent = new xap.session.ClientEvent(this.getElement(), session);
+				clientEvent.selected = "true";
+				// fire onSelect event
+				this.fireEvent("onSelect", null, null, clientEvent);
+				// fire onStateChange event
+				this.fireEvent("onStateChange", null, null, clientEvent);
+			} else {
+				if (activecheckbox == this.getPeer()) {
+					this.getPeer().setOff();
+					
+					checkboxGroup.peer = null;
+					checkboxGroup.relatedElement = null;
+				} else {
+					// reset current active checkbox for this checkbox group in the session object
+					activecheckbox.setOff();
+					// set previous radio button to false
+					checkboxGroup.relatedElement.writeBackAttribute("selected", "false");
+		
+					// fire onStateChange event on the current element
+					if (checkboxGroup.relatedElement.getPeer().enabled) {
+						var clientEvent = new xap.session.ClientEvent(this.getElement(), session);
+						clientEvent.selected = "false";
+						checkboxGroup.relatedElement.fireEvent("onStateChange", null, null, clientEvent);
+					}
+		
+					// act on the current element
+					this.getPeer().setOn();
+					this.writeBackAttribute("selected", "true");
+		
+					checkboxGroup.peer = this.getPeer();
+					checkboxGroup.relatedElement = this;
+							
+					var clientEvent = new xap.session.ClientEvent(this.getElement(), session);
+					clientEvent.selected = "true";
+					// fire onSelect event
+					this.fireEvent("onSelect", null, null, clientEvent);
+					// fire onStateChange event
+					this.fireEvent("onStateChange", null, null, clientEvent);
+				}
+			}	
+		} else {
+			if (this.getPeer().selected) {
+				this.getPeer().setOff(); 
+				this.writeBackAttribute("selected", "true");
+			} else {
+				this.getPeer().setOn(); 
+				this.writeBackAttribute("selected", "false");			
+			} 
+					
+			var clientEvent = new xap.session.ClientEvent(this.getElement(), session);
+			clientEvent.selected = "true";
+			// fire onSelect event
+			this.fireEvent("onSelect", null, null, clientEvent);
+			// fire onStateChange event
+			this.fireEvent("onStateChange", null, null, clientEvent);
+		} 
+	}
+}
 
 xap.bridges.xap.CheckboxBridge.prototype.setSelectedAttribute = function(value) {
-	(value == 'true') ? this._peer.setOn() : this._peer.setOff();
-}	
-
+	if (value == "true") {
+		if (this.group) {	
+			var checkboxGroup =  this.getSession().checkboxGroup[this.group]; 
+			if (checkboxGroup && checkboxGroup.peer && checkboxGroup.relatedElement) {
+			  	checkboxGroup.peer.setOff();
+				checkboxGroup.relatedElement.writeBackAttribute("selected", "false");
+			} 
+	
+			checkboxGroup.peer = this.getPeer();
+			checkboxGroup.relatedElement = this;
+		}
+		
+		this.getPeer().setOn();
+	} else {
+		this.getPeer().setOff();
+	} 
+}
\ No newline at end of file