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 2006/10/26 00:46:50 UTC

svn commit: r467824 [2/2] - /incubator/xap/trunk/WebContent/examples/widgets/

Modified: incubator/xap/trunk/WebContent/examples/widgets/splitPane.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/splitPane.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/splitPane.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/splitPane.xal Wed Oct 25 17:46:48 2006
@@ -1,33 +1,52 @@
 <xal xmlns="http://www.openxal.org/xal" xmlns:xal="http://www.openxal.org/xal"> 
-
-
+	
+	
 	<mco:mco 
 		xmlns:mco="http://www.openxal.org/mco" 
 		id="attributeSetter" 
 		src="AttributeTester"
 	/>
-
-
-
-	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
-	<xm:append select="/xal">
 	
-		<xal:splitPane width="200px" height="100px"
-		id="testComponent" >
-			<xal:top>
-				<xal:button text="Left"/>
-			</xal:top>
-			<xal:bottom>
-				<xal:button text="Right"/>
-			</xal:bottom>
-		</xal:splitPane>
-		
-
-		<!--standard test things -->
-		
+	
+	
+	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
+		<xm:append select="/xal">
+			<horizontalPanel>
+				
+				
+				
+				<!--standard test things -->
 				
-		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-
-	</xm:append> 	  		
-  	</xm:modifications>
+				<verticalPanel>
+					<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
+				</verticalPanel>
+				<verticalPanel>
+					<xal:splitPane 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)" onMouseDown="mco:attributeSetter.reportEvent(event)" onDragStart="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)">
+						<xal:top height="50px" backgroundColor="red" 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)" onMouseUp="mco:attributeSetter.reportEvent(event)">
+							<label text="foo" x="0" y="0"/>
+						</xal:top>
+						<xal:bottom height="50px" backgroundColor="blue" 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)" onMouseUp="mco:attributeSetter.reportEvent(event)">
+							<label text="bar" x="0" y="0"/>
+						</xal:bottom>
+					</xal:splitPane>
+					<xal:splitPane width="200px" height="100px">
+						<xal:top height="100px">
+							<label text="top" width="100px"/>
+						</xal:top>
+						<xal:bottom height="100px">
+							<label text="bottom" width="100px"/>
+						</xal:bottom>				
+					</xal:splitPane>
+					<xal:splitPane width="200px" height="100px">
+						<xal:left width="100px">
+							<label text="left" width="100px"/>
+						</xal:left>
+						<xal:right width="100px">
+							<label text="right" width="100px"/>
+						</xal:right>				
+					</xal:splitPane>
+				</verticalPanel>
+			</horizontalPanel>
+		</xm:append> 	  		
+	</xm:modifications>
 </xal>

Modified: incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.html?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.html (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.html Wed Oct 25 17:46:48 2006
@@ -1,4 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -22,7 +23,7 @@
     
  </head>
   
- <body  style="width:100%;height:100%" onload="Xap.createAllPredefinedSessions();">
-	<div style="width:100%; height:100%" xapId="ButtonExample" xapSrc="splitPaneExample.xal" xapToolkit="dojo" xapContext="../../"></div>
+ <body  onload="Xap.createAllPredefinedSessions();">
+	<div xapId="ButtonExample" xapSrc="splitPaneExample.xal" xapToolkit="dojo" xapContext="../../"></div>
 </body>
 </html>

Modified: incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.xal Wed Oct 25 17:46:48 2006
@@ -12,23 +12,16 @@
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
 	
-		<xal:splitPane width="100%" height="100%" orientation="horizontal"
-			borderWidth="2px" borderStyle="solid" borderColor="red">
-			<xal:top>
-				<xal:button text="Left"/>
-			</xal:top>
-			
-			<xal:bottom>
+		<xal:splitPane width="100%" height="100%" orientation="horizontal">
+			<xal:button text="Left"/>
 			<xal:splitPane width="100%" height="100%" orientation="vertical">
-				<xal:top>
-					<xal:button text="Top"/>
-				</xal:top>
-				<xal:bottom>
-					<xal:button text="Bottom"/>
-				</xal:bottom>
+				<xal:button text="Top"/>
+				<xal:button text="Bottom"/>
 			</xal:splitPane>	
-			</xal:bottom>
 		</xal:splitPane>
+		
+
+		
 
 	</xm:append> 	  		
   	</xm:modifications>

Modified: incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal Wed Oct 25 17:46:48 2006
@@ -1,12 +1,17 @@
 <verticalPanel xmlns="http://www.openxal.org/xal">	
 	<button width="200px" height="25px" 
 			text="print element"
-			onCommand="mco:attributeSetter.printElement(testComponent)"/>
-			
+			onCommand="mco:attributeSetter.printElement(testComponent)"/>	
 	<button width="200px" height="25px" 
 			text="borderWidth -> '25'"
 			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'borderWidth' ,'25')"/>
