From f97f2f746e8af253dd6263c12aaeed17568ead4c Mon Sep 17 00:00:00 2001 From: Chris Midgley Date: Tue, 15 Aug 2023 21:22:34 +0100 Subject: [PATCH 1/4] feat: bump spotless plugin so it works without flags in JDK16+ --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index deb3d6e269..85b8cd7322 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { id 'jacoco' id 'distribution' id 'checkstyle' - id 'com.diffplug.spotless' version "5.12.1" + id 'com.diffplug.spotless' version "5.17.1" id 'com.github.spotbugs' version "4.7.1" } From 977cc1630a75f5cb34c4e4a8fcaa1237d5eecb33 Mon Sep 17 00:00:00 2001 From: Chris Midgley Date: Wed, 16 Aug 2023 08:09:57 +0100 Subject: [PATCH 2/4] feat: try using 1.11.0 of googleJavaFormat --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 85b8cd7322..8f02a3fbf9 100644 --- a/build.gradle +++ b/build.gradle @@ -443,7 +443,7 @@ spotbugs { spotless { java { - googleJavaFormat().aosp() + googleJavaFormat('1.11.0').aosp() } } From bf42817b728d95a09f2a48153743ee7aafa07026 Mon Sep 17 00:00:00 2001 From: Chris Midgley Date: Wed, 16 Aug 2023 11:59:16 +0100 Subject: [PATCH 3/4] feat: try 6.13.0 instead This is the version immediately before JVM 11 was the minimum version. --- build.gradle | 4 +- src/org/mozilla/javascript/BaseFunction.java | 4 +- src/org/mozilla/javascript/ClassCache.java | 4 +- .../mozilla/javascript/CompilerEnvirons.java | 4 +- src/org/mozilla/javascript/Context.java | 24 ++- .../mozilla/javascript/ContextFactory.java | 4 +- .../mozilla/javascript/ContextListener.java | 8 +- .../javascript/ContinuationPending.java | 8 +- src/org/mozilla/javascript/Delegator.java | 68 ++++++--- src/org/mozilla/javascript/EcmaError.java | 20 ++- .../javascript/EvaluatorException.java | 16 +- .../mozilla/javascript/ImporterTopLevel.java | 4 +- .../javascript/JavaScriptException.java | 12 +- src/org/mozilla/javascript/NativeArray.java | 4 +- src/org/mozilla/javascript/NativeGlobal.java | 4 +- .../mozilla/javascript/NativeJavaPackage.java | 8 +- src/org/mozilla/javascript/NativeNumber.java | 4 +- src/org/mozilla/javascript/NativeScript.java | 4 +- src/org/mozilla/javascript/Ref.java | 4 +- src/org/mozilla/javascript/ScriptRuntime.java | 96 +++++++++--- src/org/mozilla/javascript/SecureCaller.java | 4 +- .../mozilla/javascript/SecurityUtilities.java | 4 +- src/org/mozilla/javascript/Synchronizer.java | 4 +- src/org/mozilla/javascript/WrapFactory.java | 4 +- .../mozilla/javascript/WrappedException.java | 8 +- src/org/mozilla/javascript/ast/AstNode.java | 4 +- .../javascript/optimizer/OptRuntime.java | 4 +- .../mozilla/javascript/drivers/JsDriver.java | 4 +- .../mozilla/javascript/drivers/ShellTest.java | 4 +- .../javascript/tests/Bug491621Test.java | 4 +- .../javascript/tests/Bug637811Test.java | 4 +- .../javascript/tests/Bug685403Test.java | 4 +- .../javascript/tests/Bug687669Test.java | 4 +- .../javascript/tests/Bug688018Test.java | 4 +- .../javascript/tests/Bug688021Test.java | 4 +- .../javascript/tests/Bug688023Test.java | 4 +- .../javascript/tests/Bug689308Test.java | 4 +- .../javascript/tests/Bug689314Test.java | 4 +- .../javascript/tests/Bug708801Test.java | 4 +- .../javascript/tests/Bug714204Test.java | 4 +- .../javascript/tests/Bug782363Test.java | 4 +- .../javascript/tests/Bug783797Test.java | 4 +- .../javascript/tests/Bug789277Test.java | 4 +- .../tests/ClassShutterExceptionTest.java | 4 +- .../tests/JavaAcessibilityTest.java | 4 +- .../javascript/tests/NativeJsonTest.java | 4 +- .../javascript/tests/NativeRegExpTest.java | 144 +++++++++++++----- .../tests/ObserveInstructionCountTest.java | 4 +- .../javascript/tests/StackTraceTest.java | 4 +- .../javascript/tests/Test262SuiteTest.java | 4 +- .../javascript/tests/WrapFactoryTest.java | 4 +- .../tests/WriteReadOnlyPropertyTest.java | 8 +- .../tests/commentspr465/IfCommentsTest.java | 4 +- .../tests/commentspr465/LoopCommentsTest.java | 4 +- .../tests/commentspr465/MiscCommentsTest.java | 4 +- .../commentspr465/SwitchCommentsTest.java | 4 +- .../tests/es5/Test262RegExpTest.java | 4 +- .../tests/es6/FunctionNullSetTest.java | 4 +- .../tests/es6/NativeRegExpTest.java | 4 +- .../tests/es6/TypedArrayJavaTest.java | 4 +- .../tests/intl402/NativeStringTest.java | 4 +- .../javascript/tools/debugger/Main.java | 24 ++- .../mozilla/javascript/tools/jsc/Main.java | 4 +- .../javascript/tools/shell/ShellConsole.java | 4 +- .../org/mozilla/javascript/xmlimpl/QName.java | 4 +- .../javascript/xmlimpl/XMLLibImpl.java | 12 +- .../mozilla/javascript/xmlimpl/XMLName.java | 12 +- .../mozilla/javascript/xmlimpl/XmlNode.java | 4 +- 68 files changed, 509 insertions(+), 171 deletions(-) diff --git a/build.gradle b/build.gradle index 8f02a3fbf9..e773239074 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { id 'jacoco' id 'distribution' id 'checkstyle' - id 'com.diffplug.spotless' version "5.17.1" + id 'com.diffplug.spotless' version "6.13.0" id 'com.github.spotbugs' version "4.7.1" } @@ -443,7 +443,7 @@ spotbugs { spotless { java { - googleJavaFormat('1.11.0').aosp() + googleJavaFormat().aosp() } } diff --git a/src/org/mozilla/javascript/BaseFunction.java b/src/org/mozilla/javascript/BaseFunction.java index 0acfa10ff4..219d51dfea 100644 --- a/src/org/mozilla/javascript/BaseFunction.java +++ b/src/org/mozilla/javascript/BaseFunction.java @@ -32,7 +32,9 @@ static void init(Context cx, Scriptable scope, boolean sealed) { obj.exportAsJSClass(MAX_PROTOTYPE_ID, scope, sealed); } - /** @deprecated Use {@link #init(Context, Scriptable, boolean)} instead */ + /** + * @deprecated Use {@link #init(Context, Scriptable, boolean)} instead + */ @Deprecated static void init(Scriptable scope, boolean sealed) { init(Context.getContext(), scope, sealed); diff --git a/src/org/mozilla/javascript/ClassCache.java b/src/org/mozilla/javascript/ClassCache.java index ade524c458..884f37c514 100644 --- a/src/org/mozilla/javascript/ClassCache.java +++ b/src/org/mozilla/javascript/ClassCache.java @@ -131,7 +131,9 @@ public synchronized void setCachingEnabled(boolean enabled) { cachingIsEnabled = enabled; } - /** @return a map from classes to associated JavaMembers objects */ + /** + * @return a map from classes to associated JavaMembers objects + */ Map getClassCacheMap() { if (classTable == null) { // Use 1 as concurrency level here and for other concurrent hash maps diff --git a/src/org/mozilla/javascript/CompilerEnvirons.java b/src/org/mozilla/javascript/CompilerEnvirons.java index cdb1682777..becc48b09b 100644 --- a/src/org/mozilla/javascript/CompilerEnvirons.java +++ b/src/org/mozilla/javascript/CompilerEnvirons.java @@ -142,7 +142,9 @@ public void setGeneratingSource(boolean generatingSource) { this.generatingSource = generatingSource; } - /** @return true iff code will be generated with callbacks to enable instruction thresholds */ + /** + * @return true iff code will be generated with callbacks to enable instruction thresholds + */ public boolean isGenerateObserverCount() { return generateObserverCount; } diff --git a/src/org/mozilla/javascript/Context.java b/src/org/mozilla/javascript/Context.java index dfbce475a9..124c68b44a 100644 --- a/src/org/mozilla/javascript/Context.java +++ b/src/org/mozilla/javascript/Context.java @@ -158,7 +158,9 @@ public class Context implements Closeable { */ public static final int FEATURE_PARENT_PROTO_PROPERTIES = 5; - /** @deprecated In previous releases, this name was given to FEATURE_PARENT_PROTO_PROPERTIES. */ + /** + * @deprecated In previous releases, this name was given to FEATURE_PARENT_PROTO_PROPERTIES. + */ @Deprecated public static final int FEATURE_PARENT_PROTO_PROPRTIES = 5; /** @@ -947,28 +949,36 @@ static EvaluatorException reportRuntimeErrorById(String messageId, Object... arg return reportRuntimeError(msg); } - /** @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead */ + /** + * @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead + */ @Deprecated static EvaluatorException reportRuntimeError0(String messageId) { String msg = ScriptRuntime.getMessageById(messageId); return reportRuntimeError(msg); } - /** @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead */ + /** + * @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead + */ @Deprecated static EvaluatorException reportRuntimeError1(String messageId, Object arg1) { String msg = ScriptRuntime.getMessageById(messageId, arg1); return reportRuntimeError(msg); } - /** @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead */ + /** + * @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead + */ @Deprecated static EvaluatorException reportRuntimeError2(String messageId, Object arg1, Object arg2) { String msg = ScriptRuntime.getMessageById(messageId, arg1, arg2); return reportRuntimeError(msg); } - /** @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead */ + /** + * @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead + */ @Deprecated static EvaluatorException reportRuntimeError3( String messageId, Object arg1, Object arg2, Object arg3) { @@ -976,7 +986,9 @@ static EvaluatorException reportRuntimeError3( return reportRuntimeError(msg); } - /** @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead */ + /** + * @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead + */ @Deprecated static EvaluatorException reportRuntimeError4( String messageId, Object arg1, Object arg2, Object arg3, Object arg4) { diff --git a/src/org/mozilla/javascript/ContextFactory.java b/src/org/mozilla/javascript/ContextFactory.java index 6ee0116605..8f5939f47e 100644 --- a/src/org/mozilla/javascript/ContextFactory.java +++ b/src/org/mozilla/javascript/ContextFactory.java @@ -527,7 +527,9 @@ public final Context enter() { return enterContext(null); } - /** @deprecated Use {@link Context#exit()} instead. */ + /** + * @deprecated Use {@link Context#exit()} instead. + */ @Deprecated public final void exit() { Context.exit(); diff --git a/src/org/mozilla/javascript/ContextListener.java b/src/org/mozilla/javascript/ContextListener.java index c12d985c64..0862b36228 100644 --- a/src/org/mozilla/javascript/ContextListener.java +++ b/src/org/mozilla/javascript/ContextListener.java @@ -15,11 +15,15 @@ @Deprecated public interface ContextListener extends ContextFactory.Listener { - /** @deprecated Rhino runtime never calls the method. */ + /** + * @deprecated Rhino runtime never calls the method. + */ @Deprecated public void contextEntered(Context cx); - /** @deprecated Rhino runtime never calls the method. */ + /** + * @deprecated Rhino runtime never calls the method. + */ @Deprecated public void contextExited(Context cx); } diff --git a/src/org/mozilla/javascript/ContinuationPending.java b/src/org/mozilla/javascript/ContinuationPending.java index f16756089a..7dbec7a6d5 100644 --- a/src/org/mozilla/javascript/ContinuationPending.java +++ b/src/org/mozilla/javascript/ContinuationPending.java @@ -53,7 +53,9 @@ public void setContinuation(NativeContinuation continuation) { this.continuationState = continuation; } - /** @return internal continuation state */ + /** + * @return internal continuation state + */ NativeContinuation getContinuationState() { return continuationState; } @@ -68,7 +70,9 @@ public void setApplicationState(Object applicationState) { this.applicationState = applicationState; } - /** @return arbitrary application state */ + /** + * @return arbitrary application state + */ public Object getApplicationState() { return applicationState; } diff --git a/src/org/mozilla/javascript/Delegator.java b/src/org/mozilla/javascript/Delegator.java index ebb8d8a13d..748c00b46a 100644 --- a/src/org/mozilla/javascript/Delegator.java +++ b/src/org/mozilla/javascript/Delegator.java @@ -74,13 +74,17 @@ public void setDelegee(Scriptable obj) { this.obj = obj; } - /** @see org.mozilla.javascript.Scriptable#getClassName */ + /** + * @see org.mozilla.javascript.Scriptable#getClassName + */ @Override public String getClassName() { return getDelegee().getClassName(); } - /** @see org.mozilla.javascript.Scriptable#get(String, Scriptable) */ + /** + * @see org.mozilla.javascript.Scriptable#get(String, Scriptable) + */ @Override public Object get(String name, Scriptable start) { return getDelegee().get(name, start); @@ -95,13 +99,17 @@ public Object get(Symbol key, Scriptable start) { return Scriptable.NOT_FOUND; } - /** @see org.mozilla.javascript.Scriptable#get(int, Scriptable) */ + /** + * @see org.mozilla.javascript.Scriptable#get(int, Scriptable) + */ @Override public Object get(int index, Scriptable start) { return getDelegee().get(index, start); } - /** @see org.mozilla.javascript.Scriptable#has(String, Scriptable) */ + /** + * @see org.mozilla.javascript.Scriptable#has(String, Scriptable) + */ @Override public boolean has(String name, Scriptable start) { return getDelegee().has(name, start); @@ -116,19 +124,25 @@ public boolean has(Symbol key, Scriptable start) { return false; } - /** @see org.mozilla.javascript.Scriptable#has(int, Scriptable) */ + /** + * @see org.mozilla.javascript.Scriptable#has(int, Scriptable) + */ @Override public boolean has(int index, Scriptable start) { return getDelegee().has(index, start); } - /** @see org.mozilla.javascript.Scriptable#put(String, Scriptable, Object) */ + /** + * @see org.mozilla.javascript.Scriptable#put(String, Scriptable, Object) + */ @Override public void put(String name, Scriptable start, Object value) { getDelegee().put(name, start, value); } - /** @see org.mozilla.javascript.SymbolScriptable#put(Symbol, Scriptable, Object) */ + /** + * @see org.mozilla.javascript.SymbolScriptable#put(Symbol, Scriptable, Object) + */ @Override public void put(Symbol symbol, Scriptable start, Object value) { final Scriptable delegee = getDelegee(); @@ -137,13 +151,17 @@ public void put(Symbol symbol, Scriptable start, Object value) { } } - /** @see org.mozilla.javascript.Scriptable#put(int, Scriptable, Object) */ + /** + * @see org.mozilla.javascript.Scriptable#put(int, Scriptable, Object) + */ @Override public void put(int index, Scriptable start, Object value) { getDelegee().put(index, start, value); } - /** @see org.mozilla.javascript.Scriptable#delete(String) */ + /** + * @see org.mozilla.javascript.Scriptable#delete(String) + */ @Override public void delete(String name) { getDelegee().delete(name); @@ -157,37 +175,49 @@ public void delete(Symbol key) { } } - /** @see org.mozilla.javascript.Scriptable#delete(int) */ + /** + * @see org.mozilla.javascript.Scriptable#delete(int) + */ @Override public void delete(int index) { getDelegee().delete(index); } - /** @see org.mozilla.javascript.Scriptable#getPrototype */ + /** + * @see org.mozilla.javascript.Scriptable#getPrototype + */ @Override public Scriptable getPrototype() { return getDelegee().getPrototype(); } - /** @see org.mozilla.javascript.Scriptable#setPrototype */ + /** + * @see org.mozilla.javascript.Scriptable#setPrototype + */ @Override public void setPrototype(Scriptable prototype) { getDelegee().setPrototype(prototype); } - /** @see org.mozilla.javascript.Scriptable#getParentScope */ + /** + * @see org.mozilla.javascript.Scriptable#getParentScope + */ @Override public Scriptable getParentScope() { return getDelegee().getParentScope(); } - /** @see org.mozilla.javascript.Scriptable#setParentScope */ + /** + * @see org.mozilla.javascript.Scriptable#setParentScope + */ @Override public void setParentScope(Scriptable parent) { getDelegee().setParentScope(parent); } - /** @see org.mozilla.javascript.Scriptable#getIds */ + /** + * @see org.mozilla.javascript.Scriptable#getIds + */ @Override public Object[] getIds() { return getDelegee().getIds(); @@ -211,13 +241,17 @@ public Object getDefaultValue(Class hint) { : getDelegee().getDefaultValue(hint); } - /** @see org.mozilla.javascript.Scriptable#hasInstance */ + /** + * @see org.mozilla.javascript.Scriptable#hasInstance + */ @Override public boolean hasInstance(Scriptable instance) { return getDelegee().hasInstance(instance); } - /** @see org.mozilla.javascript.Function#call */ + /** + * @see org.mozilla.javascript.Function#call + */ @Override public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) { return ((Function) getDelegee()).call(cx, scope, thisObj, args); diff --git a/src/org/mozilla/javascript/EcmaError.java b/src/org/mozilla/javascript/EcmaError.java index 6565f7b8d7..910f4033d5 100644 --- a/src/org/mozilla/javascript/EcmaError.java +++ b/src/org/mozilla/javascript/EcmaError.java @@ -90,31 +90,41 @@ public String getErrorMessage() { return errorMessage; } - /** @deprecated Use {@link RhinoException#sourceName()} from the super class. */ + /** + * @deprecated Use {@link RhinoException#sourceName()} from the super class. + */ @Deprecated public String getSourceName() { return sourceName(); } - /** @deprecated Use {@link RhinoException#lineNumber()} from the super class. */ + /** + * @deprecated Use {@link RhinoException#lineNumber()} from the super class. + */ @Deprecated public int getLineNumber() { return lineNumber(); } - /** @deprecated Use {@link RhinoException#columnNumber()} from the super class. */ + /** + * @deprecated Use {@link RhinoException#columnNumber()} from the super class. + */ @Deprecated public int getColumnNumber() { return columnNumber(); } - /** @deprecated Use {@link RhinoException#lineSource()} from the super class. */ + /** + * @deprecated Use {@link RhinoException#lineSource()} from the super class. + */ @Deprecated public String getLineSource() { return lineSource(); } - /** @deprecated Always returns null. */ + /** + * @deprecated Always returns null. + */ @Deprecated public Scriptable getErrorObject() { return null; diff --git a/src/org/mozilla/javascript/EvaluatorException.java b/src/org/mozilla/javascript/EvaluatorException.java index 1ab543734c..b03747aad0 100644 --- a/src/org/mozilla/javascript/EvaluatorException.java +++ b/src/org/mozilla/javascript/EvaluatorException.java @@ -44,25 +44,33 @@ public EvaluatorException( recordErrorOrigin(sourceName, lineNumber, lineSource, columnNumber); } - /** @deprecated Use {@link RhinoException#sourceName()} from the super class. */ + /** + * @deprecated Use {@link RhinoException#sourceName()} from the super class. + */ @Deprecated public String getSourceName() { return sourceName(); } - /** @deprecated Use {@link RhinoException#lineNumber()} from the super class. */ + /** + * @deprecated Use {@link RhinoException#lineNumber()} from the super class. + */ @Deprecated public int getLineNumber() { return lineNumber(); } - /** @deprecated Use {@link RhinoException#columnNumber()} from the super class. */ + /** + * @deprecated Use {@link RhinoException#columnNumber()} from the super class. + */ @Deprecated public int getColumnNumber() { return columnNumber(); } - /** @deprecated Use {@link RhinoException#lineSource()} from the super class. */ + /** + * @deprecated Use {@link RhinoException#lineSource()} from the super class. + */ @Deprecated public String getLineSource() { return lineSource(); diff --git a/src/org/mozilla/javascript/ImporterTopLevel.java b/src/org/mozilla/javascript/ImporterTopLevel.java index 9baa40071b..328ea369bf 100644 --- a/src/org/mozilla/javascript/ImporterTopLevel.java +++ b/src/org/mozilla/javascript/ImporterTopLevel.java @@ -138,7 +138,9 @@ private static Object[] getNativeJavaPackages(Scriptable scope) { return null; } - /** @deprecated Kept only for compatibility. */ + /** + * @deprecated Kept only for compatibility. + */ @Deprecated public void importPackage(Context cx, Scriptable thisObj, Object[] args, Function funObj) { js_importPackage(this, args); diff --git a/src/org/mozilla/javascript/JavaScriptException.java b/src/org/mozilla/javascript/JavaScriptException.java index 133675f35c..3b9792c66c 100644 --- a/src/org/mozilla/javascript/JavaScriptException.java +++ b/src/org/mozilla/javascript/JavaScriptException.java @@ -90,18 +90,24 @@ public String getDetails() { } } - /** @return the value wrapped by this exception */ + /** + * @return the value wrapped by this exception + */ public Object getValue() { return value; } - /** @deprecated Use {@link RhinoException#sourceName()} from the super class. */ + /** + * @deprecated Use {@link RhinoException#sourceName()} from the super class. + */ @Deprecated public String getSourceName() { return sourceName(); } - /** @deprecated Use {@link RhinoException#lineNumber()} from the super class. */ + /** + * @deprecated Use {@link RhinoException#lineNumber()} from the super class. + */ @Deprecated public int getLineNumber() { return lineNumber(); diff --git a/src/org/mozilla/javascript/NativeArray.java b/src/org/mozilla/javascript/NativeArray.java index 32fdf0ba01..f4e25def2b 100644 --- a/src/org/mozilla/javascript/NativeArray.java +++ b/src/org/mozilla/javascript/NativeArray.java @@ -853,7 +853,9 @@ public long getLength() { return length; } - /** @deprecated Use {@link #getLength()} instead. */ + /** + * @deprecated Use {@link #getLength()} instead. + */ @Deprecated public long jsGet_length() { return getLength(); diff --git a/src/org/mozilla/javascript/NativeGlobal.java b/src/org/mozilla/javascript/NativeGlobal.java index 5daa4496ec..2b4e8c30aa 100644 --- a/src/org/mozilla/javascript/NativeGlobal.java +++ b/src/org/mozilla/javascript/NativeGlobal.java @@ -496,7 +496,9 @@ static boolean isEvalFunction(Object functionObj) { return false; } - /** @deprecated Use {@link ScriptRuntime#constructError(String,String)} instead. */ + /** + * @deprecated Use {@link ScriptRuntime#constructError(String,String)} instead. + */ @Deprecated public static EcmaError constructError( Context cx, String error, String message, Scriptable scope) { diff --git a/src/org/mozilla/javascript/NativeJavaPackage.java b/src/org/mozilla/javascript/NativeJavaPackage.java index bab121e16d..6921e18187 100644 --- a/src/org/mozilla/javascript/NativeJavaPackage.java +++ b/src/org/mozilla/javascript/NativeJavaPackage.java @@ -30,13 +30,17 @@ public class NativeJavaPackage extends ScriptableObject { this.classLoader = classLoader; } - /** @deprecated NativeJavaPackage is an internal class, do not use it directly. */ + /** + * @deprecated NativeJavaPackage is an internal class, do not use it directly. + */ @Deprecated public NativeJavaPackage(String packageName, ClassLoader classLoader) { this(false, packageName, classLoader); } - /** @deprecated NativeJavaPackage is an internal class, do not use it directly. */ + /** + * @deprecated NativeJavaPackage is an internal class, do not use it directly. + */ @Deprecated public NativeJavaPackage(String packageName) { this(false, packageName, Context.getCurrentContext().getApplicationClassLoader()); diff --git a/src/org/mozilla/javascript/NativeNumber.java b/src/org/mozilla/javascript/NativeNumber.java index 63f730d617..2a932dd6a1 100644 --- a/src/org/mozilla/javascript/NativeNumber.java +++ b/src/org/mozilla/javascript/NativeNumber.java @@ -16,7 +16,9 @@ final class NativeNumber extends IdScriptableObject { private static final long serialVersionUID = 3504516769741512101L; - /** @see https://www.ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer */ + /** + * @see https://www.ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer + */ public static final double MAX_SAFE_INTEGER = 9007199254740991.0; // Math.pow(2, 53) - 1 private static final Object NUMBER_TAG = "Number"; diff --git a/src/org/mozilla/javascript/NativeScript.java b/src/org/mozilla/javascript/NativeScript.java index d095143145..757d70d693 100644 --- a/src/org/mozilla/javascript/NativeScript.java +++ b/src/org/mozilla/javascript/NativeScript.java @@ -28,7 +28,9 @@ static void init(Context cx, Scriptable scope, boolean sealed) { obj.exportAsJSClass(MAX_PROTOTYPE_ID, scope, sealed); } - /** @deprecated Use {@link #init(Context, Scriptable, boolean)} instead */ + /** + * @deprecated Use {@link #init(Context, Scriptable, boolean)} instead + */ @Deprecated static void init(Scriptable scope, boolean sealed) { init(Context.getContext(), scope, sealed); diff --git a/src/org/mozilla/javascript/Ref.java b/src/org/mozilla/javascript/Ref.java index a4e7544359..2d8e56b6cd 100644 --- a/src/org/mozilla/javascript/Ref.java +++ b/src/org/mozilla/javascript/Ref.java @@ -22,7 +22,9 @@ public boolean has(Context cx) { public abstract Object get(Context cx); - /** @deprecated Use {@link #set(Context, Scriptable, Object)} instead */ + /** + * @deprecated Use {@link #set(Context, Scriptable, Object)} instead + */ @Deprecated public abstract Object set(Context cx, Object value); diff --git a/src/org/mozilla/javascript/ScriptRuntime.java b/src/org/mozilla/javascript/ScriptRuntime.java index 825eb2537c..e463c9acd5 100644 --- a/src/org/mozilla/javascript/ScriptRuntime.java +++ b/src/org/mozilla/javascript/ScriptRuntime.java @@ -1192,7 +1192,9 @@ public static Scriptable toObjectOrNull(Context cx, Object obj) { return null; } - /** @param scope the scope that should be used to resolve primitive prototype */ + /** + * @param scope the scope that should be used to resolve primitive prototype + */ public static Scriptable toObjectOrNull(Context cx, Object obj, Scriptable scope) { if (obj instanceof Scriptable) { return (Scriptable) obj; @@ -1202,7 +1204,9 @@ public static Scriptable toObjectOrNull(Context cx, Object obj, Scriptable scope return null; } - /** @deprecated Use {@link #toObject(Scriptable, Object)} instead. */ + /** + * @deprecated Use {@link #toObject(Scriptable, Object)} instead. + */ @Deprecated public static Scriptable toObject(Scriptable scope, Object val, Class staticClass) { if (val instanceof Scriptable) { @@ -1266,14 +1270,18 @@ public static Scriptable toObject(Context cx, Scriptable scope, Object val) { throw errorWithClassName("msg.invalid.type", val); } - /** @deprecated Use {@link #toObject(Context, Scriptable, Object)} instead. */ + /** + * @deprecated Use {@link #toObject(Context, Scriptable, Object)} instead. + */ @Deprecated public static Scriptable toObject( Context cx, Scriptable scope, Object val, Class staticClass) { return toObject(cx, scope, val); } - /** @deprecated The method is only present for compatibility. */ + /** + * @deprecated The method is only present for compatibility. + */ @Deprecated public static Object call( Context cx, Object fun, Object thisArg, Object[] args, Scriptable scope) { @@ -1686,7 +1694,9 @@ public static Object getObjectProp(Scriptable obj, String property, Context cx) return result; } - /** @deprecated Use {@link #getObjectPropNoWarn(Object, String, Context, Scriptable)} instead */ + /** + * @deprecated Use {@link #getObjectPropNoWarn(Object, String, Context, Scriptable)} instead + */ @Deprecated public static Object getObjectPropNoWarn(Object obj, String property, Context cx) { return getObjectPropNoWarn(obj, property, cx, getTopCallScope(cx)); @@ -1876,7 +1886,9 @@ public static Object refGet(Ref ref, Context cx) { return ref.get(cx); } - /** @deprecated Use {@link #refSet(Ref, Object, Context, Scriptable)} instead */ + /** + * @deprecated Use {@link #refSet(Ref, Object, Context, Scriptable)} instead + */ @Deprecated public static Object refSet(Ref ref, Object value, Context cx) { return refSet(ref, value, cx, getTopCallScope(cx)); @@ -1894,7 +1906,9 @@ static boolean isSpecialProperty(String s) { return s.equals("__proto__") || s.equals("__parent__"); } - /** @deprecated Use {@link #specialRef(Object, String, Context, Scriptable)} instead */ + /** + * @deprecated Use {@link #specialRef(Object, String, Context, Scriptable)} instead + */ @Deprecated public static Ref specialRef(Object obj, String specialProperty, Context cx) { return specialRef(obj, specialProperty, cx, getTopCallScope(cx)); @@ -1904,7 +1918,9 @@ public static Ref specialRef(Object obj, String specialProperty, Context cx, Scr return SpecialRef.createSpecial(cx, scope, obj, specialProperty); } - /** @deprecated Use {@link #delete(Object, Object, Context, Scriptable, boolean)} instead */ + /** + * @deprecated Use {@link #delete(Object, Object, Context, Scriptable, boolean)} instead + */ @Deprecated public static Object delete(Object obj, Object id, Context cx) { return delete(obj, id, cx, false); @@ -2229,7 +2245,9 @@ public static Object enumInit(Object value, Context cx, boolean enumValues) { public static final int ENUMERATE_ARRAY_NO_ITERATOR = 5; public static final int ENUMERATE_VALUES_IN_ORDER = 6; - /** @deprecated Use {@link #enumInit(Object, Context, Scriptable, int)} instead */ + /** + * @deprecated Use {@link #enumInit(Object, Context, Scriptable, int)} instead + */ @Deprecated public static Object enumInit(Object value, Context cx, int enumType) { return enumInit(value, cx, getTopCallScope(cx), enumType); @@ -2295,7 +2313,9 @@ public static void setEnumNumbers(Object enumObj, boolean enumNumbers) { ((IdEnumeration) enumObj).enumNumbers = enumNumbers; } - /** @deprecated since 1.7.15. Use {@link #enumNext(Context, Object)} instead */ + /** + * @deprecated since 1.7.15. Use {@link #enumNext(Context, Object)} instead + */ @Deprecated public static Boolean enumNext(Object enumObj) { return enumNext(enumObj, Context.getContext()); @@ -2773,7 +2793,9 @@ public static Object applyOrCall( return function.call(cx, scope, callThis, callArgs); } - /** @return true if the passed in Scriptable looks like an array */ + /** + * @return true if the passed in Scriptable looks like an array + */ private static boolean isArrayLike(Scriptable obj) { return obj != null && (obj instanceof NativeArray @@ -3168,7 +3190,9 @@ public static Object nameIncrDecr( return doScriptableIncrDecr(target, id, scopeChain, value, incrDecrMask); } - /** @deprecated Use {@link #propIncrDecr(Object, String, Context, Scriptable, int)} instead */ + /** + * @deprecated Use {@link #propIncrDecr(Object, String, Context, Scriptable, int)} instead + */ @Deprecated public static Object propIncrDecr(Object obj, String id, Context cx, int incrDecrMask) { return propIncrDecr(obj, id, cx, getTopCallScope(cx), incrDecrMask); @@ -3235,7 +3259,9 @@ private static Object doScriptableIncrDecr( return result; } - /** @deprecated Use {@link #elemIncrDecr(Object, Object, Context, Scriptable, int)} instead */ + /** + * @deprecated Use {@link #elemIncrDecr(Object, Object, Context, Scriptable, int)} instead + */ @Deprecated public static Object elemIncrDecr(Object obj, Object index, Context cx, int incrDecrMask) { return elemIncrDecr(obj, index, cx, getTopCallScope(cx), incrDecrMask); @@ -3275,7 +3301,9 @@ public static Object elemIncrDecr( return result; } - /** @deprecated Use {@link #refIncrDecr(Ref, Context, Scriptable, int)} instead */ + /** + * @deprecated Use {@link #refIncrDecr(Ref, Context, Scriptable, int)} instead + */ @Deprecated public static Object refIncrDecr(Ref ref, Context cx, int incrDecrMask) { return refIncrDecr(ref, cx, getTopCallScope(cx), incrDecrMask); @@ -4472,34 +4500,44 @@ static void checkDeprecated(Context cx, String name) { } } - /** @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead */ + /** + * @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead + */ @Deprecated public static String getMessage0(String messageId) { return getMessage(messageId, null); } - /** @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead */ + /** + * @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead + */ @Deprecated public static String getMessage1(String messageId, Object arg1) { Object[] arguments = {arg1}; return getMessage(messageId, arguments); } - /** @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead */ + /** + * @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead + */ @Deprecated public static String getMessage2(String messageId, Object arg1, Object arg2) { Object[] arguments = {arg1, arg2}; return getMessage(messageId, arguments); } - /** @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead */ + /** + * @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead + */ @Deprecated public static String getMessage3(String messageId, Object arg1, Object arg2, Object arg3) { Object[] arguments = {arg1, arg2, arg3}; return getMessage(messageId, arguments); } - /** @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead */ + /** + * @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead + */ @Deprecated public static String getMessage4( String messageId, Object arg1, Object arg2, Object arg3, Object arg4) { @@ -4527,7 +4565,9 @@ public interface MessageProvider { public static final MessageProvider messageProvider = new DefaultMessageProvider(); - /** @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead */ + /** + * @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead + */ @Deprecated public static String getMessage(String messageId, Object[] arguments) { return messageProvider.getMessage(messageId, arguments); @@ -4613,28 +4653,36 @@ public static EcmaError typeErrorById(String messageId, Object... args) { return typeError(msg); } - /** @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead */ + /** + * @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead + */ @Deprecated public static EcmaError typeError0(String messageId) { String msg = getMessage0(messageId); return typeError(msg); } - /** @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead */ + /** + * @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead + */ @Deprecated public static EcmaError typeError1(String messageId, Object arg1) { String msg = getMessage1(messageId, arg1); return typeError(msg); } - /** @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead */ + /** + * @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead + */ @Deprecated public static EcmaError typeError2(String messageId, Object arg1, Object arg2) { String msg = getMessage2(messageId, arg1, arg2); return typeError(msg); } - /** @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead */ + /** + * @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead + */ @Deprecated public static EcmaError typeError3(String messageId, String arg1, String arg2, String arg3) { String msg = getMessage3(messageId, arg1, arg2, arg3); diff --git a/src/org/mozilla/javascript/SecureCaller.java b/src/org/mozilla/javascript/SecureCaller.java index e05335189c..8121e72a8f 100644 --- a/src/org/mozilla/javascript/SecureCaller.java +++ b/src/org/mozilla/javascript/SecureCaller.java @@ -19,7 +19,9 @@ import java.util.Map; import java.util.WeakHashMap; -/** @author Attila Szegedi */ +/** + * @author Attila Szegedi + */ public abstract class SecureCaller { private static final byte[] secureCallerImplBytecode = loadBytecode(); diff --git a/src/org/mozilla/javascript/SecurityUtilities.java b/src/org/mozilla/javascript/SecurityUtilities.java index c9e46c79d9..6b024af6e6 100644 --- a/src/org/mozilla/javascript/SecurityUtilities.java +++ b/src/org/mozilla/javascript/SecurityUtilities.java @@ -10,7 +10,9 @@ import java.security.PrivilegedAction; import java.security.ProtectionDomain; -/** @author Attila Szegedi */ +/** + * @author Attila Szegedi + */ public class SecurityUtilities { /** * Retrieves a system property within a privileged block. Use it only when the property is used diff --git a/src/org/mozilla/javascript/Synchronizer.java b/src/org/mozilla/javascript/Synchronizer.java index 2819ca762a..f708ca3fb1 100644 --- a/src/org/mozilla/javascript/Synchronizer.java +++ b/src/org/mozilla/javascript/Synchronizer.java @@ -47,7 +47,9 @@ public Synchronizer(Scriptable obj, Object syncObject) { this.syncObject = syncObject; } - /** @see org.mozilla.javascript.Function#call */ + /** + * @see org.mozilla.javascript.Function#call + */ @Override public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) { Object sync = syncObject != null ? syncObject : thisObj; diff --git a/src/org/mozilla/javascript/WrapFactory.java b/src/org/mozilla/javascript/WrapFactory.java index cb74600ea3..8794154ddf 100644 --- a/src/org/mozilla/javascript/WrapFactory.java +++ b/src/org/mozilla/javascript/WrapFactory.java @@ -148,7 +148,9 @@ public final boolean isJavaPrimitiveWrap() { return javaPrimitiveWrap; } - /** @see #isJavaPrimitiveWrap() */ + /** + * @see #isJavaPrimitiveWrap() + */ public final void setJavaPrimitiveWrap(boolean value) { Context cx = Context.getCurrentContext(); if (cx != null && cx.isSealed()) { diff --git a/src/org/mozilla/javascript/WrappedException.java b/src/org/mozilla/javascript/WrappedException.java index 00646b9976..022314cd2c 100644 --- a/src/org/mozilla/javascript/WrappedException.java +++ b/src/org/mozilla/javascript/WrappedException.java @@ -16,7 +16,9 @@ public class WrappedException extends EvaluatorException { private static final long serialVersionUID = -1551979216966520648L; - /** @see Context#throwAsScriptRuntimeEx(Throwable e) */ + /** + * @see Context#throwAsScriptRuntimeEx(Throwable e) + */ public WrappedException(Throwable exception) { super("Wrapped " + exception); this.exception = exception; @@ -43,7 +45,9 @@ public Throwable getWrappedException() { return exception; } - /** @deprecated Use {@link #getWrappedException()} instead. */ + /** + * @deprecated Use {@link #getWrappedException()} instead. + */ @Deprecated public Object unwrap() { return getWrappedException(); diff --git a/src/org/mozilla/javascript/ast/AstNode.java b/src/org/mozilla/javascript/ast/AstNode.java index d17ad8e63b..250ab1229e 100644 --- a/src/org/mozilla/javascript/ast/AstNode.java +++ b/src/org/mozilla/javascript/ast/AstNode.java @@ -452,7 +452,9 @@ protected void printList(List items, StringBuilder sb) { } } - /** @see Kit#codeBug */ + /** + * @see Kit#codeBug + */ public static RuntimeException codeBug() throws RuntimeException { throw Kit.codeBug(); } diff --git a/src/org/mozilla/javascript/optimizer/OptRuntime.java b/src/org/mozilla/javascript/optimizer/OptRuntime.java index 4452dac468..ee6a91f1d1 100644 --- a/src/org/mozilla/javascript/optimizer/OptRuntime.java +++ b/src/org/mozilla/javascript/optimizer/OptRuntime.java @@ -93,7 +93,9 @@ public static Object add(double val1, Object val2, Context cx) { return ScriptRuntime.add(val1, val2, cx); } - /** @deprecated Use {@link #elemIncrDecr(Object, double, Context, Scriptable, int)} instead */ + /** + * @deprecated Use {@link #elemIncrDecr(Object, double, Context, Scriptable, int)} instead + */ @Deprecated public static Object elemIncrDecr(Object obj, double index, Context cx, int incrDecrMask) { return elemIncrDecr(obj, index, cx, getTopCallScope(cx), incrDecrMask); diff --git a/testsrc/org/mozilla/javascript/drivers/JsDriver.java b/testsrc/org/mozilla/javascript/drivers/JsDriver.java index 4e92fdc20c..d1374d309c 100644 --- a/testsrc/org/mozilla/javascript/drivers/JsDriver.java +++ b/testsrc/org/mozilla/javascript/drivers/JsDriver.java @@ -19,7 +19,9 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -/** @version $Id: JsDriver.java,v 1.10 2009/05/15 12:30:45 nboyd%atg.com Exp $ */ +/** + * @version $Id: JsDriver.java,v 1.10 2009/05/15 12:30:45 nboyd%atg.com Exp $ + */ public class JsDriver { private JsDriver() {} diff --git a/testsrc/org/mozilla/javascript/drivers/ShellTest.java b/testsrc/org/mozilla/javascript/drivers/ShellTest.java index 07e096cd74..e5fa96ca82 100644 --- a/testsrc/org/mozilla/javascript/drivers/ShellTest.java +++ b/testsrc/org/mozilla/javascript/drivers/ShellTest.java @@ -25,7 +25,9 @@ import org.mozilla.javascript.tools.shell.Main; import org.mozilla.javascript.tools.shell.ShellContextFactory; -/** @version $Id: ShellTest.java,v 1.14 2011/03/29 15:17:49 hannes%helma.at Exp $ */ +/** + * @version $Id: ShellTest.java,v 1.14 2011/03/29 15:17:49 hannes%helma.at Exp $ + */ public class ShellTest { private static File frameworkFile; private static Script frameworkScript; diff --git a/testsrc/org/mozilla/javascript/tests/Bug491621Test.java b/testsrc/org/mozilla/javascript/tests/Bug491621Test.java index 24c03ac42a..b04393f826 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug491621Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug491621Test.java @@ -11,7 +11,9 @@ import org.mozilla.javascript.Parser; import org.mozilla.javascript.ast.AstRoot; -/** @author Hannes Wallnoefer */ +/** + * @author Hannes Wallnoefer + */ public class Bug491621Test { /** diff --git a/testsrc/org/mozilla/javascript/tests/Bug637811Test.java b/testsrc/org/mozilla/javascript/tests/Bug637811Test.java index bd73dd70b3..801abf27dd 100755 --- a/testsrc/org/mozilla/javascript/tests/Bug637811Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug637811Test.java @@ -10,7 +10,9 @@ import org.mozilla.javascript.Context; import org.mozilla.javascript.ContextFactory; -/** @author André Bargull */ +/** + * @author André Bargull + */ public class Bug637811Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug685403Test.java b/testsrc/org/mozilla/javascript/tests/Bug685403Test.java index 5c21cc1513..1624eb201c 100755 --- a/testsrc/org/mozilla/javascript/tests/Bug685403Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug685403Test.java @@ -17,7 +17,9 @@ import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; -/** @author André Bargull */ +/** + * @author André Bargull + */ public class Bug685403Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug687669Test.java b/testsrc/org/mozilla/javascript/tests/Bug687669Test.java index 6a7d223907..fd59c193e3 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug687669Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug687669Test.java @@ -18,7 +18,9 @@ import org.mozilla.javascript.Undefined; import org.mozilla.javascript.ast.AstRoot; -/** @author André Bargull */ +/** + * @author André Bargull + */ public class Bug687669Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug688018Test.java b/testsrc/org/mozilla/javascript/tests/Bug688018Test.java index e00074390a..12389a5005 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug688018Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug688018Test.java @@ -16,7 +16,9 @@ import org.mozilla.javascript.Parser; import org.mozilla.javascript.ast.AstRoot; -/** @author André Bargull */ +/** + * @author André Bargull + */ public class Bug688018Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug688021Test.java b/testsrc/org/mozilla/javascript/tests/Bug688021Test.java index 17297088ce..7892da38a0 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug688021Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug688021Test.java @@ -16,7 +16,9 @@ import org.mozilla.javascript.Parser; import org.mozilla.javascript.ast.AstRoot; -/** @author André Bargull */ +/** + * @author André Bargull + */ public class Bug688021Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug688023Test.java b/testsrc/org/mozilla/javascript/tests/Bug688023Test.java index 04fd88acc6..9ffe4cb18a 100755 --- a/testsrc/org/mozilla/javascript/tests/Bug688023Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug688023Test.java @@ -15,7 +15,9 @@ import org.mozilla.javascript.Parser; import org.mozilla.javascript.ast.AstRoot; -/** @author André Bargull */ +/** + * @author André Bargull + */ public class Bug688023Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug689308Test.java b/testsrc/org/mozilla/javascript/tests/Bug689308Test.java index 748e023683..0886e5ae18 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug689308Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug689308Test.java @@ -16,7 +16,9 @@ import org.mozilla.javascript.Parser; import org.mozilla.javascript.ast.AstRoot; -/** @author André Bargull */ +/** + * @author André Bargull + */ public class Bug689308Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug689314Test.java b/testsrc/org/mozilla/javascript/tests/Bug689314Test.java index 3239434912..64032936c1 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug689314Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug689314Test.java @@ -16,7 +16,9 @@ import org.mozilla.javascript.Parser; import org.mozilla.javascript.ast.AstRoot; -/** @author André Bargull */ +/** + * @author André Bargull + */ public class Bug689314Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug708801Test.java b/testsrc/org/mozilla/javascript/tests/Bug708801Test.java index e035d3456c..64dffc19c5 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug708801Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug708801Test.java @@ -30,7 +30,9 @@ import org.mozilla.javascript.optimizer.Codegen; import org.mozilla.javascript.optimizer.OptFunctionNode; -/** @author André Bargull */ +/** + * @author André Bargull + */ public class Bug708801Test { private static final ContextFactory factory = diff --git a/testsrc/org/mozilla/javascript/tests/Bug714204Test.java b/testsrc/org/mozilla/javascript/tests/Bug714204Test.java index 1408723c3c..78f3f1c2e5 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug714204Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug714204Test.java @@ -15,7 +15,9 @@ import org.mozilla.javascript.Script; import org.mozilla.javascript.ScriptableObject; -/** @author André Bargull */ +/** + * @author André Bargull + */ public class Bug714204Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug782363Test.java b/testsrc/org/mozilla/javascript/tests/Bug782363Test.java index 01c07716df..65dd8b8ddb 100755 --- a/testsrc/org/mozilla/javascript/tests/Bug782363Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug782363Test.java @@ -30,7 +30,9 @@ import org.mozilla.javascript.optimizer.Codegen; import org.mozilla.javascript.optimizer.OptFunctionNode; -/** @author André Bargull */ +/** + * @author André Bargull + */ public class Bug782363Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug783797Test.java b/testsrc/org/mozilla/javascript/tests/Bug783797Test.java index 16f2da1651..88d5521538 100755 --- a/testsrc/org/mozilla/javascript/tests/Bug783797Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug783797Test.java @@ -14,7 +14,9 @@ import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; -/** @author André Bargull */ +/** + * @author André Bargull + */ public class Bug783797Test { private interface Action { diff --git a/testsrc/org/mozilla/javascript/tests/Bug789277Test.java b/testsrc/org/mozilla/javascript/tests/Bug789277Test.java index c519684111..3ba4f55427 100755 --- a/testsrc/org/mozilla/javascript/tests/Bug789277Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug789277Test.java @@ -25,7 +25,9 @@ import org.mozilla.javascript.ast.AstRoot; import org.mozilla.javascript.ast.IdeErrorReporter; -/** @author André Bargull */ +/** + * @author André Bargull + */ @SuppressWarnings("serial") @RunWith(Parameterized.class) public class Bug789277Test { diff --git a/testsrc/org/mozilla/javascript/tests/ClassShutterExceptionTest.java b/testsrc/org/mozilla/javascript/tests/ClassShutterExceptionTest.java index 52de1e8087..f5b17b2c98 100644 --- a/testsrc/org/mozilla/javascript/tests/ClassShutterExceptionTest.java +++ b/testsrc/org/mozilla/javascript/tests/ClassShutterExceptionTest.java @@ -14,7 +14,9 @@ import org.mozilla.javascript.RhinoException; import org.mozilla.javascript.Scriptable; -/** @author Norris Boyd */ +/** + * @author Norris Boyd + */ public class ClassShutterExceptionTest { private static Context.ClassShutterSetter classShutterSetter; diff --git a/testsrc/org/mozilla/javascript/tests/JavaAcessibilityTest.java b/testsrc/org/mozilla/javascript/tests/JavaAcessibilityTest.java index 2e5405717f..bcf041d494 100644 --- a/testsrc/org/mozilla/javascript/tests/JavaAcessibilityTest.java +++ b/testsrc/org/mozilla/javascript/tests/JavaAcessibilityTest.java @@ -18,7 +18,9 @@ import org.mozilla.javascript.tools.shell.Global; import org.mozilla.javascript.tools.shell.ShellContextFactory; -/** @author donnamalayeri */ +/** + * @author donnamalayeri + */ public class JavaAcessibilityTest { protected final Global global = new Global(); diff --git a/testsrc/org/mozilla/javascript/tests/NativeJsonTest.java b/testsrc/org/mozilla/javascript/tests/NativeJsonTest.java index 6ee6213af6..cdc9ccf93c 100644 --- a/testsrc/org/mozilla/javascript/tests/NativeJsonTest.java +++ b/testsrc/org/mozilla/javascript/tests/NativeJsonTest.java @@ -11,7 +11,9 @@ import org.mozilla.javascript.Context; import org.mozilla.javascript.Scriptable; -/** @author Ronald Brill */ +/** + * @author Ronald Brill + */ public class NativeJsonTest { @Test diff --git a/testsrc/org/mozilla/javascript/tests/NativeRegExpTest.java b/testsrc/org/mozilla/javascript/tests/NativeRegExpTest.java index 944629438d..a19dcce985 100644 --- a/testsrc/org/mozilla/javascript/tests/NativeRegExpTest.java +++ b/testsrc/org/mozilla/javascript/tests/NativeRegExpTest.java @@ -25,157 +25,209 @@ public void openBrace() { }); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void globalCtor() throws Exception { testEvaluate("g-true-false-false-false", "new RegExp('foo', 'g');"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void global() throws Exception { testEvaluate("g-true-false-false-false", "/foo/g;"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void ignoreCaseCtor() throws Exception { testEvaluate("i-false-true-false-false", "new RegExp('foo', 'i');"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void ignoreCase() throws Exception { testEvaluate("i-false-true-false-false", "/foo/i;"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void multilineCtor() throws Exception { testEvaluate("m-false-false-true-false", "new RegExp('foo', 'm');"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void multiline() throws Exception { testEvaluate("m-false-false-true-false", "/foo/m;"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void stickyCtor() throws Exception { testEvaluate("y-false-false-false-true", "new RegExp('foo', 'y');"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void sticky() throws Exception { testEvaluate("y-false-false-false-true", "/foo/y;"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void globalMultilineCtor() throws Exception { testEvaluate("gm-true-false-true-false", "new RegExp('foo', 'gm');"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void globalMultiline() throws Exception { testEvaluate("gm-true-false-true-false", "/foo/gm;"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void globalIgnoreCaseCtor() throws Exception { testEvaluate("gi-true-true-false-false", "new RegExp('foo', 'ig');"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void globalIgnoreCase() throws Exception { testEvaluate("gi-true-true-false-false", "/foo/ig;"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void globalStickyCtor() throws Exception { testEvaluate("gy-true-false-false-true", "new RegExp('foo', 'gy');"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void globalSticky() throws Exception { testEvaluate("gy-true-false-false-true", "/foo/gy;"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void globalMultilineIgnoreCaseCtor() throws Exception { testEvaluate("gim-true-true-true-false", "new RegExp('foo', 'mig');"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void globalMultilineIgnoreCase() throws Exception { testEvaluate("gim-true-true-true-false", "/foo/gmi;"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void globalIgnoreCaseStickyCtor() throws Exception { testEvaluate("giy-true-true-false-true", "new RegExp('foo', 'yig');"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void globalIgnoreCaseSticky() throws Exception { testEvaluate("giy-true-true-false-true", "/foo/ygi;"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void globalMultilineStickyCtor() throws Exception { testEvaluate("gmy-true-false-true-true", "new RegExp('foo', 'gmy');"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void globalMultilineSticky() throws Exception { testEvaluate("gmy-true-false-true-true", "/foo/gmy;"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void ignoreCaseMultilineCtor() throws Exception { testEvaluate("im-false-true-true-false", "new RegExp('foo', 'im');"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void ignoreCaseMultiline() throws Exception { testEvaluate("im-false-true-true-false", "/foo/mi;"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void ignoreCaseStickyCtor() throws Exception { testEvaluate("iy-false-true-false-true", "new RegExp('foo', 'yi');"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void ignoreCaseSticky() throws Exception { testEvaluate("iy-false-true-false-true", "/foo/iy;"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void multilineStickyCtor() throws Exception { testEvaluate("my-false-false-true-true", "new RegExp('foo', 'my');"); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void multilineSticky() throws Exception { testEvaluate("my-false-false-true-true", "/foo/my;"); @@ -201,7 +253,9 @@ private static void testEvaluate(final String expected, final String regex) { test(expected, script); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void stickyTest() throws Exception { final String script = @@ -218,7 +272,9 @@ public void stickyTest() throws Exception { test("true-9-false-0-false-0", script); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void stickyStartOfLine() throws Exception { final String script = @@ -229,7 +285,9 @@ public void stickyStartOfLine() throws Exception { test("false", script); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void stickyStartOfLineMultiline() throws Exception { final String script = @@ -242,7 +300,9 @@ public void stickyStartOfLineMultiline() throws Exception { test("false-true", script); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void matchGlobal() throws Exception { final String script = @@ -255,7 +315,9 @@ public void matchGlobal() throws Exception { test("3-a-a-a", script); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ // TODO @Test public void matchGlobalSymbol() throws Exception { final String script = @@ -268,7 +330,9 @@ public void matchGlobalSymbol() throws Exception { test("3-a-a-a", script); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void matchSticky() throws Exception { final String script = @@ -279,7 +343,9 @@ public void matchSticky() throws Exception { test("1-a", script); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void matchStickySymbol() throws Exception { final String script = @@ -290,7 +356,9 @@ public void matchStickySymbol() throws Exception { test("1-a", script); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ @Test public void matchStickyAndGlobal() throws Exception { final String script = @@ -302,7 +370,9 @@ public void matchStickyAndGlobal() throws Exception { test("2-a-a", script); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ // TODO @Test public void matchStickyAndGlobalSymbol() throws Exception { final String script = @@ -314,7 +384,9 @@ public void matchStickyAndGlobalSymbol() throws Exception { test("2-a-a", script); } - /** @throws Exception if an error occurs */ + /** + * @throws Exception if an error occurs + */ // TODO @Test public void flagsPropery() throws Exception { final String script = diff --git a/testsrc/org/mozilla/javascript/tests/ObserveInstructionCountTest.java b/testsrc/org/mozilla/javascript/tests/ObserveInstructionCountTest.java index a83b351c6b..a9bd46cd7f 100644 --- a/testsrc/org/mozilla/javascript/tests/ObserveInstructionCountTest.java +++ b/testsrc/org/mozilla/javascript/tests/ObserveInstructionCountTest.java @@ -17,7 +17,9 @@ import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.drivers.TestUtils; -/** @author Norris Boyd */ +/** + * @author Norris Boyd + */ public class ObserveInstructionCountTest { // Custom Context to store execution time. static class MyContext extends Context { diff --git a/testsrc/org/mozilla/javascript/tests/StackTraceTest.java b/testsrc/org/mozilla/javascript/tests/StackTraceTest.java index d8e3b85bc8..1075d62e56 100644 --- a/testsrc/org/mozilla/javascript/tests/StackTraceTest.java +++ b/testsrc/org/mozilla/javascript/tests/StackTraceTest.java @@ -13,7 +13,9 @@ import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.StackStyle; -/** @author Marc Guillemot */ +/** + * @author Marc Guillemot + */ public class StackTraceTest { static final String LS = System.getProperty("line.separator"); diff --git a/testsrc/org/mozilla/javascript/tests/Test262SuiteTest.java b/testsrc/org/mozilla/javascript/tests/Test262SuiteTest.java index 82670fedab..4410b3ba10 100644 --- a/testsrc/org/mozilla/javascript/tests/Test262SuiteTest.java +++ b/testsrc/org/mozilla/javascript/tests/Test262SuiteTest.java @@ -442,7 +442,9 @@ public static void tearDownClass() { private final Test262Case testCase; private final boolean markedAsFailing; - /** @see https://github.com/tc39/test262/blob/main/INTERPRETING.md#host-defined-functions */ + /** + * @see https://github.com/tc39/test262/blob/main/INTERPRETING.md#host-defined-functions + */ public static class $262 { private ScriptableObject scope; diff --git a/testsrc/org/mozilla/javascript/tests/WrapFactoryTest.java b/testsrc/org/mozilla/javascript/tests/WrapFactoryTest.java index 8a34928d4d..d98fe09c30 100644 --- a/testsrc/org/mozilla/javascript/tests/WrapFactoryTest.java +++ b/testsrc/org/mozilla/javascript/tests/WrapFactoryTest.java @@ -13,7 +13,9 @@ import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; -/** @author hatanaka */ +/** + * @author hatanaka + */ public class WrapFactoryTest { /** javascript code */ private static String script = diff --git a/testsrc/org/mozilla/javascript/tests/WriteReadOnlyPropertyTest.java b/testsrc/org/mozilla/javascript/tests/WriteReadOnlyPropertyTest.java index 1f00de63d5..366765c14c 100644 --- a/testsrc/org/mozilla/javascript/tests/WriteReadOnlyPropertyTest.java +++ b/testsrc/org/mozilla/javascript/tests/WriteReadOnlyPropertyTest.java @@ -22,13 +22,17 @@ */ public class WriteReadOnlyPropertyTest { - /** @throws Exception if the test fails */ + /** + * @throws Exception if the test fails + */ @Test public void writeReadOnly_accepted() throws Exception { testWriteReadOnly(true); } - /** @throws Exception if the test fails */ + /** + * @throws Exception if the test fails + */ @Test public void writeReadOnly_throws() throws Exception { try { diff --git a/testsrc/org/mozilla/javascript/tests/commentspr465/IfCommentsTest.java b/testsrc/org/mozilla/javascript/tests/commentspr465/IfCommentsTest.java index b4d046aed1..4d7dfd9a22 100644 --- a/testsrc/org/mozilla/javascript/tests/commentspr465/IfCommentsTest.java +++ b/testsrc/org/mozilla/javascript/tests/commentspr465/IfCommentsTest.java @@ -9,7 +9,9 @@ import org.mozilla.javascript.ast.FunctionNode; import org.mozilla.javascript.ast.IfStatement; -/** @author ravik @@since 08/08/18 12:01 PM */ +/** + * @author ravik @@since 08/08/18 12:01 PM + */ public class IfCommentsTest { @Test diff --git a/testsrc/org/mozilla/javascript/tests/commentspr465/LoopCommentsTest.java b/testsrc/org/mozilla/javascript/tests/commentspr465/LoopCommentsTest.java index b5ade251e0..1ec0f22039 100644 --- a/testsrc/org/mozilla/javascript/tests/commentspr465/LoopCommentsTest.java +++ b/testsrc/org/mozilla/javascript/tests/commentspr465/LoopCommentsTest.java @@ -12,7 +12,9 @@ import org.mozilla.javascript.ast.WhileLoop; import org.mozilla.javascript.ast.WithStatement; -/** @author ravik @@since 08/08/18 2:31 PM */ +/** + * @author ravik @@since 08/08/18 2:31 PM + */ public class LoopCommentsTest { @Test diff --git a/testsrc/org/mozilla/javascript/tests/commentspr465/MiscCommentsTest.java b/testsrc/org/mozilla/javascript/tests/commentspr465/MiscCommentsTest.java index 51f019bc3e..061fc0b939 100644 --- a/testsrc/org/mozilla/javascript/tests/commentspr465/MiscCommentsTest.java +++ b/testsrc/org/mozilla/javascript/tests/commentspr465/MiscCommentsTest.java @@ -8,7 +8,9 @@ import org.mozilla.javascript.ast.FunctionNode; import org.mozilla.javascript.ast.TryStatement; -/** @author ravik @@since 08/08/18 3:13 PM */ +/** + * @author ravik @@since 08/08/18 3:13 PM + */ public class MiscCommentsTest { @Test diff --git a/testsrc/org/mozilla/javascript/tests/commentspr465/SwitchCommentsTest.java b/testsrc/org/mozilla/javascript/tests/commentspr465/SwitchCommentsTest.java index 5904dec6bb..d77240c0c5 100644 --- a/testsrc/org/mozilla/javascript/tests/commentspr465/SwitchCommentsTest.java +++ b/testsrc/org/mozilla/javascript/tests/commentspr465/SwitchCommentsTest.java @@ -11,7 +11,9 @@ import org.mozilla.javascript.ast.SwitchCase; import org.mozilla.javascript.ast.SwitchStatement; -/** @author ravik @@since 07/08/18 12:36 PM */ +/** + * @author ravik @@since 07/08/18 12:36 PM + */ public class SwitchCommentsTest { @Test diff --git a/testsrc/org/mozilla/javascript/tests/es5/Test262RegExpTest.java b/testsrc/org/mozilla/javascript/tests/es5/Test262RegExpTest.java index 56288e898e..1a7640be37 100644 --- a/testsrc/org/mozilla/javascript/tests/es5/Test262RegExpTest.java +++ b/testsrc/org/mozilla/javascript/tests/es5/Test262RegExpTest.java @@ -15,7 +15,9 @@ import org.mozilla.javascript.EcmaError; import org.mozilla.javascript.ScriptableObject; -/** @author André Bargull */ +/** + * @author André Bargull + */ public class Test262RegExpTest { private Context cx; private ScriptableObject scope; diff --git a/testsrc/org/mozilla/javascript/tests/es6/FunctionNullSetTest.java b/testsrc/org/mozilla/javascript/tests/es6/FunctionNullSetTest.java index 6fd3eef304..620e21f505 100644 --- a/testsrc/org/mozilla/javascript/tests/es6/FunctionNullSetTest.java +++ b/testsrc/org/mozilla/javascript/tests/es6/FunctionNullSetTest.java @@ -18,7 +18,9 @@ */ public class FunctionNullSetTest { - /** @throws Exception if the test fails */ + /** + * @throws Exception if the test fails + */ @Test public void setFunctionToNull() throws Exception { final String script = "function onclick() {onclick=null}"; diff --git a/testsrc/org/mozilla/javascript/tests/es6/NativeRegExpTest.java b/testsrc/org/mozilla/javascript/tests/es6/NativeRegExpTest.java index cc8adde16e..0e4aa646eb 100644 --- a/testsrc/org/mozilla/javascript/tests/es6/NativeRegExpTest.java +++ b/testsrc/org/mozilla/javascript/tests/es6/NativeRegExpTest.java @@ -15,7 +15,9 @@ import org.mozilla.javascript.ScriptableObject; import org.mozilla.javascript.tests.Utils; -/** @author Ronald Brill */ +/** + * @author Ronald Brill + */ public class NativeRegExpTest { @Test diff --git a/testsrc/org/mozilla/javascript/tests/es6/TypedArrayJavaTest.java b/testsrc/org/mozilla/javascript/tests/es6/TypedArrayJavaTest.java index c325cf8347..c104c54416 100644 --- a/testsrc/org/mozilla/javascript/tests/es6/TypedArrayJavaTest.java +++ b/testsrc/org/mozilla/javascript/tests/es6/TypedArrayJavaTest.java @@ -22,7 +22,9 @@ public void subarrayWithoutParams() throws Exception { allTypes(script, "1,2"); } - /** @throws Exception if test failed */ + /** + * @throws Exception if test failed + */ @Test public void subarrayFromSubarray() throws Exception { subarrayFromSubarray(0, 7, 0, 6, "1,2,3,4,5,6,7 - 1,2,3,4,5,6"); diff --git a/testsrc/org/mozilla/javascript/tests/intl402/NativeStringTest.java b/testsrc/org/mozilla/javascript/tests/intl402/NativeStringTest.java index 2d8445861c..1582ad6819 100644 --- a/testsrc/org/mozilla/javascript/tests/intl402/NativeStringTest.java +++ b/testsrc/org/mozilla/javascript/tests/intl402/NativeStringTest.java @@ -14,7 +14,9 @@ import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.tests.Utils; -/** @author Ronald Brill */ +/** + * @author Ronald Brill + */ public class NativeStringTest { private ContextFactory contextFactoryIntl402 = new ContextFactory() { diff --git a/toolsrc/org/mozilla/javascript/tools/debugger/Main.java b/toolsrc/org/mozilla/javascript/tools/debugger/Main.java index 85f3315e19..0050f4e82f 100644 --- a/toolsrc/org/mozilla/javascript/tools/debugger/Main.java +++ b/toolsrc/org/mozilla/javascript/tools/debugger/Main.java @@ -242,35 +242,47 @@ private static Main mainEmbeddedImpl( // Deprecated methods - /** @deprecated Use {@link #setSize(int, int)} instead. */ + /** + * @deprecated Use {@link #setSize(int, int)} instead. + */ @Deprecated public void setSize(java.awt.Dimension dimension) { debugGui.setSize(dimension.width, dimension.height); } - /** @deprecated The method does nothing and is only present for compatibility. */ + /** + * @deprecated The method does nothing and is only present for compatibility. + */ @Deprecated public void setOptimizationLevel(int level) {} - /** @deprecated The method is only present for compatibility and should not be called. */ + /** + * @deprecated The method is only present for compatibility and should not be called. + */ @Deprecated public void contextEntered(Context cx) { throw new IllegalStateException(); } - /** @deprecated The method is only present for compatibility and should not be called. */ + /** + * @deprecated The method is only present for compatibility and should not be called. + */ @Deprecated public void contextExited(Context cx) { throw new IllegalStateException(); } - /** @deprecated The method is only present for compatibility and should not be called. */ + /** + * @deprecated The method is only present for compatibility and should not be called. + */ @Deprecated public void contextCreated(Context cx) { throw new IllegalStateException(); } - /** @deprecated The method is only present for compatibility and should not be called. */ + /** + * @deprecated The method is only present for compatibility and should not be called. + */ @Deprecated public void contextReleased(Context cx) { throw new IllegalStateException(); diff --git a/toolsrc/org/mozilla/javascript/tools/jsc/Main.java b/toolsrc/org/mozilla/javascript/tools/jsc/Main.java index 9a11a63f6e..9b919898d2 100644 --- a/toolsrc/org/mozilla/javascript/tools/jsc/Main.java +++ b/toolsrc/org/mozilla/javascript/tools/jsc/Main.java @@ -16,7 +16,9 @@ import org.mozilla.javascript.tools.SourceReader; import org.mozilla.javascript.tools.ToolErrorReporter; -/** @author Norris Boyd */ +/** + * @author Norris Boyd + */ public class Main { /** diff --git a/toolsrc/org/mozilla/javascript/tools/shell/ShellConsole.java b/toolsrc/org/mozilla/javascript/tools/shell/ShellConsole.java index 2cfc445144..74daa6040b 100644 --- a/toolsrc/org/mozilla/javascript/tools/shell/ShellConsole.java +++ b/toolsrc/org/mozilla/javascript/tools/shell/ShellConsole.java @@ -21,7 +21,9 @@ import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; -/** @author André Bargull */ +/** + * @author André Bargull + */ public abstract class ShellConsole { private static final Class[] NO_ARG = {}; diff --git a/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java b/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java index 6796abe1fc..8bf0e1a2a6 100644 --- a/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java +++ b/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java @@ -78,7 +78,9 @@ String uri() { return delegate.getNamespace().getUri(); } - /** @deprecated */ + /** + * @deprecated + */ @Deprecated final XmlNode.QName toNodeQname() { return delegate; diff --git a/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java b/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java index 0670cb3d5c..14f60564e7 100644 --- a/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java +++ b/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java @@ -109,13 +109,17 @@ private XMLLibImpl(Scriptable globalScope) { this.globalScope = globalScope; } - /** @deprecated */ + /** + * @deprecated + */ @Deprecated QName qnamePrototype() { return qnamePrototype; } - /** @deprecated */ + /** + * @deprecated + */ @Deprecated Scriptable globalScope() { return globalScope; @@ -142,7 +146,9 @@ private void exportToScope(boolean sealed) { qnamePrototype.exportAsJSClass(sealed); } - /** @deprecated */ + /** + * @deprecated + */ @Deprecated XMLName toAttributeName(Context cx, Object nameValue) { if (nameValue instanceof XMLName) { diff --git a/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java b/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java index 9e6ccd4228..7a749df6e4 100644 --- a/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java +++ b/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java @@ -106,7 +106,9 @@ static XMLName formStar() { return rv; } - /** @deprecated */ + /** + * @deprecated + */ @Deprecated static XMLName formProperty(XmlNode.Namespace namespace, String localName) { if (localName != null && localName.equals("*")) localName = null; @@ -149,7 +151,9 @@ static XMLName create(XmlNode.QName qname, boolean attribute, boolean descendant return rv; } - /** @deprecated */ + /** + * @deprecated + */ @Deprecated static XMLName create(XmlNode.QName qname) { return create(qname, false, false); @@ -437,7 +441,9 @@ boolean isDescendants() { } // TODO Fix whether this is an descendant XMLName at construction? - /** @deprecated */ + /** + * @deprecated + */ @Deprecated void setIsDescendants() { // if (isDescendants) throw new IllegalStateException(); diff --git a/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlNode.java b/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlNode.java index 551343491f..24930930c9 100644 --- a/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlNode.java +++ b/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlNode.java @@ -671,7 +671,9 @@ static QName create(Namespace namespace, String localName) { return rv; } - /** @deprecated */ + /** + * @deprecated + */ @Deprecated static QName create(String uri, String localName, String prefix) { return create(Namespace.create(prefix, uri), localName); From 997f43c84e14d1c85acdf35ef27d24ed6e9d817d Mon Sep 17 00:00:00 2001 From: Chris Midgley Date: Wed, 16 Aug 2023 12:35:31 +0100 Subject: [PATCH 4/4] feat: target 1.13.0 google-java-format --- build.gradle | 2 +- src/org/mozilla/javascript/BaseFunction.java | 4 +- src/org/mozilla/javascript/ClassCache.java | 4 +- .../mozilla/javascript/CompilerEnvirons.java | 4 +- src/org/mozilla/javascript/Context.java | 24 +-- .../mozilla/javascript/ContextFactory.java | 4 +- .../mozilla/javascript/ContextListener.java | 8 +- .../javascript/ContinuationPending.java | 8 +- src/org/mozilla/javascript/Delegator.java | 68 +++------ src/org/mozilla/javascript/EcmaError.java | 20 +-- .../javascript/EvaluatorException.java | 16 +- .../mozilla/javascript/ImporterTopLevel.java | 4 +- .../javascript/JavaScriptException.java | 12 +- src/org/mozilla/javascript/NativeArray.java | 4 +- src/org/mozilla/javascript/NativeGlobal.java | 4 +- .../mozilla/javascript/NativeJavaPackage.java | 8 +- src/org/mozilla/javascript/NativeNumber.java | 4 +- src/org/mozilla/javascript/NativeScript.java | 4 +- src/org/mozilla/javascript/Ref.java | 4 +- src/org/mozilla/javascript/ScriptRuntime.java | 96 +++--------- src/org/mozilla/javascript/SecureCaller.java | 4 +- .../mozilla/javascript/SecurityUtilities.java | 4 +- src/org/mozilla/javascript/Synchronizer.java | 4 +- src/org/mozilla/javascript/WrapFactory.java | 4 +- .../mozilla/javascript/WrappedException.java | 8 +- src/org/mozilla/javascript/ast/AstNode.java | 4 +- .../javascript/optimizer/OptRuntime.java | 4 +- .../mozilla/javascript/drivers/JsDriver.java | 4 +- .../mozilla/javascript/drivers/ShellTest.java | 4 +- .../javascript/tests/Bug491621Test.java | 4 +- .../javascript/tests/Bug637811Test.java | 4 +- .../javascript/tests/Bug685403Test.java | 4 +- .../javascript/tests/Bug687669Test.java | 4 +- .../javascript/tests/Bug688018Test.java | 4 +- .../javascript/tests/Bug688021Test.java | 4 +- .../javascript/tests/Bug688023Test.java | 4 +- .../javascript/tests/Bug689308Test.java | 4 +- .../javascript/tests/Bug689314Test.java | 4 +- .../javascript/tests/Bug708801Test.java | 4 +- .../javascript/tests/Bug714204Test.java | 4 +- .../javascript/tests/Bug782363Test.java | 4 +- .../javascript/tests/Bug783797Test.java | 4 +- .../javascript/tests/Bug789277Test.java | 4 +- .../tests/ClassShutterExceptionTest.java | 4 +- .../tests/JavaAcessibilityTest.java | 4 +- .../javascript/tests/NativeJsonTest.java | 4 +- .../javascript/tests/NativeRegExpTest.java | 144 +++++------------- .../tests/ObserveInstructionCountTest.java | 4 +- .../javascript/tests/StackTraceTest.java | 4 +- .../javascript/tests/Test262SuiteTest.java | 4 +- .../javascript/tests/WrapFactoryTest.java | 4 +- .../tests/WriteReadOnlyPropertyTest.java | 8 +- .../tests/commentspr465/IfCommentsTest.java | 4 +- .../tests/commentspr465/LoopCommentsTest.java | 4 +- .../tests/commentspr465/MiscCommentsTest.java | 4 +- .../commentspr465/SwitchCommentsTest.java | 4 +- .../tests/es5/Test262RegExpTest.java | 4 +- .../tests/es6/FunctionNullSetTest.java | 4 +- .../tests/es6/NativeRegExpTest.java | 4 +- .../tests/es6/TypedArrayJavaTest.java | 4 +- .../tests/intl402/NativeStringTest.java | 4 +- .../javascript/tools/debugger/Main.java | 24 +-- .../mozilla/javascript/tools/jsc/Main.java | 4 +- .../javascript/tools/shell/ShellConsole.java | 4 +- .../org/mozilla/javascript/xmlimpl/QName.java | 4 +- .../javascript/xmlimpl/XMLLibImpl.java | 12 +- .../mozilla/javascript/xmlimpl/XMLName.java | 12 +- .../mozilla/javascript/xmlimpl/XmlNode.java | 4 +- 68 files changed, 170 insertions(+), 508 deletions(-) diff --git a/build.gradle b/build.gradle index e773239074..9f576ac46a 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { id 'jacoco' id 'distribution' id 'checkstyle' - id 'com.diffplug.spotless' version "6.13.0" + id 'com.diffplug.spotless' version "6.5.0" id 'com.github.spotbugs' version "4.7.1" } diff --git a/src/org/mozilla/javascript/BaseFunction.java b/src/org/mozilla/javascript/BaseFunction.java index 219d51dfea..0acfa10ff4 100644 --- a/src/org/mozilla/javascript/BaseFunction.java +++ b/src/org/mozilla/javascript/BaseFunction.java @@ -32,9 +32,7 @@ static void init(Context cx, Scriptable scope, boolean sealed) { obj.exportAsJSClass(MAX_PROTOTYPE_ID, scope, sealed); } - /** - * @deprecated Use {@link #init(Context, Scriptable, boolean)} instead - */ + /** @deprecated Use {@link #init(Context, Scriptable, boolean)} instead */ @Deprecated static void init(Scriptable scope, boolean sealed) { init(Context.getContext(), scope, sealed); diff --git a/src/org/mozilla/javascript/ClassCache.java b/src/org/mozilla/javascript/ClassCache.java index 884f37c514..ade524c458 100644 --- a/src/org/mozilla/javascript/ClassCache.java +++ b/src/org/mozilla/javascript/ClassCache.java @@ -131,9 +131,7 @@ public synchronized void setCachingEnabled(boolean enabled) { cachingIsEnabled = enabled; } - /** - * @return a map from classes to associated JavaMembers objects - */ + /** @return a map from classes to associated JavaMembers objects */ Map getClassCacheMap() { if (classTable == null) { // Use 1 as concurrency level here and for other concurrent hash maps diff --git a/src/org/mozilla/javascript/CompilerEnvirons.java b/src/org/mozilla/javascript/CompilerEnvirons.java index becc48b09b..cdb1682777 100644 --- a/src/org/mozilla/javascript/CompilerEnvirons.java +++ b/src/org/mozilla/javascript/CompilerEnvirons.java @@ -142,9 +142,7 @@ public void setGeneratingSource(boolean generatingSource) { this.generatingSource = generatingSource; } - /** - * @return true iff code will be generated with callbacks to enable instruction thresholds - */ + /** @return true iff code will be generated with callbacks to enable instruction thresholds */ public boolean isGenerateObserverCount() { return generateObserverCount; } diff --git a/src/org/mozilla/javascript/Context.java b/src/org/mozilla/javascript/Context.java index 124c68b44a..dfbce475a9 100644 --- a/src/org/mozilla/javascript/Context.java +++ b/src/org/mozilla/javascript/Context.java @@ -158,9 +158,7 @@ public class Context implements Closeable { */ public static final int FEATURE_PARENT_PROTO_PROPERTIES = 5; - /** - * @deprecated In previous releases, this name was given to FEATURE_PARENT_PROTO_PROPERTIES. - */ + /** @deprecated In previous releases, this name was given to FEATURE_PARENT_PROTO_PROPERTIES. */ @Deprecated public static final int FEATURE_PARENT_PROTO_PROPRTIES = 5; /** @@ -949,36 +947,28 @@ static EvaluatorException reportRuntimeErrorById(String messageId, Object... arg return reportRuntimeError(msg); } - /** - * @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead - */ + /** @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead */ @Deprecated static EvaluatorException reportRuntimeError0(String messageId) { String msg = ScriptRuntime.getMessageById(messageId); return reportRuntimeError(msg); } - /** - * @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead - */ + /** @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead */ @Deprecated static EvaluatorException reportRuntimeError1(String messageId, Object arg1) { String msg = ScriptRuntime.getMessageById(messageId, arg1); return reportRuntimeError(msg); } - /** - * @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead - */ + /** @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead */ @Deprecated static EvaluatorException reportRuntimeError2(String messageId, Object arg1, Object arg2) { String msg = ScriptRuntime.getMessageById(messageId, arg1, arg2); return reportRuntimeError(msg); } - /** - * @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead - */ + /** @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead */ @Deprecated static EvaluatorException reportRuntimeError3( String messageId, Object arg1, Object arg2, Object arg3) { @@ -986,9 +976,7 @@ static EvaluatorException reportRuntimeError3( return reportRuntimeError(msg); } - /** - * @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead - */ + /** @deprecated Use {@link #reportRuntimeErrorById(String messageId, Object... args)} instead */ @Deprecated static EvaluatorException reportRuntimeError4( String messageId, Object arg1, Object arg2, Object arg3, Object arg4) { diff --git a/src/org/mozilla/javascript/ContextFactory.java b/src/org/mozilla/javascript/ContextFactory.java index 8f5939f47e..6ee0116605 100644 --- a/src/org/mozilla/javascript/ContextFactory.java +++ b/src/org/mozilla/javascript/ContextFactory.java @@ -527,9 +527,7 @@ public final Context enter() { return enterContext(null); } - /** - * @deprecated Use {@link Context#exit()} instead. - */ + /** @deprecated Use {@link Context#exit()} instead. */ @Deprecated public final void exit() { Context.exit(); diff --git a/src/org/mozilla/javascript/ContextListener.java b/src/org/mozilla/javascript/ContextListener.java index 0862b36228..c12d985c64 100644 --- a/src/org/mozilla/javascript/ContextListener.java +++ b/src/org/mozilla/javascript/ContextListener.java @@ -15,15 +15,11 @@ @Deprecated public interface ContextListener extends ContextFactory.Listener { - /** - * @deprecated Rhino runtime never calls the method. - */ + /** @deprecated Rhino runtime never calls the method. */ @Deprecated public void contextEntered(Context cx); - /** - * @deprecated Rhino runtime never calls the method. - */ + /** @deprecated Rhino runtime never calls the method. */ @Deprecated public void contextExited(Context cx); } diff --git a/src/org/mozilla/javascript/ContinuationPending.java b/src/org/mozilla/javascript/ContinuationPending.java index 7dbec7a6d5..f16756089a 100644 --- a/src/org/mozilla/javascript/ContinuationPending.java +++ b/src/org/mozilla/javascript/ContinuationPending.java @@ -53,9 +53,7 @@ public void setContinuation(NativeContinuation continuation) { this.continuationState = continuation; } - /** - * @return internal continuation state - */ + /** @return internal continuation state */ NativeContinuation getContinuationState() { return continuationState; } @@ -70,9 +68,7 @@ public void setApplicationState(Object applicationState) { this.applicationState = applicationState; } - /** - * @return arbitrary application state - */ + /** @return arbitrary application state */ public Object getApplicationState() { return applicationState; } diff --git a/src/org/mozilla/javascript/Delegator.java b/src/org/mozilla/javascript/Delegator.java index 748c00b46a..ebb8d8a13d 100644 --- a/src/org/mozilla/javascript/Delegator.java +++ b/src/org/mozilla/javascript/Delegator.java @@ -74,17 +74,13 @@ public void setDelegee(Scriptable obj) { this.obj = obj; } - /** - * @see org.mozilla.javascript.Scriptable#getClassName - */ + /** @see org.mozilla.javascript.Scriptable#getClassName */ @Override public String getClassName() { return getDelegee().getClassName(); } - /** - * @see org.mozilla.javascript.Scriptable#get(String, Scriptable) - */ + /** @see org.mozilla.javascript.Scriptable#get(String, Scriptable) */ @Override public Object get(String name, Scriptable start) { return getDelegee().get(name, start); @@ -99,17 +95,13 @@ public Object get(Symbol key, Scriptable start) { return Scriptable.NOT_FOUND; } - /** - * @see org.mozilla.javascript.Scriptable#get(int, Scriptable) - */ + /** @see org.mozilla.javascript.Scriptable#get(int, Scriptable) */ @Override public Object get(int index, Scriptable start) { return getDelegee().get(index, start); } - /** - * @see org.mozilla.javascript.Scriptable#has(String, Scriptable) - */ + /** @see org.mozilla.javascript.Scriptable#has(String, Scriptable) */ @Override public boolean has(String name, Scriptable start) { return getDelegee().has(name, start); @@ -124,25 +116,19 @@ public boolean has(Symbol key, Scriptable start) { return false; } - /** - * @see org.mozilla.javascript.Scriptable#has(int, Scriptable) - */ + /** @see org.mozilla.javascript.Scriptable#has(int, Scriptable) */ @Override public boolean has(int index, Scriptable start) { return getDelegee().has(index, start); } - /** - * @see org.mozilla.javascript.Scriptable#put(String, Scriptable, Object) - */ + /** @see org.mozilla.javascript.Scriptable#put(String, Scriptable, Object) */ @Override public void put(String name, Scriptable start, Object value) { getDelegee().put(name, start, value); } - /** - * @see org.mozilla.javascript.SymbolScriptable#put(Symbol, Scriptable, Object) - */ + /** @see org.mozilla.javascript.SymbolScriptable#put(Symbol, Scriptable, Object) */ @Override public void put(Symbol symbol, Scriptable start, Object value) { final Scriptable delegee = getDelegee(); @@ -151,17 +137,13 @@ public void put(Symbol symbol, Scriptable start, Object value) { } } - /** - * @see org.mozilla.javascript.Scriptable#put(int, Scriptable, Object) - */ + /** @see org.mozilla.javascript.Scriptable#put(int, Scriptable, Object) */ @Override public void put(int index, Scriptable start, Object value) { getDelegee().put(index, start, value); } - /** - * @see org.mozilla.javascript.Scriptable#delete(String) - */ + /** @see org.mozilla.javascript.Scriptable#delete(String) */ @Override public void delete(String name) { getDelegee().delete(name); @@ -175,49 +157,37 @@ public void delete(Symbol key) { } } - /** - * @see org.mozilla.javascript.Scriptable#delete(int) - */ + /** @see org.mozilla.javascript.Scriptable#delete(int) */ @Override public void delete(int index) { getDelegee().delete(index); } - /** - * @see org.mozilla.javascript.Scriptable#getPrototype - */ + /** @see org.mozilla.javascript.Scriptable#getPrototype */ @Override public Scriptable getPrototype() { return getDelegee().getPrototype(); } - /** - * @see org.mozilla.javascript.Scriptable#setPrototype - */ + /** @see org.mozilla.javascript.Scriptable#setPrototype */ @Override public void setPrototype(Scriptable prototype) { getDelegee().setPrototype(prototype); } - /** - * @see org.mozilla.javascript.Scriptable#getParentScope - */ + /** @see org.mozilla.javascript.Scriptable#getParentScope */ @Override public Scriptable getParentScope() { return getDelegee().getParentScope(); } - /** - * @see org.mozilla.javascript.Scriptable#setParentScope - */ + /** @see org.mozilla.javascript.Scriptable#setParentScope */ @Override public void setParentScope(Scriptable parent) { getDelegee().setParentScope(parent); } - /** - * @see org.mozilla.javascript.Scriptable#getIds - */ + /** @see org.mozilla.javascript.Scriptable#getIds */ @Override public Object[] getIds() { return getDelegee().getIds(); @@ -241,17 +211,13 @@ public Object getDefaultValue(Class hint) { : getDelegee().getDefaultValue(hint); } - /** - * @see org.mozilla.javascript.Scriptable#hasInstance - */ + /** @see org.mozilla.javascript.Scriptable#hasInstance */ @Override public boolean hasInstance(Scriptable instance) { return getDelegee().hasInstance(instance); } - /** - * @see org.mozilla.javascript.Function#call - */ + /** @see org.mozilla.javascript.Function#call */ @Override public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) { return ((Function) getDelegee()).call(cx, scope, thisObj, args); diff --git a/src/org/mozilla/javascript/EcmaError.java b/src/org/mozilla/javascript/EcmaError.java index 910f4033d5..6565f7b8d7 100644 --- a/src/org/mozilla/javascript/EcmaError.java +++ b/src/org/mozilla/javascript/EcmaError.java @@ -90,41 +90,31 @@ public String getErrorMessage() { return errorMessage; } - /** - * @deprecated Use {@link RhinoException#sourceName()} from the super class. - */ + /** @deprecated Use {@link RhinoException#sourceName()} from the super class. */ @Deprecated public String getSourceName() { return sourceName(); } - /** - * @deprecated Use {@link RhinoException#lineNumber()} from the super class. - */ + /** @deprecated Use {@link RhinoException#lineNumber()} from the super class. */ @Deprecated public int getLineNumber() { return lineNumber(); } - /** - * @deprecated Use {@link RhinoException#columnNumber()} from the super class. - */ + /** @deprecated Use {@link RhinoException#columnNumber()} from the super class. */ @Deprecated public int getColumnNumber() { return columnNumber(); } - /** - * @deprecated Use {@link RhinoException#lineSource()} from the super class. - */ + /** @deprecated Use {@link RhinoException#lineSource()} from the super class. */ @Deprecated public String getLineSource() { return lineSource(); } - /** - * @deprecated Always returns null. - */ + /** @deprecated Always returns null. */ @Deprecated public Scriptable getErrorObject() { return null; diff --git a/src/org/mozilla/javascript/EvaluatorException.java b/src/org/mozilla/javascript/EvaluatorException.java index b03747aad0..1ab543734c 100644 --- a/src/org/mozilla/javascript/EvaluatorException.java +++ b/src/org/mozilla/javascript/EvaluatorException.java @@ -44,33 +44,25 @@ public EvaluatorException( recordErrorOrigin(sourceName, lineNumber, lineSource, columnNumber); } - /** - * @deprecated Use {@link RhinoException#sourceName()} from the super class. - */ + /** @deprecated Use {@link RhinoException#sourceName()} from the super class. */ @Deprecated public String getSourceName() { return sourceName(); } - /** - * @deprecated Use {@link RhinoException#lineNumber()} from the super class. - */ + /** @deprecated Use {@link RhinoException#lineNumber()} from the super class. */ @Deprecated public int getLineNumber() { return lineNumber(); } - /** - * @deprecated Use {@link RhinoException#columnNumber()} from the super class. - */ + /** @deprecated Use {@link RhinoException#columnNumber()} from the super class. */ @Deprecated public int getColumnNumber() { return columnNumber(); } - /** - * @deprecated Use {@link RhinoException#lineSource()} from the super class. - */ + /** @deprecated Use {@link RhinoException#lineSource()} from the super class. */ @Deprecated public String getLineSource() { return lineSource(); diff --git a/src/org/mozilla/javascript/ImporterTopLevel.java b/src/org/mozilla/javascript/ImporterTopLevel.java index 328ea369bf..9baa40071b 100644 --- a/src/org/mozilla/javascript/ImporterTopLevel.java +++ b/src/org/mozilla/javascript/ImporterTopLevel.java @@ -138,9 +138,7 @@ private static Object[] getNativeJavaPackages(Scriptable scope) { return null; } - /** - * @deprecated Kept only for compatibility. - */ + /** @deprecated Kept only for compatibility. */ @Deprecated public void importPackage(Context cx, Scriptable thisObj, Object[] args, Function funObj) { js_importPackage(this, args); diff --git a/src/org/mozilla/javascript/JavaScriptException.java b/src/org/mozilla/javascript/JavaScriptException.java index 3b9792c66c..133675f35c 100644 --- a/src/org/mozilla/javascript/JavaScriptException.java +++ b/src/org/mozilla/javascript/JavaScriptException.java @@ -90,24 +90,18 @@ public String getDetails() { } } - /** - * @return the value wrapped by this exception - */ + /** @return the value wrapped by this exception */ public Object getValue() { return value; } - /** - * @deprecated Use {@link RhinoException#sourceName()} from the super class. - */ + /** @deprecated Use {@link RhinoException#sourceName()} from the super class. */ @Deprecated public String getSourceName() { return sourceName(); } - /** - * @deprecated Use {@link RhinoException#lineNumber()} from the super class. - */ + /** @deprecated Use {@link RhinoException#lineNumber()} from the super class. */ @Deprecated public int getLineNumber() { return lineNumber(); diff --git a/src/org/mozilla/javascript/NativeArray.java b/src/org/mozilla/javascript/NativeArray.java index f4e25def2b..32fdf0ba01 100644 --- a/src/org/mozilla/javascript/NativeArray.java +++ b/src/org/mozilla/javascript/NativeArray.java @@ -853,9 +853,7 @@ public long getLength() { return length; } - /** - * @deprecated Use {@link #getLength()} instead. - */ + /** @deprecated Use {@link #getLength()} instead. */ @Deprecated public long jsGet_length() { return getLength(); diff --git a/src/org/mozilla/javascript/NativeGlobal.java b/src/org/mozilla/javascript/NativeGlobal.java index 2b4e8c30aa..5daa4496ec 100644 --- a/src/org/mozilla/javascript/NativeGlobal.java +++ b/src/org/mozilla/javascript/NativeGlobal.java @@ -496,9 +496,7 @@ static boolean isEvalFunction(Object functionObj) { return false; } - /** - * @deprecated Use {@link ScriptRuntime#constructError(String,String)} instead. - */ + /** @deprecated Use {@link ScriptRuntime#constructError(String,String)} instead. */ @Deprecated public static EcmaError constructError( Context cx, String error, String message, Scriptable scope) { diff --git a/src/org/mozilla/javascript/NativeJavaPackage.java b/src/org/mozilla/javascript/NativeJavaPackage.java index 6921e18187..bab121e16d 100644 --- a/src/org/mozilla/javascript/NativeJavaPackage.java +++ b/src/org/mozilla/javascript/NativeJavaPackage.java @@ -30,17 +30,13 @@ public class NativeJavaPackage extends ScriptableObject { this.classLoader = classLoader; } - /** - * @deprecated NativeJavaPackage is an internal class, do not use it directly. - */ + /** @deprecated NativeJavaPackage is an internal class, do not use it directly. */ @Deprecated public NativeJavaPackage(String packageName, ClassLoader classLoader) { this(false, packageName, classLoader); } - /** - * @deprecated NativeJavaPackage is an internal class, do not use it directly. - */ + /** @deprecated NativeJavaPackage is an internal class, do not use it directly. */ @Deprecated public NativeJavaPackage(String packageName) { this(false, packageName, Context.getCurrentContext().getApplicationClassLoader()); diff --git a/src/org/mozilla/javascript/NativeNumber.java b/src/org/mozilla/javascript/NativeNumber.java index 2a932dd6a1..63f730d617 100644 --- a/src/org/mozilla/javascript/NativeNumber.java +++ b/src/org/mozilla/javascript/NativeNumber.java @@ -16,9 +16,7 @@ final class NativeNumber extends IdScriptableObject { private static final long serialVersionUID = 3504516769741512101L; - /** - * @see https://www.ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer - */ + /** @see https://www.ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer */ public static final double MAX_SAFE_INTEGER = 9007199254740991.0; // Math.pow(2, 53) - 1 private static final Object NUMBER_TAG = "Number"; diff --git a/src/org/mozilla/javascript/NativeScript.java b/src/org/mozilla/javascript/NativeScript.java index 757d70d693..d095143145 100644 --- a/src/org/mozilla/javascript/NativeScript.java +++ b/src/org/mozilla/javascript/NativeScript.java @@ -28,9 +28,7 @@ static void init(Context cx, Scriptable scope, boolean sealed) { obj.exportAsJSClass(MAX_PROTOTYPE_ID, scope, sealed); } - /** - * @deprecated Use {@link #init(Context, Scriptable, boolean)} instead - */ + /** @deprecated Use {@link #init(Context, Scriptable, boolean)} instead */ @Deprecated static void init(Scriptable scope, boolean sealed) { init(Context.getContext(), scope, sealed); diff --git a/src/org/mozilla/javascript/Ref.java b/src/org/mozilla/javascript/Ref.java index 2d8e56b6cd..a4e7544359 100644 --- a/src/org/mozilla/javascript/Ref.java +++ b/src/org/mozilla/javascript/Ref.java @@ -22,9 +22,7 @@ public boolean has(Context cx) { public abstract Object get(Context cx); - /** - * @deprecated Use {@link #set(Context, Scriptable, Object)} instead - */ + /** @deprecated Use {@link #set(Context, Scriptable, Object)} instead */ @Deprecated public abstract Object set(Context cx, Object value); diff --git a/src/org/mozilla/javascript/ScriptRuntime.java b/src/org/mozilla/javascript/ScriptRuntime.java index e463c9acd5..825eb2537c 100644 --- a/src/org/mozilla/javascript/ScriptRuntime.java +++ b/src/org/mozilla/javascript/ScriptRuntime.java @@ -1192,9 +1192,7 @@ public static Scriptable toObjectOrNull(Context cx, Object obj) { return null; } - /** - * @param scope the scope that should be used to resolve primitive prototype - */ + /** @param scope the scope that should be used to resolve primitive prototype */ public static Scriptable toObjectOrNull(Context cx, Object obj, Scriptable scope) { if (obj instanceof Scriptable) { return (Scriptable) obj; @@ -1204,9 +1202,7 @@ public static Scriptable toObjectOrNull(Context cx, Object obj, Scriptable scope return null; } - /** - * @deprecated Use {@link #toObject(Scriptable, Object)} instead. - */ + /** @deprecated Use {@link #toObject(Scriptable, Object)} instead. */ @Deprecated public static Scriptable toObject(Scriptable scope, Object val, Class staticClass) { if (val instanceof Scriptable) { @@ -1270,18 +1266,14 @@ public static Scriptable toObject(Context cx, Scriptable scope, Object val) { throw errorWithClassName("msg.invalid.type", val); } - /** - * @deprecated Use {@link #toObject(Context, Scriptable, Object)} instead. - */ + /** @deprecated Use {@link #toObject(Context, Scriptable, Object)} instead. */ @Deprecated public static Scriptable toObject( Context cx, Scriptable scope, Object val, Class staticClass) { return toObject(cx, scope, val); } - /** - * @deprecated The method is only present for compatibility. - */ + /** @deprecated The method is only present for compatibility. */ @Deprecated public static Object call( Context cx, Object fun, Object thisArg, Object[] args, Scriptable scope) { @@ -1694,9 +1686,7 @@ public static Object getObjectProp(Scriptable obj, String property, Context cx) return result; } - /** - * @deprecated Use {@link #getObjectPropNoWarn(Object, String, Context, Scriptable)} instead - */ + /** @deprecated Use {@link #getObjectPropNoWarn(Object, String, Context, Scriptable)} instead */ @Deprecated public static Object getObjectPropNoWarn(Object obj, String property, Context cx) { return getObjectPropNoWarn(obj, property, cx, getTopCallScope(cx)); @@ -1886,9 +1876,7 @@ public static Object refGet(Ref ref, Context cx) { return ref.get(cx); } - /** - * @deprecated Use {@link #refSet(Ref, Object, Context, Scriptable)} instead - */ + /** @deprecated Use {@link #refSet(Ref, Object, Context, Scriptable)} instead */ @Deprecated public static Object refSet(Ref ref, Object value, Context cx) { return refSet(ref, value, cx, getTopCallScope(cx)); @@ -1906,9 +1894,7 @@ static boolean isSpecialProperty(String s) { return s.equals("__proto__") || s.equals("__parent__"); } - /** - * @deprecated Use {@link #specialRef(Object, String, Context, Scriptable)} instead - */ + /** @deprecated Use {@link #specialRef(Object, String, Context, Scriptable)} instead */ @Deprecated public static Ref specialRef(Object obj, String specialProperty, Context cx) { return specialRef(obj, specialProperty, cx, getTopCallScope(cx)); @@ -1918,9 +1904,7 @@ public static Ref specialRef(Object obj, String specialProperty, Context cx, Scr return SpecialRef.createSpecial(cx, scope, obj, specialProperty); } - /** - * @deprecated Use {@link #delete(Object, Object, Context, Scriptable, boolean)} instead - */ + /** @deprecated Use {@link #delete(Object, Object, Context, Scriptable, boolean)} instead */ @Deprecated public static Object delete(Object obj, Object id, Context cx) { return delete(obj, id, cx, false); @@ -2245,9 +2229,7 @@ public static Object enumInit(Object value, Context cx, boolean enumValues) { public static final int ENUMERATE_ARRAY_NO_ITERATOR = 5; public static final int ENUMERATE_VALUES_IN_ORDER = 6; - /** - * @deprecated Use {@link #enumInit(Object, Context, Scriptable, int)} instead - */ + /** @deprecated Use {@link #enumInit(Object, Context, Scriptable, int)} instead */ @Deprecated public static Object enumInit(Object value, Context cx, int enumType) { return enumInit(value, cx, getTopCallScope(cx), enumType); @@ -2313,9 +2295,7 @@ public static void setEnumNumbers(Object enumObj, boolean enumNumbers) { ((IdEnumeration) enumObj).enumNumbers = enumNumbers; } - /** - * @deprecated since 1.7.15. Use {@link #enumNext(Context, Object)} instead - */ + /** @deprecated since 1.7.15. Use {@link #enumNext(Context, Object)} instead */ @Deprecated public static Boolean enumNext(Object enumObj) { return enumNext(enumObj, Context.getContext()); @@ -2793,9 +2773,7 @@ public static Object applyOrCall( return function.call(cx, scope, callThis, callArgs); } - /** - * @return true if the passed in Scriptable looks like an array - */ + /** @return true if the passed in Scriptable looks like an array */ private static boolean isArrayLike(Scriptable obj) { return obj != null && (obj instanceof NativeArray @@ -3190,9 +3168,7 @@ public static Object nameIncrDecr( return doScriptableIncrDecr(target, id, scopeChain, value, incrDecrMask); } - /** - * @deprecated Use {@link #propIncrDecr(Object, String, Context, Scriptable, int)} instead - */ + /** @deprecated Use {@link #propIncrDecr(Object, String, Context, Scriptable, int)} instead */ @Deprecated public static Object propIncrDecr(Object obj, String id, Context cx, int incrDecrMask) { return propIncrDecr(obj, id, cx, getTopCallScope(cx), incrDecrMask); @@ -3259,9 +3235,7 @@ private static Object doScriptableIncrDecr( return result; } - /** - * @deprecated Use {@link #elemIncrDecr(Object, Object, Context, Scriptable, int)} instead - */ + /** @deprecated Use {@link #elemIncrDecr(Object, Object, Context, Scriptable, int)} instead */ @Deprecated public static Object elemIncrDecr(Object obj, Object index, Context cx, int incrDecrMask) { return elemIncrDecr(obj, index, cx, getTopCallScope(cx), incrDecrMask); @@ -3301,9 +3275,7 @@ public static Object elemIncrDecr( return result; } - /** - * @deprecated Use {@link #refIncrDecr(Ref, Context, Scriptable, int)} instead - */ + /** @deprecated Use {@link #refIncrDecr(Ref, Context, Scriptable, int)} instead */ @Deprecated public static Object refIncrDecr(Ref ref, Context cx, int incrDecrMask) { return refIncrDecr(ref, cx, getTopCallScope(cx), incrDecrMask); @@ -4500,44 +4472,34 @@ static void checkDeprecated(Context cx, String name) { } } - /** - * @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead - */ + /** @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead */ @Deprecated public static String getMessage0(String messageId) { return getMessage(messageId, null); } - /** - * @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead - */ + /** @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead */ @Deprecated public static String getMessage1(String messageId, Object arg1) { Object[] arguments = {arg1}; return getMessage(messageId, arguments); } - /** - * @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead - */ + /** @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead */ @Deprecated public static String getMessage2(String messageId, Object arg1, Object arg2) { Object[] arguments = {arg1, arg2}; return getMessage(messageId, arguments); } - /** - * @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead - */ + /** @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead */ @Deprecated public static String getMessage3(String messageId, Object arg1, Object arg2, Object arg3) { Object[] arguments = {arg1, arg2, arg3}; return getMessage(messageId, arguments); } - /** - * @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead - */ + /** @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead */ @Deprecated public static String getMessage4( String messageId, Object arg1, Object arg2, Object arg3, Object arg4) { @@ -4565,9 +4527,7 @@ public interface MessageProvider { public static final MessageProvider messageProvider = new DefaultMessageProvider(); - /** - * @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead - */ + /** @deprecated Use {@link #getMessageById(String messageId, Object... args)} instead */ @Deprecated public static String getMessage(String messageId, Object[] arguments) { return messageProvider.getMessage(messageId, arguments); @@ -4653,36 +4613,28 @@ public static EcmaError typeErrorById(String messageId, Object... args) { return typeError(msg); } - /** - * @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead - */ + /** @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead */ @Deprecated public static EcmaError typeError0(String messageId) { String msg = getMessage0(messageId); return typeError(msg); } - /** - * @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead - */ + /** @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead */ @Deprecated public static EcmaError typeError1(String messageId, Object arg1) { String msg = getMessage1(messageId, arg1); return typeError(msg); } - /** - * @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead - */ + /** @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead */ @Deprecated public static EcmaError typeError2(String messageId, Object arg1, Object arg2) { String msg = getMessage2(messageId, arg1, arg2); return typeError(msg); } - /** - * @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead - */ + /** @deprecated Use {@link #typeErrorById(String messageId, Object... args)} instead */ @Deprecated public static EcmaError typeError3(String messageId, String arg1, String arg2, String arg3) { String msg = getMessage3(messageId, arg1, arg2, arg3); diff --git a/src/org/mozilla/javascript/SecureCaller.java b/src/org/mozilla/javascript/SecureCaller.java index 8121e72a8f..e05335189c 100644 --- a/src/org/mozilla/javascript/SecureCaller.java +++ b/src/org/mozilla/javascript/SecureCaller.java @@ -19,9 +19,7 @@ import java.util.Map; import java.util.WeakHashMap; -/** - * @author Attila Szegedi - */ +/** @author Attila Szegedi */ public abstract class SecureCaller { private static final byte[] secureCallerImplBytecode = loadBytecode(); diff --git a/src/org/mozilla/javascript/SecurityUtilities.java b/src/org/mozilla/javascript/SecurityUtilities.java index 6b024af6e6..c9e46c79d9 100644 --- a/src/org/mozilla/javascript/SecurityUtilities.java +++ b/src/org/mozilla/javascript/SecurityUtilities.java @@ -10,9 +10,7 @@ import java.security.PrivilegedAction; import java.security.ProtectionDomain; -/** - * @author Attila Szegedi - */ +/** @author Attila Szegedi */ public class SecurityUtilities { /** * Retrieves a system property within a privileged block. Use it only when the property is used diff --git a/src/org/mozilla/javascript/Synchronizer.java b/src/org/mozilla/javascript/Synchronizer.java index f708ca3fb1..2819ca762a 100644 --- a/src/org/mozilla/javascript/Synchronizer.java +++ b/src/org/mozilla/javascript/Synchronizer.java @@ -47,9 +47,7 @@ public Synchronizer(Scriptable obj, Object syncObject) { this.syncObject = syncObject; } - /** - * @see org.mozilla.javascript.Function#call - */ + /** @see org.mozilla.javascript.Function#call */ @Override public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) { Object sync = syncObject != null ? syncObject : thisObj; diff --git a/src/org/mozilla/javascript/WrapFactory.java b/src/org/mozilla/javascript/WrapFactory.java index 8794154ddf..cb74600ea3 100644 --- a/src/org/mozilla/javascript/WrapFactory.java +++ b/src/org/mozilla/javascript/WrapFactory.java @@ -148,9 +148,7 @@ public final boolean isJavaPrimitiveWrap() { return javaPrimitiveWrap; } - /** - * @see #isJavaPrimitiveWrap() - */ + /** @see #isJavaPrimitiveWrap() */ public final void setJavaPrimitiveWrap(boolean value) { Context cx = Context.getCurrentContext(); if (cx != null && cx.isSealed()) { diff --git a/src/org/mozilla/javascript/WrappedException.java b/src/org/mozilla/javascript/WrappedException.java index 022314cd2c..00646b9976 100644 --- a/src/org/mozilla/javascript/WrappedException.java +++ b/src/org/mozilla/javascript/WrappedException.java @@ -16,9 +16,7 @@ public class WrappedException extends EvaluatorException { private static final long serialVersionUID = -1551979216966520648L; - /** - * @see Context#throwAsScriptRuntimeEx(Throwable e) - */ + /** @see Context#throwAsScriptRuntimeEx(Throwable e) */ public WrappedException(Throwable exception) { super("Wrapped " + exception); this.exception = exception; @@ -45,9 +43,7 @@ public Throwable getWrappedException() { return exception; } - /** - * @deprecated Use {@link #getWrappedException()} instead. - */ + /** @deprecated Use {@link #getWrappedException()} instead. */ @Deprecated public Object unwrap() { return getWrappedException(); diff --git a/src/org/mozilla/javascript/ast/AstNode.java b/src/org/mozilla/javascript/ast/AstNode.java index 250ab1229e..d17ad8e63b 100644 --- a/src/org/mozilla/javascript/ast/AstNode.java +++ b/src/org/mozilla/javascript/ast/AstNode.java @@ -452,9 +452,7 @@ protected void printList(List items, StringBuilder sb) { } } - /** - * @see Kit#codeBug - */ + /** @see Kit#codeBug */ public static RuntimeException codeBug() throws RuntimeException { throw Kit.codeBug(); } diff --git a/src/org/mozilla/javascript/optimizer/OptRuntime.java b/src/org/mozilla/javascript/optimizer/OptRuntime.java index ee6a91f1d1..4452dac468 100644 --- a/src/org/mozilla/javascript/optimizer/OptRuntime.java +++ b/src/org/mozilla/javascript/optimizer/OptRuntime.java @@ -93,9 +93,7 @@ public static Object add(double val1, Object val2, Context cx) { return ScriptRuntime.add(val1, val2, cx); } - /** - * @deprecated Use {@link #elemIncrDecr(Object, double, Context, Scriptable, int)} instead - */ + /** @deprecated Use {@link #elemIncrDecr(Object, double, Context, Scriptable, int)} instead */ @Deprecated public static Object elemIncrDecr(Object obj, double index, Context cx, int incrDecrMask) { return elemIncrDecr(obj, index, cx, getTopCallScope(cx), incrDecrMask); diff --git a/testsrc/org/mozilla/javascript/drivers/JsDriver.java b/testsrc/org/mozilla/javascript/drivers/JsDriver.java index d1374d309c..4e92fdc20c 100644 --- a/testsrc/org/mozilla/javascript/drivers/JsDriver.java +++ b/testsrc/org/mozilla/javascript/drivers/JsDriver.java @@ -19,9 +19,7 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -/** - * @version $Id: JsDriver.java,v 1.10 2009/05/15 12:30:45 nboyd%atg.com Exp $ - */ +/** @version $Id: JsDriver.java,v 1.10 2009/05/15 12:30:45 nboyd%atg.com Exp $ */ public class JsDriver { private JsDriver() {} diff --git a/testsrc/org/mozilla/javascript/drivers/ShellTest.java b/testsrc/org/mozilla/javascript/drivers/ShellTest.java index e5fa96ca82..07e096cd74 100644 --- a/testsrc/org/mozilla/javascript/drivers/ShellTest.java +++ b/testsrc/org/mozilla/javascript/drivers/ShellTest.java @@ -25,9 +25,7 @@ import org.mozilla.javascript.tools.shell.Main; import org.mozilla.javascript.tools.shell.ShellContextFactory; -/** - * @version $Id: ShellTest.java,v 1.14 2011/03/29 15:17:49 hannes%helma.at Exp $ - */ +/** @version $Id: ShellTest.java,v 1.14 2011/03/29 15:17:49 hannes%helma.at Exp $ */ public class ShellTest { private static File frameworkFile; private static Script frameworkScript; diff --git a/testsrc/org/mozilla/javascript/tests/Bug491621Test.java b/testsrc/org/mozilla/javascript/tests/Bug491621Test.java index b04393f826..24c03ac42a 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug491621Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug491621Test.java @@ -11,9 +11,7 @@ import org.mozilla.javascript.Parser; import org.mozilla.javascript.ast.AstRoot; -/** - * @author Hannes Wallnoefer - */ +/** @author Hannes Wallnoefer */ public class Bug491621Test { /** diff --git a/testsrc/org/mozilla/javascript/tests/Bug637811Test.java b/testsrc/org/mozilla/javascript/tests/Bug637811Test.java index 801abf27dd..bd73dd70b3 100755 --- a/testsrc/org/mozilla/javascript/tests/Bug637811Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug637811Test.java @@ -10,9 +10,7 @@ import org.mozilla.javascript.Context; import org.mozilla.javascript.ContextFactory; -/** - * @author André Bargull - */ +/** @author André Bargull */ public class Bug637811Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug685403Test.java b/testsrc/org/mozilla/javascript/tests/Bug685403Test.java index 1624eb201c..5c21cc1513 100755 --- a/testsrc/org/mozilla/javascript/tests/Bug685403Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug685403Test.java @@ -17,9 +17,7 @@ import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; -/** - * @author André Bargull - */ +/** @author André Bargull */ public class Bug685403Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug687669Test.java b/testsrc/org/mozilla/javascript/tests/Bug687669Test.java index fd59c193e3..6a7d223907 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug687669Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug687669Test.java @@ -18,9 +18,7 @@ import org.mozilla.javascript.Undefined; import org.mozilla.javascript.ast.AstRoot; -/** - * @author André Bargull - */ +/** @author André Bargull */ public class Bug687669Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug688018Test.java b/testsrc/org/mozilla/javascript/tests/Bug688018Test.java index 12389a5005..e00074390a 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug688018Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug688018Test.java @@ -16,9 +16,7 @@ import org.mozilla.javascript.Parser; import org.mozilla.javascript.ast.AstRoot; -/** - * @author André Bargull - */ +/** @author André Bargull */ public class Bug688018Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug688021Test.java b/testsrc/org/mozilla/javascript/tests/Bug688021Test.java index 7892da38a0..17297088ce 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug688021Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug688021Test.java @@ -16,9 +16,7 @@ import org.mozilla.javascript.Parser; import org.mozilla.javascript.ast.AstRoot; -/** - * @author André Bargull - */ +/** @author André Bargull */ public class Bug688021Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug688023Test.java b/testsrc/org/mozilla/javascript/tests/Bug688023Test.java index 9ffe4cb18a..04fd88acc6 100755 --- a/testsrc/org/mozilla/javascript/tests/Bug688023Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug688023Test.java @@ -15,9 +15,7 @@ import org.mozilla.javascript.Parser; import org.mozilla.javascript.ast.AstRoot; -/** - * @author André Bargull - */ +/** @author André Bargull */ public class Bug688023Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug689308Test.java b/testsrc/org/mozilla/javascript/tests/Bug689308Test.java index 0886e5ae18..748e023683 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug689308Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug689308Test.java @@ -16,9 +16,7 @@ import org.mozilla.javascript.Parser; import org.mozilla.javascript.ast.AstRoot; -/** - * @author André Bargull - */ +/** @author André Bargull */ public class Bug689308Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug689314Test.java b/testsrc/org/mozilla/javascript/tests/Bug689314Test.java index 64032936c1..3239434912 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug689314Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug689314Test.java @@ -16,9 +16,7 @@ import org.mozilla.javascript.Parser; import org.mozilla.javascript.ast.AstRoot; -/** - * @author André Bargull - */ +/** @author André Bargull */ public class Bug689314Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug708801Test.java b/testsrc/org/mozilla/javascript/tests/Bug708801Test.java index 64dffc19c5..e035d3456c 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug708801Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug708801Test.java @@ -30,9 +30,7 @@ import org.mozilla.javascript.optimizer.Codegen; import org.mozilla.javascript.optimizer.OptFunctionNode; -/** - * @author André Bargull - */ +/** @author André Bargull */ public class Bug708801Test { private static final ContextFactory factory = diff --git a/testsrc/org/mozilla/javascript/tests/Bug714204Test.java b/testsrc/org/mozilla/javascript/tests/Bug714204Test.java index 78f3f1c2e5..1408723c3c 100644 --- a/testsrc/org/mozilla/javascript/tests/Bug714204Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug714204Test.java @@ -15,9 +15,7 @@ import org.mozilla.javascript.Script; import org.mozilla.javascript.ScriptableObject; -/** - * @author André Bargull - */ +/** @author André Bargull */ public class Bug714204Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug782363Test.java b/testsrc/org/mozilla/javascript/tests/Bug782363Test.java index 65dd8b8ddb..01c07716df 100755 --- a/testsrc/org/mozilla/javascript/tests/Bug782363Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug782363Test.java @@ -30,9 +30,7 @@ import org.mozilla.javascript.optimizer.Codegen; import org.mozilla.javascript.optimizer.OptFunctionNode; -/** - * @author André Bargull - */ +/** @author André Bargull */ public class Bug782363Test { private Context cx; diff --git a/testsrc/org/mozilla/javascript/tests/Bug783797Test.java b/testsrc/org/mozilla/javascript/tests/Bug783797Test.java index 88d5521538..16f2da1651 100755 --- a/testsrc/org/mozilla/javascript/tests/Bug783797Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug783797Test.java @@ -14,9 +14,7 @@ import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; -/** - * @author André Bargull - */ +/** @author André Bargull */ public class Bug783797Test { private interface Action { diff --git a/testsrc/org/mozilla/javascript/tests/Bug789277Test.java b/testsrc/org/mozilla/javascript/tests/Bug789277Test.java index 3ba4f55427..c519684111 100755 --- a/testsrc/org/mozilla/javascript/tests/Bug789277Test.java +++ b/testsrc/org/mozilla/javascript/tests/Bug789277Test.java @@ -25,9 +25,7 @@ import org.mozilla.javascript.ast.AstRoot; import org.mozilla.javascript.ast.IdeErrorReporter; -/** - * @author André Bargull - */ +/** @author André Bargull */ @SuppressWarnings("serial") @RunWith(Parameterized.class) public class Bug789277Test { diff --git a/testsrc/org/mozilla/javascript/tests/ClassShutterExceptionTest.java b/testsrc/org/mozilla/javascript/tests/ClassShutterExceptionTest.java index f5b17b2c98..52de1e8087 100644 --- a/testsrc/org/mozilla/javascript/tests/ClassShutterExceptionTest.java +++ b/testsrc/org/mozilla/javascript/tests/ClassShutterExceptionTest.java @@ -14,9 +14,7 @@ import org.mozilla.javascript.RhinoException; import org.mozilla.javascript.Scriptable; -/** - * @author Norris Boyd - */ +/** @author Norris Boyd */ public class ClassShutterExceptionTest { private static Context.ClassShutterSetter classShutterSetter; diff --git a/testsrc/org/mozilla/javascript/tests/JavaAcessibilityTest.java b/testsrc/org/mozilla/javascript/tests/JavaAcessibilityTest.java index bcf041d494..2e5405717f 100644 --- a/testsrc/org/mozilla/javascript/tests/JavaAcessibilityTest.java +++ b/testsrc/org/mozilla/javascript/tests/JavaAcessibilityTest.java @@ -18,9 +18,7 @@ import org.mozilla.javascript.tools.shell.Global; import org.mozilla.javascript.tools.shell.ShellContextFactory; -/** - * @author donnamalayeri - */ +/** @author donnamalayeri */ public class JavaAcessibilityTest { protected final Global global = new Global(); diff --git a/testsrc/org/mozilla/javascript/tests/NativeJsonTest.java b/testsrc/org/mozilla/javascript/tests/NativeJsonTest.java index cdc9ccf93c..6ee6213af6 100644 --- a/testsrc/org/mozilla/javascript/tests/NativeJsonTest.java +++ b/testsrc/org/mozilla/javascript/tests/NativeJsonTest.java @@ -11,9 +11,7 @@ import org.mozilla.javascript.Context; import org.mozilla.javascript.Scriptable; -/** - * @author Ronald Brill - */ +/** @author Ronald Brill */ public class NativeJsonTest { @Test diff --git a/testsrc/org/mozilla/javascript/tests/NativeRegExpTest.java b/testsrc/org/mozilla/javascript/tests/NativeRegExpTest.java index a19dcce985..944629438d 100644 --- a/testsrc/org/mozilla/javascript/tests/NativeRegExpTest.java +++ b/testsrc/org/mozilla/javascript/tests/NativeRegExpTest.java @@ -25,209 +25,157 @@ public void openBrace() { }); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void globalCtor() throws Exception { testEvaluate("g-true-false-false-false", "new RegExp('foo', 'g');"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void global() throws Exception { testEvaluate("g-true-false-false-false", "/foo/g;"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void ignoreCaseCtor() throws Exception { testEvaluate("i-false-true-false-false", "new RegExp('foo', 'i');"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void ignoreCase() throws Exception { testEvaluate("i-false-true-false-false", "/foo/i;"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void multilineCtor() throws Exception { testEvaluate("m-false-false-true-false", "new RegExp('foo', 'm');"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void multiline() throws Exception { testEvaluate("m-false-false-true-false", "/foo/m;"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void stickyCtor() throws Exception { testEvaluate("y-false-false-false-true", "new RegExp('foo', 'y');"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void sticky() throws Exception { testEvaluate("y-false-false-false-true", "/foo/y;"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void globalMultilineCtor() throws Exception { testEvaluate("gm-true-false-true-false", "new RegExp('foo', 'gm');"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void globalMultiline() throws Exception { testEvaluate("gm-true-false-true-false", "/foo/gm;"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void globalIgnoreCaseCtor() throws Exception { testEvaluate("gi-true-true-false-false", "new RegExp('foo', 'ig');"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void globalIgnoreCase() throws Exception { testEvaluate("gi-true-true-false-false", "/foo/ig;"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void globalStickyCtor() throws Exception { testEvaluate("gy-true-false-false-true", "new RegExp('foo', 'gy');"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void globalSticky() throws Exception { testEvaluate("gy-true-false-false-true", "/foo/gy;"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void globalMultilineIgnoreCaseCtor() throws Exception { testEvaluate("gim-true-true-true-false", "new RegExp('foo', 'mig');"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void globalMultilineIgnoreCase() throws Exception { testEvaluate("gim-true-true-true-false", "/foo/gmi;"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void globalIgnoreCaseStickyCtor() throws Exception { testEvaluate("giy-true-true-false-true", "new RegExp('foo', 'yig');"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void globalIgnoreCaseSticky() throws Exception { testEvaluate("giy-true-true-false-true", "/foo/ygi;"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void globalMultilineStickyCtor() throws Exception { testEvaluate("gmy-true-false-true-true", "new RegExp('foo', 'gmy');"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void globalMultilineSticky() throws Exception { testEvaluate("gmy-true-false-true-true", "/foo/gmy;"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void ignoreCaseMultilineCtor() throws Exception { testEvaluate("im-false-true-true-false", "new RegExp('foo', 'im');"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void ignoreCaseMultiline() throws Exception { testEvaluate("im-false-true-true-false", "/foo/mi;"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void ignoreCaseStickyCtor() throws Exception { testEvaluate("iy-false-true-false-true", "new RegExp('foo', 'yi');"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void ignoreCaseSticky() throws Exception { testEvaluate("iy-false-true-false-true", "/foo/iy;"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void multilineStickyCtor() throws Exception { testEvaluate("my-false-false-true-true", "new RegExp('foo', 'my');"); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void multilineSticky() throws Exception { testEvaluate("my-false-false-true-true", "/foo/my;"); @@ -253,9 +201,7 @@ private static void testEvaluate(final String expected, final String regex) { test(expected, script); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void stickyTest() throws Exception { final String script = @@ -272,9 +218,7 @@ public void stickyTest() throws Exception { test("true-9-false-0-false-0", script); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void stickyStartOfLine() throws Exception { final String script = @@ -285,9 +229,7 @@ public void stickyStartOfLine() throws Exception { test("false", script); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void stickyStartOfLineMultiline() throws Exception { final String script = @@ -300,9 +242,7 @@ public void stickyStartOfLineMultiline() throws Exception { test("false-true", script); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void matchGlobal() throws Exception { final String script = @@ -315,9 +255,7 @@ public void matchGlobal() throws Exception { test("3-a-a-a", script); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ // TODO @Test public void matchGlobalSymbol() throws Exception { final String script = @@ -330,9 +268,7 @@ public void matchGlobalSymbol() throws Exception { test("3-a-a-a", script); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void matchSticky() throws Exception { final String script = @@ -343,9 +279,7 @@ public void matchSticky() throws Exception { test("1-a", script); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void matchStickySymbol() throws Exception { final String script = @@ -356,9 +290,7 @@ public void matchStickySymbol() throws Exception { test("1-a", script); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ @Test public void matchStickyAndGlobal() throws Exception { final String script = @@ -370,9 +302,7 @@ public void matchStickyAndGlobal() throws Exception { test("2-a-a", script); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ // TODO @Test public void matchStickyAndGlobalSymbol() throws Exception { final String script = @@ -384,9 +314,7 @@ public void matchStickyAndGlobalSymbol() throws Exception { test("2-a-a", script); } - /** - * @throws Exception if an error occurs - */ + /** @throws Exception if an error occurs */ // TODO @Test public void flagsPropery() throws Exception { final String script = diff --git a/testsrc/org/mozilla/javascript/tests/ObserveInstructionCountTest.java b/testsrc/org/mozilla/javascript/tests/ObserveInstructionCountTest.java index a9bd46cd7f..a83b351c6b 100644 --- a/testsrc/org/mozilla/javascript/tests/ObserveInstructionCountTest.java +++ b/testsrc/org/mozilla/javascript/tests/ObserveInstructionCountTest.java @@ -17,9 +17,7 @@ import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.drivers.TestUtils; -/** - * @author Norris Boyd - */ +/** @author Norris Boyd */ public class ObserveInstructionCountTest { // Custom Context to store execution time. static class MyContext extends Context { diff --git a/testsrc/org/mozilla/javascript/tests/StackTraceTest.java b/testsrc/org/mozilla/javascript/tests/StackTraceTest.java index 1075d62e56..d8e3b85bc8 100644 --- a/testsrc/org/mozilla/javascript/tests/StackTraceTest.java +++ b/testsrc/org/mozilla/javascript/tests/StackTraceTest.java @@ -13,9 +13,7 @@ import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.StackStyle; -/** - * @author Marc Guillemot - */ +/** @author Marc Guillemot */ public class StackTraceTest { static final String LS = System.getProperty("line.separator"); diff --git a/testsrc/org/mozilla/javascript/tests/Test262SuiteTest.java b/testsrc/org/mozilla/javascript/tests/Test262SuiteTest.java index 4410b3ba10..82670fedab 100644 --- a/testsrc/org/mozilla/javascript/tests/Test262SuiteTest.java +++ b/testsrc/org/mozilla/javascript/tests/Test262SuiteTest.java @@ -442,9 +442,7 @@ public static void tearDownClass() { private final Test262Case testCase; private final boolean markedAsFailing; - /** - * @see https://github.com/tc39/test262/blob/main/INTERPRETING.md#host-defined-functions - */ + /** @see https://github.com/tc39/test262/blob/main/INTERPRETING.md#host-defined-functions */ public static class $262 { private ScriptableObject scope; diff --git a/testsrc/org/mozilla/javascript/tests/WrapFactoryTest.java b/testsrc/org/mozilla/javascript/tests/WrapFactoryTest.java index d98fe09c30..8a34928d4d 100644 --- a/testsrc/org/mozilla/javascript/tests/WrapFactoryTest.java +++ b/testsrc/org/mozilla/javascript/tests/WrapFactoryTest.java @@ -13,9 +13,7 @@ import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; -/** - * @author hatanaka - */ +/** @author hatanaka */ public class WrapFactoryTest { /** javascript code */ private static String script = diff --git a/testsrc/org/mozilla/javascript/tests/WriteReadOnlyPropertyTest.java b/testsrc/org/mozilla/javascript/tests/WriteReadOnlyPropertyTest.java index 366765c14c..1f00de63d5 100644 --- a/testsrc/org/mozilla/javascript/tests/WriteReadOnlyPropertyTest.java +++ b/testsrc/org/mozilla/javascript/tests/WriteReadOnlyPropertyTest.java @@ -22,17 +22,13 @@ */ public class WriteReadOnlyPropertyTest { - /** - * @throws Exception if the test fails - */ + /** @throws Exception if the test fails */ @Test public void writeReadOnly_accepted() throws Exception { testWriteReadOnly(true); } - /** - * @throws Exception if the test fails - */ + /** @throws Exception if the test fails */ @Test public void writeReadOnly_throws() throws Exception { try { diff --git a/testsrc/org/mozilla/javascript/tests/commentspr465/IfCommentsTest.java b/testsrc/org/mozilla/javascript/tests/commentspr465/IfCommentsTest.java index 4d7dfd9a22..b4d046aed1 100644 --- a/testsrc/org/mozilla/javascript/tests/commentspr465/IfCommentsTest.java +++ b/testsrc/org/mozilla/javascript/tests/commentspr465/IfCommentsTest.java @@ -9,9 +9,7 @@ import org.mozilla.javascript.ast.FunctionNode; import org.mozilla.javascript.ast.IfStatement; -/** - * @author ravik @@since 08/08/18 12:01 PM - */ +/** @author ravik @@since 08/08/18 12:01 PM */ public class IfCommentsTest { @Test diff --git a/testsrc/org/mozilla/javascript/tests/commentspr465/LoopCommentsTest.java b/testsrc/org/mozilla/javascript/tests/commentspr465/LoopCommentsTest.java index 1ec0f22039..b5ade251e0 100644 --- a/testsrc/org/mozilla/javascript/tests/commentspr465/LoopCommentsTest.java +++ b/testsrc/org/mozilla/javascript/tests/commentspr465/LoopCommentsTest.java @@ -12,9 +12,7 @@ import org.mozilla.javascript.ast.WhileLoop; import org.mozilla.javascript.ast.WithStatement; -/** - * @author ravik @@since 08/08/18 2:31 PM - */ +/** @author ravik @@since 08/08/18 2:31 PM */ public class LoopCommentsTest { @Test diff --git a/testsrc/org/mozilla/javascript/tests/commentspr465/MiscCommentsTest.java b/testsrc/org/mozilla/javascript/tests/commentspr465/MiscCommentsTest.java index 061fc0b939..51f019bc3e 100644 --- a/testsrc/org/mozilla/javascript/tests/commentspr465/MiscCommentsTest.java +++ b/testsrc/org/mozilla/javascript/tests/commentspr465/MiscCommentsTest.java @@ -8,9 +8,7 @@ import org.mozilla.javascript.ast.FunctionNode; import org.mozilla.javascript.ast.TryStatement; -/** - * @author ravik @@since 08/08/18 3:13 PM - */ +/** @author ravik @@since 08/08/18 3:13 PM */ public class MiscCommentsTest { @Test diff --git a/testsrc/org/mozilla/javascript/tests/commentspr465/SwitchCommentsTest.java b/testsrc/org/mozilla/javascript/tests/commentspr465/SwitchCommentsTest.java index d77240c0c5..5904dec6bb 100644 --- a/testsrc/org/mozilla/javascript/tests/commentspr465/SwitchCommentsTest.java +++ b/testsrc/org/mozilla/javascript/tests/commentspr465/SwitchCommentsTest.java @@ -11,9 +11,7 @@ import org.mozilla.javascript.ast.SwitchCase; import org.mozilla.javascript.ast.SwitchStatement; -/** - * @author ravik @@since 07/08/18 12:36 PM - */ +/** @author ravik @@since 07/08/18 12:36 PM */ public class SwitchCommentsTest { @Test diff --git a/testsrc/org/mozilla/javascript/tests/es5/Test262RegExpTest.java b/testsrc/org/mozilla/javascript/tests/es5/Test262RegExpTest.java index 1a7640be37..56288e898e 100644 --- a/testsrc/org/mozilla/javascript/tests/es5/Test262RegExpTest.java +++ b/testsrc/org/mozilla/javascript/tests/es5/Test262RegExpTest.java @@ -15,9 +15,7 @@ import org.mozilla.javascript.EcmaError; import org.mozilla.javascript.ScriptableObject; -/** - * @author André Bargull - */ +/** @author André Bargull */ public class Test262RegExpTest { private Context cx; private ScriptableObject scope; diff --git a/testsrc/org/mozilla/javascript/tests/es6/FunctionNullSetTest.java b/testsrc/org/mozilla/javascript/tests/es6/FunctionNullSetTest.java index 620e21f505..6fd3eef304 100644 --- a/testsrc/org/mozilla/javascript/tests/es6/FunctionNullSetTest.java +++ b/testsrc/org/mozilla/javascript/tests/es6/FunctionNullSetTest.java @@ -18,9 +18,7 @@ */ public class FunctionNullSetTest { - /** - * @throws Exception if the test fails - */ + /** @throws Exception if the test fails */ @Test public void setFunctionToNull() throws Exception { final String script = "function onclick() {onclick=null}"; diff --git a/testsrc/org/mozilla/javascript/tests/es6/NativeRegExpTest.java b/testsrc/org/mozilla/javascript/tests/es6/NativeRegExpTest.java index 0e4aa646eb..cc8adde16e 100644 --- a/testsrc/org/mozilla/javascript/tests/es6/NativeRegExpTest.java +++ b/testsrc/org/mozilla/javascript/tests/es6/NativeRegExpTest.java @@ -15,9 +15,7 @@ import org.mozilla.javascript.ScriptableObject; import org.mozilla.javascript.tests.Utils; -/** - * @author Ronald Brill - */ +/** @author Ronald Brill */ public class NativeRegExpTest { @Test diff --git a/testsrc/org/mozilla/javascript/tests/es6/TypedArrayJavaTest.java b/testsrc/org/mozilla/javascript/tests/es6/TypedArrayJavaTest.java index c104c54416..c325cf8347 100644 --- a/testsrc/org/mozilla/javascript/tests/es6/TypedArrayJavaTest.java +++ b/testsrc/org/mozilla/javascript/tests/es6/TypedArrayJavaTest.java @@ -22,9 +22,7 @@ public void subarrayWithoutParams() throws Exception { allTypes(script, "1,2"); } - /** - * @throws Exception if test failed - */ + /** @throws Exception if test failed */ @Test public void subarrayFromSubarray() throws Exception { subarrayFromSubarray(0, 7, 0, 6, "1,2,3,4,5,6,7 - 1,2,3,4,5,6"); diff --git a/testsrc/org/mozilla/javascript/tests/intl402/NativeStringTest.java b/testsrc/org/mozilla/javascript/tests/intl402/NativeStringTest.java index 1582ad6819..2d8445861c 100644 --- a/testsrc/org/mozilla/javascript/tests/intl402/NativeStringTest.java +++ b/testsrc/org/mozilla/javascript/tests/intl402/NativeStringTest.java @@ -14,9 +14,7 @@ import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.tests.Utils; -/** - * @author Ronald Brill - */ +/** @author Ronald Brill */ public class NativeStringTest { private ContextFactory contextFactoryIntl402 = new ContextFactory() { diff --git a/toolsrc/org/mozilla/javascript/tools/debugger/Main.java b/toolsrc/org/mozilla/javascript/tools/debugger/Main.java index 0050f4e82f..85f3315e19 100644 --- a/toolsrc/org/mozilla/javascript/tools/debugger/Main.java +++ b/toolsrc/org/mozilla/javascript/tools/debugger/Main.java @@ -242,47 +242,35 @@ private static Main mainEmbeddedImpl( // Deprecated methods - /** - * @deprecated Use {@link #setSize(int, int)} instead. - */ + /** @deprecated Use {@link #setSize(int, int)} instead. */ @Deprecated public void setSize(java.awt.Dimension dimension) { debugGui.setSize(dimension.width, dimension.height); } - /** - * @deprecated The method does nothing and is only present for compatibility. - */ + /** @deprecated The method does nothing and is only present for compatibility. */ @Deprecated public void setOptimizationLevel(int level) {} - /** - * @deprecated The method is only present for compatibility and should not be called. - */ + /** @deprecated The method is only present for compatibility and should not be called. */ @Deprecated public void contextEntered(Context cx) { throw new IllegalStateException(); } - /** - * @deprecated The method is only present for compatibility and should not be called. - */ + /** @deprecated The method is only present for compatibility and should not be called. */ @Deprecated public void contextExited(Context cx) { throw new IllegalStateException(); } - /** - * @deprecated The method is only present for compatibility and should not be called. - */ + /** @deprecated The method is only present for compatibility and should not be called. */ @Deprecated public void contextCreated(Context cx) { throw new IllegalStateException(); } - /** - * @deprecated The method is only present for compatibility and should not be called. - */ + /** @deprecated The method is only present for compatibility and should not be called. */ @Deprecated public void contextReleased(Context cx) { throw new IllegalStateException(); diff --git a/toolsrc/org/mozilla/javascript/tools/jsc/Main.java b/toolsrc/org/mozilla/javascript/tools/jsc/Main.java index 9b919898d2..9a11a63f6e 100644 --- a/toolsrc/org/mozilla/javascript/tools/jsc/Main.java +++ b/toolsrc/org/mozilla/javascript/tools/jsc/Main.java @@ -16,9 +16,7 @@ import org.mozilla.javascript.tools.SourceReader; import org.mozilla.javascript.tools.ToolErrorReporter; -/** - * @author Norris Boyd - */ +/** @author Norris Boyd */ public class Main { /** diff --git a/toolsrc/org/mozilla/javascript/tools/shell/ShellConsole.java b/toolsrc/org/mozilla/javascript/tools/shell/ShellConsole.java index 74daa6040b..2cfc445144 100644 --- a/toolsrc/org/mozilla/javascript/tools/shell/ShellConsole.java +++ b/toolsrc/org/mozilla/javascript/tools/shell/ShellConsole.java @@ -21,9 +21,7 @@ import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; -/** - * @author André Bargull - */ +/** @author André Bargull */ public abstract class ShellConsole { private static final Class[] NO_ARG = {}; diff --git a/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java b/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java index 8bf0e1a2a6..6796abe1fc 100644 --- a/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java +++ b/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java @@ -78,9 +78,7 @@ String uri() { return delegate.getNamespace().getUri(); } - /** - * @deprecated - */ + /** @deprecated */ @Deprecated final XmlNode.QName toNodeQname() { return delegate; diff --git a/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java b/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java index 14f60564e7..0670cb3d5c 100644 --- a/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java +++ b/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java @@ -109,17 +109,13 @@ private XMLLibImpl(Scriptable globalScope) { this.globalScope = globalScope; } - /** - * @deprecated - */ + /** @deprecated */ @Deprecated QName qnamePrototype() { return qnamePrototype; } - /** - * @deprecated - */ + /** @deprecated */ @Deprecated Scriptable globalScope() { return globalScope; @@ -146,9 +142,7 @@ private void exportToScope(boolean sealed) { qnamePrototype.exportAsJSClass(sealed); } - /** - * @deprecated - */ + /** @deprecated */ @Deprecated XMLName toAttributeName(Context cx, Object nameValue) { if (nameValue instanceof XMLName) { diff --git a/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java b/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java index 7a749df6e4..9e6ccd4228 100644 --- a/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java +++ b/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java @@ -106,9 +106,7 @@ static XMLName formStar() { return rv; } - /** - * @deprecated - */ + /** @deprecated */ @Deprecated static XMLName formProperty(XmlNode.Namespace namespace, String localName) { if (localName != null && localName.equals("*")) localName = null; @@ -151,9 +149,7 @@ static XMLName create(XmlNode.QName qname, boolean attribute, boolean descendant return rv; } - /** - * @deprecated - */ + /** @deprecated */ @Deprecated static XMLName create(XmlNode.QName qname) { return create(qname, false, false); @@ -441,9 +437,7 @@ boolean isDescendants() { } // TODO Fix whether this is an descendant XMLName at construction? - /** - * @deprecated - */ + /** @deprecated */ @Deprecated void setIsDescendants() { // if (isDescendants) throw new IllegalStateException(); diff --git a/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlNode.java b/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlNode.java index 24930930c9..551343491f 100644 --- a/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlNode.java +++ b/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlNode.java @@ -671,9 +671,7 @@ static QName create(Namespace namespace, String localName) { return rv; } - /** - * @deprecated - */ + /** @deprecated */ @Deprecated static QName create(String uri, String localName, String prefix) { return create(Namespace.create(prefix, uri), localName);