commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: jakarta-commons/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt styleDefaultDemo.jelly tableTree.jelly parentDemo.jelly tree.jelly example.jelly
Date Wed, 08 Sep 2004 05:34:12 GMT
dion        2004/09/07 22:34:12

  Modified:    jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt
                        styleDefaultDemo.jelly tableTree.jelly
                        parentDemo.jelly tree.jelly example.jelly
  Log:
  detab
  
  Revision  Changes    Path
  1.3       +68 -68    jakarta-commons/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt/styleDefaultDemo.jelly
  
  Index: styleDefaultDemo.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt/styleDefaultDemo.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- styleDefaultDemo.jelly	1 Mar 2004 12:35:18 -0000	1.2
  +++ styleDefaultDemo.jelly	8 Sep 2004 05:34:12 -0000	1.3
  @@ -15,76 +15,76 @@
     limitations under the License.
   -->
   <j:jelly xmlns:j="jelly:core" xmlns="jelly:swt" xmlns:log="jelly:log">
  -	
  -	<!--
  -		|| A demo which shows some default styles being used rather than explicitly 
  -		|| specifying them for each widget
  -		-->
  +    
  +    <!--
  +        || A demo which shows some default styles being used rather than explicitly 
  +        || specifying them for each widget
  +        -->
   
     <shell text="This is a shell" var="subShell">
  -		<menuBar>
  -			<menuItem text="File" style="cascade">
  -				<menu>
  -					<menuItem text="New">
  -						<onEvent type="Selection">
  -							<log:info>Selected New option with event ${event}</log:info>
  -						</onEvent>
  -					</menuItem>
  -						
  -					<menuItem text="Open"/>
  -					<menuSeparator/>
  -					<menuItem text="Save"/>
  -				</menu>
  -			</menuItem>
  -			<menuItem text="Help" style="cascade">
  -				<menu>
  -					<menuItem text="About"/>
  -				</menu>
  -			</menuItem>
  -		</menuBar>  	
  -
  -  	<gridLayout/>
  -
  -		<group text="Some form">
  -			<gridData style="fill_horizontal"/>
  -
  -			<gridLayout numColumns="2"/>
  -			<label text="Hello"/>
  -			<text var="textField" text="1234" editable="true">
  -				<gridData style="fill_horizontal"/>
  -			</text>
  -		</group>
  -
  -		<table 
  -			headerVisible="true"
  -			linesVisible="true"
  -			toolTipText="This is a table!">
  -			
  -			<gridData style="fill_both"/>
  -			
  -			<tableColumn text="Name" width="100" toolTipText="This is the name column"/>
  -			<tableColumn text="Age" width="40" toolTipText="This is the age column"/>
  -			
  -			<!-- we'd normally use some Java bean model to implement the next bit -->
  -			<tableItem var="row"/>
  -			${row.setText(0, 'James')}
  -			${row.setText(1, '33')}
  -			<tableItem var="row"/>
  -			${row.setText(0, 'Bob')}
  -			${row.setText(1, '30')}
  -		</table>
  -
  -  	<toolBar>
  -  		<toolItem text="Click Me" toolTipText="I am a ToolBar Item that you can click">
  -  			<onEvent type="Selection">
  -  				<log:info>Clicked button with event ${event} and text field contains ${textField.text}</log:info>
  -  			</onEvent>
  -			</toolItem>
  -  	</toolBar>
  +        <menuBar>
  +            <menuItem text="File" style="cascade">
  +                <menu>
  +                    <menuItem text="New">
  +                        <onEvent type="Selection">
  +                            <log:info>Selected New option with event ${event}</log:info>
  +                        </onEvent>
  +                    </menuItem>
  +                        
  +                    <menuItem text="Open"/>
  +                    <menuSeparator/>
  +                    <menuItem text="Save"/>
  +                </menu>
  +            </menuItem>
  +            <menuItem text="Help" style="cascade">
  +                <menu>
  +                    <menuItem text="About"/>
  +                </menu>
  +            </menuItem>
  +        </menuBar>      
  +
  +      <gridLayout/>
  +
  +        <group text="Some form">
  +            <gridData style="fill_horizontal"/>
  +
  +            <gridLayout numColumns="2"/>
  +            <label text="Hello"/>
  +            <text var="textField" text="1234" editable="true">
  +                <gridData style="fill_horizontal"/>
  +            </text>
  +        </group>
  +
  +        <table 
  +            headerVisible="true"
  +            linesVisible="true"
  +            toolTipText="This is a table!">
  +            
  +            <gridData style="fill_both"/>
  +            
  +            <tableColumn text="Name" width="100" toolTipText="This is the name column"/>
  +            <tableColumn text="Age" width="40" toolTipText="This is the age column"/>
  +            
  +            <!-- we'd normally use some Java bean model to implement the next bit -->
  +            <tableItem var="row"/>
  +            ${row.setText(0, 'James')}
  +            ${row.setText(1, '33')}
  +            <tableItem var="row"/>
  +            ${row.setText(0, 'Bob')}
  +            ${row.setText(1, '30')}
  +        </table>
  +
  +      <toolBar>
  +          <toolItem text="Click Me" toolTipText="I am a ToolBar Item that you can click">
  +              <onEvent type="Selection">
  +                  <log:info>Clicked button with event ${event} and text field contains
