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 jm...@apache.org on 2007/01/06 00:51:37 UTC

svn commit: r493256 [1/2] - in /incubator/xap/trunk: WebContent/examples/dataBinding/ WebContent/examples/demo/ WebContent/examples/urlResolution/ WebContent/examples/widgets/ src/xap/bridges/dojo/ src/xap/bridges/xap/

Author: jmargaris
Date: Fri Jan  5 16:51:35 2007
New Revision: 493256

URL: http://svn.apache.org/viewvc?view=rev&rev=493256
Log:
Change names of attributes for consistency.

Modified:
    incubator/xap/trunk/WebContent/examples/dataBinding/mcoAttribute.xal
    incubator/xap/trunk/WebContent/examples/demo/table.xal
    incubator/xap/trunk/WebContent/examples/urlResolution/label.xal
    incubator/xap/trunk/WebContent/examples/widgets/borderPane.xal
    incubator/xap/trunk/WebContent/examples/widgets/button.xal
    incubator/xap/trunk/WebContent/examples/widgets/checkBox.xal
    incubator/xap/trunk/WebContent/examples/widgets/combobox.xal
    incubator/xap/trunk/WebContent/examples/widgets/editableCombobox.xal
    incubator/xap/trunk/WebContent/examples/widgets/gridPanel3.xal
    incubator/xap/trunk/WebContent/examples/widgets/gridPanel5.xal
    incubator/xap/trunk/WebContent/examples/widgets/horizontalBoxPane.xal
    incubator/xap/trunk/WebContent/examples/widgets/horizontalFlowPane.xal
    incubator/xap/trunk/WebContent/examples/widgets/htmlView.xal
    incubator/xap/trunk/WebContent/examples/widgets/label.xal
    incubator/xap/trunk/WebContent/examples/widgets/listbox.xal
    incubator/xap/trunk/WebContent/examples/widgets/radioButton.xal
    incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal
    incubator/xap/trunk/WebContent/examples/widgets/table.xal
    incubator/xap/trunk/WebContent/examples/widgets/textArea.xal
    incubator/xap/trunk/WebContent/examples/widgets/tree.xal
    incubator/xap/trunk/WebContent/examples/widgets/treeTable.xal
    incubator/xap/trunk/WebContent/examples/widgets/verticalBoxPane.xal
    incubator/xap/trunk/WebContent/examples/widgets/verticalPanelExample.xal
    incubator/xap/trunk/src/xap/bridges/dojo/BorderPanelBridge.js
    incubator/xap/trunk/src/xap/bridges/dojo/CellBridge.js
    incubator/xap/trunk/src/xap/bridges/dojo/GridPanelBridge.js
    incubator/xap/trunk/src/xap/bridges/dojo/HorizontalFlowPaneBridge.js
    incubator/xap/trunk/src/xap/bridges/dojo/HorizontalPanelBridge.js
    incubator/xap/trunk/src/xap/bridges/dojo/TextFieldBridge.js
    incubator/xap/trunk/src/xap/bridges/dojo/VerticalPanelBridge.js
    incubator/xap/trunk/src/xap/bridges/xap/LabelBridge.js

Modified: incubator/xap/trunk/WebContent/examples/dataBinding/mcoAttribute.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/dataBinding/mcoAttribute.xal?view=diff&rev=493256&r1=493255&r2=493256
==============================================================================
--- incubator/xap/trunk/WebContent/examples/dataBinding/mcoAttribute.xal (original)
+++ incubator/xap/trunk/WebContent/examples/dataBinding/mcoAttribute.xal Fri Jan  5 16:51:35 2007
@@ -26,7 +26,7 @@
 				y="50px"
 				width="290px" 
 				height="40px"
-				alignHorizontal="center"
+				horizontalAlignment="center"
 				backgroundColor="#eeeeff"									
 				text=" {this} "
 			/>
@@ -37,7 +37,7 @@
 				width="290px" 			
 				height="40px"			
 				backgroundColor="#ffeeee"			
-				alignHorizontal="center"			
+				horizontalAlignment="center"			
 				text="{this}"			
 				id="testComponent_0" 		
 			/>
@@ -47,7 +47,7 @@
 				y="100px"
 				width="290px" 
 				height="40px"
-				alignHorizontal="center"
+				horizontalAlignment="center"
 				backgroundColor="#eeeeff"									
 				text=" {this.width} "
 			/>                                      
@@ -58,7 +58,7 @@
 				width="290px" 			
 				height="40px"			
 				backgroundColor="#ffeeee"			
-				alignHorizontal="center"			
+				horizontalAlignment="center"			
 				text="{this.width}"		
 				id="testComponent_1" 		
 			/>                                      
@@ -70,7 +70,7 @@
 				y="150px"
 				width="290px" 
 				height="40px"
-				alignHorizontal="center"
+				horizontalAlignment="center"
 				backgroundColor="#eeeeff"									
 				text=" {topLabel} "
 			/>
@@ -81,7 +81,7 @@
 				width="290px" 			
 				height="40px"			
 				backgroundColor="#ffeeee"			
-				alignHorizontal="center"			
+				horizontalAlignment="center"			
 				text="{topLabel}"			
 				id="testComponent_2" 		
 			/>