+				'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'"
@@ -14,37 +19,78 @@
 				'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="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' ,'24')"/>
+				'fontSize' ,'24px')"/>
+				
+		<button width="200px" height="25px" 
+			text="fontSize-> '8'"
+			onCommand="mco:attributeSetter.setAttribute(testComponent,
+				'fontSize' ,'8px')"/>
+		
 </verticalPanel>

Modified: incubator/xap/trunk/WebContent/examples/widgets/tabPane.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/tabPane.html?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/tabPane.html (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/tabPane.html Wed Oct 25 17:46:48 2006
@@ -3,7 +3,7 @@
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>Tab pane</title>
+    <title>Button</title>
 
 	<style type="text/css">
       <!--

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=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/tabPane.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/tabPane.xal Wed Oct 25 17:46:48 2006
@@ -11,69 +11,54 @@
 
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
-	
-		<xal:tabPane width="200px" height="100px"
-		id="testComponent" >
-			<xal:tab text="Tab1" id="tab1" 
-				onSelect="mco:attributeSetter.reportEvent(event)" 
-				onStateChange="mco:attributeSetter.reportEvent(event)" 
-				backgroundColor="#FFEEFF"
-			>
-			<xal:freePanel>
-				<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:freePanel>
-			</xal:tab>
-			<xal:tab text="Tab2" id="tab2" 
-				onSelect="mco:attributeSetter.reportEvent(event)" 
-				onStateChange="mco:attributeSetter.reportEvent(event)" 
-				backgroundColor="#FFFFEE"				
-			>
-			<xal:freePanel>
-				<xal:button text="buttonA" x="0px" width="25%"/>
-				<xal:button text="buttonB" x="30%" width="25%"/>
-				<xal:button text="buttonC" x="60%" width="25%"/>
-			</xal:freePanel>
-			</xal:tab>
-			<xal:tab text="Tab3" id="tab3" 
-				onSelect="mco:attributeSetter.reportEvent(event)" 
-				onStateChange="mco:attributeSetter.reportEvent(event)" 
-				backgroundColor="#EEFFFF"				
-			>
-				<xal:freePanel>
-				<xal:button text="buttonI" x="0px" width="25%"/>
-				<xal:button text="buttonII" x="30%" width="25%"/>
-				<xal:button text="buttonIII" x="60%" width="25%"/>
-				</xal:freePanel>
-			</xal:tab>			
-			
-		</xal:tabPane>
-		
+		<horizontalPanel>
 		
+		<verticalPanel>
 		<xal:button width="200px" height="25px" 
 			text="selected(tab1)-> 'true'"
-			backgroundColor="#FFeeFF"
 			onCommand="mco:attributeSetter.setAttribute(tab1,
 				'selected' ,'true')"/>
-			
+		
 		<xal:button width="200px" height="25px" 
 			text="selected(tab2)-> 'true'"
-			backgroundColor="#FFFFee"
 			onCommand="mco:attributeSetter.setAttribute(tab2,
 				'selected' ,'true')"/>