${textField.text}</log:info>
  +              </onEvent>
  +            </toolItem>
  +      </toolBar>
     </shell>
   
  -	<!-- we could abstract the following away as a tag -->
  -	
  -	${subShell.pack()}
  -	${subShell.open()}
  +    <!-- we could abstract the following away as a tag -->
  +    
  +    ${subShell.pack()}
  +    ${subShell.open()}
   </j:jelly>
  
  
  
  1.4       +34 -34    jakarta-commons/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt/tableTree.jelly
  
  Index: tableTree.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt/tableTree.jelly,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- tableTree.jelly	1 Mar 2004 12:35:18 -0000	1.3
  +++ tableTree.jelly	8 Sep 2004 05:34:12 -0000	1.4
  @@ -17,43 +17,43 @@
   <j:jelly xmlns:j="jelly:core" xmlns="jelly:swt" xmlns:log="jelly:log">
   
     <shell text="TableTree Demo" var="subShell" style="border, close, min, max, resize,
title">
  -  	
  -  	<gridLayout/>
  +      
  +      <gridLayout/>
   
  -		<tableTree toolTipText="This is a table tree!" style="multi, full_selection">
  -			
  -			<gridData style="fill_both"/>
  -			
  -			<!-- we'd normally use some Java bean model to implement the next bit -->
  -			<tableTreeItem var="row">
  -					${row.setText('A')}
  -					${row.setText(0, 'James')}
  -					${row.setText(1, '33')}
  -				<tableTreeItem>
  -					${row.setText('B')}
  -					${row.setText(0, 'Child')}
  -					${row.setText(1, '2')}
  -				</tableTreeItem>
  -				
  -				<tableTreeItem>
  -					${row.setText(0, 'Child-nosettext')}
  -					${row.setText(1, '2')}
  -				</tableTreeItem>
  -				
  -				<tableTreeItem var="row">
  -					${row.setText('C')}
  -					${row.setText(0, 'Bob')}
  -					${row.setText(1, '30')}
  +        <tableTree toolTipText="This is a table tree!" style="multi, full_selection">
  +            
  +            <gridData style="fill_both"/>
  +            
  +            <!-- we'd normally use some Java bean model to implement the next bit -->
  +            <tableTreeItem var="row">
  +                    ${row.setText('A')}
  +                    ${row.setText(0, 'James')}
  +                    ${row.setText(1, '33')}
  +                <tableTreeItem>
  +                    ${row.setText('B')}
  +                    ${row.setText(0, 'Child')}
  +                    ${row.setText(1, '2')}
  +                </tableTreeItem>
  +                
  +                <tableTreeItem>
  +                    ${row.setText(0, 'Child-nosettext')}
  +                    ${row.setText(1, '2')}
  +                </tableTreeItem>
  +                
  +                <tableTreeItem var="row">
  +                    ${row.setText('C')}
  +                    ${row.setText(0, 'Bob')}
  +                    ${row.setText(1, '30')}
   
  -					<tableTreeItem var="row">
  -						${row.setText('C')}
  -					</tableTreeItem>
  +                    <tableTreeItem var="row">
  +                        ${row.setText('C')}
  +                    </tableTreeItem>
   
  -				</tableTreeItem>
  -			</tableTreeItem>
  -							
  -		</tableTree>
  +                </tableTreeItem>
  +            </tableTreeItem>
  +                            
  +        </tableTree>
     </shell>
   
  -	${subShell.open()}
  +    ${subShell.open()}
   </j:jelly>
  
  
  
  1.3       +36 -36    jakarta-commons/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt/parentDemo.jelly
  
  Index: parentDemo.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt/parentDemo.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- parentDemo.jelly	1 Mar 2004 12:35:18 -0000	1.2
  +++ parentDemo.jelly	8 Sep 2004 05:34:12 -0000	1.3
  @@ -17,43 +17,43 @@
   <j:jelly xmlns:j="jelly:core" xmlns="jelly:swt" xmlns:log="jelly:log">
   
     <shell text="Parent Demo" var="subShell" style="border, close, min, max, resize, title">
  -  	
  -  	<gridLayout/>
  +      
  +      <gridLayout/>
   
     </shell>
   
  -	<!-- 
  -		|| This demo shows how we can create a brand new widget which is added to a 
  -		|| given parent control (in this case the shell).
  -		|| This widget can be defined as a variable using the var="foo" attribute just
  -		|| like any other widget.
  -		-->
  -	<tree parent="${subShell}" toolTipText="This is a tree!" style="multi">
  -		
  -		<gridData style="fill_both"/>
  -		
  -		<!-- we'd normally use some Java bean model to implement the next bit -->
  -		<treeItem text="A">
  -			<treeItem text="A/A"/>
  -			<treeItem text="A/B"/>
  -			<treeItem text="A/C"/>
  -		</treeItem>
  -		<treeItem text="B">
  -			<treeItem text="B/A"/>
  -			<treeItem text="B/B"/>
  -			<treeItem text="B/C"/>
  -		</treeItem>
  -						
  -		<menu style="pop_up">
  -			<menuItem text="do something!">
  -				<onEvent type="Selection">
  -					<log:info>Clicked on ${event}</log:info>
  -				</onEvent>
  -			</menuItem>
  -		</menu>							
  -	</tree>
  -	
  -	${subShell.pack()}
  -	${subShell.open()}
  -	
  +    <!-- 
  +        || This demo shows how we can create a brand new widget which is added to a 
  +        || given parent control (in this case the shell).
  +        || This widget can be defined as a variable using the var="foo" attribute just
  +        || like any other widget.
  +        -->
  +    <tree parent="${subShell}" toolTipText="This is a tree!" style="multi">
  +        
  +        <gridData style="fill_both"/>
  +        
  +        <!-- we'd normally use some Java bean model to implement the next bit -->
  +        <treeItem text="A">
  +            <treeItem text="A/A"/>
  +            <treeItem text="A/B"/>
  +            <treeItem text="A/C"/>
  +        </treeItem>
  +        <treeItem text="B">
  +            <treeItem text="B/A"/>
  +            <treeItem text="B/B"/>
  +            <treeItem text="B/C"/>
  +        </treeItem>
  +                        
  +        <menu style="pop_up">
  +            <menuItem text="do something!">
  +                <onEvent type="Selection">
  +                    <log:info>Clicked on ${event}</log:info>
  +                </onEvent>
  +            </menuItem>
  +        </menu>                            
  +    </tree>
  +    
  +    ${subShell.pack()}
  +    ${subShell.open()}
  +    
   </j:jelly>
  
  
  
  1.5       +29 -29    jakarta-commons/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt/tree.jelly
  
  Index: tree.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt/tree.jelly,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- tree.jelly	1 Mar 2004 12:35:18 -0000	1.4
  +++ tree.jelly	8 Sep 2004 05:34:12 -0000	1.5
  @@ -17,37 +17,37 @@
   <j:jelly xmlns:j="jelly:core" xmlns="jelly:swt" xmlns:log="jelly:log">
   
     <shell text="Tree Demo" var="subShell" size="500,500" style="border, close, min, max,
