incubator-xap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmarga...@apache.org
Subject svn commit: r467824 [1/2] - /incubator/xap/trunk/WebContent/examples/widgets/
Date Thu, 26 Oct 2006 00:46:50 GMT
Author: jmargaris
Date: Wed Oct 25 17:46:48 2006
New Revision: 467824

URL: http://svn.apache.org/viewvc?view=rev&rev=467824
Log:
Updated widget tests with horizontal layout, and events, contributed by Trevor Oldak in issue XAP-18.
See http://issues.apache.org/jira/browse/XAP-18 for details.

Added:
    incubator/xap/trunk/WebContent/examples/widgets/buttonComparison.xal
Modified:
    incubator/xap/trunk/WebContent/examples/widgets/AttributeTester.js
    incubator/xap/trunk/WebContent/examples/widgets/borderPanel.xal
    incubator/xap/trunk/WebContent/examples/widgets/button.xal
    incubator/xap/trunk/WebContent/examples/widgets/checkBox.xal
    incubator/xap/trunk/WebContent/examples/widgets/combobox.xal
    incubator/xap/trunk/WebContent/examples/widgets/complexExample.xal
    incubator/xap/trunk/WebContent/examples/widgets/freePanel.xal
    incubator/xap/trunk/WebContent/examples/widgets/horizontalFlowPane.xal
    incubator/xap/trunk/WebContent/examples/widgets/horizontalPanel.xal
    incubator/xap/trunk/WebContent/examples/widgets/label.xal
    incubator/xap/trunk/WebContent/examples/widgets/menu.xal
    incubator/xap/trunk/WebContent/examples/widgets/passwordField.xal
    incubator/xap/trunk/WebContent/examples/widgets/radioButton.xal
    incubator/xap/trunk/WebContent/examples/widgets/scrollPane.xal
    incubator/xap/trunk/WebContent/examples/widgets/splitPane.xal
    incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.html
    incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.xal
    incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal
    incubator/xap/trunk/WebContent/examples/widgets/tabPane.html
    incubator/xap/trunk/WebContent/examples/widgets/tabPane.xal
    incubator/xap/trunk/WebContent/examples/widgets/table.xal
    incubator/xap/trunk/WebContent/examples/widgets/textArea.html
    incubator/xap/trunk/WebContent/examples/widgets/textArea.xal
    incubator/xap/trunk/WebContent/examples/widgets/textField.xal
    incubator/xap/trunk/WebContent/examples/widgets/tooltip.xal
    incubator/xap/trunk/WebContent/examples/widgets/verticalPanel.xal
    incubator/xap/trunk/WebContent/examples/widgets/verticalPanelExample.xal
    incubator/xap/trunk/WebContent/examples/widgets/window.xal

Modified: incubator/xap/trunk/WebContent/examples/widgets/AttributeTester.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/AttributeTester.js?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/AttributeTester.js (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/AttributeTester.js Wed Oct 25 17:46:48 2006
@@ -21,30 +21,27 @@
 	this.log(event.toString());
 }
 
+
 AttributeTester.prototype.log = function(text){
 	if (!this._logDiv){
 		var l = document.createElement('div');
 		l.style.position = 'absolute';
 	    l.style.right = '5px';
 	    l.style.top = '5px';
-	    l.style.width = '350px';
+	    l.style.width = '200px';
 	    l.style.height = '350px';
 	    l.style.overflow = 'auto';
 	    l.style.backgroundColor = '#f0f0f0';
 	    l.style.border = '1px solid gray';
 	    l.style.fontSize = '10px';
-//	    l.style.fontWeight = 'bold';	    
 	    l.style.padding = '5px';
 	    document.body.appendChild(l);
 	    this._logDiv = l;
-		dojo.event.connect(this._logDiv, "ondblclick",this,"clearLog");	  	    
-	    this._logDiv.innerHTML="[Double-click to clear.]<br/><br/>" ; 
 	}
 	
 	text = text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 	text = text.replace(/\n/g,'<br>');
-	this._logDiv.innerHTML = this._logDiv.innerHTML.replace(/<[\/]*b>/g,"") +
-		 "<br/><br/><b>" + text+"</b>";
+	this._logDiv.innerHTML = this._logDiv.innerHTML + "<br><br>" + text;
 	if (this._logDiv.innerHTML.length>5000){
       	this._logDiv.innerHTML = this._logDiv.innerHTML.substring(this._logDiv.innerHTML.length-5000);
 	}
@@ -52,12 +49,6 @@
 	
 }
 
