svn commit: r475480 - in /jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools: generic/ValueParser.java view/tools/ParameterParser.java

[nbubna]

Author: nbubna
Date: Wed Nov 15 14:57:48 2006
New Revision: 475480

URL: http://svn.apache.org/viewvc?view=rev&rev=475480
Log:
per VELTOOLS-69 - remove ValueParserSub functions and revert docs to previous 
syntax, thanks to Claude Brisson for the patch

Modified:
    
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/ValueParser.java
    
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ParameterParser.java

Modified: 
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/ValueParser.java
URL: 
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/ValueParser.java?view=diff&rev=475480&r1=475479&r2=475480
==============================================================================
--- 
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/ValueParser.java
 (original)
+++ 
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/ValueParser.java
 Wed Nov 15 14:57:48 2006
@@ -26,9 +26,9 @@
  * <p><pre>
  * Template example(s):
  *   $parser.foo                ->  bar
- *   $parser.baz.number         ->  12.6
- *   $parser.baz.int            ->  12
- *   $parser.baz.numbers        ->  [12.6]
+ *   $parser.getNumber('baz')   ->  12.6
+ *   $parser.getInt('baz')      ->  12
+ *   $parser.getNumbers('baz')  ->  [12.6]
  *
  * Toolbox configuration:
  * &lt;tool&gt;
@@ -95,92 +95,7 @@
      */
     public Object get(String key)
     {
-        return new ValueParserSub(this, key);
-    }
-
-    /**
-     * A helper class to enable simplified syntax for 
-     * using a ValueParser in a template.
-     * @since VelocityTools 1.3
-     */
-    public class ValueParserSub
-    {
-        private ValueParser parser;
-        private String key;
-
-        public ValueParserSub(ValueParser parser, String key)
-        {
-            this.parser = parser;
-            this.key = key;
-        }
-
-        public boolean getExists()
-        {
-            return parser.exists(key);
-        }
-
-        public Object get(String key)
-        {
-            if (key == null)
-            {
-                return null;
-            }
-            else if (key.equalsIgnoreCase("string"))
-            {
-                return toString();
-            }
-            else if (key.equalsIgnoreCase("number"))
-            {
-                return parser.getNumber(key);
-            }
-            else if (key.equalsIgnoreCase("boolean"))
-            {
-                return parser.getBoolean(key);
-            }
-            else if (key.equalsIgnoreCase("int"))
-            {
-                return parser.getInteger(key);
-            }
-            else if (key.equalsIgnoreCase("double"))
-            {
-                return parser.getDouble(key);
-            }
-            else if (key.equalsIgnoreCase("strings"))
-            {
-                return parser.getStrings(key);
-            }
-            else if (key.equalsIgnoreCase("numbers"))
-            {
-                return parser.getNumbers(key);
-            }
-            else if (key.equalsIgnoreCase("ints"))
-            {
-                return parser.getInts(key);
-            }
-            else if (key.equalsIgnoreCase("doubles"))
-            {
-                return parser.getDoubles(key);
-            }
-            else if (key.equalsIgnoreCase("booleans"))
-            {
-                return parser.getBooleans(key);
-            }
-            else if (key.equalsIgnoreCase("string"))
-            {
-                return toString();
-            }
-            else
-            {
-                // assume the key had a period in it and reconstruct
-                return new ValueParserSub(parser, this.key+'.'+key);
-            }
-        }
-
-        public String toString()
-        {
-            return parser.getString(key);
-        }
-
+        return getString(key);
     }
 
     /**

Modified: 
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ParameterParser.java
URL: 
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ParameterParser.java?view=diff&rev=475480&r1=475479&r2=475480
==============================================================================
--- 
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ParameterParser.java
 (original)
+++ 
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ParameterParser.java
 Wed Nov 15 14:57:48 2006
@@ -28,9 +28,9 @@
  * <p><pre>
  * Template example(s):
  *   $params.foo                ->  bar
- *   $params.baz                ->  12.6
- *   $params.baz.int            ->  12
- *   $params.baz.numbers        ->  [12.6]
+ *   $params.getNumber('baz')   ->  12.6
+ *   $params.getInt('baz')      ->  12
+ *   $params.getNumbers('baz')  ->  [12.6]
  *
  * Toolbox configuration:
  * &lt;tool&gt;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]