@@ -91,7 +91,7 @@
 				y="200px"
 				width="290px" 
 				height="40px"
-				alignHorizontal="center"
+				horizontalAlignment="center"
 				backgroundColor="#eeeeff"									
 				text=" {topLabel.text} "
 			/>                                      
@@ -102,7 +102,7 @@
 				width="290px" 			
 				height="40px"			
 				backgroundColor="#ffeeee"			
-				alignHorizontal="center"			
+				horizontalAlignment="center"			
 				text="{topLabel.text}"		
 				id="testComponent_3" 		
 			/>   
@@ -111,7 +111,7 @@
 				y="250px"
 				width="290px" 
 				height="40px"
-				alignHorizontal="center"
+				horizontalAlignment="center"
 				backgroundColor="#eeeeff"									
 				text=" {"A text message."} "
 			/>                                      
@@ -122,7 +122,7 @@
 				width="290px" 			
 				height="40px"			
 				backgroundColor="#ffeeee"			
-				alignHorizontal="center"				
+				horizontalAlignment="center"				
 				text="{"A text message."}"		
 				id="testComponent_4" 		
 			/>   		                         
@@ -132,7 +132,7 @@
 				y="300px"
 				width="290px" 
 				height="40px"
-				alignHorizontal="center"
+				horizontalAlignment="center"
 				backgroundColor="#eeeeff"									
 				text=" {3.1416} "
 			/>                                      
@@ -143,7 +143,7 @@
 				width="290px" 			
 				height="40px"			
 				backgroundColor="#ffeeee"			
-				alignHorizontal="center"			
+				horizontalAlignment="center"			
 				text="{3.1416}"		
 				id="testComponent_5" 		
 			/>   
@@ -152,7 +152,7 @@
 				y="350px"
 				width="290px" 
 				height="40px"
-				alignHorizontal="center"
+				horizontalAlignment="center"
 				backgroundColor="#eeeeff"									
 				text=" {false} "
 			/>                                      
@@ -163,7 +163,7 @@
 				width="290px" 			
 				height="40px"
 				backgroundColor="#ffeeee"			
-				alignHorizontal="center"			
+				horizontalAlignment="center"			
 				text="{false}"		
 				id="testComponent_6" 		
 			/> 
@@ -172,7 +172,7 @@
 				y="400px"
 				width="290px" 
 				height="40px"
-				alignHorizontal="center"
+				horizontalAlignment="center"
 				backgroundColor="#eeeeff"									
 				text=" {mco:attributeGetter} "
 			/>                                      
@@ -183,7 +183,7 @@
 				width="290px" 			
 				height="40px"			
 				backgroundColor="#ffeeee"			
-				alignHorizontal="center"			
+				horizontalAlignment="center"			
 				text="{mco:attributeGetter}"	
 				id="testComponent_7" 		
 			/>   
@@ -192,7 +192,7 @@
 				y="450px"
 				width="290px" 
 				height="40px"
-				alignHorizontal="center"
+				horizontalAlignment="center"
 				backgroundColor="#eeeeff"					
 				text=" {mco:attributeGetter.getText()} "
 			/>                                      
@@ -203,7 +203,7 @@
 				width="290px" 			
 				height="40px"			
 				backgroundColor="#ffeeee"			
-				alignHorizontal="center"				
+				horizontalAlignment="center"				
 				text="{mco:attributeGetter.getText()}"		
 				id="testComponent_8" 		
 			/> 		

Modified: incubator/xap/trunk/WebContent/examples/demo/table.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/demo/table.xal?view=diff&rev=493256&r1=493255&r2=493256
==============================================================================
--- incubator/xap/trunk/WebContent/examples/demo/table.xal (original)
+++ incubator/xap/trunk/WebContent/examples/demo/table.xal Fri Jan  5 16:51:35 2007
@@ -4,20 +4,20 @@
 	<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
 	<xm:append select="/ui">
 
-	<verticalBoxPane backgroundColor="#EEE" align="stretch" width="800px" height="600px" fontSize="11px" fontFamily="Arial">
+	<verticalBoxPane backgroundColor="#EEE" alignment="stretch" width="800px" height="600px" fontSize="11px" fontFamily="Arial">
 		<label width="20px" height="20px"/>
 
 		<label image="images/logo.gif"/>
 	
 		<label width="20px" height="20px"/>
 
-		<verticalBoxPane align="stretch"  backgroundColor="white" borderColor="green" borderStyle="solid" borderWidth="1px" >
+		<verticalBoxPane alignment="stretch"  backgroundColor="white" borderColor="green" borderStyle="solid" borderWidth="1px" >
 		<label text="Order Entry" color="white" backgroundColor="#999"/>
-		<horizontalBoxPane align="center">
+		<horizontalBoxPane alignment="center">
 			<freePane width="20px" height="10px"/>
 
 			<!-- can't click for some reason? -->
-			<verticalBoxPane align="center">
+			<verticalBoxPane alignment="center">
 				<radioButton text="Buy" group="BuySell"/>
 				<radioButton text="Sell" group="BuySell"/>
 			</verticalBoxPane>
@@ -92,7 +92,7 @@
 		<label width="20px" height="20px"/>
 
 