resize, title">
  -  	
  -  	<gridLayout/>
  +      
  +      <gridLayout/>
   
  -		<tree toolTipText="This is a tree!" style="multi">
  -			
  -			<gridData style="fill_both"/>
  -			
  -			<!-- we'd normally use some Java bean model to implement the next bit -->
  -			<treeItem text="A">
  -				<treeItem text="A/A"/>
  -				<treeItem text="A/B"/>
  -				<treeItem text="A/C"/>
  -			</treeItem>
  -			<treeItem text="B">
  -				<treeItem text="B/A"/>
  -				<treeItem text="B/B"/>
  -				<treeItem text="B/C"/>
  -			</treeItem>
  -							
  -			<menu style="pop_up">
  -				<menuItem text="do something!">
  -					<onEvent type="Selection">
  -						<log:info>Clicked on ${event}</log:info>
  -					</onEvent>
  -				</menuItem>
  -			</menu>							
  -		</tree>
  +        <tree toolTipText="This is a tree!" style="multi">
  +            
  +            <gridData style="fill_both"/>
  +            
  +            <!-- we'd normally use some Java bean model to implement the next bit -->
  +            <treeItem text="A">
  +                <treeItem text="A/A"/>
  +                <treeItem text="A/B"/>
  +                <treeItem text="A/C"/>
  +            </treeItem>
  +            <treeItem text="B">
  +                <treeItem text="B/A"/>
  +                <treeItem text="B/B"/>
  +                <treeItem text="B/C"/>
  +            </treeItem>
  +                            
  +            <menu style="pop_up">
  +                <menuItem text="do something!">
  +                    <onEvent type="Selection">
  +                        <log:info>Clicked on ${event}</log:info>
  +                    </onEvent>
  +                </menuItem>
  +            </menu>                            
  +        </tree>
     </shell>
   
   <!--
  -	${subShell.pack()}
  --->	
  -	${subShell.open()}
  +    ${subShell.pack()}
  +-->    
  +    ${subShell.open()}
   </j:jelly>
  
  
  
  1.7       +94 -94    jakarta-commons/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt/example.jelly
  
  Index: example.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt/example.jelly,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- example.jelly	5 Sep 2004 15:36:02 -0000	1.6
  +++ example.jelly	8 Sep 2004 05:34:12 -0000	1.7
  @@ -17,101 +17,101 @@
   <j:jelly xmlns:j="jelly:core" xmlns="jelly:swt" xmlns:log="jelly:log">
   
     <shell text="This is a shell" var="shell" size="600,300" style="border, close, min,