-AttributeTester.prototype.clearLog = function(){
-	if (this._logDiv){
-		this._logDiv.innerHTML = "" ;	
-	}
-}
-
 //IMPORTANT this works if you remove the same thing twice,
 //no error. BEcause we still found element in hashtable?
 AttributeTester.prototype.insertBefore = function( element ){
@@ -87,6 +78,17 @@
 	newElement.setAttribute("borderPosition", borderPosition);
 	newElement.setAttribute("width","30px");
 	newElement.setAttribute("height","30px");
+	newElement.setAttribute("id", borderPosition);
 	parent.appendChild(newElement);
 	alert("New dom node = " + parent.toXml());
+}
+
+AttributeTester.prototype.appendListItem = function(element) {
+	alert("append");
+	var newElement = element.getOwnerDocument().createElement("listItem", null, "http://www.dojotoolkit.org/");
+	newElement.setAttribute("text", "NEW INSERT");
+	newElement.setAttribute("value","NEW VALUE");
+	newElement.setAttribute("selected", "true");
+	element.appendChild(newElement);
+	alert("New dom node = " + element.toXml());
 }

Modified: incubator/xap/trunk/WebContent/examples/widgets/borderPanel.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/borderPanel.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/borderPanel.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/borderPanel.xal Wed Oct 25 17:46:48 2006
@@ -11,17 +11,10 @@
 
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
-	
-		<xal:borderPanel width="200px" height="200px" backgroundColor="black"
-		id="testComponent" orientation="horizontal">
-			<xal:freePanel backgroundColor="red" width="20px" height="20px" id="north" borderPosition="north"/>
-			<xal:freePanel backgroundColor="green" width="20px" height="20px"  id="south" borderPosition="south"/>
-			<xal:freePanel backgroundColor="blue" width="20px" height="20px"  id="east" borderPosition="east"/>
-			<xal:freePanel backgroundColor="yellow" width="20px" height="20px" id="west" borderPosition="west"/>
-			<xal:freePanel backgroundColor="orange" width="20px" height="20px"  id="center" borderPosition="center"/>
-		</xal:borderPanel>
-		
+		<horizontalPanel>
+
 		
+		<verticalPanel>
 		<xal:button width="200px" height="25px" 
 			text="remove north"
 			onCommand="mco:attributeSetter.remove(north)"/>
@@ -62,11 +55,30 @@
 			text="add center"
 			onCommand="mco:attributeSetter.addBorderComponent(testComponent, 'center')"/>
 		
-
+		</verticalPanel>
 		<!--standard test things -->
-		
+		<verticalPanel>
 		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-
+		</verticalPanel>
+			<xal:borderPanel width="200px" height="200px" backgroundColor="black"
+				id="testComponent" orientation="horizontal">
+				<xal:freePanel backgroundColor="red" width="20px" height="20px" id="north" borderPosition="north">
+					<label text="foo" x="0" y="0"/>
+				</xal:freePanel>
+				<xal:freePanel backgroundColor="green" width="20px" height="20px"  id="south" borderPosition="south">
+					<label text="foo" x="0" y="0"/>
+				</xal:freePanel>
+				<xal:freePanel backgroundColor="blue" width="20px" height="20px"  id="east" borderPosition="east">
+					<label text="foo" x="0" y="0"/>
+				</xal:freePanel>
+				<xal:freePanel backgroundColor="yellow" width="20px" height="20px" id="west" borderPosition="west">
+					<label text="foo" x="0" y="0"/>
+				</xal:freePanel>
+				<xal:freePanel backgroundColor="orange" width="20px" height="20px"  id="center" borderPosition="center">
+					<label text="foo" x="0" y="0"/>
+				</xal:freePanel>
+			</xal:borderPanel>
+		</horizontalPanel>
 	</xm:append> 	  		
   	</xm:modifications>
 </xal>

Modified: incubator/xap/trunk/WebContent/examples/widgets/button.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/button.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/button.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/button.xal Wed Oct 25 17:46:48 2006
@@ -1,120 +1,99 @@
-<xal xmlns="http://www.openxal.org/xal" xmlns:xal="http://www.openxal.org/xal"> 
-
-
+<xal xmlns="http://www.openxal.org/xal" xmlns:xm="http://www.openxal.org/xmodify" xmlns:xal="http://www.openxal.org/xal"> 
+	
+	
 	<mco:mco 
 		xmlns:mco="http://www.openxal.org/mco" 
 		id="attributeSetter" 
 		src="AttributeTester"
 	/>
-
-
-
-	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
-	<xm:append select="/xal">
+	<macro:macro id="createNodes" xmlns:macro="http://www.openxal.org/macro">
+		<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
+			<xm:append select="id('macroButtons')">
+				<include href="buttonComparison.xal" xmlns="http://www.openxal.org/xinclude"/>
+			</xm:append>
+		</xm:modifications>
+	</macro:macro>
+	<macro:macro id="setNodeAttributes" xmlns:macro="http://www.openxal.org/macro">
+		<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
+			<xm:set-attribute select="id('borderButton')">
+				<xm:attribute name="borderWidth" value="10px" />
+			</xm:set-attribute>
+			<xm:set-attribute select="id('disableButton')">
+				<xm:attribute name="disabled" value="true" />
+			</xm:set-attribute>
+		</xm:modifications>
+	</macro:macro>
 	