-				
+
 		<xal:button width="200px" height="25px" 
-			text="selected(tab3)-> 'true'"
-			backgroundColor="#eeFFFF"
-			onCommand="mco:attributeSetter.setAttribute(tab3,
-				'selected' ,'true')"/>				
-				
+				text="selected(tab3)-> 'true'"
+				onCommand="mco:attributeSetter.setAttribute(tab3,
+				'selected' ,'true')"/>
+		</verticalPanel>	
 		<!--standard test things -->
 		
-				
+		<verticalPanel>
 		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-
+		</verticalPanel>
+		<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:freePanel 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:freePanel>
+			</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)">
+				<verticalPanel backgroundColor="#CCFFCC">
+				<xal:button text="buttonA"/>
+				<xal:button text="buttonB"/>
+				<xal:button text="buttonC"/>
+				</verticalPanel>
+			</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)">
+				<horizontalPanel backgroundColor="#CCCCFF">
+					<xal:button text="buttonA" width="30px"/>
+					<xal:button text="buttonB"/>
+					<xal:button text="buttonC" width="30%"/>
+				</horizontalPanel>
+			</xal:tab>
+		</xal:tabPane>
+		</horizontalPanel>
 	</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=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/table.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/table.xal Wed Oct 25 17:46:48 2006
@@ -12,7 +12,95 @@
 		id="tableMco" 
 		src="TableMco"
 	/>
-
+	<macro:macro id="addRow" xmlns:macro="http://www.openxal.org/macro">
+		<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
+			<xm:append select="id('testComponent')">
+				<row>
+					<cell text="New Cell 1"/><cell text="New Cell 2"/><cell text="New Cell 3"/>
+				</row>
+			</xm:append>
+		</xm:modifications>
+	</macro:macro>
+	
+	<macro:macro id="addColumn" xmlns:macro="http://www.openxal.org/macro">
+		<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
+			<xm:insert-after select="id('column3')">
+				<column><header text="Column 4"/></column>
+			</xm:insert-after>
+			<xm:append select="id('row1')">
+				<cell text="New Cell"/>
+			</xm:append>
+				<xm:append select="id('myRow')">
+				<cell text="New Cell"/>
+				</xm:append>
+				<xm:append select="id('row3')">
+				<cell text="New Cell"/>
+				</xm:append>
+		</xm:modifications>
+	</macro:macro>
+	
+	<macro:macro id="intoBranch" xmlns:macro="http://www.openxal.org/macro">
+		<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
+			<xm:append select="id('myBranch')">
+				<row>
+					<cell text="New Cell 1"/><cell text="New Cell 2"/><cell text="New Cell 3"/>
+				</row>
+			</xm:append>
+		</xm:modifications>
+	</macro:macro>
+	
+	<macro:macro id="removeRow" xmlns:macro="http://www.openxal.org/macro">
+		<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
+			<xm:remove-element select="id('myBranch')"/>
+		</xm:modifications>
+	</macro:macro>
+	
+	<macro:macro id="removeBranch" xmlns:macro="http://www.openxal.org/macro">
+		<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
+			<xm:remove-element select="id('myBranch')"/>
+		</xm:modifications>
+	</macro:macro>
+	
+	
+	
+	<macro:macro id="branch" xmlns:macro="http://www.openxal.org/macro">
+		<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
+			<xm:append select="id('testComponent')">
+				<row>
+					<cell text="New Cell 1"/><cell text="New Cell 2"/><cell text="New Cell 3"/>
+					<row>
+						<cell text="depth 3 a"/><cell text="depth 3 b"/><cell text="depth 3 c"/>
+					</row>
+					<row>
+						<cell text="depth 3 a"/><cell text="depth 3 b"/><cell text="depth 3 c"/>
+						<row>
+							<cell text="depth 4 a"/><cell text="depth 4 b"/><cell text="depth 4 c"/>
+						</row>
+						<row>
+							<cell text="depth 4 a"/><cell text="depth 4 b"/><cell text="depth 4 c"/>
+						</row>
+						<row>
+							<cell text="depth 4 a"/><cell text="depth 4 b"/><cell text="depth 4 c"/>
+							<row>
+								<cell text="depth 5 a"/><cell text="depth 5 b"/><cell text="depth 5 c"/>
+								<row>
+									<cell text="depth 6 a"/><cell text="depth 6 b"/><cell text="depth 6 c"/>
+									<row>
+										<cell text="depth 7 a"/><cell text="depth 7 b"/><cell text="depth 7 c"/>
+										<row>
+											<cell text="depth 8 a"/><cell text="depth 8 b"/><cell text="depth 8 c"/>
+										</row>
+									</row>
+								</row>
+							</row>
+						</row>
+						
+					</row>
+				</row>
+			</xm:append>
+		</xm:modifications>
+	</macro:macro>
+	
 
 
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
@@ -22,43 +110,60 @@
 	<horizontalPanel>
 
 	<verticalPanel>
