incubator-xap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bbuff...@apache.org
Subject svn commit: r494859 [3/4] - in /incubator/xap/trunk/WebContent/examples/widgets: ./ images/
Date Wed, 10 Jan 2007 15:46:04 GMT
Modified: incubator/xap/trunk/WebContent/examples/widgets/passwordField.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/passwordField.xal?view=diff&rev=494859&r1=494858&r2=494859
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/passwordField.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/passwordField.xal Wed Jan 10 07:46:01 2007
@@ -1,66 +1,48 @@
 <xal xmlns="http://openxal.org/ui" xmlns:xal="http://openxal.org/ui"> 
-
-
+	
 	<mco
 		xmlns="http://openxal.org/core/mco" 
 		id="attributeSetter" 
 		class="AttributeTester"
 		src="AttributeTester.js"
 	/>	
-
-
-	<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
-	<xm:append select="/ui">
 	
-
-		<horizontalBoxPane>
-		<!-- text/password-field specific properties -->
-		<verticalBoxPane>
-			<xal:button width="200px" height="25px" 
-				text="text -> 'some new text'"
-				onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'text','some new text')"/>
-			
-			<xal:button width="200px" height="25px" 
-				text="Limit to 8 chars."
-				onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'maxLength','8')"/>			
-			
-			<xal:button width="200px" height="25px" 
-				text="...255 chars."
-				onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'maxLength','255')"/>								
-			<xal:button width="200px" height="25px" 
-				text="Selectability ON"
-				onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'selectable', 'true')"/>
-			<xal:button width="200px" height="25px" 
-				text="Selectability OFF" 
-				onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'selectable','false')"/>
-			
-			<xal:button width="200px" height="25px" 
-				text="Toggle editability"
-				onCommand="mco:attributeSetter.toggleBooleanAttribute(testComponent,
-				'editable')"/>				
-			
-			<xal:button width="200px" height="25px" 
-				text="Editability ON"
-				onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'editable', 'true')"/>
-			<xal:button width="200px" height="25px" 
-				text="Editability OFF" 
-				onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'editable','false')"/>			
-		</verticalBoxPane>
-		<!--standard test things -->
-		<verticalBoxPane>
-		<include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
-		</verticalBoxPane>
-		<xal:passwordField width="200px" text="A text field"
-			id="testComponent"  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)" onEdit="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)" onMouseUp="mco:a
 ttributeSetter.reportEvent(event)" onTextChange="mco:attributeSetter.reportEvent(event)"/>
-		</horizontalBoxPane>
-
-	</xm:append> 	  		
-  	</xm:modifications>
+	<mco
+		xmlns="http://openxal.org/core/mco" 
+		id="SmokeTests" 
+		class="SmokeTests"
+		src="SmokeTests.js"
+	/>	
+	
+	
+	<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+		<xm:append select="/ui">
+			<freePane width="500px" height="300px" backgroundColor="#F0F0F0" id="testComponentFreePane">	
+				<xal:passwordField id="testComponent"/>
+			</freePane>	
+			<scrollPane width="1100px" height="500px" onCreate="mco:attributeSetter.resizeScrollPane(this, testComponentFreePane)">
+				<verticalBoxPane>
+					<horizontalBoxPane borderStyle="solid" borderWidth="2px" borderColor="#000">
+						<verticalBoxPane width="500px">
+							<label height="25px" text="Specific tests:" fontWeight="bold"/>
+							<include href="textAttributeTests.xal" xmlns="http://openxal.org/core/xinclude"/>
+							<label text=" " height="25px"/>
+							<include href="formElementTests.xal" xmlns="http://openxal.org/core/xinclude"/>
+							<!-- textField specific properties -->
+							<label text=" " height="25px"/>
+							<include href="editableFieldTests.xal" xmlns="http://openxal.org/core/xinclude"/>					
+						</verticalBoxPane>
+						<!--standard test things -->		
+						<include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
+					</horizontalBoxPane>
+					<horizontalBoxPane>
+						<verticalBoxPane>
+							<label height="25px" text="Smoke tests:" fontWeight="bold"/>
+							<label text="None right now"/>
+						</verticalBoxPane>
+					</horizontalBoxPane>
+				</verticalBoxPane>
+			</scrollPane>
+		</xm:append> 	  		
+	</xm:modifications>
 </xal>

Modified: incubator/xap/trunk/WebContent/examples/widgets/popupMenu.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/popupMenu.xal?view=diff&rev=494859&r1=494858&r2=494859
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/popupMenu.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/popupMenu.xal Wed Jan 10 07:46:01 2007
@@ -1,40 +1,60 @@
 <xal xmlns="http://openxal.org/ui" xmlns:xal="http://openxal.org/ui"> 
-
-
+	
 	<mco
 		xmlns="http://openxal.org/core/mco" 
 		id="attributeSetter" 
 		class="AttributeTester"
 		src="AttributeTester.js"
 	/>	
-
-
-	<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
-	<xm:append select="/ui">
-
 	
-		<xal:defs>
-			<xal:popupMenu id="testComponent">
-					<xal:menuItem text="Cut" id="cut" onCommand="mco:attributeSetter.reportEvent(event)"/>
-					<xal:menuItem text="Copy"/>
-					<xal:horizontalSeparator />
-					<xal:menuItem text="Paste">
-						<xal:popupMenu>
-							<xal:menuItem text="Cut"/>																		<xal:menuItem text="Copy"/>
+	<mco
+		xmlns="http://openxal.org/core/mco" 
+		id="SmokeTests" 
+		class="SmokeTests"
+		src="SmokeTests.js"
+	/>	
+	
+	
+	<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+		<xm:append select="/ui">
+			<horizontalBoxPane>
+				<freePane width="500px" height="300px" backgroundColor="#F0F0F0" id="testComponentFreePane">	
+					<xal:defs>
+						<xal:popupMenu id="testComponent">
+							<xal:menuItem text="Cut" id="cut" onCommand="mco:attributeSetter.reportEvent(event)"/>
+							<xal:menuItem text="Copy"/>
 							<xal:horizontalSeparator />
-							<xal:menuItem text="Paste"/>
+							<xal:menuItem text="Paste">
+								<xal:popupMenu>
+									<xal:menuItem text="Cut"/>																		<xal:menuItem text="Copy"/>
+									<xal:horizontalSeparator />
+									<xal:menuItem text="Paste"/>
+								</xal:popupMenu>
+							</xal:menuItem>
 						</xal:popupMenu>
