You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by nb...@apache.org on 2006/03/11 19:50:12 UTC
svn commit: r385133 -
/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/XMLToolboxManager.java
Author: nbubna
Date: Sat Mar 11 10:50:10 2006
New Revision: 385133
URL: http://svn.apache.org/viewcvs?rev=385133&view=rev
Log:
remove ToolboxContext reference and add a few logging improvements
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/XMLToolboxManager.java
Modified: jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/XMLToolboxManager.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/XMLToolboxManager.java?rev=385133&r1=385132&r2=385133&view=diff
==============================================================================
--- jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/XMLToolboxManager.java (original)
+++ jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/XMLToolboxManager.java Sat Mar 11 10:50:10 2006
@@ -30,7 +30,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.velocity.tools.view.ToolboxRuleSet;
-import org.apache.velocity.tools.view.context.ToolboxContext;
/**
@@ -101,10 +100,14 @@
public void addTool(ToolInfo info)
{
+ System.out.println("addTool("+info);
if (validateToolInfo(info))
{
toolinfo.add(info);
- LOG.info("Added "+info.getKey()+" ("+info.getClassname()+") to the toolbox.");
+ if (LOG.isDebugEnabled())
+ {
+ LOG.debug("Added "+info.getClassname()+" to the toolbox as "+info.getKey());
+ }
}
}
@@ -113,6 +116,10 @@
if (validateToolInfo(info))
{
data.put(info.getKey(), info.getInstance(null));
+ if (LOG.isDebugEnabled())
+ {
+ LOG.debug("Added '"+info.getInstance(null)+"' to the toolbox as "+info.getKey());
+ }
}
}
@@ -128,6 +135,7 @@
{
if (info == null)
{
+ LOG.error("ToolInfo is null!");
return false;
}
if (info.getKey() == null || info.getKey().length() == 0)
@@ -141,14 +149,6 @@
return false;
}
return true;
- }
-
- /**
- * @deprecated Use getToolbox(Object) instead.
- */
- public ToolboxContext getToolboxContext(Object initData)
- {
- return new ToolboxContext(getToolbox(initData));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org