incubator-xap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bbuff...@apache.org
Subject svn commit: r495395 - /incubator/xap/trunk/WebContent/examples/widgets/
Date Thu, 11 Jan 2007 22:00:19 GMT
Author: bbuffone
Date: Thu Jan 11 14:00:18 2007
New Revision: 495395

URL: http://svn.apache.org/viewvc?view=rev&rev=495395
Log:
Checkin For Trevor: Enhancements to the XAP Widget Tests.

Added:
    incubator/xap/trunk/WebContent/examples/widgets/cell.xal
    incubator/xap/trunk/WebContent/examples/widgets/gridPane.xal
    incubator/xap/trunk/WebContent/examples/widgets/gridPane2.xal
    incubator/xap/trunk/WebContent/examples/widgets/gridPane3.xal
    incubator/xap/trunk/WebContent/examples/widgets/link.xal
    incubator/xap/trunk/WebContent/examples/widgets/row.xal
    incubator/xap/trunk/WebContent/examples/widgets/tabPane2.xal
    incubator/xap/trunk/WebContent/examples/widgets/tableSmokeTests0.xal
    incubator/xap/trunk/WebContent/examples/widgets/tableSmokeTests1.xal
Modified:
    incubator/xap/trunk/WebContent/examples/widgets/combobox.xal
    incubator/xap/trunk/WebContent/examples/widgets/index.html
    incubator/xap/trunk/WebContent/examples/widgets/listItemSmokeTests0.xal
    incubator/xap/trunk/WebContent/examples/widgets/listbox.xal
    incubator/xap/trunk/WebContent/examples/widgets/menu.xal
    incubator/xap/trunk/WebContent/examples/widgets/popupMenu.xal
    incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal
    incubator/xap/trunk/WebContent/examples/widgets/table.xal   (contents, props changed)
    incubator/xap/trunk/WebContent/examples/widgets/tree.xal
    incubator/xap/trunk/WebContent/examples/widgets/treeTable.xal
    incubator/xap/trunk/WebContent/examples/widgets/window.xal

Added: incubator/xap/trunk/WebContent/examples/widgets/cell.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/cell.xal?view=auto&rev=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/cell.xal (added)
+++ incubator/xap/trunk/WebContent/examples/widgets/cell.xal Thu Jan 11 14:00:18 2007
@@ -0,0 +1,161 @@
+<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"
+    />	
+    
+    <mco:mco 
+        xmlns:mco="http://openxal.org/core/mco" 
+        id="tableMco" 
+        class="TableMco"
+        src="TableMco.js"
+    />
+    
+    <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')">
+                <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://openxal.org/core/macro">
+        <xm:modifications xmlns:xm="http://openxal.org/core/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://openxal.org/core/macro">
+        <xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+            <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="//row"/> 
+        </xm:modifications>
+    </macro:macro>
+    
+    <macro:macro id="removeBranch" xmlns:macro="http://openxal.org/core/macro">
+        <xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+            <xm:remove-element select="id('myBranch')"/>
+        </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">
+        <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>
+                        <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://openxal.org/core/xmodify">
+        <xm:append select="/ui">
+            <horizontalBoxPane>
+                <freePane width="500px" height="300px" backgroundColor="#EEEEFF" id="testComponentFreePane">	
+                    <table>
+                        <column id="column1"><header text="Column 1"/></column>
+                        <column><header text="Column 2"/></column>
+                        <column id="column3"><header text="Column 3"/></column>
+                        <row id="row1">
+                            <cell text="testComponent" id="testComponent"/><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="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"/>
+                            <include href="textAttributeTests.xal" xmlns="http://openxal.org/core/xinclude"/>
+                            <label text=" " height="25px"/>		
+                        </verticalBoxPane>
+                        <!--standard test things -->		
+                        <include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
+                    </horizontalBoxPane>
+                    <horizontalBoxPane>
+                        <label height="25px" text="Specific tests:" fontWeight="bold"/>
+                        <label text="None right now" height="25px"/>	
+                    </horizontalBoxPane>
+                </verticalBoxPane>
+            </scrollPane>
+        </xm:append> 	  		
+    </xm:modifications>
+    
+</xal>
\ No newline at end of file