-
 	
-
-	  <button id="testComponent" width="300px" height="100px" text="Belly Button" onCommand="mco:attributeSetter.reportEvent(event)"/>
-		
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hello World!" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hello World!!!')" />
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hear me roar!" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hear me roar!!!')" />		 
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = top" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'top')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = bottom" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'bottom')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = left" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'left')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = center" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'center')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = right" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'right')" />
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = top" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'top')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = center" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'center')" />	
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = bottom" 
-		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'bottom')" />
-		 
-		 
-		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-		 
-		 
-		 
-		
-		<!--
-	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="top" />		
-	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-		
-		
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-	
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" />	  
-		<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-		
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" />		
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />
-		
-		
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-		
-		
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" />	
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" />		
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter"/>		
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right"/>
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left"/>	
-		
-		-->
-		
-	</xm:append> 	  		
-  	</xm:modifications>
+	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
+		<xm:append select="/xal">
+			
+			<horizontalPanel>
+				
+				
+				
+				<verticalPanel>
+					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="Hello World!" 
+						onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hello World!!!')" />
+					
+					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="Hear me roar!" 
+						onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hear me roar!!!')" />		 
+					
+					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = top" 
+						onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'top')" />	
+					
+					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="textPlacementVertical = bottom" 
+						onCommand="mco:attributeSetter.setAttribute(testComponent, 'textPlacementVertical', 'bottom')" />	
+					
+					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = left" 
+						onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'left')" />	
+					
+					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = center" 
+						onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'center')" />	
+					
+					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="alignHorizontal = right" 
+						onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignHorizontal', 'right')" />
+					
+					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="alignVertical = top" 
+						onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'top')" />	
+					
+					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="alignVertical = center" 
+						onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'center')" />	
+					
+					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="alignVertical = bottom" 
+						onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'bottom')" />
+					
+					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="disabled: true" 
+						onCommand="mco:attributeSetter.setAttribute(testComponent, 'disabled', 'true')" />
+					
+					<button width="200px" height="25px" alignHorizontal="center" alignVertical="center" text="disabled: false" 
+						onCommand="mco:attributeSetter.setAttribute(testComponent, 'disabled', 'false')" />
+				</verticalPanel>		 
+				<verticalPanel>
+					<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
+				</verticalPanel>
+				<button id="testComponent" width="300px" height="100px" text="Belly Button" onCommand="mco:attributeSetter.reportEvent(event)" onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)" onKeyChar="mco:attributeSetter.reportEvent(event)" onKeyDown="mco:attributeSetter.reportEvent(event)" onKeyUp="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)" onMouseDrag="mco:attributeSetter.reportEvent(event)" onMouseMove="mco:attributeSetter.reportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMouseOver="mco:attributeSetter.reportEvent(event)" onMouse
 Up="mco:attributeSetter.reportEvent(event)"/>
+				<verticalPanel id="testButtons">
+					<verticalPanel>
+						<label  width="150px" height="20px" text="Loaded"/>
+						<include href="buttonComparison.xal" xmlns="http://www.openxal.org/xinclude"/> 
+					</verticalPanel>
+					<verticalPanel id="macroButtons">
+						<label width="150px" height="20px"  text="Created through macro" onCreate="macro:createNodes.execute()"/>
+					</verticalPanel>
+					<verticalPanel>
+						<label width="150px" height="20px"  text="Set through macro"/>
+						<verticalPanel xmlns="http://www.openxal.org/xal" width="200">	
+							<button text="border 10" id="borderButton"/>
+							<button text="disabled" id="disableButton" onCreate="macro:setNodeAttributes.execute()"/>
+						</verticalPanel>
+					</verticalPanel>
+				</verticalPanel>
+				
+				
+				
+			</horizontalPanel>
+			
+		</xm:append> 	  		
+	</xm:modifications>
 </xal>

Added: incubator/xap/trunk/WebContent/examples/widgets/buttonComparison.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/buttonComparison.xal?view=auto&rev=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/buttonComparison.xal (added)
+++ incubator/xap/trunk/WebContent/examples/widgets/buttonComparison.xal Wed Oct 25 17:46:48 2006
@@ -0,0 +1,4 @@
+<verticalPanel xmlns="http://www.openxal.org/xal" width="200">	
+	<button text="border 10" borderWidth="10px"/>
+	<button text="disabled" disabled="true"/>
+</verticalPanel>
\ No newline at end of file

