svn commit: r929457 - in /velocity/tools/trunk/src/main/java/org/apache/velocity/tools: ToolContext.java view/ViewToolContext.java

[cbrisson]

Author: cbrisson
Date: Wed Mar 31 10:08:40 2010
New Revision: 929457

URL: http://svn.apache.org/viewvc?rev=929457&view=rev
Log:
minor fixes: implemented ViewToolContext.containsKey(), and made 
ToolContext.ketSet() rely on getToolboxes()

Modified:
    
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ToolContext.java
    
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewToolContext.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=929457&r1=929456&r2=929457&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 Mar 31 10:08:40 2010
@@ -134,10 +134,10 @@ public class ToolContext implements Cont
         Map<String,Class> toolClasses = new HashMap<String,Class>();
         // go thru toolboxes backwards so final map matches
         // what would be found in lookups
-        int n = toolboxes.size();
-        for (int i = toolboxes.size() - 1; i >= 0; i--)
+        int n = getToolboxes().size();
+        for (int i = n - 1; i >= 0; i--)
         {
-            Toolbox toolbox = toolboxes.get(i);
+            Toolbox toolbox = getToolboxes().get(i);
             toolClasses.putAll(toolbox.getToolClassMap());
         }
         return toolClasses;
@@ -231,7 +231,7 @@ public class ToolContext implements Cont
     public Set<String> keySet()
     {
         Set<String> keys = new HashSet<String>();
-        for (Toolbox toolbox : toolboxes)
+        for (Toolbox toolbox : getToolboxes())
         {
             keys.addAll(toolbox.getKeys());
         }

Modified: 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewToolContext.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewToolContext.java?rev=929457&r1=929456&r2=929457&view=diff
==============================================================================
--- 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewToolContext.java
 (original)
+++ 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewToolContext.java
 Wed Mar 31 10:08:40 2010
@@ -314,4 +314,20 @@ public class ViewToolContext extends Too
         return velocity;
     }
 
+     /**
+      * Indicates whether the specified key is in the context.
+      *
+      * @param key The key to look for.
+      * @return    Whether the key is in the context.
+      */
+     public boolean containsKey(String key)
+     {
+         return super.containsKey(key)
+           || getAttribute(key) != null
+           || key.equals(REQUEST) && request != null
+           || key.equals(RESPONSE) && response != null
+           || key.equals(SESSION) && getSession() != null
+           || key.equals(APPLICATION) && application != null;
+     }
+
 }