-					</xal:menuItem>
-			</xal:popupMenu>
-		</xal:defs>
-		
-		<xal:verticalBoxPane>
-		<xal:button text="I have a popup" popup="#testComponent"/>
-			
-		<!--standard test things -->
-		
-		<include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
-	</xal:verticalBoxPane>	
-	</xm:append> 	  		
-  	</xm:modifications>
-</xal>
+					</xal:defs>
+					
+					<xal:button text="I have a popup" popup="#testComponent"/>
+				</freePane>	
+			</horizontalBoxPane>
+			<scrollPane width="1100px" height="500px" onCreate="mco:attributeSetter.resizeScrollPane(this, testComponentFreePane)">
+				<verticalBoxPane>
+					<horizontalBoxPane borderStyle="solid" borderWidth="2px" borderColor="#000">
+						<verticalBoxPane width="500px">
+							<label height="25px" text="Specific tests:" fontWeight="bold"/>
+							<label text="None right now"/>					
+						</verticalBoxPane>
+						<!--standard test things -->		
+						<include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
+					</horizontalBoxPane>
+					<horizontalBoxPane>
+						<verticalBoxPane>
+							<label height="25px" text="Smoke tests:" fontWeight="bold"/>
+							<label text="None right now"/>
+						</verticalBoxPane>
+					</horizontalBoxPane>
+				</verticalBoxPane>
+			</scrollPane>
+		</xm:append> 	  		
+	</xm:modifications>
+</xal>
\ No newline at end of file

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=494859&r1=494858&r2=494859
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/radioButton.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/radioButton.xal Wed Jan 10 07:46:01 2007
@@ -1,175 +1,76 @@
 <xal xmlns="http://openxal.org/ui" xmlns:xal="http://openxal.org/ui"> 
-
-
-	<mco
-		xmlns="http://openxal.org/core/mco" 
-		id="attributeSetter" 
-		class="AttributeTester"
-		src="AttributeTester.js"
-	/>	
-
-
-
-	<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
-	<xm:append select="/ui">
-	
-
-
-	<freePane 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)" />		
 			
-	
-		  <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)" />		
-	</freePane>
-	
-	<horizontalFlowPane width="825px">			
-		
-			<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" 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" horizontalAlignment="center" verticalAlignment="center" text="verticalTextToImagePlacement = top" 
-				onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalTextToImagePlacement', 'top')" />	
-	
-			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="verticalTextToImagePlacement = bottom" 
-				onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalTextToImagePlacement', 'bottom')" />	
-	
-			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="horizontalTextToImagePlacement = left" 
-				onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalTextToImagePlacement', 'left')" />	
-	
-			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="horizontalTextToImagePlacement = right" 
-				onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalTextToImagePlacement', 'right')" />	 
-	
-			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="horizontalAlignment = left" 
-			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalAlignment', 'left')" />	
-	
-			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="horizontalAlignment = center" 
-			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalAlignment', 'center')" />	
-	
-			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="horizontalAlignment = right" 
-			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'horizontalAlignment', 'right')" />
-			 
-			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="verticalAlignment = top" 
-			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalAlignment', 'top')" />	
-	
-			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="verticalAlignment = center" 
-			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalAlignment', 'center')" />	
-	
-			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="verticalAlignment = bottom" 
-			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'verticalAlignment', 'bottom')" />
-			 
-			 
-			<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" horizontalAlignment="center" verticalAlignment="center" text="set image over selected" 
-			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'mouseOverSelectedImage', '../background.JPG')" />	 
-			 
-			<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" horizontalAlignment="center" verticalAlignment="center" text="set image pressed" 
-			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'pressedImage', '../background.JPG')" />	 
-			 
-			<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" horizontalAlignment="center" verticalAlignment="center" text="set image" 
-			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'image', '../background.JPG')" />				 		 
-	
-			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="richText = true" 
-			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'richText', 'true')" />			 
-	
-			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="disabled = false" 
-			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'disabled', 'false')" />	
-	
-			<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="disabled = true" 
-			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'disabled', '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" horizontalAlignment="center" verticalAlignment="center" text="selected = false" 
-			 onCommand="mco:attributeSetter.setAttribute(testComponent, 'selected', 'false')" />		
-	
-		</horizontalFlowPane>	
-		 		 		 
-		<include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
-		 
-		 
-		 
-		
-		<!--
-	  <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" 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" 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" 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" 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" horizontalAlignment="left" verticalAlignment="center" text="HLeft VCenter" horizontalTextToImagePlacement="right"/>
-	  <label width="400px" height="100px" horizontalAlignment="left" verticalAlignment="center" text="HLeft VCenter" horizontalTextToImagePlacement="left"/>	
-		
-		-->
-		
-	</xm:append> 	  		
-  	</xm:modifications>
-</xal>
\ No newline at end of file
+			<mco
+				xmlns="http://openxal.org/core/mco" 
+				id="attributeSetter" 
+				class="AttributeTester"
+				src="AttributeTester.js"
+			/>	
+			
+			<mco
+				xmlns="http://openxal.org/core/mco" 
+				id="SmokeTests" 
+				class="SmokeTests"
+				src="SmokeTests.js"
+			/>	
+			
+			
+			<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+				<xm:append select="/ui">
+					<horizontalBoxPane>
+						<freePane width="500px" height="300px" backgroundColor="#F0F0F0" id="testComponentFreePane">
+							<radioButton text="testComponent" id="testComponent" group="tc" />		
+							
+						</freePane>
+						<freePane width="500px" height="300px" backgroundColor="#CCCCCC" id="testComponentFreePane2">
+							<radioButton id="radio1" x="0px" y="0px" width="150px" height="20px" text="RADIO 1" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" />
+							<radioButton id="radio2" x="150px" y="0px" width="150px" height="20px" text="RADIO 2" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" />
+							<radioButton x="300px" y="0px" width="150px" height="20px" text="RADIO 3" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" selected="true" />
+							
+							<radioButton x="0px"  y="40px" width="150px" height="30px" text="RADIO 4 group 2" group="group2" onStateChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" selected="true" />
+							<radioButton x="150px" y="40px"  width="150px" height="30px" text="RADIO 5 group 2" group="group2" onStateChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" />		
+							
+							<radioButton x="0px" y="80px" width="200px" height="50px" text="RADIO 6 no group" onStateChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" />		
+							<radioButton x="150px" y="80px" width="200px" height="50px" text="RADIO 7 no group" onStateChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" />		
+						</freePane>
+					</horizontalBoxPane>
+					<scrollPane width="1100px" height="500px" onCreate="mco:attributeSetter.resizeScrollPane(this, testComponentFreePane)">
+						<verticalBoxPane>
+							<horizontalBoxPane borderStyle="solid" borderWidth="2px" borderColor="#000">
+								<verticalBoxPane width="50%">
+									<label height="25px" text="Specific tests:" fontWeight="bold"/>
+									<include href="textAttributeTests.xal" xmlns="http://openxal.org/core/xinclude"/>
+									<label text=" " height="25px"/>
+									<include href="imageAttributeTests.xal" xmlns="http://openxal.org/core/xinclude"/>
+									<include href="toggledFormElementTests.xal" xmlns="http://openxal.org/core/xinclude"/>
+									<include href="formElementTests.xal" xmlns="http://openxal.org/core/xinclude"/>
+									<label text=" " height="50px"/>
+									
+								</verticalBoxPane>
+								<!--standard test things -->		
+								<include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
+							</horizontalBoxPane>
+							<horizontalBoxPane>
+								<verticalBoxPane>
+									<label height="25px" text="Smoke tests:" fontWeight="bold"/>
+									<button text="Autowrapped Long text with image" onCommand="mco:SmokeTests.buttonLongTextWithImage(testComponent, smokeTestCompareButton)"/>
+									<label text="The text should all be to the left of the image."/>
+									<button text="Changer" onCommand="mco:SmokeTests.buttonImageResizing(testComponent, smokeTestCompareButton)"/>
+									<label autoWrap="true" width="500px" text="Changes the label around. It should always return to its original state and resemble the bottom button in the end. Things changed: image size, border size, text alignment, image alignment, font size"/>
+									<button text="Select/Deselect test" onCommand="mco:SmokeTests.radioSelectDeselect(radio1, radio2)"/>
+									<label autoWrap="true" width="500px" text="Deselects 'RADIO 1' and selects 'RADIO 2', then deselects 'RADIO 2'. Make sure that both buttons are reselectable, and test this with each one initially checked and unchecked. RADIO 2 tends to fail this test."/>									
+								</verticalBoxPane>	
+								<verticalBoxPane>
+									<label height="25px" text=" " fontWeight="bold"/>
+									<button text="TextPlacement" onCommand="mco:SmokeTests.textPlacement(testComponent, smokeTestCompareButton)"/>
+									<label autoWrap="true" width="500px" text="Sets horizontalTextToImagePlacement to left, verticalTextToImagePlacement to bottom, so the text should be to the bottom left of the image"/>	
+									<button text="images" onCommand="mco:SmokeTests.images(testComponent, smokeTestCompareButton)"/>
+									<label autoWrap="true" width="500px" text="Sets images for the label for background, foreground"/>
+									<button width="200px" height="25px" text="Print Dark Grey Right-Hand Frame XAL" onCommand="mco:attributeSetter.printElement(testComponentFreePane2)"/>		
+								</verticalBoxPane>
+							</horizontalBoxPane>
+						</verticalBoxPane>
+					</scrollPane>
+				</xm:append> 	  		
+			</xm:modifications>
+		</xal>
\ No newline at end of file