-		<verticalBoxPane borderColor="green" borderWidth="1px" align="start" borderStyle="solid">
+		<verticalBoxPane borderColor="green" borderWidth="1px" alignment="start" borderStyle="solid">
 		<label text="Level 1 Quotes" color="white" backgroundColor="#999"/>
 		<table borderWidth="1px" borderColor="black" borderStyle="solid" backgroundColor="white">
 			<column><header text="Symbol" backgroundColor="#CCF" width="100px"/></column>

Modified: incubator/xap/trunk/WebContent/examples/urlResolution/label.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/urlResolution/label.xal?view=diff&rev=493256&r1=493255&r2=493256
==============================================================================
--- incubator/xap/trunk/WebContent/examples/urlResolution/label.xal (original)
+++ incubator/xap/trunk/WebContent/examples/urlResolution/label.xal Fri Jan  5 16:51:35 2007
@@ -5,7 +5,7 @@
 			<label richText="true" width="400px" text="When you press the button,
 				you should see the label change images and also a new label with
 				the same changed image, along with another button to re-call that same page"/>
-			<label id="testComponent" width="400px" height="100px" alignHorizontal="center" alignVertical="top" 
+			<label id="testComponent" width="400px" height="100px" horizontalAlignment="center" verticalAlignment="top" 
 				text="MY PRECIOUS LABEL" image="images/foreground.JPG"/>
 				
 			<button text="Press this first" onCommand="xmodify/xmodify.xm"/>

Modified: incubator/xap/trunk/WebContent/examples/widgets/borderPane.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/borderPane.xal?view=diff&rev=493256&r1=493255&r2=493256
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/borderPane.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/borderPane.xal Fri Jan  5 16:51:35 2007
@@ -56,14 +56,14 @@
 		
 					
 		<xal:button width="200px" height="25px" 
-			text="gapHorizontal -> 6px"
+			text="horizontalGap -> 6px"
 			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'gapHorizontal' ,'6px')"/>
+				'horizontalGap' ,'6px')"/>
 				
 		<xal:button width="200px" height="25px" 
-			text="gapVertical -> 2px"
+			text="verticalGap -> 2px"
 			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'gapVertical' ,'2px')"/>
+				'verticalGap' ,'2px')"/>
 	
 			<xal:button width="200px" height="25px" 
 			text="width -> 30px"

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=493256&r1=493255&r2=493256
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/button.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/button.xal Fri Jan  5 16:51:35 2007
@@ -15,89 +15,89 @@
 
 		<horizontalFlowPane width="825px">
 		
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hello World!" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Hello World!" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hello World!!!')" />
 			 
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="&lt;b&gt;Hear me roar!&lt;/b&gt;" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="&lt;b&gt;Hear me roar!&lt;/b&gt;" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', '&lt;b&gt;Hear me roar!!!&lt;/b&gt;')" />		 
 			
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Very long text" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="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" horizontalAlignment="center" verticalAlignment="center" text="verticalTextToImagePlacement = top" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalTextToImagePlacement', '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" horizontalAlignment="center" verticalAlignment="center" text="verticalTextToImagePlacement = bottom" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalTextToImagePlacement', '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" horizontalAlignment="center" verticalAlignment="center" text="horizontalTextToImagePlacement = left" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalTextToImagePlacement', '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" horizontalAlignment="center" verticalAlignment="center" text="horizontalTextToImagePlacement = right" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalTextToImagePlacement', '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" horizontalAlignment="center" verticalAlignment="center" text="horizontalAlignment = left" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalAlignment', '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" horizontalAlignment="center" verticalAlignment="center" text="horizontalAlignment = center" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalAlignment', '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" horizontalAlignment="center" verticalAlignment="center" text="horizontalAlignment = right" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalAlignment', '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" horizontalAlignment="center" verticalAlignment="center" text="verticalAlignment = top" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalAlignment', '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" horizontalAlignment="center" verticalAlignment="center" text="verticalAlignment = center" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalAlignment', '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" horizontalAlignment="center" verticalAlignment="center" text="verticalAlignment = bottom" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalAlignment', 'bottom')" />
 			 
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="autoWrap = true" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="autoWrap = true" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'autoWrap', 'true')" />
 			
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="autoWrap = false" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="autoWrap = false" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'autoWrap', 'false')" />  
 			 
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set background image" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="set background image" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'backgroundImage', '../background.JPG')" />   
 	
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="set image" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'image', '../foreground.JPG')" />   
 	
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set disabled image" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="set disabled image" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'disabledImage', '../foreground_disabled.JPG')" />  
 	
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set disabled = true" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="set disabled = true" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'disabled', 'true')" />  
 	
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set disabled = false" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="set disabled = false" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'disabled', 'false')" />  
 			 
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image width = 50" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="set image width = 50" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'imageWidth', '50')" />   
 	
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image height = 20" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="set image height = 20" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'imageHeight', '20')" />   
 	
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selectable = true" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="selectable = true" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'selectable', 'true')" />   
 	
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selectable = false" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="selectable = false" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'selectable', 'false')" />  
 	
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="richText = true" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="richText = true" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'richText', 'true')" />  
 
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="richText = false" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="richText = false" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'richText', 'false')" />  
 
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image over" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="set image over" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'mouseOverImage', '../background.JPG')" />  	 
 
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image pressed" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="set image pressed" 
 				onCommand="mco:attributeSetter.setAttribute(testComponent, 'pressedImage', '../background.JPG')" />  	 
 			 			 
 			<!-- button specific properties -->

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=493256&r1=493255&r2=493256
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/checkBox.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/checkBox.xal Fri Jan  5 16:51:35 2007
@@ -38,78 +38,78 @@
 				onCommand="mco:attributeSetter.printElement(testComponent4)"/>
 					
 	
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="&lt;b&gt;Hear me roar!&lt;/b&gt;>" 
+		<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="&lt;b&gt;Hear me roar!&lt;/b&gt;>" 
 			onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', '&lt;b&gt;Hear me roar!!!&lt;/b&gt;')" />
 			 
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hear me roar!" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="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" horizontalAlignment="center" verticalAlignment="center" text="verticalTextToImagePlacement = top" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalTextToImagePlacement', '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" horizontalAlignment="center" verticalAlignment="center" text="verticalTextToImagePlacement = bottom" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalTextToImagePlacement', '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" horizontalAlignment="center" verticalAlignment="center" text="horizontalTextToImagePlacement = left" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalTextToImagePlacement', '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" horizontalAlignment="center" verticalAlignment="center" text="horizontalTextToImagePlacement = right" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalTextToImagePlacement', '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" horizontalAlignment="center" verticalAlignment="center" text="horizontalAlignment = left" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalAlignment', '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" horizontalAlignment="center" verticalAlignment="center" text="horizontalAlignment = center" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalAlignment', '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" horizontalAlignment="center" verticalAlignment="center" text="horizontalAlignment = right" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalAlignment', '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" horizontalAlignment="center" verticalAlignment="center" text="verticalAlignment = top" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalAlignment', '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" horizontalAlignment="center" verticalAlignment="center" text="verticalAlignment = center" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalAlignment', '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" horizontalAlignment="center" verticalAlignment="center" text="verticalAlignment = bottom" 
+			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalAlignment', 'bottom')" />
 			 
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="richText = true" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="richText = true" 
 			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'richText', 'true')" />		 
 			 
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image over" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="set image over" 
 			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'mouseOverImage', '../background.JPG')" />	 
 			 		 
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image over selected" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="set image over selected" 
 			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'mouseOverSelectedImage', '../background.JPG')" />	 
 			 
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image pressed selected" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="set image pressed selected" 
 			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'pressedSelectedImage', '../background.JPG')" />	 
 	
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image pressed" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="set image pressed" 
 			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'pressedImage', '../background.JPG')" />	 
 			 
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image selected" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="set image selected" 
 			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'selectedImage', '../background.JPG')" />	
 	
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="set image" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="set image" 
 			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'image', '../background.JPG')" />				 		 
 	
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="richText = true" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="richText = true" 
 			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'richText', 'true')" />			 
 	
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="disabled = false" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="disabled = false" 
 			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'disabled', 'false')" />	
 	
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="disabled = true" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="disabled = true" 
 			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'disabled', 'true')" />				 
 	
 		
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selected = true" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="selected = true" 
 			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'selected', 'true')" />	
 	
