You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2007/11/16 22:07:53 UTC

svn commit: r595822 - in /velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools: ./ config/ generic/ struts/ view/ view/tools/

Author: nbubna
Date: Fri Nov 16 13:07:51 2007
New Revision: 595822

URL: http://svn.apache.org/viewvc?rev=595822&view=rev
Log:
fix javadoc warnings

Modified:
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ClassUtils.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ComparisonDateTool.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/DisplayTool.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/FormTool.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/TilesTool.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/LinkTool.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/MultiViewsTool.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/PagerTool.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ViewResourceTool.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ClassUtils.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ClassUtils.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ClassUtils.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ClassUtils.java Fri Nov 16 13:07:51 2007
@@ -78,9 +78,9 @@
      * <p/>
      * It will try to load the class in the following order:
      * <ul>
-     * <li>From {@link Thread.currentThread().getContextClassLoader()}
+     * <li>From {@link Thread}.currentThread().getContextClassLoader()
      * <li>Using the basic {@link Class#forName(java.lang.String) }
-     * <li>From {@link ClassUtils.class.getClassLoader()}
+     * <li>From {@link ClassUtils}.class.getClassLoader()
      * </ul>
      *
      * @param name Fully qualified class name to be loaded

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java Fri Nov 16 13:07:51 2007
@@ -264,7 +264,7 @@
     }
 
     /**
-     * Returns a {@FactoryConfiguration} loaded from a configuration file
+     * Returns a {@link FactoryConfiguration} loaded from a configuration file
      * at the specified path.  If no such file is found at that path, this
      * will throw a {@link ResourceNotFoundException}.
      *
@@ -347,7 +347,7 @@
      * {@code null}.  If there are multiple matching resources in the
      * classpath, then they will be added together in the order found
      * (i.e. the last one will have precedence).
-     * @see ClassUtils#getResources(String path)
+     * @see ClassUtils#getResources(String path, Object caller)
      */
     public static FactoryConfiguration findInClasspath(String path, Object caller)
     {

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java Fri Nov 16 13:07:51 2007
@@ -93,8 +93,8 @@
     }
 
     /**
-     * @param startWithDefault Sets whether this instance should start with the
-     *        {@link FactoryConfiguration#getDefault()} configuration or not.
+     * @param includeDefaults Sets whether this instance should start with the
+     *        {@link ConfigurationUtils#getDefaultTools()} configuration or not.
      */
     public EasyFactoryConfiguration(boolean includeDefaults)
     {

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java Fri Nov 16 13:07:51 2007
@@ -87,7 +87,7 @@
      * looks for a {@link DefaultKey} annotation on the tool class.  Then,
      * if there is no default key annotation, the {@link Class#getSimpleName()}
      * is transformed into the key by removing any 'Tool' suffix and
-     * lowercasing the first character.  This will only return {@link null}
+     * lowercasing the first character.  This will only return {@code null}
      * if there is both no key and no classname set for this tool.
      */
     public String getDefaultKey()

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ComparisonDateTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ComparisonDateTool.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ComparisonDateTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ComparisonDateTool.java Fri Nov 16 13:07:51 2007
@@ -29,7 +29,7 @@
 import java.util.ResourceBundle;
 
 /**
- * Tool for comparing {@link Date} and {@link Calendar} values
+ * Tool for comparing {@link java.util.Date} and {@link Calendar} values
  * in Velocity templates.  This is a subclass of {@link DateTool}
  * and thus provides all the functionality of that tool and
  * augments it with the ability to find the relationship between
@@ -297,7 +297,7 @@
      * rendering of that Comparison will be the largest unit difference
      * between the dates followed by a description of their relative position.
      * 
-     * @param date The date in question
+     * @param then The date in question
      */
     public Comparison whenIs(Object then)
     {

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java Fri Nov 16 13:07:51 2007
@@ -161,7 +161,7 @@
     }
 
     /**
-     * @param value the Collection to be turned into a string
+     * @param values the Collection to be turned into a string
      * @return the string value of the first object in the collection
      *         or null if the collection is empty
      */
@@ -668,7 +668,7 @@
 
     /**
      * Converts an object to an instance of {@link Number} using the
-     * format returned by {@link #getFormat()} and the default {@link Locale}
+     * format returned by {@link #getNumberFormat()} and the default {@link Locale}
      * if the object is not already an instance of Number.
      *
      * @param value the string to parse
@@ -689,7 +689,7 @@
      * @param format - the format the number is in
      * @return the string as a {@link Number} or <code>null</code> if no
      *         conversion is possible
-     * @see #parseNumber(String format, Object obj, Locale locale)
+     * @see #parseNumber(String value, String format, Object locale)
      */
     public Number parseNumber(String value, String format)
     {
@@ -701,12 +701,12 @@
      * configured number format and the specified {@link Locale}.
      *
      * @param value - the string to parse
-     * @param locale - the {@link Locale}
+     * @param locale - the Locale to use
      * @return the string as a {@link Number} or <code>null</code> if no
      *         conversion is possible
      * @see java.text.NumberFormat#parse
      */
-    public Number parseNumber(String value, Locale locale)
+    public Number parseNumber(String value, Object locale)
     {
         return parseNumber(value, this.numberFormat, locale);
     }
@@ -717,7 +717,7 @@
      *
      * @param value - the string to parse
      * @param format - the format the number is in
-     * @param locale - the {@link Locale}
+     * @param locale - the Locale to use
      * @return the string as a {@link Number} or <code>null</code> if no
      *         conversion is possible
      * @see java.text.NumberFormat#parse
@@ -758,7 +758,7 @@
      * @param format - the format the date is in
      * @return the string as a {@link Date} or <code>null</code> if no
      *         conversion is possible
-     * @see ConversionUtils#toDate(String value, String format, Object locale, TimeZone timezone)
+     * @see ConversionUtils#toDate(String str, String format, Locale locale, TimeZone timezone)
      */
     public Date parseDate(String value, String format)
     {
@@ -770,12 +770,12 @@
      * configured date format and specified {@link Locale} to parse it.
      *
      * @param value - the date to convert
-     * @param locale - the {@link Locale}
+     * @param locale - the Locale to use
      * @return the string as a {@link Date} or <code>null</code> if no
      *         conversion is possible
      * @see java.text.SimpleDateFormat#parse
      */
-    public Date parseDate(String value, Locale locale)
+    public Date parseDate(String value, Object locale)
     {
         return parseDate(value, this.dateFormat, locale);
     }
@@ -786,7 +786,7 @@
      *
      * @param value - the date to convert
      * @param format - the format the date is in
-     * @param locale - the {@link Locale}
+     * @param locale - the Locale to use
      * @return the string as a {@link Date} or <code>null</code> if no
      *         conversion is possible
      * @see java.text.SimpleDateFormat#parse
@@ -802,7 +802,7 @@
      *
      * @param value - the date to convert
      * @param format - the format the date is in
-     * @param locale - the {@link Locale}
+     * @param locale - the Locale to use
      * @param timezone - the {@link TimeZone}
      * @return the string as a {@link Date} or <code>null</code> if no
      *         conversion is possible

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/DisplayTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/DisplayTool.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/DisplayTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/DisplayTool.java Fri Nov 16 13:07:51 2007
@@ -295,7 +295,7 @@
      * If the string gets curtailed, the configured suffix
      * (default is "...") is used as the ending of the truncated string.
      *
-     * @param obj The value to be truncated.
+     * @param truncateMe The value to be truncated.
      * @return A String.
      */
     public String truncate(Object truncateMe)
@@ -309,7 +309,7 @@
      * (default is "...") is used as the ending of the truncated string.
      *
      * @param maxLength An int with the maximum length.
-     * @param obj The value to be truncated.
+     * @param truncateMe The value to be truncated.
      * @return A String.
      */
     public String truncate(Object truncateMe, int maxLength)
@@ -323,7 +323,7 @@
      * If the string gets curtailed, the specified suffix
      * is used as the ending of the truncated string.
      *
-     * @param obj The value to be truncated.
+     * @param truncateMe The value to be truncated.
      * @param suffix A String.
      * @return A String.
      */

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/FormTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/FormTool.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/FormTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/FormTool.java Fri Nov 16 13:07:51 2007
@@ -83,7 +83,7 @@
     /**
      * Initializes this tool.
      *
-     * @param obj the current ViewContext
+     * @param request the current {@link HttpServletRequest}
      * @throws IllegalArgumentException if the param is not a ViewContext
      */
     public void setRequest(HttpServletRequest request)

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/MessageResourcesTool.java Fri Nov 16 13:07:51 2007
@@ -57,7 +57,7 @@
     /**
      * Initializes this tool.
      *
-     * @param obj the current ViewContext
+     * @param params the Map of configuration parameters
      * @throws IllegalArgumentException if the param is not a ViewContext
      */
     public void configure(Map params)

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/TilesTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/TilesTool.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/TilesTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/TilesTool.java Fri Nov 16 13:07:51 2007
@@ -107,7 +107,7 @@
     /**
      * Initializes this tool.
      *
-     * @param obj the current {@link Context}
+     * @param context the current {@link Context}
      * @throws IllegalArgumentException if the param is not a {@link Context}
      */
     public void setVelocityContext(Context context)

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/struts/ValidatorTool.java Fri Nov 16 13:07:51 2007
@@ -163,7 +163,7 @@
     /**
      * Initializes this tool.
      *
-     * @param obj the current ViewContext
+     * @param params the Map of configuration parameters
      * @throws IllegalArgumentException if the param is not a ViewContext
      */
     public void configure(Map params)

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/LinkTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/LinkTool.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/LinkTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/LinkTool.java Fri Nov 16 13:07:51 2007
@@ -400,7 +400,7 @@
      * @return A new LinkTool with the specified parameterName added to the
      *         ignore set.
      * @see #addAllParameters()
-     * @see #addIgnore()
+     * @see #addIgnore
      */
     protected LinkTool copyWithIgnore(String parameterName)
     {
@@ -871,7 +871,6 @@
      * current request (in addition to any others set so far).
      *
      * @see #uri(String uri)
-     * @see #configure(Map params)
      * @see #setSelfAbsolute(boolean selfAbsolute)
      * @see #setSelfIncludeParameters(boolean selfParams)
      * @see #addAllParameters()

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/MultiViewsTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/MultiViewsTool.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/MultiViewsTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/MultiViewsTool.java Fri Nov 16 13:07:51 2007
@@ -69,7 +69,7 @@
      * easy to setup language overrides at different levels within
      * your application.
      *
-     * @param obj the current ViewContext
+     * @param params the {@link Map} of configuration parameters
      * @throws IllegalArgumentException if the param is not a ViewContext
      */
     public void configure(Map params)

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/PagerTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/PagerTool.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/PagerTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/PagerTool.java Fri Nov 16 13:07:51 2007
@@ -147,7 +147,7 @@
      * Sets the index, itemsPerPage, and/or slipSize *if* they are set
      * in the request parameters.  Likewise, this will set the item list
      * to be paged *if* there is a list pushed into the request attributes
-     * under the {@link #getItemsKey()}.
+     * under the {@link #getNewItemsKey()}.
      *
      * @param request the current HttpServletRequest
      */

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java Fri Nov 16 13:07:51 2007
@@ -33,7 +33,7 @@
  * @author <a href="mailto:henning@schmiedehausen.org">Henning P. Schmiedehausen</a>
  * @since VelocityTools 1.1
  * @version $Id$
- * @deprecated Use {@link org.apache.velocity.tools.config.XmlFactoryConfigurationRuleSet
+ * @deprecated Use {@link org.apache.velocity.tools.config.XmlFactoryConfigurationRuleSet}
  */
 @Deprecated
 public class ToolboxRuleSet extends RuleSetBase

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java Fri Nov 16 13:07:51 2007
@@ -164,9 +164,8 @@
      * Overrides VelocityViewServlet to check the request for
      * an alternate layout
      *
+     * @param ctx context for this request
      * @param request client request
-     * @param response client response
-     * @return the Context to fill
      */
     protected void fillContext(Context ctx, HttpServletRequest request)
     {

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java Fri Nov 16 13:07:51 2007
@@ -81,17 +81,6 @@
  *     'org.apache.velocity.tools.view.velocity.properties'.</dd>
  * </dl>
  *
- * <p>There are methods you may wish to override to access, alter or control
- * any part of the request processing chain.  Please see the javadocs for
- * more information on :
- * <ul>
- * <li> {@link #setContentType} : <br>for changing the content type on a request
- *                                  by request basis
- * <li> {@link #requestCleanup} : <br>post rendering resource or other cleanup
- * <li> {@link #error} : <br>error handling
- * </ul>
- * </p>
- *
  * @author Dave Bryson
  * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
  * @author <a href="mailto:sidler@teamup.com">Gabe Sidler</a>
@@ -260,7 +249,7 @@
     /**
      * Simplifies process of getting a property from VelocityEngine,
      * because the VelocityEngine interface sucks compared to the singleton's.
-     * Use of this method assumes that {@link #initVelocity(ServletConfig,VelocityEngine)}
+     * Use of this method assumes that {@link #init(ServletConfig,VelocityEngine)}
      * has already been called.
      */
     protected String getProperty(String key, String alternate)

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java Fri Nov 16 13:07:51 2007
@@ -66,7 +66,8 @@
  *   <dt>org.apache.velocity.tools.shared.config</dt>
  *   <dd>By default, this is {@code true}. If set to {@code false}, then
  *     the {@link VelocityView} used by this servlet will not be shared
- *     with other VelocityViewServlets or {@link VelocityViewTag}s in the
+ *     with other VelocityViewServlets or 
+ *     {@link org.apache.velocity.tools.view.jsp.VelocityViewTag}s in the
  *     application.</dd>
  *   <dt>org.apache.velocity.tools.loadDefaults</dt>
  *   <dd>By default, this is {@code true}. If set to {@code false}, then
@@ -80,7 +81,7 @@
  *     one(s) provided by yourself and/or the default configuration(s))
  *     will have all invalid tools, properties, and/or data removed prior to
  *     configuring the ToolboxFactory for this servlet by a
- *     {@link ConfigurationCleaner}</dd>
+ *     {@link org.apache.velocity.tools.config.ConfigurationCleaner}</dd>
  * </dl>
  *
  * @version $Id$

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ViewResourceTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ViewResourceTool.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ViewResourceTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ViewResourceTool.java Fri Nov 16 13:07:51 2007
@@ -67,9 +67,9 @@
 public class ViewResourceTool extends ResourceTool
 {
     /**
-     * Sets the current {@link ServletRequest}
+     * Sets the current {@link HttpServletRequest}
      *
-     * @param request the {@link ServletRequest} to retrieve the default Locale from
+     * @param request the {@link HttpServletRequest} to retrieve the default Locale from
      */
     public void setRequest(HttpServletRequest request)
     {

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/BrowserSnifferTool.java Fri Nov 16 13:07:51 2007
@@ -22,7 +22,7 @@
 import org.apache.velocity.tools.view.ViewContext;
 
 /**
- * Use {@link org.apache.velocity.view.BrowserTool}
+ * Use {@link org.apache.velocity.tools.view.BrowserTool}
  */
 @Deprecated
 public class BrowserSnifferTool extends

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java?rev=595822&r1=595821&r2=595822&view=diff
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java Fri Nov 16 13:07:51 2007
@@ -22,7 +22,7 @@
 import org.apache.velocity.context.Context;
 
 /**
- * Use {@link org.apache.velocity.view.ViewRenderTool}
+ * Use {@link org.apache.velocity.tools.view.ViewRenderTool}
  */
 @Deprecated
 public class ViewRenderTool extends