Modified: incubator/xap/trunk/WebContent/examples/widgets/checkBox.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/checkBox.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/checkBox.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/checkBox.xal Wed Oct 25 17:46:48 2006
@@ -12,11 +12,10 @@
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
 	
-
+<horizontalPanel>
 	
 
-	  <checkBox id="testComponent" width="300px" height="100px" text="My Checkbox" onStateChange="mco:attributeSetter.reportEvent(event)" />
-		
+	 		<verticalPanel>
 
 		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hello World!" 
 		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hello World!!!')" />
@@ -54,71 +53,12 @@
 		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = bottom" 
 		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'bottom')" />
 		 
-		 
+		 </verticalPanel>
+		 <verticalPanel>
 		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-		 
-		
-		<!--
-	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="top" />		
-	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-		
-		
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-	
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" />	  
-		<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-		
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" />		
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />
-		
-		
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-		
-		
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" />	
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" />		
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter"/>		
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right"/>
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left"/>	
-		
-		-->
-		
+		</verticalPanel>
+	<verticalPanel><checkBox id="testComponent" width="300px" height="100px" text="My Checkbox" onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onCommand="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)" onKeyChar="mco:attributeSetter.reportEvent(event)" onKeyDown="mco:attributeSetter.reportEvent(event)" onKeyUp="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)" onMouseDrag="mco:attributeSetter.reportEvent(event)" onMouseMove="mco:attributeSetter.reportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMouseOver="mco:attributeSetter.reportEvent(ev
 ent)" onMouseUp="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" onStateChange="mco:attributeSetter.reportEvent(event)"/></verticalPanel>
+</horizontalPanel>
 	</xm:append> 	  		
   	</xm:modifications>
 </xal>

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=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/combobox.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/combobox.xal Wed Oct 25 17:46:48 2006
@@ -11,19 +11,34 @@
 
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
-	
-
-	  <comboBox id="testComponent" selectionMode="singleRow"  height="100px" onTextChange="mco:attributeSetter.reportEvent(event)">
-		  <listBox id="testComponentListBox" selectionMode="singleRow"  color="#ccccff" width="300px" fontWeight="bold" fontSize="24px" >
-				<listItem text="Option 1" value="Value 1"/>
+	<horizontalPanel>
+		<verticalPanel>
+		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Remove Option 2 of ListBox via XAL DOM" 
+		 onCommand="mco:attributeSetter.remove(testOption2)" />
+		 
+		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Insert a NEW Option" 
+		 onCommand="mco:attributeSetter.appendListItem(testComponentListBox)" />	
+		 
+		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Multiselect" 
+		 onCommand="mco:attributeSetter.setAttribute(testOption1, 'selected', 'true')" />		 		 
+		 </verticalPanel>
+		 <verticalPanel>
+		<!--standard test things -->
+		
+		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
+		</verticalPanel>
+		<verticalPanel>
+			<comboBox id="testComponent" selectionMode="singleRow"  height="100px" 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)" onEdit="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:a
 ttributeSetter.reportEvent(event)" onMouseUp="mco:attributeSetter.reportEvent(event)" onTextChange="mco:attributeSetter.reportEvent(event)">
+				<listBox  id="testComponentListBox" selectionMode="singleRow"  color="#ccccff" width="300px" fontWeight="bold" fontSize="24px" 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)" onPositionChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)"
  onStateChange="mco:attributeSetter.reportEvent(event)">
+					<listItem text="Option 1" value="Value 1" 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)" onMouseUp="mco:attributeSetter.reportEvent(event)"/>
 				<listItem text="Option 2" value="Value 2" selected="true"/>
 				<listItem text="Option 3" value="Value 3"/>					
 			</listBox>
 		</comboBox>
 		
-
-		<listBox id="blahblah" color="green" fontWeight="bold" fontSize="16px" selectionMode="multiRow" onStateChange="mco:attributeSetter.reportEvent(event)">
-			<listItem text="Option 1" value="Value 1"/>
+		
+		<listBox id="blahblah" color="green" fontWeight="bold" fontSize="16px" selectionMode="multiRow" 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)" onPositionChange="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" onStateChange="mco:attributeSett
 er.reportEvent(event)">
+			<listItem id="testOption1" text="Option 1" value="Value 1"/>
 			<listItem id="testOption2" text="Option 2" value="Value 2"/>
 			<listItem id="testOption3" text="Option 3" value="Value 3" selected="true"/>
 		</listBox>
@@ -31,24 +46,9 @@
 		<listBox id="googoo" selectionMode="singleRow">
 			<listItem text="NO EVENTS ONLY SINGLE ROW SELECT" value="SINGLE ROW"/>
 			<listItem text="NO EVENTS ONLY SINGLE ROW SELECT" value="SINGLE ROW"/>			