Modified: incubator/xap/trunk/WebContent/examples/widgets/rowCycling.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/rowCycling.xal?view=diff&rev=494859&r1=494858&r2=494859
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/rowCycling.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/rowCycling.xal Wed Jan 10 07:46:01 2007
@@ -1,7 +1,4 @@
-<xal xmlns="http://openxal.org/ui" 
-	xmlns:xal="http://openxal.org/ui"
-	xmlns:macro="http://openxal.org/core/macro"
-    xmlns:xm="http://openxal.org/core/xmodify"> 
+<xal xmlns="http://openxal.org/ui" xmlns:xal="http://openxal.org/ui"> 
 	
 	<mco:mco 
 		xmlns:mco="http://openxal.org/core/mco" 
@@ -9,15 +6,6 @@
 		class="CyclingMco"
 		src="CyclingMco.js"
 	/>
-	
-	
-	<macro:macro id="changeCellText">
-        <xm:modifications>
-            <xm:set-attribute select="//cell">
-                <xm:attribute name="text" value="{0}"/>
-            </xm:set-attribute>
-        </xm:modifications>
-    </macro:macro>
 
 	
 
@@ -36,12 +24,6 @@
 	<button text="Stop cycling" onCommand="mco:cyclingMco.stopCycling(testComponent)"/>
 	<button text="Cycle once" onCommand="mco:cyclingMco.cycleOnce(testComponent)"/>
 	<button text="Clear" onCommand="mco:cyclingMco.clear(testComponent)"/>
-	
-	<freePane height="20px"/>
-	<button text="Start text cycling" onCommand="mco:cyclingMco.startTextCycling(testComponent, macro:changeCellText)"/>
-	<button text="Stop text cycling" onCommand="mco:cyclingMco.stopCycling(testComponent)"/>
-	<freePane height="20px"/>
-	<button text="Cycle in memory rows" onCommand="mco:cyclingMco.cycleInMemoryRows()"/>
 	<button text="Print stats" onCommand="mco:cyclingMco.printStats(event)"/>
 
 </xal>

Modified: incubator/xap/trunk/WebContent/examples/widgets/scrollPane.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/scrollPane.xal?view=diff&rev=494859&r1=494858&r2=494859
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/scrollPane.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/scrollPane.xal Wed Jan 10 07:46:01 2007
@@ -1,37 +1,61 @@
-<xal xmlns="http://openxal.org/ui" xmlns:xal="http://openxal.org/ui">
+<xal xmlns="http://openxal.org/ui" xmlns:xal="http://openxal.org/ui"> 
 	
 	<mco
 		xmlns="http://openxal.org/core/mco" 
 		id="attributeSetter" 
 		class="AttributeTester"
 		src="AttributeTester.js"
-	/>		
+	/>	
+	
+	<mco
+		xmlns="http://openxal.org/core/mco" 
+		id="SmokeTests" 
+		class="SmokeTests"
+		src="SmokeTests.js"
+	/>	
 	
 	
 	<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
 		<xm:append select="/ui">
 			<horizontalBoxPane>
+				<freePane width="500px" height="300px" backgroundColor="#F0F0F0" id="testComponentFreePane">	
+					<xal:scrollPane id="testComponent" width="300px" height="200px">
+						<xal:verticalBoxPane>
+							<xal:button text="button1"/>
+							<xal:button text="button2"/>
+							<xal:button text="button3"/>
+							<xal:button text="buttonA"/>
+							<xal:button text="buttonB"/>
+							<xal:button text="buttonC"/>
+							<xal:button text="button1"/>
+							<xal:button text="button2"/>
+							<xal:button text="button3"/>
+							<xal:button text="buttonA"/>
+							<xal:button text="buttonB"/>
+							<xal:button text="buttonC"/>
+						</xal:verticalBoxPane>
+					</xal:scrollPane>
+				</freePane>	
+			</horizontalBoxPane>
+			<scrollPane width="1100px" height="500px" onCreate="mco:attributeSetter.resizeScrollPane(this, testComponentFreePane)">
 				<verticalBoxPane>
-					<include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
+					<horizontalBoxPane borderStyle="solid" borderWidth="2px" borderColor="#000">
+						<verticalBoxPane width="500px">
+							<label fontStyle="italic" autoWrap="true" text="Note: Due to a bug, the height for this component has been pre-set in this component test. It can be changed without a problem, but its current displayed height is not its default"/>							
+							<label height="25px" text="Specific tests:" fontWeight="bold"/>
+							<label text="None right now"/>			
+						</verticalBoxPane>
+						<!--standard test things -->		
+						<include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
+					</horizontalBoxPane>
+					<horizontalBoxPane>
+						<verticalBoxPane>
+							<label height="25px" text="Smoke tests:" fontWeight="bold"/>
+							<label text="None right now"/>
+						</verticalBoxPane>
+					</horizontalBoxPane>
 				</verticalBoxPane>
