Author: cbrisson
Date: Fri Jul 13 19:27:31 2018
New Revision: 1835856

URL: http://svn.apache.org/viewvc?rev=1835856&view=rev
Log:
some javadoc bugs incidentally fixed

Modified:
    
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java
    
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java
    
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
    
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java
    
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Converter.java
    
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java
    velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt

Modified: 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java?rev=1835856&r1=1835855&r2=1835856&view=diff
==============================================================================
--- 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java
 Fri Jul 13 19:27:31 2018
@@ -97,7 +97,7 @@ public abstract class ChainedInternalCon
     }
 
     /**
-     * @see org.apache.velocity.context.Context#containsKey(java.lang.Object)
+     * @see org.apache.velocity.context.Context#containsKey(java.lang.String)
      */
     public boolean containsKey(String key)
     {
@@ -113,7 +113,7 @@ public abstract class ChainedInternalCon
     }
 
     /**
-     * @see org.apache.velocity.context.Context#remove(java.lang.Object)
+     * @see org.apache.velocity.context.Context#remove(java.lang.String)
      */
     public Object remove(String key)
     {

Modified: 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java?rev=1835856&r1=1835855&r2=1835856&view=diff
==============================================================================
--- 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java
 Fri Jul 13 19:27:31 2018
@@ -259,7 +259,7 @@ public final class InternalContextAdapte
     }
 
     /**
-     * @see org.apache.velocity.context.Context#containsKey(java.lang.Object)
+     * @see org.apache.velocity.context.Context#containsKey(java.lang.String)
      */
     public boolean containsKey(String key)
     {
@@ -275,7 +275,7 @@ public final class InternalContextAdapte
     }
 
     /**
-     * @see org.apache.velocity.context.Context#remove(java.lang.Object)
+     * @see org.apache.velocity.context.Context#remove(java.lang.String)
      */
     public Object remove(String key)
     {

Modified: 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java?rev=1835856&r1=1835855&r2=1835856&view=diff
==============================================================================
--- 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
 Fri Jul 13 19:27:31 2018
@@ -1630,9 +1630,9 @@ public class RuntimeInstance implements
     /**
      * Get a logger for the specified child namespace.
      * If a logger was configured using the runtime.log.instance configuration 
property, returns this instance.
-     * Otherwise, uses SLF4J LoggerFactory on baseNamespace + childNamespace.
+     * Otherwise, uses SLF4J LoggerFactory on baseNamespace '.' childNamespace.
      * @param childNamespace
-     * @return
+     * @return child namespace logger
      */
     public Logger getLog(String childNamespace)
     {

Modified: 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java?rev=1835856&r1=1835855&r2=1835856&view=diff
==============================================================================
--- 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java
 Fri Jul 13 19:27:31 2018
@@ -426,7 +426,7 @@ public interface RuntimeServices
      * If a logger was configured using the runtime.log.instance configuration 
property, returns this instance.
      * Otherwise, uses SLF4J LoggerFactory on baseNamespace + childNamespace.
      * @param childNamespace
-     * @return
+     * @return child name space logger
      */
     Logger getLog(String childNamespace);
 

Modified: 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Converter.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Converter.java?rev=1835856&r1=1835855&r2=1835856&view=diff
==============================================================================
--- 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Converter.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Converter.java
 Fri Jul 13 19:27:31 2018
@@ -32,7 +32,7 @@ public interface Converter<T>
     /**
      * convert object to type T
      * @param o input object
-     * @result converted object
+     * @return converted object
      */
     T convert(Object o);
 }

Modified: 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java?rev=1835856&r1=1835855&r2=1835856&view=diff
==============================================================================
--- 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java
 Fri Jul 13 19:27:31 2018
@@ -98,7 +98,7 @@ public class UberspectImpl implements Ub
     public void setRuntimeServices(RuntimeServices rs)
     {
         rsvc = rs;
-        log = rsvc.getLog("rendering");
+        log = rsvc.getLog("introspection");
 
         String conversionHandlerClass = 
rs.getString(RuntimeConstants.CONVERSION_HANDLER_CLASS);
         if (conversionHandlerClass == null || 
conversionHandlerClass.equals("none"))
@@ -149,7 +149,7 @@ public class UberspectImpl implements Ub
      *
      * @param log The logger instance to use.
      * @since 1.5
-     * @Deprecated logger is now set by default to the namespace logger 
"velocity.rendering".
+     * @deprecated logger is now set by default to the namespace logger 
"velocity.rendering".
      */
     public void setLog(Logger log)
     {
@@ -537,7 +537,7 @@ public class UberspectImpl implements Ub
          *              (This will always be one less than the number of
          *               expected arguments.)
          * @param actual The actual parameters being passed to this method
-         * @returns The actual parameters adjusted for the varargs in order
+         * @return The actual parameters adjusted for the varargs in order
          *          to fit the method declaration.
          */
         private Object[] handleVarArg(final Class type,

Modified: velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt?rev=1835856&r1=1835855&r2=1835856&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt 
(original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt Fri 
Jul 13 19:27:31 2018
@@ -1508,7 +1508,7 @@ void DirectiveAssign() : {}
 /**
  *   Supports the Pluggable Directives
  *     #foo( arg+ )
- * @returns true if ends with a newline
+ * @return true if ends with a newline
  */
 boolean Directive() :
 {
@@ -1875,7 +1875,7 @@ TOKEN :
  * This method is responsible for allowing
  * all non-grammar text to pass through
  * unscathed.
- * @returns true if last read token was a newline
+ * @return true if last read token was a newline
  */
 boolean Text() : {}
 {


Reply via email to