-		</listBox>		
-		
-
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Print" 
-		 onCommand="mco:attributeSetter.printElement(testComponent)" />
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Remove Option 2 of ListBox via XAL DOM" 
-		 onCommand="mco:attributeSetter.remove(testOption2)" />
-		 
-		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Insert a NEW Option" 
-		 onCommand="mco:attributeSetter.append(testComponentListBox)" />		 		 
-		 
-		 
-		<!--standard test things -->
-		
-		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-
-		
+		</listBox>	
+		</verticalPanel>
+		</horizontalPanel>
 	</xm:append> 	  		
   	</xm:modifications>
 </xal>

Modified: incubator/xap/trunk/WebContent/examples/widgets/complexExample.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/complexExample.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/complexExample.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/complexExample.xal Wed Oct 25 17:46:48 2006
@@ -16,16 +16,11 @@
 			<xal:freePanel width="100%" height="100px" backgroundColor="red" borderPosition="north"/>
 
 			<xal:splitPane>
-			    <xal:top>
-					<xal:freePanel backgroundColor="yellow"/>
-				</xal:top>
-				
-				<xal:bottom>
-					<xal:tabPane>
-						<xal:tab text="Package Explorer"/>
-						<xal:tab text="JUnit"/>
-					</xal:tabPane>
-				</xal:bottom>
+				<xal:freePanel backgroundColor="yellow"/>
+				<xal:tabPane>
+					<xal:tab text="Package Explorer"/>
+					<xal:tab text="JUnit"/>
+				</xal:tabPane>
 			</xal:splitPane>
 			<xal:freePanel width="100%" height="100px" backgroundColor="green" borderPosition="south"/>
 

Modified: incubator/xap/trunk/WebContent/examples/widgets/freePanel.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/freePanel.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/freePanel.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/freePanel.xal Wed Oct 25 17:46:48 2006
@@ -12,18 +12,19 @@
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
 	
-		<xal:freePanel width="200px" height="200px" backgroundColor="black"
-		id="testComponent" orientation="horizontal">
-			<xal:freePanel width="100px" height="100px" backgroundColor="red"/>
-			<xal:freePanel width="100px" height="100px" x="100px" backgroundColor="green"/>
-			<xal:freePanel y="100px" height="50%" width="100%" backgroundColor="blue"/>
-		</xal:freePanel>
-		
-
+		<horizontalPanel>
+			<verticalPanel>
+				<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>	
+			</verticalPanel>
+			<xal:freePanel width="200px" height="200px" backgroundColor="black"
+				id="testComponent" orientation="horizontal">
+				<xal:freePanel width="100px" height="100px" backgroundColor="red"><label text="panel 1"/></xal:freePanel>
+				<xal:freePanel width="100px" height="100px" x="100px" backgroundColor="green"><button text="my Button"/></xal:freePanel>
+				<xal:freePanel y="100px" height="50%" width="100%" backgroundColor="blue"><checkBox text="my Checkbox"/></xal:freePanel>
+			</xal:freePanel>
+			
+		</horizontalPanel>
 		<!--standard test things -->
-		
-				
-		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
 
 	</xm:append> 	  		
   	</xm:modifications>

Modified: incubator/xap/trunk/WebContent/examples/widgets/horizontalFlowPane.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/horizontalFlowPane.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/horizontalFlowPane.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/horizontalFlowPane.xal Wed Oct 25 17:46:48 2006
@@ -1,42 +1,100 @@
-<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 xmlns="http://www.openxal.org/xal" xmlns:xal="http://www.openxal.org/xal"
+	xmlns:xm="http://www.openxal.org/xmodify">
 	
-		<xal:splitPane width="400px" height="400px">
-			<xal:top>
-			<xal:horizontalFlowPane width="200px" height="200px" backgroundColor="black"
-			id="testComponent">
-				<xal:freePanel width="100px" height="100px" backgroundColor="red"/>
-				<xal:freePanel width="100px" height="100px" x="100px" backgroundColor="green"/>
-				<xal:freePanel y="100px" width="100px" height="100px" backgroundColor="blue"/>
-			</xal:horizontalFlowPane>
-			</xal:top>
-			
-			<xal:bottom>
-			<xal:horizontalFlowPane width="200px" height="200px" backgroundColor="black">
-				<xal:freePanel width="100px" height="100px" backgroundColor="red"/>
-				<xal:freePanel width="100px" height="100px" x="100px" backgroundColor="green"/>
-				<xal:freePanel y="100px" width="100px" height="100px" backgroundColor="blue"/>
-			</xal:horizontalFlowPane>
-			</xal:bottom>
-		</xal:splitPane>
+	
+	<mco:mco xmlns:mco="http://www.openxal.org/mco" id="attributeSetter" src="AttributeTester"/>
+	
+	
+	<!-- Page title -->
+	<xm:modifications document="html">
 		