-				<xal:scrollPane width="200px" height="100px" id="testComponent">
-					<xal:verticalBoxPane>
-						<xal:button text="button1"/>
-						<xal:button text="button2"/>
-						<xal:button text="button3"/>
-						<xal:button text="buttonA"/>
-						<xal:button text="buttonB"/>
-						<xal:button text="buttonC"/>
-						<xal:button text="button1"/>
-						<xal:button text="button2"/>
-						<xal:button text="button3"/>
-						<xal:button text="buttonA"/>
-						<xal:button text="buttonB"/>
-						<xal:button text="buttonC"/>
-					</xal:verticalBoxPane>
-				</xal:scrollPane>
-				
-			</horizontalBoxPane>
-		</xm:append>
+			</scrollPane>
+		</xm:append> 	  		
 	</xm:modifications>
 </xal>

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=494859&r1=494858&r2=494859
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal Wed Jan 10 07:46:01 2007
@@ -1,117 +1,128 @@
-<verticalBoxPane width="825px" xmlns="http://openxal.org/ui" alignment="left">
-<horizontalFlowPane width="825px" xmlns="http://openxal.org/ui">
-	<label width="825px" height="25px" text="Standard tests:" fontWeight="bold"/>
-
-	<button width="200px" height="25px" text="print element"
-		onCommand="mco:attributeSetter.printElement(testComponent)"/>
-	<button width="200px" height="25px" text="borderWidth -> '25'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'borderWidth' ,'25px')"/>
-	<button width="200px" height="25px" text="borderWidth -> '10'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'borderWidth' ,'10px')"/>
-
-	<button width="200px" height="25px" text="borderStyle -> 'solid'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'borderStyle' ,'solid')"/>
-
-	<button width="200px" height="25px" text="borderStyle -> 'dotted'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'borderStyle' ,'dotted')"/>
-
-
-	<button width="200px" height="25px" text="borderColor -> 'red'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'borderColor' ,'red')"/>
-	<button width="200px" height="25px" text="borderColor -> 'yellow'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'borderColor' ,'yellow')"/>
-	<button width="200px" height="25px" text="width -> '300px'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'width' ,'300px')"/>
-
-	<button width="200px" height="25px" text="width -> '100px'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'width' ,'100px')"/>
-
-	<button width="200px" height="25px" text="height -> '300px'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'height' ,'300px')"/>
-
-	<button width="200px" height="25px" text="height -> '100px'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'height' ,'100px')"/>
-
-	<button width="200px" height="25px" text="fontWeight -> 'bold'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'fontWeight' ,'bold')"/>
-
-	<button width="200px" height="25px" text="fontWeight -> 'lighter'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'fontWeight' ,'lighter')"/>
-
-	<button width="200px" height="25px" text="fontFamily -> 'Garamond'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'fontFamily' ,'Garamond')"/>	
-				
-	<button width="200px" height="25px" text="fontStyle -> 'italic'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'fontStyle' ,'italic')"/>								
-	<button width="200px" height="25px" text="backgroundColor -> 'green'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'backgroundColor' ,'green')"/>
-
-	<button width="200px" height="25px" text="backgroundColor -> 'purple'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'backgroundColor' ,'purple')"/>
-
-	<button width="200px" height="25px" text="color -> 'red'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'color' ,'red')"/>
-
-	<button width="200px" height="25px" text="color -> 'pink'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'color' ,'pink')"/>
-	<button width="200px" height="25px" text="fontSize-> '24'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'fontSize' ,'24px')"/>
-
-	<button width="200px" height="25px" text="fontSize-> '8'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'fontSize' ,'8px')"/>
-
-	<button width="200px" height="25px" text="visible-> 'false'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'visible' ,'false')"/>
-				
-	<button width="200px" height="25px" text="visible-> 'true'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'visible' ,'true')"/>
-				
-	<button width="200px" height="25px" text="disabled-> 'false'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'disabled' ,'false')"/>
-				
-	<button width="200px" height="25px" text="disabled-> 'true'"
-		onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'disabled' ,'true')"/>				
-
-</horizontalFlowPane>
+<verticalBoxPane width="500px" xmlns="http://openxal.org/ui" align="left" fontSize="14px" backgroundColor="#EEEEEE">
+	<label height="25px" text="Standard tests:" fontWeight="bold"/>
+	<horizontalBoxPane width="500px">
+		<label width="100px" text="borderWidth:"/>
+		<radioButton group="borderWidth" width="75px" text="1px" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+		<radioButton group="borderWidth" width="75px" text="5px" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+		<radioButton group="borderWidth" width="75px" text="25px" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+		<radioButton group="borderWidth" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+	</horizontalBoxPane>
+	<horizontalBoxPane width="500px">
+		<label width="100px" text="borderStyle:"/>
+		<radioButton group="borderStyle" width="75px" text="solid" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+		<radioButton group="borderStyle" width="75px" text="dotted" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+		<radioButton group="borderStyle" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+	</horizontalBoxPane>
+	<horizontalBoxPane width="500px">
+		<label width="100px" text="borderColor:"/>
+		<radioButton group="borderColor" width="75px" text="red" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="borderColor" width="75px" text="#33CCCC" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="borderColor" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+	</horizontalBoxPane>
+	<label text=" " height="25px"/>
+	<horizontalBoxPane width="500px">
+		<label width="100px" text="backgroundColor:"/>
+		<radioButton group="backgroundColor" width="75px" text="green" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="backgroundColor" width="75px" text="#FF00CC" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="backgroundColor" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+	</horizontalBoxPane>
+	<horizontalBoxPane width="500px">
+		<label width="100px" text="width:"/>
+		<radioButton group="width" width="75px" text="100px" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="width" width="75px" text="300px" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="width" width="75px" text="25%" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+	</horizontalBoxPane>
+	<horizontalBoxPane width="500px">
+		<label width="100px" text=""/>
+		<radioButton group="width" width="75px" text="50%" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="width" width="75px" text="100%" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="width" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+	</horizontalBoxPane>
+	<horizontalBoxPane width="500px">
+		<label width="100px" text="height:"/>
+		<radioButton group="height" width="75px" text="100px" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="height" width="75px" text="300px" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="height" width="75px" text="25%" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+	</horizontalBoxPane>
+	<horizontalBoxPane width="500px">
+		<label width="100px" text=""/>
+		<radioButton group="height" width="75px" text="50%" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="height" width="75px" text="100%" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="height" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+	</horizontalBoxPane>
+	<label text=" " height="25px"/>
+	<horizontalBoxPane width="500px">
+		<label width="100px" text="fontWeight:"/>
+		<radioButton group="fontWeight" width="75px" text="bold" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="fontWeight" width="75px" text="lighter" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="fontWeight" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+	</horizontalBoxPane>
+	<horizontalBoxPane width="500px">
+		<label width="100px" text="fontFamily:"/>
+		<radioButton group="fontFamily" width="75px" text="Arial" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="fontFamily" width="75px" text="serif" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="fontFamily" width="75px" text="sans-serif" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="fontFamily" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>		
+	</horizontalBoxPane>
+	<horizontalBoxPane width="500px">
+		<label width="100px" text="fontStyle:"/>
+		<radioButton group="fontStyle" width="75px" text="normal" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="fontStyle" width="75px" text="italic" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="fontStyle" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+	</horizontalBoxPane>	
+	<horizontalBoxPane width="500px">
+		<label width="100px" text="(font) color:"/>
+		<radioButton group="color" width="75px" text="#339966" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="color" width="75px" text="blue" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="color" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+	</horizontalBoxPane>				
+	<horizontalBoxPane width="500px">
+		<label width="100px" text="fontSize:"/>
+		<radioButton group="fontSize" width="75px" text="8px" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="fontSize" width="75px" text="12px" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="fontSize" width="75px" text="24px" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="fontSize" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+	</horizontalBoxPane>	
+	<label text=" " height="25px"/>
+	<horizontalBoxPane width="500px">
+		<label width="100px" text="visible:"/>
+		<radioButton group="visible" width="75px" text="false" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="visible" width="75px" text="true" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="visible" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+	</horizontalBoxPane>
+	<horizontalBoxPane width="500px">
+		<label width="100px" text="hidden:"/>
+		<radioButton group="hidden" width="75px" text="false" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="hidden" width="75px" text="true" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group, this.text)"/>
+		<radioButton group="hidden" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+	</horizontalBoxPane>
+	<label text=" " height="25px"/>
+	<horizontalBoxPane>
+		<button width="200px" height="25px" text="Print Element XAL" onCommand="mco:attributeSetter.printElement(testComponent)"/>
+		<button width="200px" height="25px" text="Assign Event Listeners to TestComponent" onCommand="mco:attributeSetter.addEvents(testComponent)"/>
+	</horizontalBoxPane>
+	<label text=" " height="25px"/>
+	<label width="400px" autoWrap="true" text="The two fields below can be used to set any attribute for the test component to any value. In the attribute field, enter the name of an attribute (height, backgroundColor, visible) and a corresponding value (33px, #99CCCC, true) in the 'value' field, and the attribute-value pair will be assigned to the test component when you hit 'Go'. "/>
 	<horizontalBoxPane>
