svn commit: r689661 - in /velocity/tools/trunk/src/main/java/org/apache/velocity/tools: ToolContext.java ToolManager.java

[nb...@apache.org]

Author: nbubna
Date: Wed Aug 27 16:25:56 2008
New Revision: 689661

URL: http://svn.apache.org/viewvc?rev=689661&view=rev
Log:
minor refactoring for better consistency and convenience

Modified:
    velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ToolContext.java
    velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ToolManager.java

Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ToolContext.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ToolContext.java?rev=689661&r1=689660&r2=689661&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ToolContext.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ToolContext.java Wed Aug 27 16:25:56 2008
@@ -157,6 +157,17 @@
         return toolProps.put(key, value);
     }
 
+    public void putToolProperties(Map<String,Object> props)
+    {
+        if (props != null)
+        {
+            for (Map.Entry<String,Object> prop : props.entrySet())
+            {
+                putToolProperty(prop.getKey(), prop.getValue());
+            }
+        }
+    }
+
     public Object put(String key, Object value)
     {
         return localContext.put(key, value);

Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ToolManager.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ToolManager.java?rev=689661&r1=689660&r2=689661&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ToolManager.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ToolManager.java Wed Aug 27 16:25:56 2008
@@ -114,13 +114,7 @@
         if (this.engine != null)
         {
             context = new ToolContext(this.engine);
-            if (toolProps != null && !toolProps.isEmpty())
-            {
-                for (Map.Entry<String,Object> prop : toolProps.entrySet())
-                {
-                    context.putToolProperty(prop.getKey(), prop.getValue());
-                }
-            }
+            context.putToolProperties(toolProps);
         }
         else
         {
@@ -142,27 +136,36 @@
         }
     }
 
+    protected boolean hasTools(String scope)
+    {
+        return this.factory.hasTools(scope);
+    }
+
+    protected Toolbox createToolbox(String scope)
+    {
+        return this.factory.createToolbox(scope);
+    }
+
     protected boolean hasRequestTools()
     {
-        return this.factory.hasTools(Scope.REQUEST);
+        return hasTools(Scope.REQUEST);
     }
 
     protected Toolbox getRequestToolbox()
     {
-        return this.factory.createToolbox(Scope.REQUEST);
+        return createToolbox(Scope.REQUEST);
     }
 
     protected boolean hasApplicationTools()
     {
-        return this.factory.hasTools(Scope.APPLICATION);
+        return hasTools(Scope.APPLICATION);
     }
 
     protected Toolbox getApplicationToolbox()
     {
         if (this.application == null)
         {
-            this.application =
-                this.factory.createToolbox(Scope.APPLICATION);
+            this.application = createToolbox(Scope.APPLICATION);
         }
         return this.application;
     }