-			<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selected = false" 
+			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="selected = false" 
 			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'selected', 'false')" />	 
 			 
 		 
@@ -120,63 +120,63 @@
 		 
 		
 <!--
-	  <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" horizontalAlignment="center" verticalAlignment="top" text="HCenterVTop" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="bottom" />
+	  <label width="400px" height="100px" horizontalAlignment="center" verticalAlignment="top" text="HCenterVTop" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="top" />		
+	  <label width="400px" height="100px" horizontalAlignment="center" verticalAlignment="top" text="HCenterVTop" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="bottom" />		
+		
+		
+	  <label width="700px" height="100px" horizontalAlignment="center" verticalAlignment="bottom" text="HCenter VBottom" />
+	  <label width="700px" height="100px" horizontalAlignment="center" verticalAlignment="bottom" text="HCenter VBottom" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="top" />
+	  <label width="700px" height="100px" horizontalAlignment="center" verticalAlignment="bottom" text="HCenter VBottom" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="bottom" />
+	  <label width="700px" height="100px" horizontalAlignment="center" verticalAlignment="bottom" text="HCenter VBottom" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="top" />
+	  <label width="700px" height="100px" horizontalAlignment="center" verticalAlignment="bottom" text="HCenter VBottom" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="bottom" />		
+	
+	  <label width="700px" height="100px" horizontalAlignment="center" verticalAlignment="center" text="HCenter VCenter" />	  
+		<label width="700px" height="100px" horizontalAlignment="center" verticalAlignment="center" text="HCenter VCenter" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="top" />
+	  <label width="700px" height="100px" horizontalAlignment="center" verticalAlignment="center" text="HCenter VCenter" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="bottom" />
+	  <label width="700px" height="100px" horizontalAlignment="center" verticalAlignment="center" text="HCenter VCenter" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="top" />
+	  <label width="700px" height="100px" horizontalAlignment="center" verticalAlignment="center" text="HCenter VCenter" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="bottom" />		
+		
+	  <label width="400px" height="100px" horizontalAlignment="right" verticalAlignment="top" text="HRight VTop" />		
+	  <label width="400px" height="100px" horizontalAlignment="right" verticalAlignment="top" text="HRight VTop" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="top" />
+	  <label width="400px" height="100px" horizontalAlignment="right" verticalAlignment="top" text="HRight VTop" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="bottom" />
+	  <label width="400px" height="100px" horizontalAlignment="right" verticalAlignment="top" text="HRight VTop" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="top" />
+	  <label width="400px" height="100px" horizontalAlignment="right" verticalAlignment="top" text="HRight VTop" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="bottom" />
+		
+		
+	  <label width="400px" height="100px" horizontalAlignment="right" verticalAlignment="bottom" text="HRight VBottom" />
+	  <label width="400px" height="100px" horizontalAlignment="right" verticalAlignment="bottom" text="HRight VBottom" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="top" />
+	  <label width="400px" height="100px" horizontalAlignment="right" verticalAlignment="bottom" text="HRight VBottom" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="bottom" />
+	  <label width="400px" height="100px" horizontalAlignment="right" verticalAlignment="bottom" text="HRight VBottom" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="top" />
+	  <label width="400px" height="100px" horizontalAlignment="right" verticalAlignment="bottom" text="HRight VBottom" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="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" horizontalAlignment="right" verticalAlignment="center" text="HRight VCenter" />
+	  <label width="400px" height="100px" horizontalAlignment="right" verticalAlignment="center" text="HRight VCenter" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="top" />
+	  <label width="400px" height="100px" horizontalAlignment="right" verticalAlignment="center" text="HRight VCenter" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="bottom" />
+	  <label width="400px" height="100px" horizontalAlignment="right" verticalAlignment="center" text="HRight VCenter" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="top" />
+	  <label width="400px" height="100px" horizontalAlignment="right" verticalAlignment="center" text="HRight VCenter" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="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" horizontalAlignment="left" verticalAlignment="top" text="HLeft VTop" />	
+	  <label width="400px" height="100px" horizontalAlignment="left" verticalAlignment="top" text="HLeft VTop" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="top" />
+	  <label width="400px" height="100px" horizontalAlignment="left" verticalAlignment="top" text="HLeft VTop" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="bottom" />
+	  <label width="400px" height="100px" horizontalAlignment="left" verticalAlignment="top" text="HLeft VTop" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="top" />
+	  <label width="400px" height="100px" horizontalAlignment="left" verticalAlignment="top" text="HLeft VTop" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="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" horizontalAlignment="left" verticalAlignment="bottom" text="HLeft VBottom" />		
+	  <label width="400px" height="100px" horizontalAlignment="left" verticalAlignment="bottom" text="HLeft VBottom" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="top" />
+	  <label width="400px" height="100px" horizontalAlignment="left" verticalAlignment="bottom" text="HLeft VBottom" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="bottom" />
+	  <label width="400px" height="100px" horizontalAlignment="left" verticalAlignment="bottom" text="HLeft VBottom" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="top" />
+	  <label width="400px" height="100px" horizontalAlignment="left" verticalAlignment="bottom" text="HLeft VBottom" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="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" horizontalAlignment="left" verticalAlignment="center" text="HLeft VCenter"/>		
+	  <label width="400px" height="100px" horizontalAlignment="left" verticalAlignment="center" text="HLeft VCenter" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="top" />
+	  <label width="400px" height="100px" horizontalAlignment="left" verticalAlignment="center" text="HLeft VCenter" horizontalTextToImagePlacement="right" verticalTextToImagePlacement="bottom" />
+	  <label width="400px" height="100px" horizontalAlignment="left" verticalAlignment="center" text="HLeft VCenter" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="top" />
+	  <label width="400px" height="100px" horizontalAlignment="left" verticalAlignment="center" text="HLeft VCenter" horizontalTextToImagePlacement="left" verticalTextToImagePlacement="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"/>	
+	  <label width="400px" height="100px" horizontalAlignment="left" verticalAlignment="center" text="HLeft VCenter" horizontalTextToImagePlacement="right"/>
+	  <label width="400px" height="100px" horizontalAlignment="left" verticalAlignment="center" text="HLeft VCenter" horizontalTextToImagePlacement="left"/>	
 		
 -->
 		