-		<textField text="attribute" id="attributeName"/>
-
-		<textField id="attributeValue" text="value" 
-			onKeyDown="mco:attributeSetter.setAttributeOnCR(event,testComponent,
-			attributeName.text, attributeValue.text)"
-		/>
-
-
-		<button text="Go!"
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
-			attributeName.text, attributeValue.text)"
-			width="30px"/>
+		<verticalBoxPane>
+			<horizontalBoxPane>
+				<label text="Attribute: " width="75px"/><textField id="attributeName"/>
+			</horizontalBoxPane>
+			<horizontalBoxPane>
+				<label text="Value: " width="75px"/><textField id="attributeValue" onKeyDown="mco:attributeSetter.setAttributeOnCR(event,testComponent, attributeName.text, attributeValue.text)"/>
+			</horizontalBoxPane>
+		</verticalBoxPane>
+		<button text="Go!" onCommand="mco:attributeSetter.setAttribute(testComponent, attributeName.text, attributeValue.text)" width="50px" height="45px"/>
+		<button text="Remove Attribute" onCommand="mco:attributeSetter.removeAttribute(testComponent, attributeName.text)" height="45px"/>
+	</horizontalBoxPane>
+	<label text=" " height="25px"/>
+	<label width="400px" autoWrap="true" text="Execute javascript with the field below. Type it in and hit 'Go.'"/>
+	<horizontalBoxPane>
+		<textField id="codeSnippet" width="200px" onKeyDown="mco:attributeSetter.evalCodeOnCR(event,codeSnippet.text)"/>
+		<button text="Go!" onCommand="mco:attributeSetter.evalCode(codeSnippet.text)" width="50px" height="22px"/>
+	</horizontalBoxPane>
+
+</verticalBoxPane>
 		
-	</horizontalBoxPane>
-	<button width="200px" height="25px" text="Add Events"
-		onCommand="mco:attributeSetter.addEvents(testComponent)"/>
-		</verticalBoxPane>
\ No newline at end of file
+
+

Modified: incubator/xap/trunk/WebContent/examples/widgets/tabPane.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/tabPane.xal?view=diff&rev=494859&r1=494858&r2=494859
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/tabPane.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/tabPane.xal Wed Jan 10 07:46:01 2007
@@ -1,65 +1,125 @@
 <xal xmlns="http://openxal.org/ui" xmlns:xal="http://openxal.org/ui"> 
-
-
+	
 	<mco
 		xmlns="http://openxal.org/core/mco" 
 		id="attributeSetter" 
 		class="AttributeTester"
 		src="AttributeTester.js"
 	/>	
-
-
-
+	
+	<mco
+		xmlns="http://openxal.org/core/mco" 
+		id="SmokeTests" 
+		class="SmokeTests"
+		src="SmokeTests.js"
+	/>
+	
+	<macro:macro id="removeElement" xmlns:macro="http://openxal.org/core/macro">
+		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+			<xm:remove-element select="id('{0}')"/>
+		</xm:modifications>
+	</macro:macro>
+	
+	<macro:macro id="appendTab" xmlns:macro="http://openxal.org/core/macro">
+		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+			<xm:append select="id('testComponent')">
+				<xal:tab text="New Tab">
+					<xal:horizontalBoxPane width="500px">
+						<xal:label width="100px" text="I am a new tab!"/>
+					</xal:horizontalBoxPane>
+				</xal:tab>
+				
+				
+			</xm:append>
+		</xm:modifications>
+	</macro:macro>
+	
+	<macro:macro id="insertBetweenTabs" xmlns:macro="http://openxal.org/core/macro">
+		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+			<xm:insert-before select="id('tab3')">
+				<xal:tab text="New Tab">
+					<xal:horizontalBoxPane width="500px">
+						<xal:label width="100px" text="I am a new tab!"/>
+					</xal:horizontalBoxPane>
+				</xal:tab>
+			</xm:insert-before>
+		</xm:modifications>
+	</macro:macro>
+	
+	
 	<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
