some javadoc bugs incidentally fixed

git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1835856 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 11 insertions, 11 deletions

diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java b/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java
index 9d6cb107..088251f7 100755
--- a/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/context/ChainedInternalContextAdapter.java
@@ -97,7 +97,7 @@ public abstract class ChainedInternalContextAdapter implements InternalContextAd
     }
 
     /**
-     * @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 ChainedInternalContextAdapter implements InternalContextAd
     }
 
     /**
-     * @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)
     {
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java b/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java
index ee086494..9ca91e47 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java
@@ -259,7 +259,7 @@ public final class InternalContextAdapterImpl implements InternalContextAdapter
     }
 
     /**
-     * @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 InternalContextAdapterImpl implements InternalContextAdapter
     }
 
     /**
-     * @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)
     {
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
index 4e4798a2..82cfddde 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
@@ -1630,9 +1630,9 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices
     /**
      * 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)
     {
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java
index 4a5ae8cc..42606022 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java
@@ -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);
 
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Converter.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Converter.java
index fcb2b187..37e2fa98 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Converter.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/Converter.java
@@ -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);
 }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java
index fd5839ec..cdda364d 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java
@@ -98,7 +98,7 @@ public class UberspectImpl implements Uberspect, RuntimeServicesAware
     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 Uberspect, RuntimeServicesAware
      *
      * @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 Uberspect, RuntimeServicesAware
          *              (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,