From 5ecfccb0edaa34d5a3b9028621679a8f5452fd07 Mon Sep 17 00:00:00 2001 From: Musachy Barroso Date: Mon, 24 Nov 2008 19:05:16 +0000 Subject: [PATCH] WW-2891 Replace deprecated operators in FreeMarker (just ?exists on this commit) git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@720258 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/struts2/dispatcher/error.ftl | 8 +- .../resources/template/css_xhtml/checkbox.ftl | 22 +-- .../template/css_xhtml/controlheader-core.ftl | 14 +- .../template/css_xhtml/controlheader.ftl | 2 +- .../template/css_xhtml/form-validate.ftl | 2 +- .../resources/template/css_xhtml/form.ftl | 2 +- .../resources/template/css_xhtml/label.ftl | 12 +- .../resources/template/css_xhtml/reset.ftl | 4 +- .../resources/template/css_xhtml/submit.ftl | 4 +- core/src/main/resources/template/simple/a.ftl | 8 +- .../resources/template/simple/actionerror.ftl | 6 +- .../template/simple/actionmessage.ftl | 6 +- .../resources/template/simple/checkbox.ftl | 8 +- .../template/simple/checkboxlist.ftl | 8 +- .../resources/template/simple/combobox.ftl | 10 +- .../template/simple/common-attributes.ftl | 2 +- .../main/resources/template/simple/css.ftl | 12 +- .../main/resources/template/simple/debug.ftl | 4 +- .../main/resources/template/simple/div.ftl | 10 +- .../template/simple/doubleselect.ftl | 28 ++-- .../template/simple/dynamic-attributes.ftl | 2 +- .../resources/template/simple/fielderror.ftl | 10 +- .../main/resources/template/simple/file.ftl | 12 +- .../resources/template/simple/form-close.ftl | 8 +- .../resources/template/simple/form-common.ftl | 26 ++-- .../main/resources/template/simple/form.ftl | 2 +- .../main/resources/template/simple/hidden.ftl | 8 +- .../template/simple/inputtransferselect.ftl | 36 ++--- .../main/resources/template/simple/label.ftl | 12 +- .../resources/template/simple/optgroup.ftl | 4 +- .../template/simple/optiontransferselect.ftl | 128 +++++++++--------- .../resources/template/simple/password.ftl | 12 +- .../resources/template/simple/radiomap.ftl | 16 +-- .../main/resources/template/simple/reset.ftl | 22 +-- .../template/simple/scripting-events.ftl | 28 ++-- .../main/resources/template/simple/select.ftl | 18 +-- .../template/simple/submit-close.ftl | 4 +- .../main/resources/template/simple/submit.ftl | 36 ++--- .../main/resources/template/simple/table.ftl | 2 +- .../main/resources/template/simple/text.ftl | 12 +- .../resources/template/simple/textarea.ftl | 10 +- .../template/simple/updownselect.ftl | 8 +- .../resources/template/xhtml/checkbox.ftl | 22 +-- .../main/resources/template/xhtml/control.ftl | 2 +- .../template/xhtml/controlheader-core.ftl | 6 +- .../template/xhtml/controlheader.ftl | 2 +- .../template/xhtml/form-close-validate.ftl | 12 +- .../template/xhtml/form-validate.ftl | 2 +- .../main/resources/template/xhtml/form.ftl | 2 +- .../main/resources/template/xhtml/reset.ftl | 2 +- .../main/resources/template/xhtml/submit.ftl | 2 +- .../main/resources/template/xhtml/tooltip.ftl | 6 +- 52 files changed, 323 insertions(+), 323 deletions(-) diff --git a/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl b/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl index 676def4de..1b89aad79 100644 --- a/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl +++ b/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl @@ -38,13 +38,13 @@ <#assign msgs = [] /> <#list chain as ex> - <#if ex.message?exists> + <#if ex.message??> <#assign msgs = [ex.message] + msgs/> <#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 rootloc?exists> + <#if rootloc??> File: ${rootloc.URI} @@ -100,7 +100,7 @@ -<#if rootloc?exists> +<#if rootloc??> <#assign snippet = rootloc.getSnippet(2) /> <#if (snippet?size > 0)>
diff --git a/core/src/main/resources/template/css_xhtml/checkbox.ftl b/core/src/main/resources/template/css_xhtml/checkbox.ftl index ecb75b564..a7ffc43d3 100644 --- a/core/src/main/resources/template/css_xhtml/checkbox.ftl +++ b/core/src/main/resources/template/css_xhtml/checkbox.ftl @@ -25,14 +25,14 @@ NOTE: The 'header' stuff that follows is in this one file for checkbox due to th 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/> -
<#if parameters.id?exists>id="wwgrp_${parameters.id}"<#rt/> class="wwgrp"> +<#assign hasFieldErrors = fieldErrors?? && fieldErrors[parameters.name]??/> +
<#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/> class="wwgrp"> <#if hasFieldErrors> -
<#if parameters.id?exists>id="wwerr_${parameters.id}"<#rt/> class="wwerr"> +
<#if parameters.id??>id="wwerr_${parameters.id}"<#rt/> class="wwerr"> <#list fieldErrors[parameters.name] as error> - <#if parameters.id?exists> + <#if parameters.id??> errorFor="${parameters.id}"<#rt/> class="errorMessage"> @@ -43,9 +43,9 @@ lables <#if parameters.labelposition?default("") == 'left'> -<#if parameters.id?exists>id="wwlbl_${parameters.id}"<#rt/> class="wwlbl"> +<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/> class="wwlbl"> -<#if parameters.id?exists> +<#if parameters.id??> for="${parameters.id?html}"<#rt/> <#if hasFieldErrors> @@ -62,7 +62,7 @@ lables <#else> -<#if parameters.id?exists>id="wwctrl_${parameters.id}"<#rt/> class="wwctrl"> +<#if parameters.id??>id="wwctrl_${parameters.id}"<#rt/> class="wwctrl"> <#if parameters.required?default(false)> *<#t/> @@ -75,15 +75,15 @@ lables <#else> <#rt/> -<#if parameters.label?exists> +<#if parameters.label??> <#if parameters.labelposition?default("top") == 'top'>
<#else> -<#if parameters.id?exists>id="wwlbl_${parameters.id}"<#rt/> class="wwlbl"> +<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/> class="wwlbl"> -<#if parameters.id?exists> +<#if parameters.id??> for="${parameters.id?html}"<#rt/> <#if hasFieldErrors> @@ -94,7 +94,7 @@ lables >${parameters.label?html}<#rt/> -<#if parameters.label?exists> +<#if parameters.label??> <#if parameters.labelposition?default("top") == 'top'>
<#rt/> <#else> diff --git a/core/src/main/resources/template/css_xhtml/controlheader-core.ftl b/core/src/main/resources/template/css_xhtml/controlheader-core.ftl index e7b3bc544..c9cdf11ee 100644 --- a/core/src/main/resources/template/css_xhtml/controlheader-core.ftl +++ b/core/src/main/resources/template/css_xhtml/controlheader-core.ftl @@ -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/> -
<#if parameters.id?exists>id="wwgrp_${parameters.id}"<#rt/> class="wwgrp"> +<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> +
<#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/> class="wwgrp"> <#if hasFieldErrors> -
<#if parameters.id?exists>id="wwerr_${parameters.id}"<#rt/> class="wwerr"> +
<#if parameters.id??>id="wwerr_${parameters.id}"<#rt/> class="wwerr"> <#list fieldErrors[parameters.name] as error> - <#if parameters.id?exists> + <#if parameters.id??> errorFor="${parameters.id}"<#rt/> class="errorMessage"> @@ -41,15 +41,15 @@
<#t/> -<#if parameters.label?exists> +<#if parameters.label??> <#if parameters.labelposition?default("top") == 'top'>
<#else> -<#if parameters.id?exists>id="wwlbl_${parameters.id}"<#rt/> class="wwlbl"> +<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/> class="wwlbl">