From cac0683dab84ccd655e393988aa5d71e783ee72e Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Tue, 29 Jul 2014 11:42:29 +0200
Subject: [PATCH] Rearranged statement whitespace in Velocity macros (cherry
 picked from commit 7bc9660)

---
 .../web/servlet/view/velocity/spring.vm       | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm
index 159b145117f..78c3d61b080 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm
@@ -82,7 +82,7 @@
  *   by user config.
  *#
 #macro( springBind $path )
-    #if ("$!springHtmlEscape" != "")
+    #if("$!springHtmlEscape"!="")
         #set( $status = $springMacroRequestContext.getBindStatus($path, $springHtmlEscape) )
     #else
         #set( $status = $springMacroRequestContext.getBindStatus($path) )
@@ -171,7 +171,7 @@
  * from a list of options.
  *
  * The null check for $status.value leverages Velocity's 'quiet' notation rather
- * than the more common #if ($status.value) since this method evaluates to the
+ * than the more common #if($status.value) since this method evaluates to the
  * boolean 'false' if the content of $status.value is the String "false" - not
  * what we want.
  *
@@ -185,7 +185,7 @@
     <select id="${status.expression}" name="${status.expression}" ${attributes}>
         #foreach($option in $options.keySet())
             <option value="${option}"
-            #if ("$!status.value" == "$option") selected="selected" #end>
+            #if("$!status.value"=="$option") selected="selected" #end>
             ${options.get($option)}</option>
         #end
     </select>
@@ -208,7 +208,7 @@
         #foreach($option in $options.keySet())
             <option value="${option}"
             #foreach($item in $status.actualValue)
-                #if ($item == $option) selected="selected" #end
+                #if($item==$option) selected="selected" #end
             #end
             >${options.get($option)}</option>
         #end
@@ -231,7 +231,7 @@
     #springBind($path)
     #foreach($option in $options.keySet())
         <input type="radio" name="${status.expression}" value="${option}"
-        #if ("$!status.value" == "$option") checked="checked" #end
+        #if("$!status.value"=="$option") checked="checked" #end
         ${attributes}
         #springCloseTag()
         ${options.get($option)} ${separator}
@@ -255,7 +255,7 @@
     #foreach($option in $options.keySet())
         <input type="checkbox" name="${status.expression}" value="${option}" 
         #foreach($item in $status.actualValue)
-            #if ($item == $option) checked="checked" #end
+            #if($item==$option) checked="checked" #end
         #end
         ${attributes} #springCloseTag()
         ${options.get($option)} ${separator}
@@ -275,7 +275,7 @@
 #macro( springFormCheckbox $path $attributes )
     #springBind($path)
     <input type="hidden" name="_${status.expression}" value="on"/>
-    <input type="checkbox" id="${status.expression}" name="${status.expression}"#if ("$!{status.value}"=="true") checked="checked"#end ${attributes}/>
+    <input type="checkbox" id="${status.expression}" name="${status.expression}"#if("$!{status.value}"=="true") checked="checked"#end ${attributes}/>
 #end
 
 #**
@@ -293,10 +293,10 @@
 *#
 #macro( springShowErrors $separator $classOrStyle )
     #foreach($error in $status.errorMessages)
-        #if ($classOrStyle == "")
+        #if($classOrStyle=="")
             <b>${error}</b>
         #else
-            #if ($classOrStyle.indexOf(":") == -1)
+            #if($classOrStyle.indexOf(":")==-1)
                 #set($attr="class")
             #else
                 #set($attr="style")
@@ -314,9 +314,4 @@
  * depending on the value of a 'springXhtmlCompliant' variable in the
  * template context.
  *#
-#macro( springCloseTag )#if ($springXhtmlCompliant)/>#else>#end #end
-
-
-
-
-
+#macro( springCloseTag )#if($springXhtmlCompliant)/>#else>#end#end