Modified: incubator/xap/trunk/WebContent/examples/widgets/combobox.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/combobox.xal?view=diff&rev=495395&r1=495394&r2=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/combobox.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/combobox.xal Thu Jan 11 14:00:18 2007
@@ -14,6 +14,14 @@
 		src="SmokeTests.js"
 	/>	
 	
+	<macro:macro id="insertNode" xmlns:macro="http://openxal.org/core/macro">
+		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+			<xm:insert-before select="id('testOption2')">
+				<listItem text="Option 1.5" value="Value 1.5"/>
+			</xm:insert-before>
+		</xm:modifications>
+	</macro:macro>
+	
 	
 	<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
 		<xm:append select="/ui">

Added: incubator/xap/trunk/WebContent/examples/widgets/gridPane.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/gridPane.xal?view=auto&rev=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/gridPane.xal (added)
+++ incubator/xap/trunk/WebContent/examples/widgets/gridPane.xal Thu Jan 11 14:00:18 2007
@@ -0,0 +1,54 @@
+<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:window title="One column" width="500px" height="500px">
+  			<xal:gridPanel> 
+  				<xal:button text="B1" /> 
+  				<xal:button text="Wide Button 2" /> 
+  				<xal:button text="Button 3" /> 
+  				<xal:button text="B4" /> 
+  				<xal:button text="Button 5" /> 
+  			</xal:gridPanel>
+  		</xal:window>
+  		<xal:window title="Two columns">
+  			<xal:gridPanel columns="2"> 
+  				<xal:button text="B1" /> 
+  				<xal:button text="Wide Button 2" /> 
+  				<xal:button text="Button 3" /> 
+  				<xal:button text="B4" /> 
+  				<xal:button text="Button 5" /> 
+  			</xal:gridPanel>
+  		</xal:window>
+  		
+  		<xal:window title="Three columns">
+  			<xal:gridPanel columns="3"> 
+  				<xal:button text="B1" /> 
+  				<xal:button text="Wide Button 2" /> 
+  				<xal:button text="Button 3" /> 
+  				<xal:button text="B4" /> 
+  				<xal:button text="Button 5" /> 
+  			</xal:gridPanel>
+  		</xal:window>
+  		
+  		<xal:window title="Three columns, evenlySpaced">
+  			<xal:gridPanel columns="3" evenlySpace="true"> 
+  				<xal:button text="B1" /> 
+  				<xal:button text="Wide Button 2" /> 
+  				<xal:button text="Button 3" /> 
+  				<xal:button text="B4" /> 
+  				<xal:button text="Button 5" /> 
+  			</xal:gridPanel>
+  		</xal:window>
+	</xm:append> 	  		
+  	</xm:modifications>
+</xal>

Added: incubator/xap/trunk/WebContent/examples/widgets/gridPane2.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/gridPane2.xal?view=auto&rev=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/gridPane2.xal (added)
+++ incubator/xap/trunk/WebContent/examples/widgets/gridPane2.xal Thu Jan 11 14:00:18 2007
@@ -0,0 +1,47 @@
+<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:window>
+  		<xal:gridPanel columns="3"> 
+  			<xal:button text="B1" /> 
+  			<xal:button text="Wide Button 2" /> 
+  			<xal:button text="Button 3" /> 
+  			<xal:button text="B4" /> 
+  			<xal:button text="Colspan2, hAlign fill" columnSpan="2" hAlign="fill" />  	
+  		</xal:gridPanel>
+  	</xal:window>
+  	
+  	<xal:window>
+  		<xal:gridPanel columns="3"> 
+  			<xal:button text="B1" /> 
+  			<xal:button text="Colspan2, hAlign fill" columnSpan="2" hAlign="fill" /> 
+  			<xal:button text="Button 3" /> 
+  			<xal:button text="B4" /> 
+  			<xal:button text="Button 5" /> 	
+  		</xal:gridPanel>
+  	</xal:window>
+  	
+  	  <xal:window>
+  		<xal:gridPanel columns="3"> 
+  			<xal:button text="B1" /> 
+  			<xal:button text="Wide Button 2" /> 
+  			<xal:button text="rowspan2, vAlign fill" rowSpan="2" vAlign="fill" /> 
+  			<xal:button text="B4" /> 
+  			<xal:button text="Button 5" /> 
+  		</xal:gridPanel>
+  	</xal:window>
+  
+	</xm:append> 	  		
+  	</xm:modifications>
+</xal>