-	<xm:append select="/ui">
-		<horizontalBoxPane>
-		
-		<verticalBoxPane>
-		<xal:button width="200px" height="25px" 
-			text="selected(tab1)-> 'true'"
-			onCommand="mco:attributeSetter.setAttribute(tab1,
-				'selected' ,'true')"/>
-		
-		<xal:button width="200px" height="25px" 
-			text="selected(tab2)-> 'true'"
-			onCommand="mco:attributeSetter.setAttribute(tab2,
-				'selected' ,'true')"/>
-
-		<xal:button width="200px" height="25px" 
-				text="selected(tab3)-> 'true'"
-				onCommand="mco:attributeSetter.setAttribute(tab3,
-				'selected' ,'true')"/>
-		</verticalBoxPane>	
-		<!--standard test things -->
-		
-		<verticalBoxPane>
-		<include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
-		</verticalBoxPane>
-		<xal:tabPane width="200px" height="100px"
-				id="testComponent" 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)" 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)">
-			<xal:tab text="Tab1" id="tab1"  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)" 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)" onMouseUp="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)">
-				<xal:freePane backgroundColor="#FFCCCC">
-					<xal:button text="button1" x="0px" width="25%"/>
-					<xal:button text="button2" x="30%" width="25%"/>
-					<xal:button text="button3" x="60%" width="25%"/>
-				</xal:freePane>
-			</xal:tab>
-			<xal:tab text="Tab2" id="tab2"  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)" 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)" onMouseUp="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)">
-				<verticalBoxPane backgroundColor="#CCFFCC">
-				<xal:button text="buttonA"/>
-				<xal:button text="buttonB"/>
-				<xal:button text="buttonC"/>
+		<xm:append select="/ui">
+			<freePane width="500px" height="300px" backgroundColor="#F0F0F0" id="testComponentFreePane">
+				<xal:tabPane id="testComponent" width="300px" height="200px">
+					<xal:tab text="Tab1" id="tab1">
+						<xal:freePane backgroundColor="#FFCCCC" width="100%" height="100%">
+							<xal:button text="button1" x="0px" width="25%"/>
+							<xal:button text="button2" x="30%" width="25%"/>
+							<xal:button text="button3" x="60%" width="25%"/>
+						</xal:freePane>
+					</xal:tab>
+					<xal:tab text="Tab2" id="tab2">
+						<verticalBoxPane backgroundColor="#CCFFCC">
+							<xal:button text="buttonA"/>
+							<xal:button text="buttonB"/>
+							<xal:button text="buttonC"/>
+						</verticalBoxPane>
+					</xal:tab>
+					<xal:tab text="Tab 3" id="tab3">
+						<horizontalBoxPane backgroundColor="#CCCCFF">
+							<xal:button text="buttonA" width="30px"/>
+							<xal:button text="buttonB"/>
+							<xal:button text="buttonC" width="30%"/>
+						</horizontalBoxPane>
+					</xal:tab>
+				</xal:tabPane>
+			</freePane>	
+			<scrollPane width="1100px" height="500px" onCreate="mco:attributeSetter.resizeScrollPane(this, testComponentFreePane)">
+				<verticalBoxPane>
+					<horizontalBoxPane borderStyle="solid" borderWidth="2px" borderColor="#000">
+						<verticalBoxPane width="500px">
+							<label height="25px" text="Specific tests:" fontWeight="bold"/>
+							<label fontStyle="italic" autoWrap="true" text="Note: Due to a bug, the height for this component has been pre-set in this component test. It can be changed without a problem, but its current displayed height is not its default"/>
+							<horizontalBoxPane width="500px">
+								<label width="100px" text="tab 1 selected:"/>
+								<radioButton group="selected1" width="75px" text="true" onSelect="mco:attributeSetter.setAttribute(tab1, 'selected' ,this.text)"/>
+								<radioButton group="selected1" width="75px" text="false" onSelect="mco:attributeSetter.setAttribute(tab1, 'selected' ,this.text)"/>
+								<radioButton group="selected1" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(tab1, 'selected')"/>
+							</horizontalBoxPane>
+							<horizontalBoxPane width="500px">
+								<label width="100px" text="tab 2 selected:"/>
+								<radioButton group="selected2" width="75px" text="true" onSelect="mco:attributeSetter.setAttribute(tab2, 'selected' ,this.text)"/>
+								<radioButton group="selected2" width="75px" text="false" onSelect="mco:attributeSetter.setAttribute(tab2, 'selected' ,this.text)"/>
+								<radioButton group="selected2" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(tab2, 'selected')"/>
+							</horizontalBoxPane>
+							<horizontalBoxPane width="500px">
+								<label width="100px" text="tab 3 selected:"/>
+								<radioButton group="selected3" width="75px" text="true" onSelect="mco:attributeSetter.setAttribute(tab3, 'selected' ,this.text)"/>
+								<radioButton group="selected3" width="75px" text="false" onSelect="mco:attributeSetter.setAttribute(tab3, 'selected' ,this.text)"/>
+								<radioButton group="selected3" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(tab3, 'selected')"/>
+							</horizontalBoxPane>
+			
+						</verticalBoxPane>
+						<!--standard test things -->		
+						<include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
+					</horizontalBoxPane>
+					<horizontalBoxPane>
+						<verticalBoxPane width="500px">
+							<label height="25px" text="Smoke tests:" fontWeight="bold"/>
+							<button text="Remove tab1" onCommand="macro:removeElement.execute('tab1')"/>
+							<label text="Try with tab1 selected/deselected, try removing all 3 tabs"/>
+							<button text="Remove tab2" onCommand="macro:removeElement.execute('tab2')"/>
+							<button text="Remove tab3" onCommand="macro:removeElement.execute('tab3')"/>
+						</verticalBoxPane>
+						<verticalBoxPane width="500px">
+							<label height="25px" text=" " fontWeight="bold"/>
+							<button text="Insert Tab" onCommand="macro:appendTab.execute()"/>
+							<label text="Insert a bunch at once, insert with various other tabs selected"/>
+							<button text="Insert tab between tab2 and tab3" onCommand="macro:insertBetweenTabs.execute()"/>
+						</verticalBoxPane>
+					</horizontalBoxPane>
 				</verticalBoxPane>
-			</xal:tab>
-			<xal:tab text="Tab 3" id="tab3"  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)" 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)" onMouseUp="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)">
-				<horizontalBoxPane backgroundColor="#CCCCFF">
-					<xal:button text="buttonA" width="30px"/>
-					<xal:button text="buttonB"/>
-					<xal:button text="buttonC" width="30%"/>
-				</horizontalBoxPane>
-			</xal:tab>
-		</xal:tabPane>
-		</horizontalBoxPane>
-	</xm:append> 	  		
-  	</xm:modifications>
+			</scrollPane>
+		</xm:append> 	  		
+	</xm:modifications>
 </xal>

Modified: incubator/xap/trunk/WebContent/examples/widgets/table.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/table.xal?view=diff&rev=494859&r1=494858&r2=494859
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/table.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/table.xal Wed Jan 10 07:46:01 2007
@@ -8,6 +8,13 @@
 		src="AttributeTester.js"
 	/>	
 	
+	<mco
+		xmlns="http://openxal.org/core/mco" 
+		id="SmokeTests" 
+		class="SmokeTests"
+		src="SmokeTests.js"
+	/>	
+	
 	<mco:mco 
 		xmlns:mco="http://openxal.org/core/mco" 
 		id="tableMco" 
@@ -24,6 +31,19 @@
 		</xm:modifications>
 	</macro:macro>
 	
+	<macro:macro id="addMultiRow" xmlns:macro="http://openxal.org/core/macro">
+		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+			<xm:append select="id('testComponent')">
+				<row>
+					<cell text="New Cell 1"/><cell text="New Cell 2"/><cell text="New Cell 3"/>
+				</row>
+				<row>
+					<cell text="New Cell 4"/><cell text="New Cell 5"/><cell text="New Cell 6"/>
+				</row>
+			</xm:append>
+		</xm:modifications>
+	</macro:macro>
+	
 	<macro:macro id="addColumn" xmlns:macro="http://openxal.org/core/macro">
 		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
 			<xm:insert-after select="id('column3')">
@@ -53,13 +73,13 @@
 	
 	<macro:macro id="removeRow" xmlns:macro="http://openxal.org/core/macro">
 		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
-			<xm:remove-element select="id('testComponent')/row[1]"/>
+			<xm:remove-element select="id('myRow')"/>
 		</xm:modifications>
 	</macro:macro>
 	
 	<macro:macro id="removeAllRows" xmlns:macro="http://openxal.org/core/macro">
 		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
-			<xm:remove-element select="id('testComponent')/row"/> 
+			<xm:remove-element select="//row"/> 
 		</xm:modifications>
 	</macro:macro>
 
@@ -69,6 +89,11 @@
 		</xm:modifications>
 	</macro:macro>
 	
+	<macro:macro id="removeAllBranches" xmlns:macro="http://openxal.org/core/macro">
+		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+			<xm:remove-element select="//row/row"/> 
+		</xm:modifications>
+	</macro:macro>
 	
 	
 	<macro:macro id="branch" xmlns:macro="http://openxal.org/core/macro">
@@ -109,74 +134,84 @@
 		</xm:modifications>
 	</macro:macro>
 	
-
-
 	<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