Modified: incubator/xap/trunk/WebContent/examples/widgets/combobox.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/combobox.xal?view=diff&rev=493256&r1=493255&r2=493256
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/combobox.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/combobox.xal Fri Jan  5 16:51:35 2007
@@ -54,13 +54,13 @@
 					</comboBox>
 				</freePane>
 				<horizontalBoxPane>
-					<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Remove Option 2 of ListBox via XAL DOM" onCommand="mco:attributeSetter.remove(testOption2)" />
+					<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Remove Option 2 of ListBox via XAL DOM" onCommand="mco:attributeSetter.remove(testOption2)" />
 
-					<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Insert a new option" onCommand="mco:attributeSetter.appendListItem(testComponentListBox,false)" />
+					<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Insert a new option" onCommand="mco:attributeSetter.appendListItem(testComponentListBox,false)" />
 
-					<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Insert a new, selected, option" onCommand="mco:attributeSetter.appendListItem(testComponentListBox,true)" />
+					<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Insert a new, selected, option" onCommand="mco:attributeSetter.appendListItem(testComponentListBox,true)" />
 
-					<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Selected text/value" onCommand="mco:attributeSetter.reportTextValueAttributes(testComponent)" />
+					<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Selected text/value" onCommand="mco:attributeSetter.reportTextValueAttributes(testComponent)" />
 					
 				</horizontalBoxPane>
 