-
-		<!--standard test things -->
+		<!-- 
+			All of the below seem to to change the HTML DOM, but
+			window doesn't seem to find out about it - a web search 
+			indicates that title setting just doesn't work using direct 
+			manipulation of	the DOM...
+		-->
 		
-				
-		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-
-	</xm:append> 	  		
-  	</xm:modifications>
+		<!--  Don't use 'replace' in case there's no title to start-with: -->
+		<!--  xm:remove-element select="//HTML/HEAD/TITLE"/ -->
+		<!--  xm:append select="//HTML/HEAD">
+			<title>Text area testt:</title>
+			</xm:append  -->
+		<!--  xm:replace select="//HTML/HEAD/TITLE">
+			<title>Text area testttt:</title>
+			</xm:replace -->
+		
+		<xm:append select="//HTML/HEAD">
+			<script> document.title="Text area tests:";</script>
+		</xm:append>
+		<!--  
+			Anybody know a way of forcing (in effect)
+			an invalidation that would make the window
+			look again to the DOM?
+		-->
+		
+	</xm:modifications>
+	
+	<xm:modifications>
+		<xm: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/horizontalPanel.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/horizontalPanel.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/horizontalPanel.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/horizontalPanel.xal Wed Oct 25 17:46:48 2006
@@ -11,15 +11,9 @@
 
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
-	
-		<xal:horizontalPanel width="200px" height="200px" backgroundColor="black"
-		id="testComponent">
-			<xal:freePanel width="20px" height="100px" backgroundColor="red"/>
-			<xal:freePanel width="20px" height="100px" backgroundColor="green" id="referenceComponent"/>
-			<xal:freePanel width="20px" height="100px" backgroundColor="blue"/>
-		</xal:horizontalPanel>
+		<horizontalPanel>
 		
-
+		<verticalPanel>
 		<!-- container tests -->
 		<xal:button width="200px" height="25px" 
 			text="pack -> end"
@@ -59,21 +53,38 @@
 
 		<!-- container tests -->
 		<xal:button width="200px" height="25px" 
-			text="insert before"
+			text="insert before green"
 			onCommand="mco:attributeSetter.insertBefore(referenceComponent)"/>
 
 		<xal:button width="200px" height="25px" 
-			text="remove"
+			text="remove green"
 			onCommand="mco:attributeSetter.remove(referenceComponent)"/>
-
-
+		</verticalPanel>
 
 
 		
 		<!--standard test things -->
 		
-				
+		<verticalPanel>	
 		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
+		</verticalPanel>
+		
+			<xal:horizontalPanel width="200px" height="200px" backgroundColor="black"
+				id="testComponent">
+				<xal:freePanel width="20px" height="100px" backgroundColor="red">
+					<label text="foo" x="0" y="0" />
+				</xal:freePanel>
+				<xal:freePanel width="20px" height="100px" backgroundColor="green" id="referenceComponent">
+					<label text="foo" x="0" y="0" />
+				</xal:freePanel>
+				<xal:freePanel width="20px" height="100px" backgroundColor="blue">
+					<label text="foo" x="0" y="0" />
+				</xal:freePanel>
+			</xal:horizontalPanel>
+		
+		
+		
+		</horizontalPanel>
 
 	</xm:append> 	  		
   	</xm:modifications>

Modified: incubator/xap/trunk/WebContent/examples/widgets/label.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/label.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/label.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/label.xal Wed Oct 25 17:46:48 2006
@@ -11,13 +11,10 @@
 
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
-	
-
-	
-
-	  <label id="testComponent" width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="MY PRECIOUS LABEL" textPlacementHorizontal="right" textPlacementVertical="top" />
-		
+	<horizontalPanel>
 
+			
+		<verticalPanel>
 		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hello World!" 
 		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hello World!!!')" />
 		 
@@ -49,79 +46,22 @@
 		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'bottom')" />
 		 
 		 
-		 
 		<!-- button specific properties -->
+		
 		<button width="200px" height="25px" 
 			text="text -> 'some new text'"
 			onCommand="mco:attributeSetter.setAttribute(testComponent,
 				'text','some new text')"/>
-				
+		</verticalPanel>			
 		<!--standard test things -->
 		
-		
+		<verticalPanel>
 		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
+		 </verticalPanel>
 		 
+		<label id="testComponent" width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="MY PRECIOUS LABEL" textPlacementHorizontal="right" textPlacementVertical="top" onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)" onKeyChar="mco:attributeSetter.reportEvent(event)" onKeyDown="mco:attributeSetter.reportEvent(event)" onKeyUp="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)" onMouseDrag="mco:attributeSetter.reportEvent(event)" onMouseMove="mco:attributeSetter.reportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMo
 useOver="mco:attributeSetter.reportEvent(event)" onMouseUp="mco:attributeSetter.reportEvent(event)"/>
 		
