Author: nbubna
Date: Tue Mar 3 20:21:23 2009
New Revision: 749731
URL: http://svn.apache.org/viewvc?rev=749731&view=rev
Log:
prefer getValue to get when getting Objects from ValueParser
Modified:
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ContextTool.java
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewContextTool.java
Modified:
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ContextTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ContextTool.java?rev=749731&r1=749730&r2=749731&view=diff
==============================================================================
---
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ContextTool.java
(original)
+++
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ContextTool.java
Tue Mar 3 20:21:23 2009
@@ -69,7 +69,7 @@
*/
protected void configure(ValueParser parser)
{
- this.context = (Context)parser.get(ToolContext.CONTEXT_KEY);
+ this.context = (Context)parser.getValue(ToolContext.CONTEXT_KEY);
}
Modified:
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/XmlTool.java?rev=749731&r1=749730&r2=749731&view=diff
==============================================================================
---
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
(original)
+++
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
Tue Mar 3 20:21:23 2009
@@ -103,7 +103,7 @@
*/
protected void configure(ValueParser parser)
{
- this.LOG = (Log)parser.get(ToolContext.LOG_KEY);
+ this.LOG = (Log)parser.getValue(ToolContext.LOG_KEY);
String file = parser.getString(FILE_KEY);
if (file != null)
Modified:
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewContextTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewContextTool.java?rev=749731&r1=749730&r2=749731&view=diff
==============================================================================
---
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewContextTool.java
(original)
+++
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewContextTool.java
Tue Mar 3 20:21:23 2009
@@ -65,9 +65,9 @@
// do ContextTool config first
super.configure(parser);
- this.request = (HttpServletRequest)parser.get(ViewContext.REQUEST);
+ this.request =
(HttpServletRequest)parser.getValue(ViewContext.REQUEST);
this.session = request.getSession(false);
- this.application =
(ServletContext)parser.get(ViewContext.SERVLET_CONTEXT_KEY);
+ this.application =
(ServletContext)parser.getValue(ViewContext.SERVLET_CONTEXT_KEY);
}
@Override