-	<table id="testComponent" width="200px" height="100px" 
-		onSelect="mco:attributeSetter.reportEvent(event)"
-		onStateChange="mco:attributeSetter.reportEvent(event)"
-		onExpand="mco:attributeSetter.reportEvent(event)"
-		onCollapse="mco:attributeSetter.reportEvent(event)"
-	>
-		<column><header text="Column 1"/></column>
-		<column><header text="Column 2"/></column>
-		<column><header text="Column 3"/></column>
-		<row>
-			<cell text="a"/><cell text="b"/><cell text="c"/>
-			<row>
-				<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>
-			<cell text="a"/><cell text="b"/><cell text="c"/>
-		</row>
-		<row>
-			<cell text="aaaaaaaaaaaaaaaaaa"/><cell text="bbbbbb"/><cell text="ccccc"/>
-		</row>
-	</table>
-
 		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Start table updating" 
-		 onCommand="mco:tableMco.startUpdates(testComponent)" />
-		 
+			onCommand="mco:tableMco.startUpdates(testComponent)" />
+		
 		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Stop table updating" 
-		 onCommand="mco:tableMco.stopUpdates(testComponent)" />
+			onCommand="mco:tableMco.stopUpdates(testComponent)" />
+		
+		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Add basic row" 
+			onCommand="macro:addRow.execute()" />
+		
+		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Add Branches" 
+			onCommand="macro:branch.execute()" />
+		
+		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Insert Into Branch" 
+			onCommand="macro:intoBranch.execute()" />
+		
+		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Remove Row" 
+			onCommand="macro:removeRow.execute()" />
+		
+		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Remove Branch" 
+			onCommand="macro:removeBranch.execute()" />
+
+		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Add Column" 
+			onCommand="macro:addColumn.execute()" />
 		 
 	
 		 
-		 </verticalPanel> 
+</verticalPanel> 
+<verticalPanel>
 		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-		 
+		 </verticalPanel>
+		<verticalPanel>
+			<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"/>
+						</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>
+		</verticalPanel>
 		 </horizontalPanel>
 		
 	</xm:append> 	  		