-		<!--
-	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="top" />		
-	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-		
-		
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-	
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" />	  
-		<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-		
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" />		
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />
-		
-		
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-		
-		
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" />	
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" />		
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter"/>		
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right"/>
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left"/>	
-		
-		-->
+	</horizontalPanel>
 		
 	</xm:append> 	  		
   	</xm:modifications>

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=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/menu.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/menu.xal Wed Oct 25 17:46:48 2006
@@ -11,12 +11,12 @@
 
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
-	
+	<!--- layout issues prevent putting the menu into a horizpanel-->
 	<xal:verticalPanel>
-		<xal:menuBar id="testComponent" height="50px">
+		<xal:menuBar id="testComponent" height="50px"  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)">
 			<xal:menuBarItem text="Edit">
-				<xal:menu>
-					<xal:menuItem text="Cut" onCommand="mco:attributeSetter.reportEvent(event)"/>
+				<xal:menu  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)" onMouseUp="mco:attributeSetter.reportEvent(event)">
+					<xal:menuItem text="Cut" 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)" onMouseUp="mco:attributeSetter.reportEvent(event)"/>
 					<xal:menuItem text="Copy"/>
 					<xal:horizontalSeparator />
 					<xal:menuItem text="Paste"/>
@@ -35,7 +35,7 @@
 					</xal:menuItem>
 				</xal:menu>
 			</xal:menuBarItem>
-
+			
 			<xal:menuBarItem text="Format">
 				<xal:menu>
 					<xal:menuItem text="Cut"/>
@@ -51,11 +51,9 @@
 					<xal:menuItem text="Preferences..."/>
 				</xal:menu>
 			</xal:menuBarItem>
-
+			
 		</xal:menuBar>
-		
 		<!--standard test things -->
-		
 		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
 	</xal:verticalPanel>
 	</xm:append> 	  		

Modified: incubator/xap/trunk/WebContent/examples/widgets/passwordField.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/passwordField.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/passwordField.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/passwordField.xal Wed Oct 25 17:46:48 2006
@@ -12,48 +12,54 @@
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
 	
-		<xal:passwordField width="200px" text="A text field"
-		id="testComponent" onEdit="mco:attributeSetter.reportEvent(event)"
-		onTextChange="mco:attributeSetter.reportEvent(event)"
-		/>
-		
-		
+
+		<horizontalPanel>
 		<!-- text/password-field specific properties -->
-		<xal:button width="200px" height="25px" 
-			text="text -> 'some new text'"
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
+		<verticalPanel>
+			<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,
+			
+			<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,
+			
+			<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,
-				'editable','false')"/>		
-		
+			<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>
+		<xal:passwordField width="200px" text="A text field"
+			id="testComponent"  onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onCommand="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)" onEdit="mco:attributeSetter.reportEvent(event)" onKeyChar="mco:attributeSetter.reportEvent(event)" onKeyDown="mco:attributeSetter.reportEvent(event)" onKeyUp="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)" onMouseDrag="mco:attributeSetter.reportEvent(event)" onMouseMove="mco:attributeSetter.reportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMouseOver="mco:attributeSetter.reportEvent(event)" onMouseUp="mco:a
 ttributeSetter.reportEvent(event)" onTextChange="mco:attributeSetter.reportEvent(event)"/>
+		</horizontalPanel>
 
 	</xm:append> 	  		
   	</xm:modifications>

Modified: incubator/xap/trunk/WebContent/examples/widgets/radioButton.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/radioButton.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/radioButton.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/radioButton.xal Wed Oct 25 17:46:48 2006
@@ -12,15 +12,10 @@
 	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
 	<xm:append select="/xal">
 	
-
+	<horizontalPanel>
 	
-
-	  <radioButton id="testComponent" width="300px" height="100px" text="RADIO 1" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" />
-	  <radioButton width="300px" height="100px" text="RADIO 2" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" />
-	  <radioButton width="300px" height="100px" text="RADIO 3" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" selected="true" />
-	  <radioButton width="300px" height="100px" text="RADIO 4" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" />		
 		
-
+		<verticalPanel>
 		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="Hello World!" 
 		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'text', 'Hello World!!!')" />
 		 
@@ -53,78 +48,37 @@
 
 		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = center" 
 		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'center')" />	
-
+			
 		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="alignVertical = bottom" 
 		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'bottom')" />
-		 
-		 
-
 
-		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
+			
+		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selected = true" 
+		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'selected', 'true')" />	
 		 
