Author: nbubna
Date: Wed Sep 17 14:39:04 2008
New Revision: 696463
URL: http://svn.apache.org/viewvc?rev=696463&view=rev
Log:
fix javadoc errors
Modified:
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ConversionUtils.java
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfiguration.java
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/MathTool.java
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewFilter.java
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
Modified:
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ConversionUtils.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ConversionUtils.java?rev=696463&r1=696462&r2=696463&view=diff
==============================================================================
---
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ConversionUtils.java
(original)
+++
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/ConversionUtils.java
Wed Sep 17 14:39:04 2008
@@ -603,9 +603,9 @@
* @see ClassUtils#getResource(String,Object)
* @see URL
*/
- public static URL toURL(String name)
+ public static URL toURL(String value)
{
- return toURL(name, ConversionUtils.class);
+ return toURL(value, ConversionUtils.class);
}
/**
@@ -621,11 +621,11 @@
* @see ClassUtils#getResource(String,Object)
* @see URL
*/
- public static URL toURL(String name, Object caller)
+ public static URL toURL(String value, Object caller)
{
try
{
- File file = new File(name);
+ File file = new File(value);
if (file.exists())
{
return file.toURI().toURL();
@@ -634,7 +634,7 @@
catch (Exception e) {}
try
{
- URL url = ClassUtils.getResource(name, caller);
+ URL url = ClassUtils.getResource(value, caller);
if (url != null)
{
return url;
@@ -643,7 +643,7 @@
catch (Exception e) {}
try
{
- return new URL(name);
+ return new URL(value);
}
catch (Exception e) {}
return null;
Modified:
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfiguration.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfiguration.java?rev=696463&r1=696462&r2=696463&view=diff
==============================================================================
---
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfiguration.java
(original)
+++
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfiguration.java
Wed Sep 17 14:39:04 2008
@@ -77,7 +77,7 @@
* format from VelocityTools 1.x.
*
* @param supportOldConfig whether the old toolbox.xml format should be
supported
- * @param name the name of the "source" of this instance
+ * @param id the name of the "source" of this instance
* @see FactoryConfiguration#setSource(String)
*/
public XmlFactoryConfiguration(boolean supportOldConfig, String id)
Modified:
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/MathTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/MathTool.java?rev=696463&r1=696462&r2=696463&view=diff
==============================================================================
---
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/MathTool.java
(original)
+++
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/MathTool.java
Wed Sep 17 14:39:04 2008
@@ -534,7 +534,7 @@
// --------------------------- protected methods ------------------
/**
- * @see #matchType(Number[],double)
+ * @see #matchType(double,Number...)
*/
protected Number matchType(Number in, double out)
{
@@ -542,7 +542,7 @@
}
/**
- * @see #matchType(Number[],double)
+ * @see #matchType(double,Number...)
*/
protected Number matchType(Number in1, Number in2, double out)
{
Modified:
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewFilter.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewFilter.java?rev=696463&r1=696462&r2=696463&view=diff
==============================================================================
---
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewFilter.java
(original)
+++
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewFilter.java
Wed Sep 17 14:39:04 2008
@@ -30,6 +30,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.velocity.context.Context;
+import org.apache.velocity.tools.Toolbox;
import org.apache.velocity.tools.view.VelocityView;
import org.apache.velocity.tools.view.ViewToolContext;
Modified:
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java?rev=696463&r1=696462&r2=696463&view=diff
==============================================================================
---
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
(original)
+++
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
Wed Sep 17 14:39:04 2008
@@ -67,7 +67,7 @@
* <dt>org.apache.velocity.tools.shared.config</dt>
* <dd>By default, this is [EMAIL PROTECTED] true}. If set to [EMAIL
PROTECTED] false}, then
* the [EMAIL PROTECTED] VelocityView} used by this servlet will not be
shared
- * with [EMAIL PROTECTED] VelocityViewFilters}, other VelocityViewServlets
or
+ * with [EMAIL PROTECTED] VelocityViewFilter}s, other VelocityViewServlets
or
* [EMAIL PROTECTED] org.apache.velocity.tools.view.jsp.VelocityViewTag}s
in the
* application.</dd>
* <dt>org.apache.velocity.tools.loadDefaults</dt>