Modified: incubator/xap/trunk/WebContent/examples/widgets/textArea.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/textArea.html?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/textArea.html (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/textArea.html Wed Oct 25 17:46:48 2006
@@ -4,7 +4,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
-	<title>Text area</title>
+	<title>Dummy title:</title>
 
 	<style type="text/css">
       <!--
@@ -23,17 +23,16 @@
     <script language="JavaScript" type="text/javascript" src="AttributeTester.js"></script>
     
     
-	<!-- script language="JavaScript">
+	<script language="JavaScript">
    		Xap._sourceRootDir = "../../" ; 	
 		Xap.addDebuggables(		
 							"xap.widgets.dojo.TextArea",
 							"xap.bridges.dojo.TextAreaBridge",
-							"xap.bridges.dojo.TextFieldBridge",							
 							"xap.bridges.dojo.DojoWidgetBridge",
 							"xap.xml.xmodify.CommandDirective"																
 							) ;
 		Xap._loadDebuggables() ;
-	</script -->    
+	</script>    
     
     
     

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=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/textArea.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/textArea.xal Wed Oct 25 17:46:48 2006
@@ -1,95 +1,100 @@
-<xal xmlns="http://www.openxal.org/xal" 
-	xmlns:xal="http://www.openxal.org/xal"
-	xmlns:xm="http://www.openxal.org/xmodify"	
-> 
-
-
-	<mco:mco 
-		xmlns:mco="http://www.openxal.org/mco" 
-		id="attributeSetter" 
-		src="AttributeTester"
-	/>
-
-
-	<xm:modifications>
-		<xm:append select="/xal">
-		
-			<xal:textArea width="200px" height="100px" text="A text area."
-			editable="true" 
-			id="testComponent" onEdit="mco:attributeSetter.reportEvent(event)"
-			onTextChange="mco:attributeSetter.reportEvent(event)"
-			/>
-			
-			
-			<!-- 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="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')"/>
-					
-			<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')"/>					
-					
-		
-			
-			<!--standard test things -->
-			
-					
-			<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-		</xm:append> 	  		
-  	</xm:modifications>
-  	
-  	
-  	
+<xal xmlns="http://www.openxal.org/xal" xmlns:xal="http://www.openxal.org/xal"
+	xmlns:xm="http://www.openxal.org/xmodify">
+	
+	
+	<mco:mco xmlns:mco="http://www.openxal.org/mco" id="attributeSetter" src="AttributeTester"/>
+	
+	
 	<!-- 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 
+			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:remove-element select="//HTML/HEAD/TITLE"/ -->
 		<!--  xm:append select="//HTML/HEAD">
-				<title>Text area testt:</title>
-		</xm:append  -->	
+			<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:append select="//HTML/HEAD">
-			<SCRIPT language="JavaScript"  
-					type="text/javascript" 
-					id="test"
-			>
-				document.title="Text area tests:";
-			</SCRIPT>				
-		</xm:append>	
-		
-
-
+		-->
 		
-	</xm:modifications>  	
-  	
-</xal>
\ No newline at end of file
+	</xm:modifications>
+	
+	<xm:modifications>
+		<xm:append select="/xal">
+			
+			<horizontalPanel>
+				<verticalPanel>
+					<!-- 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 -->
+				</verticalPanel>
+				<verticalPanel>
+					<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
+				</verticalPanel>
+				<xal:textArea width="200px" text="This is some text" 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)"
+					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)"/>
+			</horizontalPanel>
+		</xm:append>
+	</xm:modifications>
+</xal>

Modified: incubator/xap/trunk/WebContent/examples/widgets/textField.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/textField.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/textField.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/textField.xal Wed Oct 25 17:46:48 2006
@@ -12,55 +12,59 @@
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
 	
-		<xal:textField width="200px" text="123456789abcdef0" editable="true"
-		id="testComponent" onEdit="mco:attributeSetter.reportEvent(event)"
-		onTextChange="mco:attributeSetter.reportEvent(event)"
-		/>
-
-		
-		
+		<horizontalPanel>
+		<verticalPanel>
 		<!-- textField specific properties -->
-		<xal:button width="200px" height="25px" 
-			text="text -> 'some new text'"
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
+			<xal:button width="200px" height="25px" 
+				text="text -> 'some new text'"
+				onCommand="mco:attributeSetter.setAttribute(testComponent,
 				'text','some new text')"/>
-				
-		<!-- textField specific properties -->
-		<xal:button width="200px" height="25px" 
-			text="Limit text to 8 chars"
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'maxLength','8')"/>	
-				
-		<!-- textField specific properties -->
-		<xal:button width="200px" height="25px" 
-			text="...255 chars."
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
+			
+			<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,
+			<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,
+			<xal:button width="200px" height="25px" 
+				text="Selectability OFF" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent,
 				'selectable','false')"/>
