svn commit: r593763 - in /velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools: generic/ValueParser.java view/ParameterTool.java

[cbrisson]

Author: cbrisson
Date: Sat Nov 10 02:46:10 2007
New Revision: 593763

URL: http://svn.apache.org/viewvc?rev=593763&view=rev
Log:
braces style and tests ok

Modified:
    
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ValueParser.java
    
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ParameterTool.java

Modified: 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ValueParser.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ValueParser.java?rev=593763&r1=593762&r2=593763&view=diff
==============================================================================
--- 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ValueParser.java
 (original)
+++ 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ValueParser.java
 Sat Nov 10 02:46:10 2007
@@ -387,7 +387,8 @@
      * Are subkeys allowed ?
      * @return yes/no
      */
-    protected boolean getAllowSubkeys() {
+    protected boolean getAllowSubkeys()
+    {
         return allowSubkeys;
     }
 
@@ -395,7 +396,8 @@
      * allow or disallow subkeys
      * @param allow
      */
-    protected void setAllowSubkeys(boolean allow) {
+    protected void setAllowSubkeys(boolean allow)
+    {
         allowSubkeys = allow;
     }
 
@@ -405,21 +407,33 @@
      * @param subkey
      * @return
      */
-    protected ValueParser getSubkey(String subkey) {
-        if (!hasSubkeys || subkey == null || subkey.length() == 0) {
+    protected ValueParser getSubkey(String subkey)
+    {
+        if (!hasSubkeys || subkey == null || subkey.length() == 0)
+        {
             return null;
         }
         Map<String,Object> values = null;
         subkey = subkey.concat(".");
-        for(Map.Entry<String,Object> 
entry:(Set<Map.Entry>)getSource().entrySet()) {
-            if(entry.getKey().startsWith(subkey)) {
-                if(values == null) {
+        for(Map.Entry<String,Object> 
entry:(Set<Map.Entry>)getSource().entrySet())
+        {
+            if(entry.getKey().startsWith(subkey))
+            {
+                if(values == null)
+                {
                     values = new HashMap<String,Object>();
                 }
                 
values.put(entry.getKey().substring(subkey.length()),entry.getValue());
             }
         }
-        hasSubkeys = (values == null);
-        return new ValueParser(values); /* we could also return a new value 
parser ! */
+        if (values == null)
+        {
+            hasSubkeys = false;
+            return null;
+        }
+        else
+        {
+            return new ValueParser(values);
+        }
     }
 }

Modified: 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ParameterTool.java?rev=593763&r1=593762&r2=593763&view=diff
==============================================================================
--- 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
 (original)
+++ 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
 Sat Nov 10 02:46:10 2007
@@ -110,7 +110,8 @@
     public Object getValue(String key)
     {
         Object value = getRequest().getParameter(key);
-        if(value == null && getAllowSubkeys()) {
+        if(value == null && getAllowSubkeys())
+        {
             value = getSubkey(key);
         }
         return value;