Modified: incubator/xap/trunk/WebContent/examples/widgets/editableCombobox.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/editableCombobox.xal?view=diff&rev=493256&r1=493255&r2=493256
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/editableCombobox.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/editableCombobox.xal Fri Jan  5 16:51:35 2007
@@ -58,11 +58,11 @@
 					
 				</freePane>
 				<horizontalBoxPane x="500px">
-					<button  height="50px" alignHorizontal="center" alignVertical="center" text="Remove Option 2 of ListBox via XAL DOM" onCommand="mco:attributeSetter.remove(optionItem2)" />
+					<button  height="50px" horizontalAlignment="center" verticalAlignment="center" text="Remove Option 2 of ListBox via XAL DOM" onCommand="mco:attributeSetter.remove(optionItem2)" />
 
-					<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Insert a NEW Option" onCommand="mco:attributeSetter.appendListItem(testComponentListBox)" />
+					<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Insert a NEW Option" onCommand="mco:attributeSetter.appendListItem(testComponentListBox)" />
 				<!--  no multiselect:
-					<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Multiselect" onCommand="mco:attributeSetter.setAttribute(optionItem1, 'selected', 'true')" />
+					<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Multiselect" onCommand="mco:attributeSetter.setAttribute(optionItem1, 'selected', 'true')" />
 				-->					
 				</horizontalBoxPane>
 

Modified: incubator/xap/trunk/WebContent/examples/widgets/gridPanel3.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/gridPanel3.xal?view=diff&rev=493256&r1=493255&r2=493256
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/gridPanel3.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/gridPanel3.xal Fri Jan  5 16:51:35 2007
@@ -18,14 +18,14 @@
   			<xal:button text="Wide Button 2" /> 
   			<xal:button text="Button 3" /> 
   			<xal:button text="B4" /> 
-  			<xal:button text="Colspan2, hAlign fill" columnSpan="2" hAlign="fill" />  	
+  			<xal:button text="Colspan2, gridHorizontalAlignment fill" gridColumnSpan="2" gridHorizontalAlignment="fill" />  	
   		</xal:gridPanel>
   	</xal:window>
   	
   	<xal:window>
   		<xal:gridPanel columns="3"> 
   			<xal:button text="B1" /> 
-  			<xal:button text="Colspan2, hAlign fill" columnSpan="2" hAlign="fill" /> 
+  			<xal:button text="Colspan2, gridHorizontalAlignment fill" gridColumnSpan="2" gridHorizontalAlignment="fill" /> 
   			<xal:button text="Button 3" /> 
   			<xal:button text="B4" /> 
   			<xal:button text="Button 5" /> 	
@@ -36,11 +36,11 @@
   		<xal:gridPanel columns="3"> 
   			<xal:button text="B1" /> 
   			<xal:button text="Wide Button 2" /> 
-  			<xal:button text="rowspan2, vAlign fill" rowSpan="2" vAlign="fill" /> 
+  			<xal:button text="rowspan2, gridVerticalAlignment fill" gridRowSpan="2" gridVerticalAlignment="fill" /> 
   			<xal:button text="B4" /> 
   			<xal:button text="Button 5" /> 
   		</xal:gridPanel>
-  	</window>
+  	</xal:window>
   
 	</xm:append> 	  		
   	</xm:modifications>

Modified: incubator/xap/trunk/WebContent/examples/widgets/gridPanel5.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/gridPanel5.xal?view=diff&rev=493256&r1=493255&r2=493256
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/gridPanel5.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/gridPanel5.xal Fri Jan  5 16:51:35 2007
@@ -14,25 +14,25 @@
 	<window xmlns="http://openxal.org/ui">
   		<gridPanel columns="3"> 
   			<label text="Dog's Name:" /> 
- 		 	<textField columnSpan="2" hAlign="fill" /> 
+ 		 	<textField gridColumnSpan="2" gridHorizontalAlignment="fill" /> 
   			<label text="Breed" /> 
-  			<textField hAlign="fill" /> 
-  			<label text="Categories" hAlign="center" /> 
+  			<textField gridHorizontalAlignment="fill" /> 
+  			<label text="Categories" gridHorizontalAlignment="center" /> 
   			<label text="Photo:" /> 
-  			<label backgroundColor="red" vGrabSpace="true" hGrabSpace="true" vAlign="fill" hAlign="fill" rowSpan="3" /> 
-			<listBox rowSpan="4" vAlign="fill">
+  			<label backgroundColor="red" gridVerticalGrabSpace="true" gridHorizontalGrabSpace="true" gridVerticalAlignment="fill" hAlign="fill" gridRowSpan="3" /> 
+			<listBox gridRowSpan="4" gridVerticalAlignment="fill">
   				<listItem text="Loudest Bark" /> 
   				<listItem text="Best of Breed" /> 
   			</listBox>
   			<button text="Browse..." /> 
   			<button text="Delete" /> 
-  			<gridPanel borderColor="black" columns="2" columnSpan="2" borderStyle="solid" borderWidth="1px" caption="Owner Info" hAlign="fill">
+  			<gridPanel borderColor="black" columns="2" gridColumnSpan="2" borderStyle="solid" borderWidth="1px" caption="Owner Info" hAlign="fill">
 				<label text="Name:" /> 