Added: incubator/xap/trunk/WebContent/examples/widgets/gridPane3.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/gridPane3.xal?view=auto&rev=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/gridPane3.xal (added)
+++ incubator/xap/trunk/WebContent/examples/widgets/gridPane3.xal Thu Jan 11 14:00:18 2007
@@ -0,0 +1,41 @@
+<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">
+	
+	<window xmlns="http://openxal.org/ui">
+  		<gridPanel columns="3"> 
+  			<label text="Dog's Name:" /> 
+ 		 	<textField columnSpan="2" hAlign="fill" /> 
+  			<label text="Breed" /> 
+  			<textField hAlign="fill" /> 
+  			<label text="Categories" hAlign="center" /> 
+  			<label text="Photo:" /> 
+  			<label backgroundColor="red" vGrabSpace="true" hGrabSpace="true" vAlign="fill" hAlign="fill" rowSpan="3" /> 
+			<listBox rowSpan="4" vAlign="fill">
+  				<listItem text="Loudest Bark" /> 
+  				<listItem text="Best of Breed" /> 
+  			</listBox>
+  			<button text="Browse..." /> 
+  			<button text="Delete" /> 
+  			<gridPanel borderColor="black" columns="2" columnSpan="2" borderStyle="solid" borderWidth="1px" caption="Owner Info" hAlign="fill">
+				<label text="Name:" /> 
+				<textField hGrabSpace="true" hAlign="fill" /> 
+				<label text="Phone:" /> 
+				<textField hGrabSpace="true" hAlign="fill" /> 
+  			</gridPanel>
+  			<button text="Enter" columnSpan="3" hAlign="end" /> 
+   		</gridPanel>
+	</window>
+
+	</xm:append> 	  		
+  	</xm:modifications>
+</xal>