+		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="selected = false" 
+		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'selected', 'false')" />
 		 
 		 
-		
-		<!--
-	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="top" />		
-	  <label width="400px" height="100px" alignHorizontal="center" alignVertical="top" text="HCenterVTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-		
-		
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="bottom" text="HCenter VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-	
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" />	  
-		<label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="700px" height="100px" alignHorizontal="center" alignVertical="center" text="HCenter VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-		
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" />		
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="top" text="HRight VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />
-		
-		
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="bottom" text="HRight VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="right" alignVertical="center" text="HRight VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-		
-		
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" />	
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="top" text="HLeft VTop" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" />		
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="bottom" text="HLeft VBottom" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
-
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter"/>		
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right" textPlacementVertical="bottom" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="top" />
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left" textPlacementVertical="bottom" />		
+		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="disabled = true" 
+		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'disabled', 'true')" />	
+			
+		<button width="200px" height="50px" alignHorizontal="center" alignVertical="center" text="disabled = false" 
+		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'disabled', 'false')" />
+		 
+		 </verticalPanel>
 
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="right"/>
-	  <label width="400px" height="100px" alignHorizontal="left" alignVertical="center" text="HLeft VCenter" textPlacementHorizontal="left"/>	
-		
-		-->
+		<verticalPanel>
+		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
+		</verticalPanel>
+		<verticalPanel>
+			<radioButton id="testComponent" width="300px" height="100px" text="Test Component" group="America" onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onCommand="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)" onKeyChar="mco:attributeSetter.reportEvent(event)" onKeyDown="mco:attributeSetter.reportEvent(event)" onKeyUp="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)" onMouseDrag="mco:attributeSetter.reportEvent(event)" onMouseMove="mco:attributeSetter.reportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMouseOver="mco:attributeSetter.repor
 tEvent(event)" onMouseUp="mco:attributeSetter.reportEvent(event)" onSelect="mco:attributeSetter.reportEvent(event)" onStateChange="mco:attributeSetter.reportEvent(event)"/>
+ 			<radioButton width="300px" height="100px" text="SELECTED" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" selected="true"/>
+			<radioButton width="300px" height="100px" text="Selected too" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" selected="true" />
+			<radioButton width="300px" height="100px" text="RADIO 4" group="America" onStateChange="mco:attributeSetter.reportEvent(event)" />		
+			<radioButton width="300px" height="100px" text="Different Group" group="bonk" onStateChange="mco:attributeSetter.reportEvent(event)" />			
+		 </verticalPanel>
+	</horizontalPanel>
 		
 	</xm:append> 	  		
   	</xm:modifications>

Modified: incubator/xap/trunk/WebContent/examples/widgets/scrollPane.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/scrollPane.xal?view=diff&rev=467824&r1=467823&r2=467824
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/scrollPane.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/scrollPane.xal Wed Oct 25 17:46:48 2006
@@ -1,41 +1,34 @@
-<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 xmlns="http://www.openxal.org/xal" xmlns:xal="http://www.openxal.org/xal">
 	
-		<xal:scrollPane width="200px" height="100px"
-		id="testComponent" >
-			<xal:verticalPanel>
-				<xal:button text="button1"/>
-				<xal:button text="button2"/>
-				<xal:button text="button3"/>
-				<xal:button text="buttonA"/>
-				<xal:button text="buttonB"/>
-				<xal:button text="buttonC"/>
-				<xal:button text="button1"/>
-				<xal:button text="button2"/>
-				<xal:button text="button3"/>
-				<xal:button text="buttonA"/>
-				<xal:button text="buttonB"/>
-				<xal:button text="buttonC"/>
-			</xal:verticalPanel>
-		</xal:scrollPane>
-		
-				
-		<!--standard test things -->
-		
+	
+	<mco:mco xmlns:mco="http://www.openxal.org/mco" id="attributeSetter" src="AttributeTester"/>
+	
+	
+	
+	<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
+		<xm:append select="/xal">
+			<horizontalPanel>
+				<verticalPanel>
+					<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
+				</verticalPanel>
+				<xal:scrollPane width="200px" height="100px" id="testComponent">
+					<xal:verticalPanel>
+						<xal:button text="button1"/>
+						<xal:button text="button2"/>
+						<xal:button text="button3"/>
+						<xal:button text="buttonA"/>
+						<xal:button text="buttonB"/>
+						<xal:button text="buttonC"/>
+						<xal:button text="button1"/>
+						<xal:button text="button2"/>
+						<xal:button text="button3"/>
+						<xal:button text="buttonA"/>
+						<xal:button text="buttonB"/>
+						<xal:button text="buttonC"/>
+					</xal:verticalPanel>
+				</xal:scrollPane>
 				
-		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
-
-	</xm:append> 	  		
-  	</xm:modifications>
-</xal>
\ No newline at end of file
+			</horizontalPanel>
+		</xm:append>
+	</xm:modifications>
+</xal>



Mime
View raw message