svn commit: r594835 - /velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ValueParser.java

[cbrisson]

Author: cbrisson
Date: Wed Nov 14 03:10:31 2007
New Revision: 594835

URL: http://svn.apache.org/viewvc?rev=594835&view=rev
Log:
make allowSubKeys explicitely configurable and provide a nice toString method 
to ValueParser

Modified:
    
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ValueParser.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=594835&r1=594834&r2=594835&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
 Wed Nov 14 03:10:31 2007
@@ -114,6 +114,13 @@
             // then don't allow subkeys
             setAllowSubkeys(false);
         }
+
+        // except if explicitely asked for
+        Boolean allow = values.getBoolean(ALLOWSUBKEYS_KEY);
+        if(allow != null)
+        {
+            setAllowSubkeys(allow);
+        }
     }
 
     // ----------------- public parsing methods --------------------------
@@ -541,5 +548,19 @@
 
     public Set<Map.Entry<String,Object>> entrySet() {
         return getSource().entrySet();
+    }
+
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("{ ");
+        for(Map.Entry<String,Object> entry:entrySet())
+        {
+            builder.append(entry.getKey());
+            builder.append('=');
+            builder.append(String.valueOf(entry.getValue()));
+            builder.append(' ');
+        }
+        builder.append('}');
+        return builder.toString();
     }
 }