Modified: incubator/xap/trunk/WebContent/examples/widgets/index.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/index.html?view=diff&rev=495395&r1=495394&r2=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/index.html (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/index.html Thu Jan 11 14:00:18 2007
@@ -2,42 +2,45 @@
 
 <h2>Component Tests</h2>
 <ul>
-<li><a href="button.html">&lt;button&gt;</a></li>
-<li><a href="label.html">&lt;label&gt;</a></li>
-<li><a href="checkBox.html">&lt;checkBox&gt;</a></li>
-<li><a href="radioButton.html">&lt;radioButton&gt;</a></li>
-<li><a href="combobox.html">&lt;comboBox&gt;</a></li>
-<li><a href="editableCombobox.html">&lt;editableComboBox&gt;</a></li>
-<li><a href="listbox.html">&lt;listbox&gt;</a></li>
-<li><a href="textField.html">&lt;textField&gt;</a></li>
-<li><a href="textArea.html">&lt;textArea&gt;</a></li>
-<li><a href="passwordField.html">&lt;passwordField&gt;</a></li>
-<li><a href="htmlView.html">&lt;htmlView&gt;/&lt;textView&gt;</a></li>
-<li><a href="tabPane.html">&lt;tabPane&gt;</a></li>
-<li><a href="horizontalSplitPane.html">&lt;horizontalSplitPane&gt;</a></li>
-<li><a href="verticalSplitPane.html">&lt;verticalSplitPane&gt;</a></li>
-<li><a href="freePane.html">&lt;freePane&gt;</a></li>
-<li><a href="verticalBoxPane.html">&lt;verticalBoxPane&gt;</a></li>
-<li><a href="horizontalBoxPane.html">&lt;horizontalBoxPane&gt;</a></li>
-<li><a href="borderPane.html">&lt;borderPane&gt;</a></li>
-<li><a href="table.html">&lt;table&gt;</a></li>
-<li><a href="tree.html">&lt;tree&gt;</a></li>
-<li><a href="treeTable.html">&lt;treeTable&gt;</a></li>
-<li><a href="menu.html">&lt;menu&gt;</a></li>
-<li><a href="popupMenu.html">&lt;popupMenu&gt;</a></li>
-<li><a href="tooltip.html">&lt;tooltip&gt;</a></li>
-<li><a href="window.html">&lt;window&gt;</a></li>
-<li><a href="horizontalFlowPane.html">&lt;horizontalFlowPane&gt;</a></li>
-<li><a href="scrollPane.html">&lt;scrollPane&gt;</a></li>
-<li><a href="desktopPane.html">&lt;desktopPane&gt;</a></li>
-<li><a href="verticalToolBar.html">&lt;verticalToolBar&gt;</a></li>
-<li><a href="horizontalToolBar.html">&lt;horizontalToolBar&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=button.xal">&lt;button&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=label.xal">&lt;label&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=link.xal">&lt;link&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=checkBox.xal">&lt;checkBox&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=radioButton.xal">&lt;radioButton&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=combobox.xal">&lt;comboBox&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=editableCombobox.xal">&lt;editableComboBox&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=listbox.xal">&lt;listbox&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=textField.xal">&lt;textField&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=textArea.xal">&lt;textArea&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=passwordField.xal">&lt;passwordField&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=htmlView.xal">&lt;htmlView&gt;/&lt;textView&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=tabPane.xal">&lt;tabPane&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=horizontalSplitPane.xal">&lt;horizontalSplitPane&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=verticalSplitPane.xal">&lt;verticalSplitPane&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=freePane.xal">&lt;freePane&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=verticalBoxPane.xal">&lt;verticalBoxPane&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=horizontalBoxPane.xal">&lt;horizontalBoxPane&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=borderPane.xal">&lt;borderPane&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=table.xal">&lt;table&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=row.xal">&lt;row&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=cell.xal">&lt;cell&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=tree.xal">&lt;tree&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=treeTable.xal">&lt;treeTable&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=menu.xal">&lt;menu&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=popupMenu.xal">&lt;popupMenu&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=tooltip.xal">&lt;tooltip&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=window.xal">&lt;window&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=horizontalFlowPane.xal">&lt;horizontalFlowPane&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=scrollPane.xal">&lt;scrollPane&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=desktopPane.xal">&lt;desktopPane&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=verticalToolBar.xal">&lt;verticalToolBar&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=horizontalToolBar.xal">&lt;horizontalToolBar&gt;</a></li>
 </ul>
 
 <h2>Table</h2>
 <ul>
-<li><a href="tableSorting.html">sorting</a></li>
-<li><a href="rowCycling.html">constant row addition/removal</a></li>
+<li><a href="widget_loader.html?xalFile=tableSorting.xal">sorting</a></li>
+<li><a href="widget_loader.html?xalFile=rowCycling.xal">constant row addition/removal</a></li>
 </ul>
 
 
@@ -45,25 +48,18 @@
 
 <h2>GridPanel</h2>
 <ul>
-<li><a href="gridPanel.html">&lt;gridPanel&gt;</a></li>
-<li><a href="gridPanel2.html">&lt;gridPanel2&gt;</a></li>
-<li><a href="gridPanel3.html">&lt;gridPanel3&gt;</a></li>
-<li><a href="gridPanel4.html">&lt;gridPanel4&gt;</a></li>
-<li><a href="gridPanel5.html">&lt;gridPanel5&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=gridPane.xal">&lt;gridPanel&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=gridPane2.xal">&lt;gridPanel2&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=gridPane3.xal">&lt;gridPanel3&gt;</a></li>
 </ul>
 
 
-<h2>Event Tests</h2>
-<ul>
-<li><a href="freePanelEvents.html">&lt;freePanel&gt;</a></li>
-<li><a href="textFieldEvents.html">&lt;textField&gt;</a></li>
-</ul>
 
 <br>
 <h2>Examples</h2>
 <ul>
-<li><a href="splitPaneExample.html">&lt;splitPane&gt;</a></li>
-<li><a href="verticalPanelExample.html">&lt;verticalPanel&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=splitPaneExample.xal">&lt;splitPane&gt;</a></li>
+<li><a href="widget_loader.html?xalFile=verticalPanelExample.xal">&lt;verticalPanel&gt;</a></li>
 </ul>
 
 </body>

Added: incubator/xap/trunk/WebContent/examples/widgets/link.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/link.xal?view=auto&rev=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/link.xal (added)
+++ incubator/xap/trunk/WebContent/examples/widgets/link.xal Thu Jan 11 14:00:18 2007
@@ -0,0 +1,59 @@
+<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">
+            <freePane width="500px" height="300px" backgroundColor="#F0F0F0" id="testComponentFreePane">
+                <link id="testComponent" text="This is a link."/>
+                <link id="smokeTestCompareButton" x="0px" y="100px" visible="false" text="This is a link." onCommand="mco:attributeSetter.reportEvent(event)"/>
+            </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="imageAttributeTests.xal" xmlns="http://openxal.org/core/xinclude"/>
+                            <label text=" " height="25px"/>
+                            <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 button 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"/>
+                        </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 button for background, foreground, disabled, mouseover, mousedown"/>				
+                        </verticalBoxPane>
+                    </horizontalBoxPane>
+                </verticalBoxPane>
+            </scrollPane>
+        </xm:append> 	  		
+    </xm:modifications>
+</xal>
\ No newline at end of file

Modified: incubator/xap/trunk/WebContent/examples/widgets/listItemSmokeTests0.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/listItemSmokeTests0.xal?view=diff&rev=495395&r1=495394&r2=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/listItemSmokeTests0.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/listItemSmokeTests0.xal Thu Jan 11 14:00:18 2007
@@ -4,4 +4,5 @@
 						    <label autoWrap="true" text="Option should not be selected. Its text is longer than the default text; look for expansion of the component."/>
 							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Insert a new selected option" onCommand="mco:attributeSetter.appendListItem(testComponentListBox,true)" />
 						    <label text="Option should be selected"/>
+							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Insert a new option between 1 and 2" onCommand="macro:insertNode.execute()" />
 						</verticalBoxPane>	

Modified: incubator/xap/trunk/WebContent/examples/widgets/listbox.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/listbox.xal?view=diff&rev=495395&r1=495394&r2=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/listbox.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/listbox.xal Thu Jan 11 14:00:18 2007
@@ -14,6 +14,13 @@
 		src="SmokeTests.js"
 	/>	
 	
+	<macro:macro id="insertNode" xmlns:macro="http://openxal.org/core/macro">
+		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+			<xm:insert-before select="id('testOption2')">
+				<listItem text="Option 1.5" value="Value 1.5"/>
+			</xm:insert-before>
+		</xm:modifications>
+	</macro:macro>
 	
 	<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
 		<xm:append select="/ui">
@@ -68,6 +75,7 @@
 							<label autoWrap="true" text="Option should not be selected. Its text is longer than the default text; look for expansion of the component."/>
 							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Insert a new selected option" onCommand="mco:attributeSetter.appendListItem(testComponent,true)" />
 							<label text="Option should be selected"/>
+							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Insert a new option between 1 and 2" onCommand="macro:insertNode.execute()" />
 						</verticalBoxPane>	
 						<!-- separated so they can be in different columns -->
 						<verticalBoxPane width="500px" xmlns="http://openxal.org/ui">

Modified: incubator/xap/trunk/WebContent/examples/widgets/menu.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/menu.xal?view=diff&rev=495395&r1=495394&r2=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/menu.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/menu.xal Thu Jan 11 14:00:18 2007
@@ -23,7 +23,7 @@
 				<xal:popupMenu>
 					<xal:menuItem text="Cut"/>
 					<xal:menuItem text="Copy" />
-					<xal:horizontalSeparator />
+					<xal:horizontalSeparator  width="10px"/>
 					<xal:menuItem text="Paste"/>
 				</xal:popupMenu>
 			</xal:menu>

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=495395&r1=495394&r2=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/popupMenu.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/popupMenu.xal Thu Jan 11 14:00:18 2007
@@ -34,7 +34,18 @@
 						</xal:popupMenu>
 					</xal:defs>
 					
+					<xal:defs>
+						<xal:popupMenu id="testComponent2">
+						</xal:popupMenu>
+					</xal:defs>
+					
 					<xal:button text="I have a popup" popup="#testComponent"/>
+					
+					<xal:label x="0px" y="40px" text="I have the same popup" popup="#testComponent"/>
+					
+					<xal:checkBox x="0px" y="80px" text="I have a different, empty one" popup="#testComponent2"/>
+					
+					
 				</freePane>	
 			</horizontalBoxPane>
 			<scrollPane width="1100px" height="500px" onCreate="mco:attributeSetter.resizeScrollPane(this, testComponentFreePane)">

Added: incubator/xap/trunk/WebContent/examples/widgets/row.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/row.xal?view=auto&rev=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/row.xal (added)
+++ incubator/xap/trunk/WebContent/examples/widgets/row.xal Thu Jan 11 14:00:18 2007
@@ -0,0 +1,174 @@
+<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"
+	/>	
+	
+	<mco:mco 
+		xmlns:mco="http://openxal.org/core/mco" 
+		id="tableMco" 
+		class="TableMco"
+		src="TableMco.js"
+	/>
+	<macro:macro id="addRow" 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>
+			</xm:append>
+		</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="intoBranch" xmlns:macro="http://openxal.org/core/macro">
+		<xm:modifications xmlns:xm="http://openxal.org/core/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="removeAllRows" xmlns:macro="http://openxal.org/core/macro">
+		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+			<xm:remove-element select="//row"/> 
+		</xm:modifications>
+	</macro:macro>
+
+	<macro:macro id="removeBranch" xmlns:macro="http://openxal.org/core/macro">
+		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+			<xm:remove-element select="id('myBranch')"/>
+		</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">
+		<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>
+						<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://openxal.org/core/xmodify">
+		<xm:append select="/ui">
+			<horizontalBoxPane>
+				<freePane width="500px" height="300px" backgroundColor="#EEEEFF" id="testComponentFreePane">	
+					<table>
+						<column id="column1"><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 id="testComponent">
+							<cell text="testComponent"/><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"/>
+							<horizontalBoxPane width="500px">
+								<label width="100px" text="selected:"/>
+								<radioButton group="selected" width="75px" text="true" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+								<radioButton group="selected" width="75px" text="false" onSelect="mco:attributeSetter.setAttribute(testComponent, this.group ,this.text)"/>
+								<radioButton group="selected" width="75px" text="(none)" onSelect="mco:attributeSetter.removeAttribute(testComponent, this.group)"/>
+							</horizontalBoxPane>			
+						</verticalBoxPane>
+						<!--standard test things -->		
+						<include href="standardButtons.xal" xmlns="http://openxal.org/core/xinclude"/>
+					</horizontalBoxPane>
+					<horizontalBoxPane>
+						<verticalBoxPane>
+						<include href="tableSmokeTests0.xal" xmlns="http://openxal.org/core/xinclude"/>
+						<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Add Widget Cells" 
+							onCommand="macro:addWidgetCells.execute()" />
+						<label width="500px" autoWrap="true" text="Cells can be replaced by various widgets. This will put those widgets into 3 rows"/>
+							
+						</verticalBoxPane>
+						<include href="tableSmokeTests1.xal" xmlns="http://openxal.org/core/xinclude"/>
+					</horizontalBoxPane>
+				</verticalBoxPane>
+			</scrollPane>
+		</xm:append> 	  		
+	</xm:modifications>
+
+</xal>
\ No newline at end of file

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=495395&r1=495394&r2=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal Thu Jan 11 14:00:18 2007
@@ -89,12 +89,6 @@
 		<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>
@@ -109,7 +103,7 @@
 				<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)"/>