-	<xm:append select="/ui">
-	
-
-	<horizontalBoxPane>
-
-	<verticalBoxPane>
-		<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Start table updating" 
-			onCommand="mco:tableMco.startUpdates(testComponent)" />
-		
-		<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Stop table updating" 
-			onCommand="mco:tableMco.stopUpdates(testComponent)" />
-		
-		<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Add basic row" 
-			onCommand="macro:addRow.execute()" />
-		
-		<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Add Branches" 
-			onCommand="macro:branch.execute()" />
-		
-		<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Insert Into Branch" 
-			onCommand="macro:intoBranch.execute()" />
-		
-		<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Remove Row" 
-			onCommand="macro:removeRow.execute()" />
-		
-		<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Remove All Rows" 
-			onCommand="macro:removeAllRows.execute()" />
-
-		<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Remove Branch" 
-			onCommand="macro:removeBranch.execute()" />
-
-		<button width="200px" height="50px" horizontalAlignment="center" verticalAlignment="center" text="Add Column" 
-			onCommand="macro:addColumn.execute()" />
-		 
-	
-		 
-</verticalBoxPane> 
-<verticalBoxPane>
-		<include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
-		 </verticalBoxPane>
-		<verticalBoxPane>
-			<table id="testComponent" width="200px" height="100px" 
-				onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onAfterSort="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onCollapse="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)" onEdit="mco:attributeSetter.reportEvent(event)" onExpand="mco:attributeSetter.reportEvent(event)" onFirstExpand="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.r
 eportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMouseOver="mco:attributeSetter.reportEvent(event)" onMouseUp="mco:attributeSetter.reportEvent(event)" onPositionChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" onSort="mco:attributeSetter.reportEvent(event)" onStateChange="mco:attributeSetter.reportEvent(event)"
-				>
-				<column><header text="Column 1"  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(event)"/></column>
-				<column><header text="Column 2"/></column>
-				<column id="column3"><header text="Column 3"/></column>
-				<row id="row1"  onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)">
-					<cell text="a"  onDoubleClick="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)"/><cell text="b"/><cell text="c"/>
-					<row id="myBranch">
-						<cell text="depth 2 a"/><cell text="depth 2 b"/><cell text="depth 2 c"/>
-						<row>
-							<cell text="depth 3 a"/><cell text="depth 3 b"/><cell text="depth 3 c"/>
+		<xm:append select="/ui">
+			<horizontalBoxPane>
+				<freePane width="500px" height="300px" backgroundColor="#FFFFFF" id="testComponentFreePane">	
+					<table id="testComponent">
+						<column><header text="Column 1"/></column>
+						<column><header text="Column 2"/></column>
+						<column id="column3"><header text="Column 3"/></column>
+						<row id="row1">
+							<cell text="a"/><cell text="b"/><cell text="c"/>
+							<row id="myBranch">
+								<cell text="depth 2 a"/><cell text="depth 2 b"/><cell text="depth 2 c"/>
+								<row>
+									<cell text="depth 3 a"/><cell text="depth 3 b"/><cell text="depth 3 c"/>
+								</row>
+							</row>
 						</row>
-					</row>
-				</row>
-				<row id="myRow">
-					<cell text="a"/><cell text="b"/><cell text="c"/>
-				</row>
-				<row id="row3">
-					<cell text="aaaaaaaaaaaaaaaaaa"/><cell text="bbbbbb"/><cell text="ccccc"/>
-				</row>
-			</table>
-		</verticalBoxPane>
-		 </horizontalBoxPane>
-		
-	</xm:append> 	  		
-  	</xm:modifications>
+						<row id="myRow">
+							<cell text="x"/><cell text="y"/><cell text="z"/>
+						</row>
+						<row id="row3">
+							<cell text="aaaaaaaaaaaaaaaaaa"/><cell text="bbbbbb"/><cell text="ccccc"/>
+						</row>
+					</table>
+				</freePane>	
+			</horizontalBoxPane>
+			<scrollPane width="1100px" height="500px" onCreate="mco:attributeSetter.resizeScrollPane(this, testComponentFreePane)">
+				<verticalBoxPane>
+					<horizontalBoxPane borderStyle="solid" borderWidth="2px" borderColor="#000">
+						<verticalBoxPane width="500px">
+							<label height="25px" text="Specific tests:" fontWeight="bold"/>
+							<label text="None right now"/>			
+						</verticalBoxPane>
+						<!--standard test things -->		
+						<include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
+					</horizontalBoxPane>
+					<horizontalBoxPane>
+						<verticalBoxPane width="500px">
+							<label height="25px" text="Smoke tests:" fontWeight="bold"/>
+							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Start table updating" 
+								onCommand="mco:tableMco.startUpdates(testComponent)" />
+							
+							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Stop table updating" 
+								onCommand="mco:tableMco.stopUpdates(testComponent)" />
+							
+							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Add basic row" 
+								onCommand="macro:addRow.execute()" />
+								
+							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Add multi row" 
+								onCommand="macro:addMultiRow.execute()" />
+							
+							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Add Branches" 
+								onCommand="macro:branch.execute()" />
+							
+							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Insert Into Branch" 
+								onCommand="macro:intoBranch.execute()" />
+						</verticalBoxPane>
+						<verticalBoxPane>
+							<label height="25px" text=" " fontWeight="bold"/>
+							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Remove Row (x,y,z)" 
+								onCommand="macro:removeRow.execute()" />
+							
+							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Remove All Rows" 
+								onCommand="macro:removeAllRows.execute()" />
+							
+							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Remove Branch (depth 2a, etc)" 
+								onCommand="macro:removeBranch.execute()" />
+							<label width="500px" autoWrap="true" text="Things to look out for: Behavior of parent (whether it loses the expand/contract button), behavior when expanded or not, behavior with children expanded or not, correctness of colors, deletion of children"/>
+							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Add Column" 
+								onCommand="macro:addColumn.execute()" />
+							<label width="500px" autoWrap="true" text="Click 'Remove Branch' before running this test"/>							
+							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Remove All Branches" 
+								onCommand="macro:removeAllBranches.execute()" />
+						</verticalBoxPane>
+					</horizontalBoxPane>
+				</verticalBoxPane>
+			</scrollPane>
+		</xm:append> 	  		
+	</xm:modifications>
+
 </xal>

Modified: incubator/xap/trunk/WebContent/examples/widgets/textArea.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/textArea.xal?view=diff&rev=494859&r1=494858&r2=494859
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/textArea.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/textArea.xal Wed Jan 10 07:46:01 2007
@@ -1,5 +1,4 @@
-<xal xmlns="http://openxal.org/ui" xmlns:xal="http://openxal.org/ui"
-	xmlns:xm="http://openxal.org/core/xmodify">
+<xal xmlns="http://openxal.org/ui" xmlns:xal="http://openxal.org/ui"> 
 	
 	<mco
 		xmlns="http://openxal.org/core/mco" 
@@ -8,98 +7,42 @@
 		src="AttributeTester.js"
 	/>	
 	
+	<mco
+		xmlns="http://openxal.org/core/mco" 
+		id="SmokeTests" 
+		class="SmokeTests"
+		src="SmokeTests.js"
+	/>	
 	
