From 3131781e5165364442ded34d8cafc6765d4194b0 Mon Sep 17 00:00:00 2001 From: Jesse Pavel Date: Tue, 29 Jan 2019 11:46:30 -0500 Subject: [PATCH 1/2] Fix Javadoc errors --- src/bsh/BshClassManager.java | 6 +++--- src/bsh/BshScriptEngine.java | 2 +- src/bsh/Interpreter.java | 2 +- src/bsh/NameSpace.java | 13 +++++++------ src/bsh/UtilEvalError.java | 2 +- src/bsh/classpath/BshClassLoader.java | 3 +-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/bsh/BshClassManager.java b/src/bsh/BshClassManager.java index 253146b..9b40f90 100644 --- a/src/bsh/BshClassManager.java +++ b/src/bsh/BshClassManager.java @@ -134,8 +134,8 @@ static void clearResolveCache() { Create a new instance of the class manager. Class manager instnaces are now associated with the interpreter. - @see bsh.Interpreter.getClassManager() - @see bsh.Interpreter.setClassLoader( ClassLoader ) + @see bsh.Interpreter#getClassManager() + @see bsh.Interpreter#setClassLoader( ClassLoader ) */ public static BshClassManager createClassManager( Interpreter interpreter ) { @@ -316,7 +316,7 @@ protected Method getResolvedMethod( /** Clear the caches in BshClassManager - @see public void #reset() for external usage + @see #reset() for external usage */ protected void clearCaches() { diff --git a/src/bsh/BshScriptEngine.java b/src/bsh/BshScriptEngine.java index 3e7402a..7250ed7 100644 --- a/src/bsh/BshScriptEngine.java +++ b/src/bsh/BshScriptEngine.java @@ -234,7 +234,7 @@ public CompiledScript compile(Reader script) throws ScriptException { /** * Calls a procedure compiled during a previous script execution, which is - * retained in the state of the {@code ScriptEngine{@code . + * retained in the state of the {@code ScriptEngine}. * * @param name The name of the procedure to be called. * @param thiz If the procedure is a member of a class defined in the script diff --git a/src/bsh/Interpreter.java b/src/bsh/Interpreter.java index c556a23..9d54106 100644 --- a/src/bsh/Interpreter.java +++ b/src/bsh/Interpreter.java @@ -107,7 +107,7 @@ public class Interpreter { /* --- Begin static members --- */ - public static final String VERSION = "2.1.9+"; + public static final String VERSION = "2.1.9"; /* Debug utils are static so that they are reachable by code that doesn't necessarily have an interpreter reference (e.g. tracing in utils). diff --git a/src/bsh/NameSpace.java b/src/bsh/NameSpace.java index bf4988f..e5140fe 100644 --- a/src/bsh/NameSpace.java +++ b/src/bsh/NameSpace.java @@ -34,6 +34,8 @@ package bsh; +import bsh.This; + import java.io.Serializable; import java.util.List; import java.util.ArrayList; @@ -162,7 +164,7 @@ are cached here (those which might be imported). Qualified names are // Begin constructors /** - @parent the parent namespace of this namespace. Child namespaces + @param parent the parent namespace of this namespace. Child namespaces inherit all variables and methods of their parent and can (of course) override / shadow them. */ @@ -1266,7 +1268,7 @@ private synchronized void writeObject(java.io.ObjectOutputStream s) required. The method will appear as if called externally from Java.

- @see bsh.This.invokeMethod( + @see bsh.This#invokeMethod( String methodName, Object [] args, Interpreter interpreter, CallStack callstack, SimpleNode callerInfo, boolean ) */ @@ -1281,9 +1283,8 @@ public Object invokeMethod( /** This method simply delegates to This.invokeMethod();

- @see bsh.This.invokeMethod( - String methodName, Object [] args, Interpreter interpreter, - CallStack callstack, SimpleNode callerInfo ) + @see This#invokeMethod(java.lang.String, java.lang.Object[], + bsh.Interpreter, bsh.CallStack, bsh.SimpleNode, boolean) */ public Object invokeMethod( String methodName, Object [] args, Interpreter interpreter, @@ -1526,4 +1527,4 @@ private List clone(final List list) { return new ArrayList(list); } -} \ No newline at end of file +} diff --git a/src/bsh/UtilEvalError.java b/src/bsh/UtilEvalError.java index 76e4084..eaf2d2d 100644 --- a/src/bsh/UtilEvalError.java +++ b/src/bsh/UtilEvalError.java @@ -72,7 +72,7 @@ public UtilEvalError( String s, Throwable cause ) { /** Re-throw as an eval error, prefixing msg to the message and specifying the node. If a node already exists the addNode is ignored. - @see #setNode( bsh.SimpleNode ) + @see EvalError#setNode( bsh.SimpleNode )

@param msg may be null for no additional message. */ diff --git a/src/bsh/classpath/BshClassLoader.java b/src/bsh/classpath/BshClassLoader.java index 3c26d39..4a359dd 100644 --- a/src/bsh/classpath/BshClassLoader.java +++ b/src/bsh/classpath/BshClassLoader.java @@ -56,7 +56,7 @@ public BshClassLoader( BshClassManager classManager, URL [] bases ) { } /** - @param bases URLs JARClassLoader seems to require absolute paths + @param bcp BshClassPath */ public BshClassLoader( BshClassManager classManager, BshClassPath bcp ) { this( classManager, bcp.getPathComponents() ); @@ -64,7 +64,6 @@ public BshClassLoader( BshClassManager classManager, BshClassPath bcp ) { /** For use by children - @param bases URLs JARClassLoader seems to require absolute paths */ protected BshClassLoader( BshClassManager classManager ) { this( classManager, new URL [] { } ); From 8fc634b21aa3fb40a9debe8ae4d876125bf7104d Mon Sep 17 00:00:00 2001 From: Jesse Pavel Date: Tue, 29 Jan 2019 11:48:12 -0500 Subject: [PATCH 2/2] Update version no. in Interpreter.java --- src/bsh/Interpreter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bsh/Interpreter.java b/src/bsh/Interpreter.java index 9d54106..c556a23 100644 --- a/src/bsh/Interpreter.java +++ b/src/bsh/Interpreter.java @@ -107,7 +107,7 @@ public class Interpreter { /* --- Begin static members --- */ - public static final String VERSION = "2.1.9"; + public static final String VERSION = "2.1.9+"; /* Debug utils are static so that they are reachable by code that doesn't necessarily have an interpreter reference (e.g. tracing in utils).