+				<label text="Value: " width="75px"/><textField id="attributeValue"/>
 			</horizontalBoxPane>
 		</verticalBoxPane>
 		<button text="Go!" onCommand="mco:attributeSetter.setAttribute(testComponent, attributeName.text, attributeValue.text)" width="50px" height="45px"/>
@@ -118,7 +112,7 @@
 	<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)"/>
+		<textField id="codeSnippet" width="200px"/>
 		<button text="Go!" onCommand="mco:attributeSetter.evalCode(codeSnippet.text)" width="50px" height="22px"/>
 	</horizontalBoxPane>
 

Added: incubator/xap/trunk/WebContent/examples/widgets/tabPane2.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/tabPane2.xal?view=auto&rev=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/tabPane2.xal (added)
+++ incubator/xap/trunk/WebContent/examples/widgets/tabPane2.xal Thu Jan 11 14:00:18 2007
@@ -0,0 +1,16 @@
+<xal xmlns="http://openxal.org/ui/html">
+    
+    <verticalBoxPane width="600px" height="600px" borderWidth="1px" borderColor="blue" borderStyle="solid">
+        <tabPane width="500px" height="500px" borderColor="red" borderStyle="solid">
+            <tab text="First" width="400px" height="400px">
+                <label text="first label"/>    
+            </tab>
+            <tab text="Second" width="400px" height="400px">   
+                <label text="second label"/>  
+            </tab>
+            <tab text="Third" width="400px" height="400px"> 
+                <label text="third label"/>
+            </tab>  
+        </tabPane>
+    </verticalBoxPane>
+</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=495395&r1=495394&r2=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/table.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/table.xal Thu Jan 11 14:00:18 2007
@@ -1,217 +1,220 @@
-<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"
-	/>	
-	
-	<mco:mco 
-		xmlns:mco="http://openxal.org/core/mco" 
-		id="tableMco" 
-		class="TableMco"
-		src="TableMco.js"
-	/>
-	<macro:macro id="addRow" xmlns:macro="http://openxal.org/core/macro">
-		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
-			<xm:append select="id('testComponent')">
+<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"
+	/>	
+	
+	<mco:mco 
+		xmlns:mco="http://openxal.org/core/mco" 
+		id="tableMco" 
+		class="TableMco"
+		src="TableMco.js"
+	/>
+	<macro:macro id="addRow" 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>
+			</xm:append>
+		</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')">
+				<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://openxal.org/core/macro">
+		<xm:modifications xmlns:xm="http://openxal.org/core/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://openxal.org/core/macro">
+		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+			<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="//row"/> 
+		</xm:modifications>
+	</macro:macro>
+
+	<macro:macro id="removeBranch" xmlns:macro="http://openxal.org/core/macro">
+		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+			<xm:remove-element select="id('myBranch')"/>
+		</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">
+		<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>
+						<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>
+	
+	
+	<macro:macro id="addWidgetCells" 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>
-			</xm:append>
-		</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')">
-				<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://openxal.org/core/macro">
-		<xm:modifications xmlns:xm="http://openxal.org/core/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://openxal.org/core/macro">
-		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
-			<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="//row"/> 
-		</xm:modifications>
-	</macro:macro>
-
-	<macro:macro id="removeBranch" xmlns:macro="http://openxal.org/core/macro">
-		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
-			<xm:remove-element select="id('myBranch')"/>
-		</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">
-		<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>
-						<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://openxal.org/core/xmodify">
-		<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 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>
-
+					<label text="label" id="widgetCellLabel"/>
+					<button text="button" id="widgetCellButton"/>
+					<checkBox text="checkBox" id="widgetCellCheckbox"/>
+				</row>
+				<row>
+					<radioButton text="radioButton" id="widgetCellRadioButton"/>
+					<textField text="textField" id="widgetCellTextField"/>
+					<passwordField text="passwordField" id="widgetCellPasswordField"/>
+				</row>
+				<row>
+					<comboBox height="25px" text="ComboBox" width="200px">
+						<listBox>
+							<listItem text="listItem #1"/>
+							<listItem text="comboBox" selected="true"/>
+							<listItem text="listItem #3"/>
+						</listBox>
+					</comboBox>
+					<label text="label"/>
+					<label text="label"/>
+				</row>
+				
+			</xm:append>
+		</xm:modifications>		
+		
+	</macro:macro>
+	
+	
+	<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
+		<xm:append select="/ui">
+			<horizontalBoxPane>
+				<freePane width="500px" height="300px" backgroundColor="#EEEEFF" id="testComponentFreePane">	
+					<table id="testComponent">
+						<column id="column1"><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 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>
+						<include href="tableSmokeTests0.xal" xmlns="http://openxal.org/core/xinclude"/>
+						<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Add Widget Cells" 
+							onCommand="macro:addWidgetCells.execute()" />
+						<label width="500px" autoWrap="true" text="Cells can be replaced by various widgets. This will put those widgets into 3 rows"/>
+							
+						</verticalBoxPane>
+						<include href="tableSmokeTests1.xal" xmlns="http://openxal.org/core/xinclude"/>
+					</horizontalBoxPane>
+				</verticalBoxPane>
+			</scrollPane>
+		</xm:append> 	  		
+	</xm:modifications>
+
 </xal>

