You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by mi...@apache.org on 2005/07/06 12:24:51 UTC
cvs commit: jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/form FormConditional.jwc
mindbridge 2005/07/06 03:24:51
Modified: framework/src/java/org/apache/tapestry/html
ExceptionDisplay.jwc RequestDisplay.html
contrib/src/java/org/apache/tapestry/contrib/tree/components
TreeNodeView.jwc TreeView.jwc
examples/Workbench/src/context PaletteResults.html
UploadResults.html
examples/Workbench/src/context/WEB-INF Border.html web.xml
ShowError.html LocaleSelection.jwc
examples/wap/context/quiz Scores.wml
contrib/src/java/org/apache/tapestry/contrib/palette
Palette.html
contrib/src/java/org/apache/tapestry/contrib/form
FormConditional.jwc
Log:
Switching references to Conditional to the If component
Revision Changes Path
1.7 +2 -2 jakarta-tapestry/framework/src/java/org/apache/tapestry/html/ExceptionDisplay.jwc
Index: ExceptionDisplay.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/html/ExceptionDisplay.jwc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ExceptionDisplay.jwc 18 Apr 2005 17:06:41 -0000 1.6
+++ ExceptionDisplay.jwc 6 Jul 2005 10:24:49 -0000 1.7
@@ -74,11 +74,11 @@
<binding name="delegate" value="ognl:adapterFactory.getRenderableAdaptor(property.value)"/>
</component>
- <component id="ifLast" type="Conditional">
+ <component id="ifLast" type="If">
<binding name="condition" value="ognl:last"/>
</component>
- <component id="ifNotLast" type="Conditional">
+ <component id="ifNotLast" type="If">
<binding name="condition" value="ognl:! last"/>
</component>
1.3 +1 -1 jakarta-tapestry/framework/src/java/org/apache/tapestry/html/RequestDisplay.html
Index: RequestDisplay.html
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/html/RequestDisplay.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestDisplay.html 14 Mar 2005 22:29:48 -0000 1.2
+++ RequestDisplay.html 6 Jul 2005 10:24:49 -0000 1.3
@@ -1,7 +1,7 @@
<span jwcid="$content$">
<span jwcid="@Describe" object="ognl:request"/>
-<span jwcid="@Conditional" condition="ognl:request.getSession(false) != null">
+<span jwcid="@If" condition="ognl:request.getSession(false) != null">
<span jwcid="@Describe" object="ognl:request.getSession(false)"/>
</span>
1.4 +4 -4 jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.jwc
Index: TreeNodeView.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.jwc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TreeNodeView.jwc 6 Jan 2005 02:17:10 -0000 1.3
+++ TreeNodeView.jwc 6 Jul 2005 10:24:49 -0000 1.4
@@ -52,17 +52,17 @@
<binding name="anchor" expression="cleanSelectedID"/>
</component>
- <component id="showImages" type="Conditional">
+ <component id="showImages" type="If">
<binding name="condition" expression="showImages"/>
</component>
<component id="showImages2" copy-of="showImages"/>
- <component id="makeNodeDirect" type="Conditional">
+ <component id="makeNodeDirect" type="If">
<binding name="condition" expression="makeNodeDirect"/>
</component>
- <component id="makeNodeNoDirect" type="Conditional">
+ <component id="makeNodeNoDirect" type="If">
<binding name="condition" expression="makeNodeNoDirect"/>
</component>
@@ -99,7 +99,7 @@
<private-asset name="_whiteSpaceImage" resource-path="WhiteSpace.gif"/>
- <component id="showConnectImage" type="Conditional">
+ <component id="showConnectImage" type="If">
<binding name="condition" expression="showConnectImage"/>
</component>
<component id="connectImage" type="Image">
1.6 +2 -0 jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeView.jwc
Index: TreeView.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeView.jwc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TreeView.jwc 18 Apr 2005 17:08:19 -0000 1.5
+++ TreeView.jwc 6 Jul 2005 10:24:49 -0000 1.6
@@ -33,5 +33,7 @@
<component id="any" type="Any" inherit-informal-parameters="yes"/>
<component id="renderBody" type="RenderBody"/>
+
+ <property name="treeSessionState" persist="session"/>
</component-specification>
1.3 +1 -1 jakarta-tapestry/examples/Workbench/src/context/PaletteResults.html
Index: PaletteResults.html
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/src/context/PaletteResults.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PaletteResults.html 1 Apr 2005 16:04:56 -0000 1.2
+++ PaletteResults.html 6 Jul 2005 10:24:50 -0000 1.3
@@ -1 +1 @@
-<span jwcid="@Border">
<p>Here are your selections. If the Palette was set for manual sorting, then the order
is significant.
<ul>
<li jwcid="loop"><span jwcid="@Insert" value="ognl:components.loop.value"/></li>
</ul>
<span jwcid="@Conditional" condition="! selectedColors">
<p>You made no selections.
</span>
<p>
<a jwcid="@PageLink" page="Palette"><img jwcid="backRollover" alt="[Back]"/></a>
</span>
+<span jwcid="@Border">
<p>Here are your selections. If the Palette was set for manual sorting, then the order
is significant.
<ul>
<li jwcid="loop"><span jwcid="@Insert" value="ognl:components.loop.value"/></li>
</ul>
<span jwcid="@If" condition="! selectedColors">
<p>You made no selections.
</span>
<p>
<a jwcid="@PageLink" page="Palette"><img jwcid="backRollover" alt="[Back]"/></a>
</span>
1.3 +1 -1 jakarta-tapestry/examples/Workbench/src/context/UploadResults.html
Index: UploadResults.html
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/src/context/UploadResults.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UploadResults.html 1 Apr 2005 16:04:56 -0000 1.2
+++ UploadResults.html 6 Jul 2005 10:24:50 -0000 1.3
@@ -1 +1 @@
-<span jwcid="@Border">
<table border=0>
<tr><th>Upload Path:</th>
<td><span jwcid="@Insert" value="file.filePath">File path</span></td>
</tr>
<tr><th>Upload File:</th>
<td><span jwcid="@Insert" value="file.fileName">File name</span></td>
</tr>
<tr><th>Content Type:</th>
<td><span jwcid="@Insert" value="file.contentType">text/plain</span></td>
</tr>
<tr>
<th>Size:</th>
<td><span jwcid="@Insert" value="file.size">1000</span> (bytes)
<span jwcid="@Conditional" condition="file.inMemory">(in memory)</span>
</td>
</tr>
</table>
<p>
<pre><span jwcid="@Insert" value="fileDump"/></pre>
<p>
<a jwcid="@PageLink" page="Upload"><img jwcid="backRollover" alt="[Back]"/></a>
</span>
+<span jwcid="@Border">
<table border=0>
<tr><th>Upload Path:</th>
<td><span jwcid="@Insert" value="file.filePath">File path</span></td>
</tr>
<tr><th>Upload File:</th>
<td><span jwcid="@Insert" value="file.fileName">File name</span></td>
</tr>
<tr><th>Content Type:</th>
<td><span jwcid="@Insert" value="file.contentType">text/plain</span></td>
</tr>
<tr>
<th>Size:</th>
<td><span jwcid="@Insert" value="file.size">1000</span> (bytes)
<span jwcid="@If" condition="file.inMemory">(in memory)</span>
</td>
</tr>
</table>
<p>
<pre><span jwcid="@Insert" value="fileDump"/></pre>
<p>
<a jwcid="@PageLink" page="Upload"><img jwcid="backRollover" alt="[Back]"/></a>
</span>
1.7 +1 -1 jakarta-tapestry/examples/Workbench/src/context/WEB-INF/Border.html
Index: Border.html
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/src/context/WEB-INF/Border.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Border.html 9 Apr 2005 00:54:07 -0000 1.6
+++ Border.html 6 Jul 2005 10:24:50 -0000 1.7
@@ -41,7 +41,7 @@
</tr>
<tr class="data">
<td colspan="2">
- <span jwcid="@Conditional" condition="page.visit.requestDebug">
+ <span jwcid="@If" condition="page.visit.requestDebug">
<span jwcid="@RequestDisplay"/>
</span>
</td>
1.9 +4 -0 jakarta-tapestry/examples/Workbench/src/context/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/src/context/WEB-INF/web.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- web.xml 19 Apr 2005 02:25:48 -0000 1.8
+++ web.xml 6 Jul 2005 10:24:50 -0000 1.9
@@ -33,6 +33,10 @@
<servlet>
<servlet-name>workbench</servlet-name>
<servlet-class>org.apache.tapestry.ApplicationServlet</servlet-class>
+ <init-param>
+ <param-name>TreeRootDir</param-name>
+ <param-value>/</param-value>
+ </init-param>
<load-on-startup>0</load-on-startup>
</servlet>
1.3 +1 -1 jakarta-tapestry/examples/Workbench/src/context/WEB-INF/ShowError.html
Index: ShowError.html
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/src/context/WEB-INF/ShowError.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ShowError.html 1 Apr 2005 16:04:56 -0000 1.2
+++ ShowError.html 6 Jul 2005 10:24:50 -0000 1.3
@@ -1,4 +1,4 @@
-<span jwcid="@Conditional" condition="ognl:bindings.delegate.object.hasErrors">
+<span jwcid="@If" condition="ognl:bindings.delegate.object.hasErrors">
<table class="inputerror">
<tr valign=top>
1.8 +1 -1 jakarta-tapestry/examples/Workbench/src/context/WEB-INF/LocaleSelection.jwc
Index: LocaleSelection.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/src/context/WEB-INF/LocaleSelection.jwc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LocaleSelection.jwc 2 Jun 2005 13:35:10 -0000 1.7
+++ LocaleSelection.jwc 6 Jul 2005 10:24:50 -0000 1.8
@@ -22,7 +22,7 @@
<component-specification class="org.apache.tapestry.workbench.table.LocaleSelection"
allow-body="no" allow-informal-parameters="yes">
- <component id="condTable" type="Conditional">
+ <component id="condTable" type="If">
<binding name="condition" value="ognl:localeSet.size > 0"/>
</component>
1.3 +2 -2 jakarta-tapestry/examples/wap/context/quiz/Scores.wml
Index: Scores.wml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/wap/context/quiz/Scores.wml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Scores.wml 23 Apr 2003 17:56:59 -0000 1.2
+++ Scores.wml 6 Jul 2005 10:24:51 -0000 1.3
@@ -13,7 +13,7 @@
<card id="main" title="Scores">
<p>
Points: <p jwcid="@Insert" value="ognl:visit.points"/>
- <p jwcid="@Conditional" condition="ognl:newHighscore">
+ <p jwcid="@If" condition="ognl:newHighscore">
<p jwcid="@Insert" value="New highscore!"/>
</p>
<br/>
1.3 +1 -1 jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/palette/Palette.html
Index: Palette.html
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/palette/Palette.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Palette.html 25 Aug 2004 19:43:43 -0000 1.2
+++ Palette.html 6 Jul 2005 10:24:51 -0000 1.3
@@ -34,7 +34,7 @@
name="ognl:symbols.deselectImageName"
alt="message:tooltip.deselect"/></a>
- <span jwcid="@Conditional" condition="ognl:sortUser">
+ <span jwcid="@If" condition="ognl:sortUser">
<a jwcid="@Any" element="a"
href="ognl:symbols.upOnClickScript"><img jwcid="@Image"
1.9 +1 -1 jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/form/FormConditional.jwc
Index: FormConditional.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/form/FormConditional.jwc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FormConditional.jwc 15 May 2005 22:56:37 -0000 1.8
+++ FormConditional.jwc 6 Jul 2005 10:24:51 -0000 1.9
@@ -19,7 +19,7 @@
"-//Apache Software Foundation//Tapestry Specification 4.0//EN"
"http://jakarta.apache.org/tapestry/dtd/Tapestry_4_0.dtd">
-<component-specification class="org.apache.tapestry.contrib.form.FormConditional">
+<component-specification class="org.apache.tapestry.contrib.form.FormConditional" deprecated="yes">
<description>
Conditionally emulates an element and its attributes (if element is specified) and/or includes a block of content if a condition is met.
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org