-				
-		<xal:button width="200px" height="25px" 
-			text="Editability ON"
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
+			
+			<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,
+			<xal:button width="200px" height="25px" 
+				text="Editability OFF" 
+				onCommand="mco:attributeSetter.setAttribute(testComponent,
 				'editable','false')"/>							
+		</verticalPanel>									
 				
 		
 		
 		<!--standard test things -->
 		
-				
+		<verticalPanel>	
 		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-	
+		</verticalPanel>
+		<verticalPanel>
+		<xal:textField 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)"/>
+		</verticalPanel>
+		</horizontalPanel>
 	</xm:append> 	  		
   	</xm:modifications>
 </xal>

Modified: incubator/xap/trunk/WebContent/examples/widgets/tooltip.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/tooltip.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/tooltip.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/tooltip.xal Wed Oct 25 17:46:48 2006
@@ -12,13 +12,13 @@
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
 	<xal:verticalPanel>
-		<xal:button text="I have a tooltip" tooltip="A button"/>
-		<xal:checkBox text="So do I" tooltip="Yes/No?"/>
+		<xal:button text="I have a tooltip" tooltip="Button Tooltip 1"/>
+		<xal:checkBox text="So do I" tooltip="Checkbox tooltip"/>
 		
 		<!-- TODO if you have a tooltip on the container and
 		child they both show up -->
-		<xal:verticalPanel tooltip="A weird error case" width="300px" height="300px" backgroundColor="red">
-			<xal:button text="I have a tooltip" tooltip="A button"/>
+		<xal:verticalPanel tooltip="Tooltip for red panel" width="300px" height="300px" backgroundColor="red">
+			<xal:button text="I have a tooltip" tooltip="Button Tooltip 2"/>
 		</xal:verticalPanel>
 	</xal:verticalPanel>	
 	</xm:append> 	  		

Modified: incubator/xap/trunk/WebContent/examples/widgets/verticalPanel.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/verticalPanel.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/verticalPanel.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/verticalPanel.xal Wed Oct 25 17:46:48 2006
@@ -11,15 +11,8 @@
 
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
-	
-		<xal:verticalPanel width="200px" height="200px" backgroundColor="black"
-		id="testComponent">
-			<xal:freePanel width="100px" height="20px" backgroundColor="red"/>
-			<xal:freePanel width="100px" height="20px" backgroundColor="green" id="referenceComponent"/>
-			<xal:freePanel width="100px" height="20px" backgroundColor="blue"/>
-		</xal:verticalPanel>
-		
-
+	<horizontalPanel>
+		<verticalPanel>
 		<!-- container tests -->
 		<xal:button width="200px" height="25px" 
 			text="pack -> end"
@@ -66,15 +59,28 @@
 			text="remove"
 			onCommand="mco:attributeSetter.remove(referenceComponent)"/>
 
-
+</verticalPanel>
 
 
 		
 		<!--standard test things -->
 		
-				
+				<verticalPanel>
 		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-
+		</verticalPanel>
+		<xal:verticalPanel width="200px" height="200px" backgroundColor="black"
+			id="testComponent">
+			<xal:freePanel width="100px" height="20px" backgroundColor="red">
+				<label text="foo" x="0" y="0" />
+			</xal:freePanel>
+			<xal:freePanel width="100px" height="20px" backgroundColor="green" id="referenceComponent">
+				<label text="foo" x="0" y="0" />
+			</xal:freePanel>
+			<xal:freePanel width="100px" height="20px" backgroundColor="blue">
+				<label text="foo" x="0" y="0" />
+			</xal:freePanel>
+		</xal:verticalPanel>
+</horizontalPanel>
 	</xm:append> 	  		
   	</xm:modifications>
 </xal>

Modified: incubator/xap/trunk/WebContent/examples/widgets/verticalPanelExample.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/verticalPanelExample.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/verticalPanelExample.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/verticalPanelExample.xal Wed Oct 25 17:46:48 2006
@@ -16,18 +16,18 @@
 	
 		<xal:verticalPanel width="200px" height="200px" borderWidth="1" borderStyle="solid" borderColor="black">
 		