Propchange: incubator/xap/trunk/WebContent/examples/widgets/table.xal
            ('svn:eol-style' removed)

Added: incubator/xap/trunk/WebContent/examples/widgets/tableSmokeTests0.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/tableSmokeTests0.xal?view=auto&rev=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/tableSmokeTests0.xal (added)
+++ incubator/xap/trunk/WebContent/examples/widgets/tableSmokeTests0.xal Thu Jan 11 14:00:18 2007
@@ -0,0 +1,21 @@
+						<verticalBoxPane width="500px" xmlns="http://openxal.org/ui">
+						    <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()" />
+						    <label width="500px" autoWrap="true" text="New row should be a child of the 'depth 2a' row"/>
+						</verticalBoxPane>
\ No newline at end of file

Added: incubator/xap/trunk/WebContent/examples/widgets/tableSmokeTests1.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/tableSmokeTests1.xal?view=auto&rev=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/tableSmokeTests1.xal (added)
+++ incubator/xap/trunk/WebContent/examples/widgets/tableSmokeTests1.xal Thu Jan 11 14:00:18 2007
@@ -0,0 +1,17 @@
+						<verticalBoxPane xmlns="http://openxal.org/ui">
+						    <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>
\ No newline at end of file

Modified: incubator/xap/trunk/WebContent/examples/widgets/tree.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/tree.xal?view=diff&rev=495395&r1=495394&r2=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/tree.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/tree.xal Thu Jan 11 14:00:18 2007
@@ -31,11 +31,21 @@
 		</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')">