max, resize, title">
  -		<menu style="bar">
  -			<menuItem text="File" style="cascade">
  -				<menu>
  -					<menuItem text="New">
  -						<onEvent type="Selection">
  -							<log:info>Selected New option with event ${event}</log:info>
  -						</onEvent>
  -					</menuItem>
  -						
  -					<menuItem text="Open"/>
  -					<menuItem style="separator"/>
  -					<menuItem text="Save"/>
  -				</menu>
  -			</menuItem>
  -			<menuItem text="Help" style="cascade">
  -				<menu>
  -					<menuItem text="About"/>
  -				</menu>
  -			</menuItem>
  -		</menu>  	
  -
  -  	<gridLayout/>
  -
  -		<group text="Some form">
  -			<gridData style="fill_horizontal"/>
  -
  -			<gridLayout numColumns="2"/>
  -			<label text="Hello" style="horizontal, shadow_in"/>
  -			<text var="textField" text="1234" editable="true">
  -				<gridData style="fill_horizontal"/>
  -			</text>
  -		</group>
  -
  -		<table 
  -			headerVisible="true"
  -			linesVisible="true"
  -			toolTipText="This is a table!" 
  -			style="multi, border, full_selection">
  -			
  -			<gridData style="fill_both"/>
  -			
  -			<tableColumn text="Name" width="100" />
  -			<tableColumn text="Age" width="40" />
  -			
  -			<!-- we'd normally use some Java bean model to implement the next bit -->
  -			<tableItem var="row"/>
  -			${row.setText(0, 'James')}
  -			${row.setText(1, '33')}
  -			<tableItem var="row"/>
  -			${row.setText(0, 'Bob')}
  -			${row.setText(1, '30')}
  -		</table>
  -
  -  	<toolBar style="vertical">
  -  		<toolItem text="Click Me" toolTipText="I am a ToolBar Item that you can click">
  -  			<onEvent type="Selection">
  -  				<log:info>Clicked button with event ${event} and text field contains ${textField.text}</log:info>
  -  			</onEvent>
  -			</toolItem>
  -  		<toolItem text="Tree" toolTipText="Starts the Tree demo">
  -  			<onEvent type="Selection">
  -  				<j:include uri="tree.jelly"/>
  -  			</onEvent>
  -			</toolItem>
  -  		<toolItem text="TableTree" toolTipText="Starts the TableTree demo">
  -  			<onEvent type="Selection">
  -  				<j:include uri="tableTree.jelly"/>
  -  			</onEvent>
  -			</toolItem>
  -  		<toolItem text="Parent Demo" toolTipText="Starts the Parent Demo that shows how
to start a component given a parent widget">
  -  			<onEvent type="Selection">
  -  				<j:include uri="parentDemo.jelly"/>
  -  			</onEvent>
  -			</toolItem>
  -  		<toolItem text="Style Defaulting Demo" toolTipText="Shows how default styles can