-				<textField hGrabSpace="true" hAlign="fill" /> 
+				<textField gridHorizontalGrabSpace="true" gridHorizontalAlignment="fill" /> 
 				<label text="Phone:" /> 
-				<textField hGrabSpace="true" hAlign="fill" /> 
+				<textField gridHorizontalGrabSpace="true" gridHorizontalAlignment="fill" /> 
   			</gridPanel>
-  			<button text="Enter" columnSpan="3" hAlign="end" /> 
+  			<button text="Enter" gridColumnSpan="3" gridHorizontalAlignment="end" /> 
    		</gridPanel>
 	</window>
 

Modified: incubator/xap/trunk/WebContent/examples/widgets/horizontalBoxPane.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/horizontalBoxPane.xal?view=diff&rev=493256&r1=493255&r2=493256
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/horizontalBoxPane.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/horizontalBoxPane.xal Fri Jan  5 16:51:35 2007
@@ -31,24 +31,24 @@
 				'pack' ,'center')"/>
 
 		<xal:button width="200px" height="25px" 
-			text="align -> center"
+			text="alignment -> center"
 			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'align' ,'center')"/>
+				'alignment' ,'center')"/>
 				
 		<xal:button width="200px" height="25px" 
-			text="align -> start"
+			text="alignment -> start"
 			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'align' ,'start')"/>
+				'alignment' ,'start')"/>
 				
 		<xal:button width="200px" height="25px" 
-			text="align -> end"
+			text="alignment -> end"
 			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'align' ,'end')"/>
+				'alignment' ,'end')"/>
 				
 		<xal:button width="200px" height="25px" 
-			text="align -> stretch"
+			text="alignment -> stretch"
 			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'align' ,'stretch')"/>
+				'alignment' ,'stretch')"/>
 
 		<xal:button width="200px" height="25px" 
 			text="height -> 30px"
@@ -88,10 +88,10 @@
 		
 			<xal:horizontalBoxPane width="200px" height="200px" backgroundColor="black"
 				id="testComponent">
-				<xal:freePane flex="2" width="20px" height="100px" backgroundColor="red" id="redComponent">
+				<xal:freePane boxFlex="2" width="20px" height="100px" backgroundColor="red" id="redComponent">
 					<label text="f:2" x="0" y="0" />
 				</xal:freePane>
-				<xal:freePane flex="3" width="20px" height="160px" backgroundColor="green" id="greenComponent">
+				<xal:freePane boxFlex="3" width="20px" height="160px" backgroundColor="green" id="greenComponent">
 					<label text="f:3" x="0" y="0" />
 				</xal:freePane>
 				<xal:freePane width="20px" height="130px" backgroundColor="blue" id="blueComponent">

Modified: incubator/xap/trunk/WebContent/examples/widgets/horizontalFlowPane.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/horizontalFlowPane.xal?view=diff&rev=493256&r1=493255&r2=493256
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/horizontalFlowPane.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/horizontalFlowPane.xal Fri Jan  5 16:51:35 2007
@@ -52,27 +52,27 @@
 						onCommand="mco:attributeSetter.setAttribute(testComponent,
 						'editable','false')"/>
 						
-					<xal:button width="180px" height="25px" text="gapHorizontal: 6px"
+					<xal:button width="180px" height="25px" text="horizontalGap: 6px"
 						onCommand="mco:attributeSetter.setAttribute(testComponent,
-						'gapHorizontal','6px')"/>
+						'horizontalGap','6px')"/>
 						
-					<xal:button width="180px" height="25px" text="gapVertical: 2px"
+					<xal:button width="180px" height="25px" text="verticalGap: 2px"
 						onCommand="mco:attributeSetter.setAttribute(testComponent,
-						'gapVertical','2px')"/>
+						'verticalGap','2px')"/>
 						
-					<xal:button width="180px" height="25px" text="align: start"
+					<xal:button width="180px" height="25px" text="alignment: start"
 						onCommand="mco:attributeSetter.setAttribute(testComponent,
-						'align','start')"/>						
+						'alignment','start')"/>						
 
 						
-					<xal:button width="180px" height="25px" text="align: end"
+					<xal:button width="180px" height="25px" text="alignment: end"
 						onCommand="mco:attributeSetter.setAttribute(testComponent,
-						'align','end')"/>	
+						'alignment','end')"/>	
 
 						
-					<xal:button width="180px" height="25px" text="align: center"
+					<xal:button width="180px" height="25px" text="alignment: center"
 						onCommand="mco:attributeSetter.setAttribute(testComponent,
-						'align','center')"/>							
+						'alignment','center')"/>							
 																		
 					<!--standard test things -->
 				</verticalBoxPane>

Modified: incubator/xap/trunk/WebContent/examples/widgets/htmlView.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/htmlView.xal?view=diff&rev=493256&r1=493255&r2=493256
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/htmlView.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/htmlView.xal Fri Jan  5 16:51:35 2007
@@ -12,7 +12,7 @@
 		<xm:append select="/ui">
 				<xal:htmlView width="200px" height="200px"
 					text="This is some text" id="testComponent"