-		<xal:freePanel width="100px" height="20px" backgroundColor="red"/>
-		<xal:freePanel width="100px" height="20px" backgroundColor="green"/>
-		<xal:freePanel width="100px" height="20px" backgroundColor="blue"/>
+		<xal:freePanel width="100" height="20" backgroundColor="red"/>
+		<xal:freePanel width="100" height="20" backgroundColor="green"/>
+		<xal:freePanel width="100" height="20" backgroundColor="blue"/>
 		
 		</xal:verticalPanel >
 
 		
 		<xal:verticalPanel x="250px" width="200px" height="200px" borderWidth="1" borderStyle="solid" borderColor="black" pack="end">
 		
-		<xal:freePanel width="100px" height="20px" backgroundColor="red"/>
-		<xal:freePanel width="100px" height="20px" backgroundColor="green"/>
-		<xal:freePanel width="100px" height="20px" backgroundColor="blue"/>
+		<xal:freePanel width="100" height="20" backgroundColor="red"/>
+		<xal:freePanel width="100" height="20" backgroundColor="green"/>
+		<xal:freePanel width="100" height="20" backgroundColor="blue"/>
 
 		</xal:verticalPanel >
 
@@ -35,9 +35,9 @@
 
 		<xal:verticalPanel y="250px" width="200px" height="200px" borderWidth="1" borderStyle="solid" borderColor="black" align="stretch">
 
-		<xal:freePanel width="100px" height="20px" backgroundColor="red"/>
-		<xal:freePanel width="100px" height="20px" backgroundColor="green"/>
-		<xal:freePanel width="100px" height="20px" backgroundColor="blue"/>
+		<xal:freePanel width="100" height="20" backgroundColor="red"/>
+		<xal:freePanel width="100" height="20" backgroundColor="green"/>
+		<xal:freePanel width="100" height="20" backgroundColor="blue"/>
 
 		</xal:verticalPanel >
 
@@ -45,9 +45,9 @@
 
 		<xal:verticalPanel x="250px" y="250px" width="200px" height="200px" borderWidth="1" borderStyle="solid" borderColor="black" align="end">
 
-		<xal:freePanel width="100px" height="20px" backgroundColor="red"/>
-		<xal:freePanel width="100px" height="20px" backgroundColor="green"/>
-		<xal:freePanel width="100px" height="20px" backgroundColor="blue"/>
+		<xal:freePanel width="100" height="20" backgroundColor="red"/>
+		<xal:freePanel width="100" height="20" backgroundColor="green"/>
+		<xal:freePanel width="100" height="20" backgroundColor="blue"/>
 
 		</xal:verticalPanel >
 

Modified: incubator/xap/trunk/WebContent/examples/widgets/window.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/window.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/window.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/window.xal Wed Oct 25 17:46:48 2006
@@ -13,7 +13,8 @@
 	<xm:append select="/xal">
 	
 
-	<xal:window title="No min,max,close or resize" x="200px" resizable="false" minimizable="false" maximizable="false" closable="false"/>
+		<xal:window title="No min,max,close or resize" x="200px" resizable="false" minimizable="false" maximizable="false" closable="false" 		onClose="mco:attributeSetter.reportEvent(event)"
+			onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" 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)"/>
 	<xal:window title="A window" id="testComponent"
 		onClose="mco:attributeSetter.reportEvent(event)"
 		onMinimize="mco:attributeSetter.reportEvent(event)"
@@ -23,6 +24,7 @@
 		onClosing="mco:attributeSetter.reportEvent(event)"
 		onRestore="mco:attributeSetter.reportEvent(event)"
 		onRestoring="mco:attributeSetter.reportEvent(event)"
+		onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" 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)"
 
 	>
 		<xal:borderPanel backgroundColor="green">