be used, rather than always specifying the styles">
  -  			<onEvent type="Selection">
  -  				<j:include uri="styleDefaultDemo.jelly"/>
  -  			</onEvent>
  -			</toolItem>
  -  	</toolBar>
  +        <menu style="bar">
  +            <menuItem text="File" style="cascade">
  +                <menu>
  +                    <menuItem text="New">
  +                        <onEvent type="Selection">
  +                            <log:info>Selected New option with event ${event}</log:info>
  +                        </onEvent>
  +                    </menuItem>
  +                        
  +                    <menuItem text="Open"/>
  +                    <menuItem style="separator"/>
  +                    <menuItem text="Save"/>
  +                </menu>
  +            </menuItem>
  +            <menuItem text="Help" style="cascade">
  +                <menu>
  +                    <menuItem text="About"/>
  +                </menu>
  +            </menuItem>
  +        </menu>      
  +
  +      <gridLayout/>
  +
  +        <group text="Some form">
  +            <gridData style="fill_horizontal"/>
  +
  +            <gridLayout numColumns="2"/>
  +            <label text="Hello" style="horizontal, shadow_in"/>
  +            <text var="textField" text="1234" editable="true">
  +                <gridData style="fill_horizontal"/>
  +            </text>
  +        </group>
  +
  +        <table 
  +            headerVisible="true"
  +            linesVisible="true"
  +            toolTipText="This is a table!" 
  +            style="multi, border, full_selection">
  +            
  +            <gridData style="fill_both"/>
  +            
  +            <tableColumn text="Name" width="100" />
  +            <tableColumn text="Age" width="40" />
  +            
  +            <!-- we'd normally use some Java bean model to implement the next bit -->
  +            <tableItem var="row"/>
  +            ${row.setText(0, 'James')}
  +            ${row.setText(1, '33')}
  +            <tableItem var="row"/>
  +            ${row.setText(0, 'Bob')}
  +            ${row.setText(1, '30')}
  +        </table>
  +
  +      <toolBar style="vertical">
  +          <toolItem text="Click Me" toolTipText="I am a ToolBar Item that you can click">
  +              <onEvent type="Selection">
  +                  <log:info>Clicked button with event ${event} and text field contains
${textField.text}</log:info>
  +              </onEvent>
  +            </toolItem>
  +          <toolItem text="Tree" toolTipText="Starts the Tree demo">
  +              <onEvent type="Selection">
  +                  <j:include uri="tree.jelly"/>
  +              </onEvent>
  +            </toolItem>
  +          <toolItem text="TableTree" toolTipText="Starts the TableTree demo">
  +              <onEvent type="Selection">
  +                  <j:include uri="tableTree.jelly"/>
  +              </onEvent>
  +            </toolItem>
  +          <toolItem text="Parent Demo" toolTipText="Starts the Parent Demo that shows
how to start a component given a parent widget">
  +              <onEvent type="Selection">
  +                  <j:include uri="parentDemo.jelly"/>
  +              </onEvent>
  +            </toolItem>
  +          <toolItem text="Style Defaulting Demo" toolTipText="Shows how default styles
can be used, rather than always specifying the styles">
  +              <onEvent type="Selection">
  +                  <j:include uri="styleDefaultDemo.jelly"/>
  +              </onEvent>
  +            </toolItem>
  +      </toolBar>
     </shell>
   
  -	<!-- we could abstract the following away as a tag -->
  -	
  +    <!-- we could abstract the following away as a tag -->
  +    
   <!--
  -	${shell.pack()}
  --->	
  -	${shell.open()}
  -	
  -	<j:set var="display" value="${shell.display}"/>
  -	
  -	<j:while test="${!shell.isDisposed()}">
  -		<j:if test="${!display.readAndDispatch()}">
  -			<j:set var="foo" value="${display.sleep()}"/>
  -		</j:if>
  -	</j:while>
  -	${display.dispose()}
  +    ${shell.pack()}
  +-->    
  +    ${shell.open()}
  +    
  +    <j:set var="display" value="${shell.display}"/>
  +    
  +    <j:while test="${!shell.isDisposed()}">
  +        <j:if test="${!display.readAndDispatch()}">
  +            <j:set var="foo" value="${display.sleep()}"/>
  +        </j:if>
  +    </j:while>
  +    ${display.dispose()}
   </j:jelly>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message