-					alignHorizontal="right" alignVertical="center"
+					horizontalAlignment="right" verticalAlignment="center"
 					onActiveGained="mco:attributeSetter.reportEvent(event)"
 					onActiveLost="mco:attributeSetter.reportEvent(event)"
 					onBeforeActiveLost="mco:attributeSetter.reportEvent(event)"

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=493256&r1=493255&r2=493256
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/label.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/label.xal Fri Jan  5 16:51:35 2007
@@ -11,7 +11,7 @@
 				text="MY PRECIOUS LABEL" />
 
 	<horizontalFlowPane width="825px">					
-				<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="'Hello World!'" 
+				<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="'Hello World!'" 
 					onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', '\'Hello World!\'')" />
 				 
 		<button width="200px" height="50px" text="&lt;b&gt;Hear me roar!&lt;/b&gt;" 
@@ -20,35 +20,35 @@
 				<button width="200px" height="50px"  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"  text="textPlacementVertical = top" 
-					onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'top')" />	
+				<button width="200px" height="50px"  text="verticalTextToImagePlacement = top" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalTextToImagePlacement', 'top')" />	
 		
-				<button width="200px" height="50px"  text="textPlacementVertical = bottom" 
-					onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'bottom')" />	
+				<button width="200px" height="50px"  text="verticalTextToImagePlacement = bottom" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalTextToImagePlacement', 'bottom')" />	
 		
-				<button width="200px" height="50px" text="textPlacementHorizontal = left" 
-					onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementHorizontal', 'left')" />	
+				<button width="200px" height="50px" text="horizontalTextToImagePlacement = left" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalTextToImagePlacement', 'left')" />	
 		
-				<button width="200px" height="50px"  text="textPlacementHorizontal = right" 
-					onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementHorizontal', 'right')" />	
+				<button width="200px" height="50px"  text="horizontalTextToImagePlacement = right" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalTextToImagePlacement', 'right')" />	
 		
-				<button width="200px" height="50px"  text="alignHorizontal = left" 
-					onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'left')" />	
+				<button width="200px" height="50px"  text="horizontalAlignment = left" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalAlignment', 'left')" />	
 		
-				<button width="200px" height="50px"  text="alignHorizontal = center" 
-					onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'center')" />	
+				<button width="200px" height="50px"  text="horizontalAlignment = center" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalAlignment', 'center')" />	
 		
-				<button width="200px" height="50px"  text="alignHorizontal = right" 
-					onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'right')" />
+				<button width="200px" height="50px"  text="horizontalAlignment = right" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalAlignment', 'right')" />
 				 
-				<button width="200px" height="50px"  text="alignVertical = top" 
-					onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'top')" />	
+				<button width="200px" height="50px"  text="verticalAlignment = top" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalAlignment', 'top')" />	
 		
-				<button width="200px" height="50px"  text="alignVertical = center" 
-					onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'center')" />	
+				<button width="200px" height="50px"  text="verticalAlignment = center" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalAlignment', 'center')" />	
 		
-				<button width="200px" height="50px"  text="alignVertical = bottom" 
-					onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'bottom')" />
+				<button width="200px" height="50px"  text="verticalAlignment = bottom" 
+					onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalAlignment', 'bottom')" />
 				 
 				<button width="200px" height="50px"  text="autoWrap = true" 
 					onCommand="mco:attributeSetter.setAttribute(testComponent, 'autoWrap', 'true')" />

Modified: incubator/xap/trunk/WebContent/examples/widgets/listbox.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/listbox.xal?view=diff&rev=493256&r1=493255&r2=493256
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/listbox.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/listbox.xal Fri Jan  5 16:51:35 2007
@@ -57,16 +57,16 @@
 				</freePane>
 
 				<horizontalBoxPane>
-					<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Remove Option 2 of ListBox via XAL DOM" onCommand="mco:attributeSetter.remove(testOption2)" />
+					<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Remove Option 2 of ListBox via XAL DOM" onCommand="mco:attributeSetter.remove(testOption2)" />
 
-					<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Insert a new option" onCommand="mco:attributeSetter.appendListItem(testComponent,false)" />
+					<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Insert a new option" onCommand="mco:attributeSetter.appendListItem(testComponent,false)" />
 
-					<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Insert a new, selected, option" onCommand="mco:attributeSetter.appendListItem(testComponent,true)" />
+					<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Insert a new, selected, option" onCommand="mco:attributeSetter.appendListItem(testComponent,true)" />
 
-					<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Multiselect on" onCommand="mco:attributeSetter.setAttribute(testComponent, 'selectionMode', 'multiRow')" />
-					<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Multiselect off" onCommand="mco:attributeSetter.setAttribute(testComponent, 'selectionMode', 'single')" />					
+					<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Multiselect on" onCommand="mco:attributeSetter.setAttribute(testComponent, 'selectionMode', 'multiRow')" />
+					<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Multiselect off" onCommand="mco:attributeSetter.setAttribute(testComponent, 'selectionMode', 'single')" />					
 					
-					<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Selected text/value" onCommand="mco:attributeSetter.reportTextValueAttributes(testComponent)" />
+					<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Selected text/value" onCommand="mco:attributeSetter.reportTextValueAttributes(testComponent)" />
 
 				</horizontalBoxPane>
 					<!--standard test things -->