-				<column><header text="Column 4"/></column>
-			</xm:insert-after>
 			<xm:append select="id('row1')">
 				<cell text="New Cell"/>
 			</xm:append>
@@ -60,7 +70,7 @@
 	
 	<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>
 	
@@ -76,7 +86,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">
 		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
@@ -121,9 +135,6 @@
 			<horizontalBoxPane>
 				<freePane width="500px" height="300px" backgroundColor="#FFFFFF" id="testComponentFreePane">	
 					<tree 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">
@@ -134,7 +145,7 @@
 							</row>
 						</row>
 						<row id="myRow">
-							<cell text="a"/><cell text="b"/><cell text="c"/>
+							<cell text="x"/><cell text="y"/><cell text="z"/>
 						</row>
 						<row id="row3">
 							<cell text="aaaaaaaaaaaaaaaaaa"/><cell text="bbbbbb"/><cell text="ccccc"/>
@@ -153,37 +164,8 @@
 						<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 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" 
-								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" 
-								onCommand="macro:removeBranch.execute()" />
-							
-							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Add Column" 
-								onCommand="macro:addColumn.execute()" />
-						</verticalBoxPane>
+						<include href="tableSmokeTests0.xal" xmlns="http://openxal.org/core/xinclude"/>
+						<include href="tableSmokeTests1.xal" xmlns="http://openxal.org/core/xinclude"/>
 					</horizontalBoxPane>
 				</verticalBoxPane>
 			</scrollPane>

