You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mu...@apache.org on 2008/11/24 20:05:19 UTC
svn commit: r720258 [1/2] - in /struts/struts2/trunk/core/src/main/resources:
org/apache/struts2/dispatcher/ template/css_xhtml/ template/simple/
template/xhtml/
Author: musachy
Date: Mon Nov 24 11:05:16 2008
New Revision: 720258
URL: http://svn.apache.org/viewvc?rev=720258&view=rev
Log:
WW-2891 Replace deprecated operators in FreeMarker (just ?exists on this commit)
Modified:
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/controlheader-core.ftl
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/controlheader.ftl
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/form.ftl
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/label.ftl
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/reset.ftl
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/submit.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/common-attributes.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/css.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/form-common.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/hidden.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/inputtransferselect.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/scripting-events.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/submit-close.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/table.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/updownselect.ftl
struts/struts2/trunk/core/src/main/resources/template/xhtml/checkbox.ftl
struts/struts2/trunk/core/src/main/resources/template/xhtml/control.ftl
struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader-core.ftl
struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader.ftl
struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl
struts/struts2/trunk/core/src/main/resources/template/xhtml/form-validate.ftl
struts/struts2/trunk/core/src/main/resources/template/xhtml/form.ftl
struts/struts2/trunk/core/src/main/resources/template/xhtml/reset.ftl
struts/struts2/trunk/core/src/main/resources/template/xhtml/submit.ftl
struts/struts2/trunk/core/src/main/resources/template/xhtml/tooltip.ftl
Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl Mon Nov 24 11:05:16 2008
@@ -38,13 +38,13 @@
<#assign msgs = [] />
<#list chain as ex>
- <#if ex.message?exists>
+ <#if ex.message??>
<#assign msgs = [ex.message] + msgs/>
</#if>
</#list>
<#assign rootex = exception/>
<#list chain as ex>
- <#if (ex.location?exists && (ex.location != unknown))>
+ <#if (ex.location?? && (ex.location != unknown))>
<#assign rootloc = ex.location/>
<#assign rootex = ex/>
<#else>
@@ -80,7 +80,7 @@
</#if>
</td>
</tr>
- <#if rootloc?exists>
+ <#if rootloc??>
<tr>
<td><strong>File</strong>:</td>
<td>${rootloc.URI}</td>
@@ -100,7 +100,7 @@
</table>
</div>
-<#if rootloc?exists>
+<#if rootloc??>
<#assign snippet = rootloc.getSnippet(2) />
<#if (snippet?size > 0)>
<div id="snippet">
Modified: struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl Mon Nov 24 11:05:16 2008
@@ -25,14 +25,14 @@
that for checkboxes we do not want the label field to show up as checkboxes handle their own
lables
-->
-<#assign hasFieldErrors = fieldErrors?exists && fieldErrors[parameters.name]?exists/>
-<div <#rt/><#if parameters.id?exists>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp">
+<#assign hasFieldErrors = fieldErrors?? && fieldErrors[parameters.name]??/>
+<div <#rt/><#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp">
<#if hasFieldErrors>
-<div <#rt/><#if parameters.id?exists>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr">
+<div <#rt/><#if parameters.id??>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr">
<#list fieldErrors[parameters.name] as error>
<div<#rt/>
- <#if parameters.id?exists>
+ <#if parameters.id??>
errorFor="${parameters.id}"<#rt/>
</#if>
class="errorMessage">
@@ -43,9 +43,9 @@
</#if>
<#if parameters.labelposition?default("") == 'left'>
<span <#rt/>
-<#if parameters.id?exists>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl">
+<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl">
<label<#t/>
-<#if parameters.id?exists>
+<#if parameters.id??>
for="${parameters.id?html}"<#rt/>
</#if>
<#if hasFieldErrors>
@@ -62,7 +62,7 @@
<#else>
<span <#rt/>
</#if>
-<#if parameters.id?exists>id="wwctrl_${parameters.id}"<#rt/></#if> class="wwctrl">
+<#if parameters.id??>id="wwctrl_${parameters.id}"<#rt/></#if> class="wwctrl">
<#if parameters.required?default(false)>
<span class="required">*</span><#t/>
@@ -75,15 +75,15 @@
<#else>
</span> <#rt/>
</#if>
-<#if parameters.label?exists>
+<#if parameters.label??>
<#if parameters.labelposition?default("top") == 'top'>
<div <#rt/>
<#else>
<span <#rt/>
</#if>
-<#if parameters.id?exists>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl">
+<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl">
<label<#t/>
-<#if parameters.id?exists>
+<#if parameters.id??>
for="${parameters.id?html}"<#rt/>
</#if>
<#if hasFieldErrors>
@@ -94,7 +94,7 @@
>${parameters.label?html}</label><#rt/>
</#if>
</#if>
-<#if parameters.label?exists>
+<#if parameters.label??>
<#if parameters.labelposition?default("top") == 'top'>
</div> <#rt/>
<#else>
Modified: struts/struts2/trunk/core/src/main/resources/template/css_xhtml/controlheader-core.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/controlheader-core.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/css_xhtml/controlheader-core.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/css_xhtml/controlheader-core.ftl Mon Nov 24 11:05:16 2008
@@ -24,14 +24,14 @@
Only show message if errors are available.
This will be done if ActionSupport is used.
-->
-<#assign hasFieldErrors = parameters.name?exists && fieldErrors?exists && fieldErrors[parameters.name]?exists/>
-<div <#rt/><#if parameters.id?exists>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp">
+<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/>
+<div <#rt/><#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp">
<#if hasFieldErrors>
-<div <#rt/><#if parameters.id?exists>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr">
+<div <#rt/><#if parameters.id??>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr">
<#list fieldErrors[parameters.name] as error>
<div<#rt/>
- <#if parameters.id?exists>
+ <#if parameters.id??>
errorFor="${parameters.id}"<#rt/>
</#if>
class="errorMessage">
@@ -41,15 +41,15 @@
</div><#t/>
</#if>
-<#if parameters.label?exists>
+<#if parameters.label??>
<#if parameters.labelposition?default("top") == 'top'>
<div <#rt/>
<#else>
<span <#rt/>
</#if>
-<#if parameters.id?exists>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl">
+<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl">
<label <#t/>
-<#if parameters.id?exists>
+<#if parameters.id??>
for="${parameters.id?html}" <#t/>
</#if>
<#if hasFieldErrors>
Modified: struts/struts2/trunk/core/src/main/resources/template/css_xhtml/controlheader.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/controlheader.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/css_xhtml/controlheader.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/css_xhtml/controlheader.ftl Mon Nov 24 11:05:16 2008
@@ -26,5 +26,5 @@
<#else>
<span <#rt/>
</#if>
-<#if parameters.id?exists>id="wwctrl_${parameters.id}"<#rt/></#if> class="wwctrl">
+<#if parameters.id??>id="wwctrl_${parameters.id}"<#rt/></#if> class="wwctrl">
\ No newline at end of file
Modified: struts/struts2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl Mon Nov 24 11:05:16 2008
@@ -22,7 +22,7 @@
-->
<#if parameters.validate?default(false) == true>
<script type="text/javascript" src="${base}/struts/css_xhtml/validation.js"></script>
- <#if parameters.onsubmit?exists>
+ <#if parameters.onsubmit??>
${tag.addParameter('onsubmit', "${parameters.onsubmit}; return validateForm_${parameters.id}();")}
<#else>
${tag.addParameter('onsubmit', "return validateForm_${parameters.id}();")}
Modified: struts/struts2/trunk/core/src/main/resources/template/css_xhtml/form.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/form.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/css_xhtml/form.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/css_xhtml/form.ftl Mon Nov 24 11:05:16 2008
@@ -25,7 +25,7 @@
<#if (parameters.validate?default(false))>
onreset="${parameters.onreset?default('clearErrorMessages(this);clearErrorLabels(this);')}"
<#else>
- <#if parameters.onreset?exists>
+ <#if parameters.onreset??>
onreset="${parameters.onreset?html}"
</#if>
</#if>
Modified: struts/struts2/trunk/core/src/main/resources/template/css_xhtml/label.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/label.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/css_xhtml/label.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/css_xhtml/label.ftl Mon Nov 24 11:05:16 2008
@@ -23,23 +23,23 @@
<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<label<#rt/>
-<#if parameters.id?exists>
+<#if parameters.id??>
id="${parameters.id?html}"<#rt/>
</#if>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
+<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
</#if>
-<#if parameters.for?exists>
+<#if parameters.for??>
for="${parameters.for?html}"<#rt/>
</#if>
><#rt/>
-<#if parameters.nameValue?exists>
+<#if parameters.nameValue??>
<@s.property value="parameters.nameValue"/><#t/>
</#if>
Modified: struts/struts2/trunk/core/src/main/resources/template/css_xhtml/reset.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/reset.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/css_xhtml/reset.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/css_xhtml/reset.ftl Mon Nov 24 11:05:16 2008
@@ -25,10 +25,10 @@
<#else>
<span <#rt/>
</#if>
-<#if parameters.align?exists>
+<#if parameters.align??>
align="${parameters.align?html}"<#t/>
</#if>
-<#if parameters.id?exists>
+<#if parameters.id??>
id="wwctrl_${parameters.id}"<#rt/>
</#if>
><#t/>
Modified: struts/struts2/trunk/core/src/main/resources/template/css_xhtml/submit.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/submit.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/css_xhtml/submit.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/css_xhtml/submit.ftl Mon Nov 24 11:05:16 2008
@@ -25,10 +25,10 @@
<#else>
<span <#rt/>
</#if>
-<#if parameters.align?exists>
+<#if parameters.align??>
align="${parameters.align?html}"<#t/>
</#if>
-<#if parameters.id?exists>
+<#if parameters.id??>
id="wwctrl_${parameters.id}"<#rt/>
</#if>
><#t/>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl Mon Nov 24 11:05:16 2008
@@ -27,16 +27,16 @@
<#if parameters.href?if_exists != "">
href="${parameters.href}"<#rt/>
</#if>
-<#if parameters.tabindex?exists>
+<#if parameters.tabindex??>
tabindex="${parameters.tabindex?html}"<#rt/>
</#if>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
+<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
-<#if parameters.title?exists>
+<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl Mon Nov 24 11:05:16 2008
@@ -20,16 +20,16 @@
* under the License.
*/
-->
-<#if (actionErrors?exists && actionErrors?size > 0)>
+<#if (actionErrors?? && actionErrors?size > 0)>
<ul>
<#list actionErrors as error>
<li><span<#rt/>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
<#else>
class="errorMessage"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
+<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
>${error!}</span></li>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl Mon Nov 24 11:05:16 2008
@@ -20,16 +20,16 @@
* under the License.
*/
-->
-<#if (actionMessages?exists && actionMessages?size > 0)>
+<#if (actionMessages?? && actionMessages?size > 0)>
<ul>
<#list actionMessages as message>
<li><span<#rt/>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
<#else>
class="actionMessage"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
+<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
>${message!}</span></li>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl Mon Nov 24 11:05:16 2008
@@ -21,7 +21,7 @@
*/
-->
<input type="checkbox" name="${parameters.name?html}" value="${parameters.fieldValue?html}"<#rt/>
-<#if parameters.nameValue?exists && parameters.nameValue>
+<#if parameters.nameValue?? && parameters.nameValue>
checked="checked"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
@@ -30,14 +30,14 @@
<#if parameters.readonly?default(false)>
readonly="readonly"<#rt/>
</#if>
-<#if parameters.tabindex?exists>
+<#if parameters.tabindex??>
tabindex="${parameters.tabindex?html}"<#rt/>
</#if>
-<#if parameters.id?exists>
+<#if parameters.id??>
id="${parameters.id?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/css.ftl" />
-<#if parameters.title?exists>
+<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl Mon Nov 24 11:05:16 2008
@@ -21,15 +21,15 @@
*/
-->
<#assign itemCount = 0/>
-<#if parameters.list?exists>
+<#if parameters.list??>
<@s.iterator value="parameters.list">
<#assign itemCount = itemCount + 1/>
- <#if parameters.listKey?exists>
+ <#if parameters.listKey??>
<#assign itemKey = stack.findValue(parameters.listKey)/>
<#else>
<#assign itemKey = stack.findValue('top')/>
</#if>
- <#if parameters.listValue?exists>
+ <#if parameters.listValue??>
<#assign itemValue = stack.findString(parameters.listValue)?default("")/>
<#else>
<#assign itemValue = stack.findString('top')/>
@@ -42,7 +42,7 @@
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
</#if>
- <#if parameters.title?exists>
+ <#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl Mon Nov 24 11:05:16 2008
@@ -22,7 +22,7 @@
-->
<script type="text/javascript">
function autoPopulate_${parameters.escapedId?html}(targetElement) {
- <#if parameters.headerKey?exists && parameters.headerValue?exists>
+ <#if parameters.headerKey?? && parameters.headerValue??>
if (targetElement.options[targetElement.selectedIndex].value == '${parameters.headerKey?html}') {
return;
}
@@ -37,25 +37,25 @@
</script>
<#include "/${parameters.templateDir}/simple/text.ftl" />
<br />
-<#if parameters.list?exists>
+<#if parameters.list??>
<select onChange="autoPopulate_${parameters.escapedId?html}(this);"<#rt/>
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
</#if>
>
- <#if (parameters.headerKey?exists && parameters.headerValue?exists)>
+ <#if (parameters.headerKey?? && parameters.headerValue??)>
<option value="${parameters.headerKey?html}">${parameters.headerValue?html}</option>
</#if>
<#if parameters.emptyOption?default(false)>
<option value=""></option>
</#if>
<@s.iterator value="parameters.list">
- <#if parameters.listKey?exists>
+ <#if parameters.listKey??>
<#assign tmpListKey = stack.findString(parameters.listKey) />
<#else>
<#assign tmpListKey = stack.findString('top') />
</#if>
- <#if parameters.listValue?exists>
+ <#if parameters.listValue??>
<#assign tmpListValue = stack.findString(parameters.listValue) />
<#else>
<#assign tmpListValue = stack.findString('top') />
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/common-attributes.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/common-attributes.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/common-attributes.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/common-attributes.ftl Mon Nov 24 11:05:16 2008
@@ -20,6 +20,6 @@
* under the License.
*/
-->
-<#if parameters.accesskey?exists>
+<#if parameters.accesskey??>
accesskey="${parameters.accesskey?html}"
</#if>
\ No newline at end of file
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/css.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/css.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/css.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/css.ftl Mon Nov 24 11:05:16 2008
@@ -20,16 +20,16 @@
* under the License.
*/
-->
-<#assign hasFieldErrors = parameters.name?exists && fieldErrors?exists && fieldErrors[parameters.name]?exists/>
-<#if parameters.cssClass?exists && !(hasFieldErrors && parameters.cssErrorClass?exists)>
+<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/>
+<#if parameters.cssClass?? && !(hasFieldErrors && parameters.cssErrorClass??)>
class="${parameters.cssClass?html}"<#rt/>
-<#elseif parameters.cssClass?exists && (hasFieldErrors && parameters.cssErrorClass?exists)>
+<#elseif parameters.cssClass?? && (hasFieldErrors && parameters.cssErrorClass??)>
class="${parameters.cssClass?html} ${parameters.cssErrorClass?html}"<#rt/>
-<#elseif !(parameters.cssClass?exists) && (hasFieldErrors && parameters.cssErrorClass?exists)>
+<#elseif !(parameters.cssClass??) && (hasFieldErrors && parameters.cssErrorClass??)>
class="${parameters.cssErrorClass?html}"<#rt/>
</#if>
-<#if parameters.cssStyle?exists && !(hasFieldErrors && (parameters.cssErrorStyle?exists || parameters.cssErrorClass?exists))>
+<#if parameters.cssStyle?? && !(hasFieldErrors && (parameters.cssErrorStyle?? || parameters.cssErrorClass??))>
style="${parameters.cssStyle?html}"<#rt/>
-<#elseif hasFieldErrors && parameters.cssErrorStyle?exists>
+<#elseif hasFieldErrors && parameters.cssErrorStyle??>
style="${parameters.cssErrorStyle?html}"<#rt/>
</#if>
\ No newline at end of file
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl Mon Nov 24 11:05:16 2008
@@ -55,7 +55,7 @@
<#list stackObject.value.keySet() as propertyName>
<#if renderRow==true></tr><tr><#else> <#assign renderRow=false> </#if>
<td bgcolor="<#if (index % 2) == 0>#BBBBBB<#else>#CCCCCC</#if>">${propertyName}</td>
- <td bgcolor="<#if (index % 2) == 0>#BBBBBB<#else>#CCCCCC</#if>"><#if stackObject.value.get(propertyName)?exists>${stackObject.value.get(propertyName).toString()?html}<#else>null</#if></td>
+ <td bgcolor="<#if (index % 2) == 0>#BBBBBB<#else>#CCCCCC</#if>"><#if stackObject.value.get(propertyName)??>${stackObject.value.get(propertyName).toString()?html}<#else>null</#if></td>
</tr>
<#assign index= index + 1>
</#list>
@@ -73,7 +73,7 @@
<#assign index=1>
<#list stack.context.keySet() as contextKey>
<tr bgcolor="<#if (index % 2) == 0>#BBBBBB<#else>#CCCCCC</#if>">
- <td>${contextKey}</td><td><#if stack.context.get(contextKey)?exists>${stack.context.get(contextKey).toString()?html}<#else>null</#if></td>
+ <td>${contextKey}</td><td><#if stack.context.get(contextKey)??>${stack.context.get(contextKey).toString()?html}<#else>null</#if></td>
</tr>
<#assign index= index + 1>
</#list>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl Mon Nov 24 11:05:16 2008
@@ -21,11 +21,11 @@
*/
-->
<div
- <#if parameters.id?exists> id="${parameters.id?html}" </#if>
- <#if parameters.name?exists> name="${parameters.name?html}" </#if>
- <#if parameters.cssClass?exists> class="${parameters.cssClass?html}" </#if>
- <#if parameters.cssStyle?exists> style="${parameters.cssStyle?html}" </#if>
- <#if parameters.title?exists> title="${parameters.title?html}"<#rt/>
+ <#if parameters.id??> id="${parameters.id?html}" </#if>
+ <#if parameters.name??> name="${parameters.name?html}" </#if>
+ <#if parameters.cssClass??> class="${parameters.cssClass?html}" </#if>
+ <#if parameters.cssStyle??> style="${parameters.cssStyle?html}" </#if>
+ <#if parameters.title??> title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl Mon Nov 24 11:05:16 2008
@@ -22,10 +22,10 @@
-->
<#include "/${parameters.templateDir}/simple/select.ftl" />
<#assign startCount = 0/>
-<#if parameters.headerKey?exists && parameters.headerValue?exists>
+<#if parameters.headerKey?? && parameters.headerValue??>
<#assign startCount = startCount + 1/>
</#if>
-<#if parameters.emptyOption?exists>
+<#if parameters.emptyOption??>
<#assign startCount = startCount + 1/>
</#if>
@@ -35,25 +35,25 @@
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
</#if>
-<#if parameters.doubleTabindex?exists>
+<#if parameters.doubleTabindex??>
tabindex="${parameters.doubleTabindex?html}"<#rt/>
</#if>
-<#if parameters.doubleId?exists>
+<#if parameters.doubleId??>
id="${parameters.doubleId?html}"<#rt/>
</#if>
-<#if parameters.doubleCss?exists>
+<#if parameters.doubleCss??>
class="${parameters.doubleCss?html}"<#rt/>
</#if>
-<#if parameters.doubleStyle?exists>
+<#if parameters.doubleStyle??>
style="${parameters.doubleStyle?html}"<#rt/>
</#if>
-<#if parameters.title?exists>
+<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
<#if parameters.multiple?default(false)>
multiple="multiple"<#rt/>
</#if>
-<#if parameters.get("doubleSize")?exists>
+<#if parameters.get("doubleSize")??>
size="${parameters.get("doubleSize")?html}"<#rt/>
</#if>
<#if parameters.doubleMultiple?default(false)>
@@ -68,25 +68,25 @@
${parameters.id}Group[i] = new Array();
<@s.iterator value="parameters.list">
- <#if parameters.listKey?exists>
+ <#if parameters.listKey??>
<#assign itemKey = stack.findValue(parameters.listKey)/>
<#else>
<#assign itemKey = stack.findValue('top')/>
</#if>
- <#if parameters.listValue?exists>
+ <#if parameters.listValue??>
<#assign itemValue = stack.findString(parameters.listValue)/>
<#else>
<#assign itemValue = stack.findString('top')/>
</#if>
<#assign doubleItemCount = 0/>
<@s.iterator value="${parameters.doubleList}">
- <#if parameters.doubleListKey?exists>
+ <#if parameters.doubleListKey??>
<#assign doubleItemKey = stack.findValue(parameters.doubleListKey)/>
<#else>
<#assign doubleItemKey = stack.findValue('top')/>
</#if>
<#assign doubleItemKeyStr = doubleItemKey.toString() />
- <#if parameters.doubleListValue?exists>
+ <#if parameters.doubleListValue??>
<#assign doubleItemValue = stack.findString(parameters.doubleListValue)/>
<#else>
<#assign doubleItemValue = stack.findString('top')/>
@@ -102,7 +102,7 @@
<#assign itemCount = startCount/>
<#assign redirectTo = 0/>
<@s.iterator value="parameters.list">
- <#if parameters.listKey?exists>
+ <#if parameters.listKey??>
<#assign itemKey = stack.findValue(parameters.listKey)/>
<#else>
<#assign itemKey = stack.findValue('top')/>
@@ -121,7 +121,7 @@
for (i = 0; i < ${parameters.id}Group[x].length; i++) {
${parameters.id}Temp.options[i] = new Option(${parameters.id}Group[x][i].text, ${parameters.id}Group[x][i].value);
- <#if parameters.doubleNameValue?exists>
+ <#if parameters.doubleNameValue??>
if (${parameters.id}Temp.options[i].value == '${parameters.doubleNameValue}') {
${parameters.id}Temp.options[i].selected = true;
selected = true;
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl Mon Nov 24 11:05:16 2008
@@ -20,7 +20,7 @@
* under the License.
*/
-->
-<#if (parameters.dynamicAttributes?exists && parameters.dynamicAttributes?size > 0)><#t/>
+<#if (parameters.dynamicAttributes?? && parameters.dynamicAttributes?size > 0)><#t/>
<#assign aKeys = parameters.dynamicAttributes.keySet()><#t/>
<#list aKeys as aKey><#t/>
${aKey}="${parameters.dynamicAttributes[aKey]?html}"<#rt/>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl Mon Nov 24 11:05:16 2008
@@ -20,7 +20,7 @@
* under the License.
*/
-->
-<#if fieldErrors?exists><#t/>
+<#if fieldErrors??><#t/>
<#assign eKeys = fieldErrors.keySet()><#t/>
<#assign eKeysSize = eKeys.size()><#t/>
<#assign doneStartUlTag=false><#t/>
@@ -38,12 +38,12 @@
</#if><#t/>
<#list eValue as eEachValue><#t/>
<li><span<#rt/>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
<#else>
class="errorMessage"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
+<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
>${eEachValue}</span></li>
@@ -62,12 +62,12 @@
<#assign eValue = fieldErrors[eKey]><#t/>
<#list eValue as eEachValue><#t/>
<li><span<#rt/>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
<#else>
class="errorMessage"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
+<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
>${eEachValue}</span></li>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl Mon Nov 24 11:05:16 2008
@@ -22,26 +22,26 @@
-->
<input type="file"<#rt/>
name="${parameters.name?default("")?html}"<#rt/>
-<#if parameters.get("size")?exists>
+<#if parameters.get("size")??>
size="${parameters.get("size")?html}"<#rt/>
</#if>
-<#if parameters.nameValue?exists>
+<#if parameters.nameValue??>
value="<@s.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
</#if>
-<#if parameters.accept?exists>
+<#if parameters.accept??>
accept="${parameters.accept?html}"<#rt/>
</#if>
-<#if parameters.tabindex?exists>
+<#if parameters.tabindex??>
tabindex="${parameters.tabindex?html}"<#rt/>
</#if>
-<#if parameters.id?exists>
+<#if parameters.id??>
id="${parameters.id?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/css.ftl" />
-<#if parameters.title?exists>
+<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl Mon Nov 24 11:05:16 2008
@@ -35,7 +35,7 @@
StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
var selectObj = document.getElementById("${selectObjectId}");
- <#if parameters.optiontransferselectIds.get(selectObjectId)?exists>
+ <#if parameters.optiontransferselectIds.get(selectObjectId)??>
<#assign selectTagHeaderKey = parameters.optiontransferselectIds.get(selectObjectId)/>
selectAllOptionsExceptSome(selectObj, "key", "${selectTagHeaderKey}");
<#else>
@@ -51,7 +51,7 @@
StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
var selectObj = document.getElementById("${selectObjectId}");
- <#if parameters.inputtransferselectIds.get(selectObjectId)?exists>
+ <#if parameters.inputtransferselectIds.get(selectObjectId)??>
<#assign selectTagHeaderKey = parameters.inputtransferselectIds.get(selectObjectId)/>
selectAllOptionsExceptSome(selectObj, "key", "${selectTagHeaderKey}");
<#else>
@@ -67,7 +67,7 @@
StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
var selectObj = document.getElementById("${selectObjId}");
- <#if parameters.optiontransferselectDoubleIds.get(selectObjId)?exists>
+ <#if parameters.optiontransferselectDoubleIds.get(selectObjId)??>
<#assign selectTagHeaderKey = parameters.optiontransferselectDoubleIds.get(selectObjId)/>
selectAllOptionsExceptSome(selectObj, "key", "${selectTagHeaderKey}");
<#else>
@@ -89,7 +89,7 @@
StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
var updownselectObj = document.getElementById("${tmpId}");
- <#if parameters.updownselectIds.get(tmpId)?exists>
+ <#if parameters.updownselectIds.get(tmpId)??>
<#assign tmpHeaderKey = parameters.updownselectIds.get(tmpId) />
selectAllOptionsExceptSome(updownselectObj, "key", "${tmpHeaderKey}");
<#else>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/form-common.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/form-common.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/form-common.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/form-common.ftl Mon Nov 24 11:05:16 2008
@@ -21,49 +21,49 @@
*/
-->
<#if (parameters.validate?default(false) == false)><#rt/>
- <#if parameters.onsubmit?exists><#rt/>
+ <#if parameters.onsubmit??><#rt/>
${tag.addParameter('onsubmit', "${parameters.onsubmit}; return true;") }
<#else>
${tag.addParameter('onsubmit', "return true;") }
</#if>
</#if>
<form<#rt/>
-<#if parameters.id?exists>
+<#if parameters.id??>
id="${parameters.id?html}"<#rt/>
</#if>
-<#if parameters.name?exists>
+<#if parameters.name??>
name="${parameters.name?html}"<#rt/>
</#if>
-<#if parameters.onsubmit?exists>
+<#if parameters.onsubmit??>
onsubmit="${parameters.onsubmit?html}"<#rt/>
</#if>
-<#if parameters.onreset?exists>
+<#if parameters.onreset??>
onsubmit="${parameters.onreset?html}"<#rt/>
</#if>
-<#if parameters.action?exists>
+<#if parameters.action??>
action="${parameters.action?html}"<#rt/>
</#if>
-<#if parameters.target?exists>
+<#if parameters.target??>
target="${parameters.target?html}"<#rt/>
</#if>
-<#if parameters.method?exists>
+<#if parameters.method??>
method="${parameters.method?html}"<#rt/>
<#else>
method="post"<#rt/>
</#if>
-<#if parameters.enctype?exists>
+<#if parameters.enctype??>
enctype="${parameters.enctype?html}"<#rt/>
</#if>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
+<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
-<#if parameters.title?exists>
+<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
-<#if parameters.acceptcharset?exists>
+<#if parameters.acceptcharset??>
accept-charset="${parameters.acceptcharset?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" />
\ No newline at end of file
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl Mon Nov 24 11:05:16 2008
@@ -21,7 +21,7 @@
*/
-->
<#include "/${parameters.templateDir}/simple/form-common.ftl" />
-<#if parameters.onreset?exists>
+<#if parameters.onreset??>
onreset="${parameters.onreset?html}"<#rt/>
</#if>
>
\ No newline at end of file
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/hidden.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/hidden.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/hidden.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/hidden.ftl Mon Nov 24 11:05:16 2008
@@ -22,16 +22,16 @@
-->
<input type="hidden"<#rt/>
name="${parameters.name?default("")?html}"<#rt/>
-<#if parameters.nameValue?exists>
+<#if parameters.nameValue??>
value="<@s.property value="parameters.nameValue"/>"<#rt/>
</#if>
-<#if parameters.id?exists>
+<#if parameters.id??>
id="${parameters.id?html}"<#rt/>
</#if>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
+<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/inputtransferselect.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/inputtransferselect.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/inputtransferselect.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/inputtransferselect.ftl Mon Nov 24 11:05:16 2008
@@ -20,14 +20,14 @@
* under the License.
*/
-->
-<#if !stack.findValue("#inputtransferselect_js_included")?exists><#t/>
+<#if !stack.findValue("#inputtransferselect_js_included")??><#t/>
<script type="text/javascript" src="<@s.url value="/struts/inputtransferselect.js" encode='false' includeParams='none'/>"></script>
<#assign temporaryVariable = stack.setValue("#inputtransferselect_js_included", "true") /><#t/>
</#if><#t/>
<table border="0">
<tr>
<td>
-<#if parameters.leftTitle?exists><#t/>
+<#if parameters.leftTitle??><#t/>
<label for="leftTitle">${parameters.leftTitle}</label><br />
</#if><#t/>
@@ -40,19 +40,19 @@
<#if parameters.readonly?default(false)>
readonly="readonly"<#rt/>
</#if>
-<#if parameters.tabindex?exists>
+<#if parameters.tabindex??>
tabindex="${parameters.tabindex?html}"<#rt/>
</#if>
-<#if parameters.id?exists>
+<#if parameters.id??>
id="${parameters.id?html}_input"<#rt/>
</#if>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
+<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
-<#if parameters.title?exists>
+<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
@@ -64,57 +64,57 @@
<td valign="middle" align="center">
<#assign addLabel=parameters.addLabel?default("->")?html /><#t/>
<input type="button"
- <#if parameters.buttonCssClass?exists><#t/>
+ <#if parameters.buttonCssClass??><#t/>
class="${parameters.buttonCssClass?html}"
</#if><#t/>
- <#if parameters.buttonCssStyle?exists>
+ <#if parameters.buttonCssStyle??>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
value="${addLabel}" onclick="addOption(document.getElementById('${parameters.id?html}_input'), document.getElementById('${parameters.id?html}'))" /><br /><br />
<#t/>
<#assign removeLabel=parameters.removeLabel?default("<-")?html /><#t/>
<input type="button"
- <#if parameters.buttonCssClass?exists><#t/>
+ <#if parameters.buttonCssClass??><#t/>
class="${parameters.buttonCssClass?html}"
</#if><#t/>
- <#if parameters.buttonCssStyle?exists>
+ <#if parameters.buttonCssStyle??>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
value="${removeLabel}" onclick="removeOptions(document.getElementById('${parameters.id?html}'))" /><br /><br />
<#t/>
<#assign removeAllLabel=parameters.removeAllLabel?default("<<--")?html /><#t/>
<input type="button"
- <#if parameters.buttonCssClass?exists><#t/>
+ <#if parameters.buttonCssClass??><#t/>
class="${parameters.buttonCssClass?html}"
</#if><#t/>
- <#if parameters.buttonCssStyle?exists>
+ <#if parameters.buttonCssStyle??>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
value="${removeAllLabel}" onclick="removeAllOptions(document.getElementById('${parameters.id?html}'))" /><br /><br />
</td>
<td>
-<#if parameters.rightTitle?exists><#t/>
+<#if parameters.rightTitle??><#t/>
<label for="rightTitle">${parameters.rightTitle}</label><br />
</#if><#t/>
<#include "/${parameters.templateDir}/simple/select.ftl" />
<#if parameters.allowUpDown?default(true)>
<input type="button"
-<#if parameters.headerKey?exists>
+<#if parameters.headerKey??>
onclick="moveOptionDown(document.getElementById('${parameters.id}'), 'key', '${parameters.headerKey}');"
<#else>
onclick="moveOptionDown(document.getElementById('${parameters.id}'), 'key', '');"
</#if>
-<#if parameters.downLabel?exists>
+<#if parameters.downLabel??>
value="${parameters.downLabel?html}"
</#if>
/>
<input type="button"
-<#if parameters.headerKey?exists>
+<#if parameters.headerKey??>
onclick="moveOptionUp(document.getElementById('${parameters.id}'), 'key', '${parameters.headerKey}');"
<#else>
onclick="moveOptionUp(document.getElementById('${parameters.id}'), 'key', '');"
</#if>
-<#if parameters.upLabel?exists>
+<#if parameters.upLabel??>
value="${parameters.upLabel?html}"
</#if>
/>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl Mon Nov 24 11:05:16 2008
@@ -21,25 +21,25 @@
*/
-->
<label<#rt/>
-<#if parameters.id?exists>
+<#if parameters.id??>
id="${parameters.id?html}"<#rt/>
</#if>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
+<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
-<#if parameters.title?exists>
+<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
-<#if parameters.for?exists>
+<#if parameters.for??>
for="${parameters.for?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" />
><#rt/>
-<#if parameters.nameValue?exists>
+<#if parameters.nameValue??>
<@s.property value="parameters.nameValue"/><#t/>
</#if>
</label>
\ No newline at end of file
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl Mon Nov 24 11:05:16 2008
@@ -20,11 +20,11 @@
* under the License.
*/
-->
-<#if parameters.optGroupInternalListUiBeanList?exists>
+<#if parameters.optGroupInternalListUiBeanList??>
<#assign optGroupInternalListUiBeans=parameters.optGroupInternalListUiBeanList />
<#list optGroupInternalListUiBeans as optGroupInternalListUiBean>
<optgroup
- <#if optGroupInternalListUiBean.parameters.label?exists>
+ <#if optGroupInternalListUiBean.parameters.label??>
label="${optGroupInternalListUiBean.parameters.label}"
</#if>
<#if optGroupInternalListUiBean.parameters.disabled?default(false)>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl Mon Nov 24 11:05:16 2008
@@ -20,27 +20,27 @@
* under the License.
*/
-->
-<#if !stack.findValue("#optiontransferselect_js_included")?exists><#t/>
+<#if !stack.findValue("#optiontransferselect_js_included")??><#t/>
<script type="text/javascript" src="<@s.url value="/struts/optiontransferselect.js" encode='false' includeParams='none'/>"></script>
<#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/>
</#if><#t/>
<table border="0">
<tr>
<td>
-<#if parameters.leftTitle?exists><#t/>
+<#if parameters.leftTitle??><#t/>
<label for="leftTitle">${parameters.leftTitle}</label><br />
</#if><#t/>
<#include "/${parameters.templateDir}/simple/select.ftl" />
<#if parameters.allowUpDownOnLeft?default(true)>
<input type="button"
- onclick="moveOptionDown(document.getElementById('${parameters.id}'), 'key', <#if parameters.headerKey?exists>'${parameters.headerKey}'<#else>''</#if>);<#if parameters.upDownOnLeftOnclick?has_content>${parameters.upDownOnLeftOnclick};</#if>"
-<#if parameters.leftDownLabel?exists>
+ onclick="moveOptionDown(document.getElementById('${parameters.id}'), 'key', <#if parameters.headerKey??>'${parameters.headerKey}'<#else>''</#if>);<#if parameters.upDownOnLeftOnclick?has_content>${parameters.upDownOnLeftOnclick};</#if>"
+<#if parameters.leftDownLabel??>
value="${parameters.leftDownLabel?html}"
</#if>
/>
<input type="button"
- onclick="moveOptionUp(document.getElementById('${parameters.id}'), 'key', <#if parameters.headerKey?exists>'${parameters.headerKey}'<#else>''</#if>);<#if parameters.upDownOnLeftOnclick?has_content>${parameters.upDownOnLeftOnclick};</#if>"
-<#if parameters.leftUpLabel?exists>
+ onclick="moveOptionUp(document.getElementById('${parameters.id}'), 'key', <#if parameters.headerKey??>'${parameters.headerKey}'<#else>''</#if>);<#if parameters.upDownOnLeftOnclick?has_content>${parameters.upDownOnLeftOnclick};</#if>"
+<#if parameters.leftUpLabel??>
value="${parameters.leftUpLabel?html}"
</#if>
/>
@@ -50,21 +50,21 @@
<td valign="middle" align="center">
<#if parameters.allowAddToLeft?default(true)><#t/>
<#assign addToLeftLabel = parameters.addToLeftLabel?default("<-")?html/><#t/>
- <#if parameters.doubleHeaderKey?exists><#t/>
+ <#if parameters.doubleHeaderKey??><#t/>
<input type="button"
- <#if parameters.buttonCssClass?exists><#t/>
+ <#if parameters.buttonCssClass??><#t/>
class="${parameters.buttonCssClass?html}"
</#if><#t/>
- <#if parameters.buttonCssStyle?exists><#t/>
+ <#if parameters.buttonCssStyle??><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
value="${addToLeftLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '${parameters.doubleHeaderKey}', '');<#if parameters.addToLeftOnclick?has_content>${parameters.addToLeftOnclick};</#if>" /><br /><br />
<#else><#t/>
<input type="button"
- <#if parameters.buttonCssClass?exists><#t/>
+ <#if parameters.buttonCssClass??><#t/>
class="${parameters.buttonCssClass?html}"
</#if><#t/>
- <#if parameters.buttonCssStyle?exists><#t/>
+ <#if parameters.buttonCssStyle??><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
value="${addToLeftLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '');<#if parameters.addToLeftOnclick?has_content>${parameters.addToLeftOnclick};</#if>" /><br /><br />
@@ -72,21 +72,21 @@
</#if><#t/>
<#if parameters.allowAddToRight?default(true)><#t/>
<#assign addToRightLabel=parameters.addToRightLabel?default("->")?html /><#t/>
- <#if parameters.headerKey?exists><#t/>
+ <#if parameters.headerKey??><#t/>
<input type="button"
- <#if parameters.buttonCssClass?exists><#t/>
+ <#if parameters.buttonCssClass??><#t/>
class="${parameters.buttonCssClass?html}"
</#if><#t/>
- <#if parameters.buttonCssStyle?exists><#t/>
+ <#if parameters.buttonCssStyle??><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
value="${addToRightLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '${parameters.headerKey}', '');<#if parameters.addToRightOnclick?has_content>${parameters.addToRightOnclick};</#if>" /><br /><br />
<#else><#t/>
<input type="button"
- <#if parameters.buttonCssClass?exists><#t/>
+ <#if parameters.buttonCssClass??><#t/>
class="${parameters.buttonCssClass?html}"
</#if><#t/>
- <#if parameters.buttonCssStyle?exists>
+ <#if parameters.buttonCssStyle??>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
value="${addToRightLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '');<#if parameters.addToRightOnclick?has_content>${parameters.addToRightOnclick};</#if>" /><br /><br />
@@ -94,21 +94,21 @@
</#if><#t/>
<#if parameters.allowAddAllToLeft?default(true)><#t/>
<#assign addAllToLeftLabel=parameters.addAllToLeftLabel?default("<<--")?html /><#t/>
- <#if parameters.doubleHeaderKey?exists><#t/>
+ <#if parameters.doubleHeaderKey??><#t/>
<input type="button"
- <#if parameters.buttonCssClass?exists><#t/>
+ <#if parameters.buttonCssClass??><#t/>
class="${parameters.buttonCssClass}"
</#if><#t/>
- <#if parameters.buttonCssStyle?exists><#t/>
+ <#if parameters.buttonCssStyle??><#t/>
style="${parameters.buttonCssStyle}"
</#if><#t/>
value="${addAllToLeftLabel}" onclick="moveAllOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '${parameters.doubleHeaderKey}', '');<#if parameters.addAllToLeftOnclick?has_content>${parameters.addAllToLeftOnclick};</#if>" /><br /><br />
<#else><#t/>
<input type="button"
- <#if parameters.buttonCssClass?exists><#t/>
+ <#if parameters.buttonCssClass??><#t/>
class="${parameters.buttonCssClass?html}"
</#if><#t/>
- <#if parameters.buttonCssStyle?exists><#t/>
+ <#if parameters.buttonCssStyle??><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
value="${addAllToLeftLabel}" onclick="moveAllOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '');<#if parameters.addAllToLeftOnclick?has_content>${parameters.addAllToLeftOnclick};</#if>" /><br /><br />
@@ -116,21 +116,21 @@
</#if><#t/>
<#if parameters.allowAddAllToRight?default(true)><#t/>
<#assign addAllToRightLabel=parameters.addAllToRightLabel?default("-->>")?html /><#t/>
- <#if parameters.headerKey?exists><#t/>
+ <#if parameters.headerKey??><#t/>
<input type="button"
- <#if parameters.buttonCssClass?exists><#t/>
+ <#if parameters.buttonCssClass??><#t/>
class="${parameters.buttonCssClass?html}"
</#if><#t/>
- <#if parameters.buttonCssStyle?exists><#t/>
+ <#if parameters.buttonCssStyle??><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
value="${addAllToRightLabel}" onclick="moveAllOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '${parameters.headerKey}', '');<#if parameters.addAllToRightOnclick?has_content>${parameters.addAllToRightOnclick};</#if>" /><br /><br />
<#else><#t/>
<input type="button"
- <#if parameters.buttonCssClass?exists><#t/>
+ <#if parameters.buttonCssClass??><#t/>
class="${parameters.buttonCssClass?html}"
</#if><#t/>
- <#if parameters.buttonCssStyle?exists><#t/>
+ <#if parameters.buttonCssStyle??><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
value="${addAllToRightLabel}" onclick="moveAllOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '');<#if parameters.addAllToRightOnclick?has_content>${parameters.addAllToRightOnclick};</#if>" /><br /><br />
@@ -138,39 +138,39 @@
</#if><#t/>
<#if parameters.allowSelectAll?default(true)><#t/>
<#assign selectAllLabel=parameters.selectAllLabel?default("<*>")?html /><#t/>
- <#if parameters.headerKey?exists && parameters.doubleHeaderKey?exists><#t/>
+ <#if parameters.headerKey?? && parameters.doubleHeaderKey??><#t/>
<input type="button"
- <#if parameters.buttonCssClass?exists><#t/>
+ <#if parameters.buttonCssClass??><#t/>
class="${parameters.buttonCssClass?html}"
</#if><#t/>
- <#if parameters.buttonCssStyle?exists><#t/>
+ <#if parameters.buttonCssStyle??><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
value="${selectAllLabel}" onclick="selectAllOptionsExceptSome(document.getElementById('${parameters.id?html}'), 'key', '${parameters.headerKey}');selectAllOptionsExceptSome(document.getElementById('${parameters.doubleId?html}'), 'key', '${parameters.doubleHeaderKey}');<#if parameters.selectAllOnclick?has_content>${parameters.selectAllOnclick};</#if>" /><br /><br />
- <#elseif parameters.headerKey?exists><#t/>
+ <#elseif parameters.headerKey??><#t/>
<input type="button"
- <#if parameters.buttonCssClass?exists><#t/>
+ <#if parameters.buttonCssClass??><#t/>
class="${parameters.buttonCssClass?html}"
</#if><#t/>
- <#if parameters.buttonCssStyle?exists><#t/>
+ <#if parameters.buttonCssStyle??><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
value="${selectAllLabel}" onclick="selectAllOptionsExceptSome(document.getElementById('${parameters.id?html}'), 'key', '${parameters.headerKey}');selectAllOptions(document.getElementById('${parameters.doubleId?html}'));<#if parameters.selectAllOnclick?has_content>${parameters.selectAllOnclick};</#if>" /><br /><br />
- <#elseif parameters.doubleHeaderKey?exists><#t/>
+ <#elseif parameters.doubleHeaderKey??><#t/>
<input type="button"
- <#if parameters.buttonCssClass?exists><#t/>
+ <#if parameters.buttonCssClass??><#t/>
class="${parameters.buttonCssClass?html}"
</#if><#t/>
- <#if parameters.buttonCssStyle?exists><#t/>
+ <#if parameters.buttonCssStyle??><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
value="${selectAllLabel}" onclick="selectAllOptions(document.getElementById('${parameters.id?html}'));selectAllOptionsExceptSome(document.getElementById('${parameters.doubleId?html}'), 'key', '${parameters.doubleHeaderKey}');<#if parameters.selectAllOnclick?has_content>${parameters.selectAllOnclick};</#if>" /><br /><br />
<#else><#t/>
<input type="button"
- <#if parameters.buttonCssClass?exists><#t/>
+ <#if parameters.buttonCssClass??><#t/>
class="${parameters.buttonCssClass?html}"
</#if><#t/>
- <#if parameters.buttonCssStyle?exists><#t/>
+ <#if parameters.buttonCssStyle??><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
value="${selectAllLabel}" onclick="selectAllOptions(document.getElementById('${parameters.id?html}'));selectAllOptions(document.getElementById('${parameters.doubleId?html}'));<#if parameters.selectAllOnclick?has_content>${parameters.selectAllOnclick};</#if>" /><br /><br />
@@ -178,12 +178,12 @@
</#if><#t/>
</td>
<td>
-<#if parameters.rightTitle?exists><#t/>
+<#if parameters.rightTitle??><#t/>
<label for="rightTitle">${parameters.rightTitle}</label><br />
</#if><#t/>
<select
name="${parameters.doubleName?default("")?html}"
- <#if parameters.get("doubleSize")?exists><#t/>
+ <#if parameters.get("doubleSize")??><#t/>
size="${parameters.get("doubleSize")?html}"
</#if><#t/>
<#if parameters.doubleDisabled?default(false)><#t/>
@@ -192,75 +192,75 @@
<#if parameters.doubleMultiple?default(false)><#t/>
multiple="multiple"
</#if><#t/>
- <#if parameters.doubleTabindex?exists><#t/>
+ <#if parameters.doubleTabindex??><#t/>
tabindex="${parameters.tabindex?html}"
</#if><#t/>
- <#if parameters.doubleId?exists><#t/>
+ <#if parameters.doubleId??><#t/>
id="${parameters.doubleId?html}"
</#if><#t/>
- <#if parameters.doubleCss?exists><#t/>
+ <#if parameters.doubleCss??><#t/>
class="${parameters.doubleCss?html}"
</#if><#t/>
- <#if parameters.doubleStyle?exists><#t/>
+ <#if parameters.doubleStyle??><#t/>
style="${parameters.doubleStyle?html}"
</#if><#t/>
- <#if parameters.doubleOnclick?exists><#t/>
+ <#if parameters.doubleOnclick??><#t/>
onclick="${parameters.doubleOnclick?html}"
</#if><#t/>
- <#if parameters.doubleOndblclick?exists><#t/>
+ <#if parameters.doubleOndblclick??><#t/>
ondblclick="${parameters.doubleOndblclick?html}"
</#if><#t/>
- <#if parameters.doubleOnmousedown?exists><#t/>
+ <#if parameters.doubleOnmousedown??><#t/>
onmousedown="${parameters.doubleOnmousedown?html}"
</#if><#t/>
- <#if parameters.doubleOnmouseup?exists><#t/>
+ <#if parameters.doubleOnmouseup??><#t/>
onmouseup="${parameters.doubleMnmouseup?html}"
</#if><#t/>
- <#if parameters.doubleOnmousemove?exists><#t/>
+ <#if parameters.doubleOnmousemove??><#t/>
onmousemove="${parameters.doubleOnmousemove?html}"
</#if><#t/>
- <#if parameters.doubleOnmouseout?exists><#t/>
+ <#if parameters.doubleOnmouseout??><#t/>
onmouseout="${parameters.doubleOnmouseout?html}"
</#if><#t/>
- <#if parameters.doubleOnfocus?exists><#t/>
+ <#if parameters.doubleOnfocus??><#t/>
onfocus="${parameters.doubleOnfocus?html}"
</#if><#t/>
- <#if parameters.doubleOnblur?exists><#t/>
+ <#if parameters.doubleOnblur??><#t/>
onblur="${parameters.doubleOnblur?html}"
</#if><#t/>
- <#if parameters.doubleOnkeypress?exists><#t/>
+ <#if parameters.doubleOnkeypress??><#t/>
onkeypress="${parameters.doubleOnkeypress?html}"
</#if><#t/>
- <#if parameters.doubleOnKeydown?exists><#t/>
+ <#if parameters.doubleOnKeydown??><#t/>
onkeydown="${parameters.doubleOnkeydown?html}"
</#if><#t/>
- <#if parameters.doubleOnkeyup?exists><#t/>
+ <#if parameters.doubleOnkeyup??><#t/>
onkeyup="${parameters.doubleOnkeyup?html}"
</#if><#t/>
- <#if parameters.doubleOnselect?exists><#t/>
+ <#if parameters.doubleOnselect??><#t/>
onselect="${parameters.doubleOnselect?html}"
</#if><#t/>
- <#if parameters.doubleOnchange?exists><#t/>
+ <#if parameters.doubleOnchange??><#t/>
onchange="${parameters.doubleOnchange?html}"
</#if><#t/>
- <#if parameters.doubleAccesskey?exists><#t/>
+ <#if parameters.doubleAccesskey??><#t/>
accesskey="${parameters.doubleAccesskey?html}"
</#if>
>
- <#if parameters.doubleHeaderKey?exists && parameters.doubleHeaderValue?exists><#t/>
+ <#if parameters.doubleHeaderKey?? && parameters.doubleHeaderValue??><#t/>
<option value="${parameters.doubleHeaderKey?html}">${parameters.doubleHeaderValue?html}</option>
</#if><#t/>
<#if parameters.doubleEmptyOption?default(false)><#t/>
<option value=""></option>
</#if><#t/>
<@s.iterator value="parameters.doubleList"><#t/>
- <#if parameters.doubleListKey?exists><#t/>
+ <#if parameters.doubleListKey??><#t/>
<#assign doubleItemKey = stack.findValue(parameters.doubleListKey) /><#t/>
<#else><#t/>
<#assign doubleItemKey = stack.findValue('top') /><#t/>
</#if><#t/>
<#assign doubleItemKeyStr = doubleItemKey.toString() /><#t/>
- <#if parameters.doubleListValue?exists><#t/>
+ <#if parameters.doubleListValue??><#t/>
<#assign doubleItemValue = stack.findString(parameters.doubleListValue)!"" /><#t/>
<#else><#t/>
<#assign doubleItemValue = stack.findString('top') /><#t/>
@@ -274,14 +274,14 @@
</select>
<#if parameters.allowUpDownOnRight?default(true)>
<input type="button"
- onclick="moveOptionDown(document.getElementById('${parameters.doubleId}'), 'key', <#if parameters.doubleHeaderKey?exists>'${parameters.doubleHeaderKey}'<#else>''</#if>);<#if parameters.upDownOnRightOnclick?has_content>${parameters.upDownOnRightOnclick};</#if>"
-<#if parameters.rightDownLabel?exists>
+ onclick="moveOptionDown(document.getElementById('${parameters.doubleId}'), 'key', <#if parameters.doubleHeaderKey??>'${parameters.doubleHeaderKey}'<#else>''</#if>);<#if parameters.upDownOnRightOnclick?has_content>${parameters.upDownOnRightOnclick};</#if>"
+<#if parameters.rightDownLabel??>
value="${parameters.rightDownLabel?html}"
</#if>
/>
<input type="button"
- onclick="moveOptionUp(document.getElementById('${parameters.doubleId}'), 'key', <#if parameters.doubleHeaderKey?exists>'${parameters.doubleHeaderKey}'<#else>''</#if>);<#if parameters.upDownOnRightOnclick?has_content>${parameters.upDownOnRightOnclick};</#if>"
-<#if parameters.rightUpLabel?exists>
+ onclick="moveOptionUp(document.getElementById('${parameters.doubleId}'), 'key', <#if parameters.doubleHeaderKey??>'${parameters.doubleHeaderKey}'<#else>''</#if>);<#if parameters.upDownOnRightOnclick?has_content>${parameters.upDownOnRightOnclick};</#if>"
+<#if parameters.rightUpLabel??>
value="${parameters.rightUpLabel?html}"
</#if>
/>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl Mon Nov 24 11:05:16 2008
@@ -22,13 +22,13 @@
-->
<input type="password"<#rt/>
name="${parameters.name?default("")?html}"<#rt/>
-<#if parameters.get("size")?exists>
+<#if parameters.get("size")??>
size="${parameters.get("size")?html}"<#rt/>
</#if>
-<#if parameters.maxlength?exists>
+<#if parameters.maxlength??>
maxlength="${parameters.maxlength?html}"<#rt/>
</#if>
-<#if parameters.nameValue?exists && parameters.showPassword?default(false)>
+<#if parameters.nameValue?? && parameters.showPassword?default(false)>
value="<@s.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
@@ -37,14 +37,14 @@
<#if parameters.readonly?default(false)>
readonly="readonly"<#rt/>
</#if>
-<#if parameters.tabindex?exists>
+<#if parameters.tabindex??>
tabindex="${parameters.tabindex?html}"<#rt/>
</#if>
-<#if parameters.id?exists>
+<#if parameters.id??>
id="${parameters.id?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/css.ftl" />
-<#if parameters.title?exists>
+<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl Mon Nov 24 11:05:16 2008
@@ -21,41 +21,41 @@
*/
-->
<@s.iterator value="parameters.list">
- <#if parameters.listKey?exists>
+ <#if parameters.listKey??>
<#assign itemKey = stack.findValue(parameters.listKey)/>
<#else>
<#assign itemKey = stack.findValue('top')/>
</#if>
<#assign itemKeyStr = itemKey.toString() />
- <#if parameters.listValue?exists>
+ <#if parameters.listValue??>
<#assign itemValue = stack.findString(parameters.listValue)/>
<#else>
<#assign itemValue = stack.findString('top')/>
</#if>
<input type="radio"<#rt/>
-<#if parameters.name?exists>
+<#if parameters.name??>
name="${parameters.name?html}"<#rt/>
</#if>
id="${parameters.id?html}${itemKeyStr?html}"<#rt/>
<#if tag.contains(parameters.nameValue?default(''), itemKeyStr)>
checked="checked"<#rt/>
</#if>
-<#if itemKey?exists>
+<#if itemKey??>
value="${itemKeyStr?html}"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
</#if>
-<#if parameters.tabindex?exists>
+<#if parameters.tabindex??>
tabindex="${parameters.tabindex?html}"<#rt/>
</#if>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
+<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
-<#if parameters.title?exists>
+<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl Mon Nov 24 11:05:16 2008
@@ -20,39 +20,39 @@
* under the License.
*/
-->
-<#if parameters.type?exists && parameters.type=="button">
+<#if parameters.type?? && parameters.type=="button">
<button type="reset"<#rt/>
-<#if parameters.name?exists>
+<#if parameters.name??>
name="${parameters.name?html}"<#rt/>
</#if>
-<#if parameters.nameValue?exists>
+<#if parameters.nameValue??>
value="<@s.property value="parameters.nameValue"/>"<#rt/>
</#if>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
+<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl"/>
<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" />
-><#if parameters.label?exists><@s.property value="parameters.label"/><#rt/></#if></button>
+><#if parameters.label??><@s.property value="parameters.label"/><#rt/></#if></button>
<#else>
<input type="reset"<#rt/>
-<#if parameters.name?exists>
+<#if parameters.name??>
name="${parameters.name?html}"<#rt/>
</#if>
-<#if parameters.nameValue?exists>
+<#if parameters.nameValue??>
value="<@s.property value="parameters.nameValue"/>"<#rt/>
</#if>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
+<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
-<#if parameters.title?exists>
+<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/scripting-events.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/scripting-events.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/scripting-events.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/scripting-events.ftl Mon Nov 24 11:05:16 2008
@@ -20,45 +20,45 @@
* under the License.
*/
-->
-<#if parameters.onclick?exists>
+<#if parameters.onclick??>
onclick="${parameters.onclick?html}"<#rt/>
</#if>
-<#if parameters.ondblclick?exists>
+<#if parameters.ondblclick??>
ondblclick="${parameters.ondblclick?html}"<#rt/>
</#if>
-<#if parameters.onmousedown?exists>
+<#if parameters.onmousedown??>
onmousedown="${parameters.onmousedown?html}"<#rt/>
</#if>
-<#if parameters.onmouseup?exists>
+<#if parameters.onmouseup??>
onmouseup="${parameters.onmouseup?html}"<#rt/>
</#if>
-<#if parameters.onmouseover?exists>
+<#if parameters.onmouseover??>
onmouseover="${parameters.onmouseover?html}"<#rt/>
</#if>
-<#if parameters.onmousemove?exists>
+<#if parameters.onmousemove??>
onmousemove="${parameters.onmousemove?html}"<#rt/>
</#if>
-<#if parameters.onmouseout?exists>
+<#if parameters.onmouseout??>
onmouseout="${parameters.onmouseout?html}"<#rt/>
</#if>
-<#if parameters.onfocus?exists>
+<#if parameters.onfocus??>
onfocus="${parameters.onfocus?html}"<#rt/>
</#if>
-<#if parameters.onblur?exists>
+<#if parameters.onblur??>
onblur="${parameters.onblur?html}"<#rt/>
</#if>
-<#if parameters.onkeypress?exists>
+<#if parameters.onkeypress??>
onkeypress="${parameters.onkeypress?html}"<#rt/>
</#if>
-<#if parameters.onkeydown?exists>
+<#if parameters.onkeydown??>
onkeydown="${parameters.onkeydown?html}"<#rt/>
</#if>
-<#if parameters.onkeyup?exists>
+<#if parameters.onkeyup??>
onkeyup="${parameters.onkeyup?html}"<#rt/>
</#if>
-<#if parameters.onselect?exists>
+<#if parameters.onselect??>
onselect="${parameters.onselect?html}"<#rt/>
</#if>
-<#if parameters.onchange?exists>
+<#if parameters.onchange??>
onchange="${parameters.onchange?html}"<#rt/>
</#if>
\ No newline at end of file
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl Mon Nov 24 11:05:16 2008
@@ -23,20 +23,20 @@
<#setting number_format="#.#####">
<select<#rt/>
name="${parameters.name?default("")?html}"<#rt/>
-<#if parameters.get("size")?exists>
+<#if parameters.get("size")??>
size="${parameters.get("size")?html}"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
</#if>
-<#if parameters.tabindex?exists>
+<#if parameters.tabindex??>
tabindex="${parameters.tabindex?html}"<#rt/>
</#if>
-<#if parameters.id?exists>
+<#if parameters.id??>
id="${parameters.id?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/css.ftl" />
-<#if parameters.title?exists>
+<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
<#if parameters.multiple?default(false)>
@@ -46,7 +46,7 @@
<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" />
>
-<#if parameters.headerKey?exists && parameters.headerValue?exists>
+<#if parameters.headerKey?? && parameters.headerValue??>
<option value="${parameters.headerKey?html}"
<#if tag.contains(parameters.nameValue, parameters.headerKey) == true>
selected="selected"
@@ -57,8 +57,8 @@
<option value=""></option>
</#if>
<@s.iterator value="parameters.list">
- <#if parameters.listKey?exists>
- <#if stack.findValue(parameters.listKey)?exists>
+ <#if parameters.listKey??>
+ <#if stack.findValue(parameters.listKey)??>
<#assign itemKey = stack.findValue(parameters.listKey)/>
<#assign itemKeyStr = itemKey.toString()/>
<#else>
@@ -69,8 +69,8 @@
<#assign itemKey = stack.findValue('top')/>
<#assign itemKeyStr = itemKey.toString()/>
</#if>
- <#if parameters.listValue?exists>
- <#if stack.findString(parameters.listValue)?exists>
+ <#if parameters.listValue??>
+ <#if stack.findString(parameters.listValue)??>
<#assign itemValue = stack.findString(parameters.listValue)/>
<#else>
<#assign itemValue = ''/>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/submit-close.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/submit-close.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/submit-close.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/submit-close.ftl Mon Nov 24 11:05:16 2008
@@ -1,5 +1,5 @@
-<#if parameters.type?exists && parameters.type=="button">
-<#if (parameters.body)?default("")?length gt 0>${parameters.body}<#elseif parameters.label?exists><@s.property value="parameters.label"/><#rt/></#if>
+<#if parameters.type?? && parameters.type=="button">
+<#if (parameters.body)?default("")?length gt 0>${parameters.body}<#elseif parameters.label??><@s.property value="parameters.label"/><#rt/></#if>
</button>
<#else>
${parameters.body}<#rt/>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl Mon Nov 24 11:05:16 2008
@@ -20,30 +20,30 @@
* under the License.
*/
-->
-<#if parameters.type?exists && parameters.type=="button">
+<#if parameters.type?? && parameters.type=="button">
<button type="submit"<#rt/>
-<#if parameters.id?exists>
+<#if parameters.id??>
id="${parameters.id?html}"<#rt/>
</#if>
-<#if parameters.name?exists>
+<#if parameters.name??>
name="${parameters.name?html}"<#rt/>
</#if>
-<#if parameters.nameValue?exists>
+<#if parameters.nameValue??>
value="<@s.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
</#if>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
+<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
-<#if parameters.title?exists>
+<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
-<#if parameters.tabindex?exists>
+<#if parameters.tabindex??>
tabindex="${parameters.tabindex?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl"/>
@@ -51,40 +51,40 @@
<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" />
>
<#else>
-<#if parameters.type?exists && parameters.type=="image">
+<#if parameters.type?? && parameters.type=="image">
<@s.property value="parameters.body"/>
<input type="image"<#rt/>
-<#if parameters.label?exists>
+<#if parameters.label??>
alt="${parameters.label?html}"<#rt/>
</#if>
-<#if parameters.src?exists>
+<#if parameters.src??>
src="${parameters.src?html}"<#rt/>
</#if>
<#else>
<input type="submit"<#rt/>
</#if>
-<#if parameters.id?exists>
+<#if parameters.id??>
id="${parameters.id?html}"<#rt/>
</#if>
-<#if parameters.name?exists>
+<#if parameters.name??>
name="${parameters.name?html}"<#rt/>
</#if>
-<#if parameters.nameValue?exists>
+<#if parameters.nameValue??>
value="<@s.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
</#if>
-<#if parameters.cssClass?exists>
+<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
+<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
-<#if parameters.title?exists>
+<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
-<#if parameters.tabindex?exists>
+<#if parameters.tabindex??>
tabindex="${parameters.tabindex?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/table.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/table.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/table.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/table.ftl Mon Nov 24 11:05:16 2008
@@ -23,7 +23,7 @@
<#assign webTable = tag/>
<#assign tableModel = webTable.model/>
-<#if tableModel?exists>
+<#if tableModel??>
<p align="center">
<table bgcolor="white" border="0" cellpadding="1" cellspacing="0" >
<tr>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl Mon Nov 24 11:05:16 2008
@@ -22,13 +22,13 @@
-->
<input type="text"<#rt/>
name="${parameters.name?default("")?html}"<#rt/>
-<#if parameters.get("size")?exists>
+<#if parameters.get("size")??>
size="${parameters.get("size")?html}"<#rt/>
</#if>
-<#if parameters.maxlength?exists>
+<#if parameters.maxlength??>
maxlength="${parameters.maxlength?html}"<#rt/>
</#if>
-<#if parameters.nameValue?exists>
+<#if parameters.nameValue??>
value="<@s.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
@@ -37,14 +37,14 @@
<#if parameters.readonly?default(false)>
readonly="readonly"<#rt/>
</#if>
-<#if parameters.tabindex?exists>
+<#if parameters.tabindex??>
tabindex="${parameters.tabindex?html}"<#rt/>
</#if>
-<#if parameters.id?exists>
+<#if parameters.id??>
id="${parameters.id?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/css.ftl" />
-<#if parameters.title?exists>
+<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl?rev=720258&r1=720257&r2=720258&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl Mon Nov 24 11:05:16 2008
@@ -24,7 +24,7 @@
name="${parameters.name?default("")?html}"<#rt/>
cols="${parameters.cols?default("")?html}"<#rt/>
rows="${parameters.rows?default("")?html}"<#rt/>
-<#if parameters.wrap?exists>
+<#if parameters.wrap??>
wrap="${parameters.wrap?html}"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
@@ -33,21 +33,21 @@
<#if parameters.readonly?default(false)>
readonly="readonly"<#rt/>
</#if>
-<#if parameters.tabindex?exists>
+<#if parameters.tabindex??>
tabindex="${parameters.tabindex?html}"<#rt/>
</#if>
-<#if parameters.id?exists>
+<#if parameters.id??>
id="${parameters.id?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/css.ftl" />
-<#if parameters.title?exists>
+<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" />
><#rt/>
-<#if parameters.nameValue?exists>
+<#if parameters.nameValue??>
<@s.property value="parameters.nameValue"/><#t/>
</#if>
</textarea>
\ No newline at end of file