Author: nbubna
Date: Wed Nov 29 22:38:50 2006
New Revision: 480856

URL: http://svn.apache.org/viewvc?view=rev&rev=480856
Log:
fix a problem with getKeys() and improve javadoc

Modified:
    
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ContextTool.java

Modified: 
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ContextTool.java
URL: 
http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ContextTool.java?view=diff&rev=480856&r1=480855&r2=480856
==============================================================================
--- 
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ContextTool.java
 (original)
+++ 
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ContextTool.java
 Wed Nov 29 22:38:50 2006
@@ -35,7 +35,8 @@
 import org.apache.velocity.tools.view.context.ViewContext;
 
 /**
- * <p>View tool for convenient access to context meta-data.</p>
+ * <p>View tool for convenient access to [EMAIL PROTECTED] ViewContext} data 
and
+ *  meta-data.</p>
  * <p><pre>
  * Template example(s):
  *  #foreach( $key in $context.keys )
@@ -123,9 +124,10 @@
         Set keys = new HashSet();
 
         // get the tool keys, if there is a toolbox
-        if (this.toolbox != null)
+        Map tools = getToolbox();
+        if (tools != null)
         {
-            keys.addAll(getToolbox().keySet());
+            keys.addAll(tools.keySet());
         }
 
         // recurse down the velocity context collecting keys



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

Reply via email to