-	<!-- Page title -->
-	<xm:modifications document="html">
-		
-		<!-- 
-			All of the below seem to to change the HTML DOM, but
-			window doesn't seem to find out about it - a web search 
-			indicates that title setting just doesn't work using direct 
-			manipulation of	the DOM...
-		-->
-		
-		<!--  Don't use 'replace' in case there's no title to start-with: -->
-		<!--  xm:remove-element select="//HTML/HEAD/TITLE"/ -->
-		<!--  xm:append select="//HTML/HEAD">
-			<title>Text area testt:</title>
-			</xm:append  -->
-		<!--  xm:replace select="//HTML/HEAD/TITLE">
-			<title>Text area testttt:</title>
-			</xm:replace -->
-		
-		<xm:append select="//HTML/HEAD">
-			<script> document.title="Text area tests:";</script>
-		</xm:append>
-		<!--  
-			Anybody know a way of forcing (in effect)
-			an invalidation that would make the window
-			look again to the DOM?
-		-->
-		
-	</xm:modifications>
 	
-	<xm:modifications>
+	<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
 		<xm:append select="/ui">
-				<xal:textArea width="200px" 
-					id="testComponent"
-					horizontalAlignment="right" verticalAlignment="center"
-					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)"
-					onEdit="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)"
-					onMouseUp="mco:attributeSetter.reportEvent(event)"
-					onTextChange="mco:attributeSetter.reportEvent(event)">this is some text in a text area</xal:textArea>			
-			<horizontalBoxPane>
-				<verticalBoxPane>
-					<!-- button specific properties -->
-					<xal:button width="200px" height="25px" text="text -> 'some new text'"
-						onCommand="mco:attributeSetter.setAttribute(testComponent,
-						'text','some new text')"/>
-					
-					<xal:button width="200px" height="25px" text="Limit to 8 chars."
-						onCommand="mco:attributeSetter.setAttribute(testComponent,
-						'maxLength','8')"/>
-					
-					<xal:button width="200px" height="25px" text="...255 chars."
-						onCommand="mco:attributeSetter.setAttribute(testComponent,
-						'maxLength','255')"/>
-					<xal:button width="200px" height="25px" text="Selectability ON"
-						onCommand="mco:attributeSetter.setAttribute(testComponent,
-						'selectable', 'true')"/>
-					<xal:button width="200px" height="25px" text="Selectability OFF"
-						onCommand="mco:attributeSetter.setAttribute(testComponent,
-						'selectable','false')"/>
-					
-					<xal:button width="200px" height="25px" text="Toggle editability"
-						onCommand="mco:attributeSetter.toggleBooleanAttribute(testComponent,
-						'editable')"/>
-					
-					<xal:button width="200px" height="25px" text="Editability ON"
-						onCommand="mco:attributeSetter.setAttribute(testComponent,
-						'editable', 'true')"/>
-					<xal:button width="200px" height="25px" text="Editability OFF"
-						onCommand="mco:attributeSetter.setAttribute(testComponent,
-						'editable','false')"/>
-					<!--standard test things -->
-				</verticalBoxPane>
+			<freePane width="500px" height="300px" backgroundColor="#F0F0F0" id="testComponentFreePane">	
+				<xal:textArea id="testComponent"/>
+			</freePane>	
+			<scrollPane width="1100px" height="500px" onCreate="mco:attributeSetter.resizeScrollPane(this, testComponentFreePane)">
 				<verticalBoxPane>
-					<include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
+					<horizontalBoxPane borderStyle="solid" borderWidth="2px" borderColor="#000">
+						<verticalBoxPane width="500px">
+							<label height="25px" text="Specific tests:" fontWeight="bold"/>
+							<include href="textAttributeTests.xal" xmlns="http://openxal.org/core/xinclude"/>
+							<label text=" " height="25px"/>
+							<include href="formElementTests.xal" xmlns="http://openxal.org/core/xinclude"/>
+							<!-- textField specific properties -->
+							<label text=" " height="25px"/>
+							<include href="editableFieldTests.xal" xmlns="http://openxal.org/core/xinclude"/>					
+						</verticalBoxPane>
+						<!--standard test things -->		
+						<include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
+					</horizontalBoxPane>
+					<horizontalBoxPane>
+						<verticalBoxPane>
+							<label height="25px" text="Smoke tests:" fontWeight="bold"/>
+							<label text="None right now"/>
+						</verticalBoxPane>
+					</horizontalBoxPane>
 				</verticalBoxPane>
-			</horizontalBoxPane>
-		</xm:append>
+			</scrollPane>
+		</xm:append> 	  		
 	</xm:modifications>
-</xal>
+</xal>
\ No newline at end of file

Added: incubator/xap/trunk/WebContent/examples/widgets/textAttributeTests.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/textAttributeTests.xal?view=auto&rev=494859
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/textAttributeTests.xal (added)
+++ incubator/xap/trunk/WebContent/examples/widgets/textAttributeTests.xal Wed Jan 10 07:46:01 2007
@@ -0,0 +1,44 @@
+						<verticalBoxPane xmlns="http://openxal.org/ui">
+						    <horizontalBoxPane width="500px">
+						        <label width="100px" text="text:"/>
+						        <radioButton group="text" width="150px" text="Hello World!!!" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+						        <radioButton group="text" width="150px" text="&lt;b&gt;Hear me roar!&lt;/b&gt;" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+						    </horizontalBoxPane>
+						    <horizontalBoxPane width="500px">
+						        <label width="100px" text=" " height="2px"/>
+						        <radioButton group="text" width="150px" text="(very long text)" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,'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.')"/>
+						        <radioButton group="text" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>				
+						    </horizontalBoxPane>
+						    <horizontalBoxPane width="500px">
+						        <label width="100px" text="autoWrap:"/>
+						        <radioButton group="autoWrap" width="75px" text="true" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+						        <radioButton group="autoWrap" width="75px" text="false" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+						        <radioButton group="autoWrap" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+						    </horizontalBoxPane>
+						    <horizontalBoxPane width="500px">
+						        <label width="100px" text="richText:"/>
+						        <radioButton group="richText" width="75px" text="true" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+						        <radioButton group="richText" width="75px" text="false" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+						        <radioButton group="richText" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+						    </horizontalBoxPane>
+							<horizontalBoxPane width="500px">
+								<label width="100px" text="selectable:"/>
+								<radioButton group="selectable" width="75px" text="true" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+								<radioButton group="selectable" width="75px" text="false" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+								<radioButton group="selectable" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+							</horizontalBoxPane>
+						    <horizontalBoxPane width="500px">
+						    	<label width="175px" text="verticalAlignment:"/>
+						    	<radioButton group="verticalAlignment" width="75px" text="top" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+						    	<radioButton group="verticalAlignment" width="75px" text="center" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+						    	<radioButton group="verticalAlignment" width="75px" text="bottom" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+						        <radioButton group="verticalAlignment" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>			
+						    </horizontalBoxPane>
+						    <horizontalBoxPane width="500px">
+						    	<label width="175px" text="horizontalAlignment:"/>
+						        <radioButton group="horizontalAlignment" width="75px" text="left" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+						    	<radioButton group="horizontalAlignment" width="75px" text="center" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+						    	<radioButton group="horizontalAlignment" width="75px" text="right" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+						    	<radioButton group="horizontalAlignment" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+						    </horizontalBoxPane>
+						</verticalBoxPane>
\ No newline at end of file



Mime
View raw message