Modified: incubator/xap/trunk/WebContent/examples/widgets/treeTable.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/treeTable.xal?view=diff&rev=495395&r1=495394&r2=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/treeTable.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/treeTable.xal Thu Jan 11 14:00:18 2007
@@ -31,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')">
@@ -60,7 +73,7 @@
 	
 	<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>
 	
@@ -76,7 +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">
 		<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
@@ -134,7 +151,7 @@
 							</row>
 						</row>
 						<row id="myRow">
-							<cell text="a"/><cell text="b"/><cell text="c"/>
+							<cell text="x"/><cell text="y"/><cell text="z"/>
 						</row>
 						<row id="row3">
 							<cell text="aaaaaaaaaaaaaaaaaa"/><cell text="bbbbbb"/><cell text="ccccc"/>
@@ -153,37 +170,8 @@
 						<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 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" 
-								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" 
-								onCommand="macro:removeBranch.execute()" />
-							
-							<button width="200px" height="25px" horizontalAlign="center" verticalAlign="center" text="Add Column" 
-								onCommand="macro:addColumn.execute()" />
-						</verticalBoxPane>
+						<include href="tableSmokeTests0.xal" xmlns="http://openxal.org/core/xinclude"/>
+						<include href="tableSmokeTests1.xal" xmlns="http://openxal.org/core/xinclude"/>
 					</horizontalBoxPane>
 				</verticalBoxPane>
 			</scrollPane>

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=495395&r1=495394&r2=495395
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/window.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/window.xal Thu Jan 11 14:00:18 2007
@@ -12,10 +12,16 @@
 
 	<xm:modifications xmlns:xm="http://openxal.org/core/xmodify">
 	<xm:append select="/ui">
-	
+
 		<xal:window title="testComponent" id="testComponent">
 			<label text="foo"/>
 		</xal:window>
+
+	
+
+		
+		
+		
 		<xal:window title="No min,max,close or resize" x="200px" resizable="false" minimizable="false" maximizable="false" closable="false"/>
 	<xal:window title="A window" minimized="true">
 		<xal:borderPane backgroundColor="green">



Mime
View raw message