Merge branch '317949-fix-asm-api-values-in-javadoc' into 'master'

Fix the ASM 'api' fields and parameters javadoc.

Closes #317949

See merge request asm/asm!326

asm-analysis/src/main/java/org/objectweb/asm/tree/analysis/BasicInterpreter.java

@@ -70,10 +70,8 @@ public class BasicInterpreter extends Interpreter<BasicValue> implements Opcodes
   /**
    * Constructs a new {@link BasicInterpreter}.
    *
-   * @param api the ASM API version supported by this interpreter. Must be one of {@link
-   *     org.objectweb.asm.Opcodes#ASM4}, {@link org.objectweb.asm.Opcodes#ASM5}, {@link
-   *     org.objectweb.asm.Opcodes#ASM6}, {@link org.objectweb.asm.Opcodes#ASM7}, {@link
-   *     org.objectweb.asm.Opcodes#ASM8} or {@link org.objectweb.asm.Opcodes#ASM9}.
+   * @param api the ASM API version supported by this interpreter. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    */
   protected BasicInterpreter(final int api) {
     super(api);

asm-analysis/src/main/java/org/objectweb/asm/tree/analysis/BasicVerifier.java

@@ -28,6 +28,7 @@
 package org.objectweb.asm.tree.analysis;
 
 import java.util.List;
+import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.FieldInsnNode;
@@ -56,10 +57,8 @@ public class BasicVerifier extends BasicInterpreter {
   /**
    * Constructs a new {@link BasicVerifier}.
    *
-   * @param api the ASM API version supported by this interpreter. Must be one of {@link
-   *     org.objectweb.asm.Opcodes#ASM4}, {@link org.objectweb.asm.Opcodes#ASM5}, {@link
-   *     org.objectweb.asm.Opcodes#ASM6}, {@link org.objectweb.asm.Opcodes#ASM7}, {@link
-   *     org.objectweb.asm.Opcodes#ASM8} or or {@link org.objectweb.asm.Opcodes#ASM9}.
+   * @param api the ASM API version supported by this interpreter. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    */
   protected BasicVerifier(final int api) {
     super(api);

asm-analysis/src/main/java/org/objectweb/asm/tree/analysis/Interpreter.java

@@ -28,6 +28,7 @@
 package org.objectweb.asm.tree.analysis;
 
 import java.util.List;
+import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.TryCatchBlockNode;
@@ -45,18 +46,16 @@ import org.objectweb.asm.tree.TryCatchBlockNode;
 public abstract class Interpreter<V extends Value> {
 
   /**
-   * The ASM API version supported by this interpreter. The value of this field must be one of
-   * {@link org.objectweb.asm.Opcodes#ASM4}, {@link org.objectweb.asm.Opcodes#ASM5}, {@link
-   * org.objectweb.asm.Opcodes#ASM6} or {@link org.objectweb.asm.Opcodes#ASM7}.
+   * The ASM API version supported by this interpreter. The value of this field must be one of the
+   * {@code ASM}<i>x</i> values in {@link Opcodes}.
    */
   protected final int api;
 
   /**
    * Constructs a new {@link Interpreter}.
    *
-   * @param api the ASM API version supported by this interpreter. Must be one of {@link
-   *     org.objectweb.asm.Opcodes#ASM4}, {@link org.objectweb.asm.Opcodes#ASM5}, {@link
-   *     org.objectweb.asm.Opcodes#ASM6} or {@link org.objectweb.asm.Opcodes#ASM7}.
+   * @param api the ASM API version supported by this interpreter. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    */
   protected Interpreter(final int api) {
     this.api = api;

asm-analysis/src/main/java/org/objectweb/asm/tree/analysis/SimpleVerifier.java

@@ -28,6 +28,7 @@
 package org.objectweb.asm.tree.analysis;
 
 import java.util.List;
+import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 
 /**
@@ -108,10 +109,8 @@ public class SimpleVerifier extends BasicVerifier {
    * Constructs a new {@link SimpleVerifier} to verify a specific class. This class will not be
    * loaded into the JVM since it may be incorrect.
    *
-   * @param api the ASM API version supported by this verifier. Must be one of {@link
-   *     org.objectweb.asm.Opcodes#ASM4}, {@link org.objectweb.asm.Opcodes#ASM5}, {@link
-   *     org.objectweb.asm.Opcodes#ASM6}, {@link org.objectweb.asm.Opcodes#ASM7}, {@link
-   *     org.objectweb.asm.Opcodes#ASM8} or or {@link org.objectweb.asm.Opcodes#ASM9}.
+   * @param api the ASM API version supported by this verifier. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param currentClass the type of the class to be verified.
    * @param currentSuperClass the type of the super class of the class to be verified.
    * @param currentClassInterfaces the types of the interfaces directly implemented by the class to

asm-analysis/src/main/java/org/objectweb/asm/tree/analysis/SourceInterpreter.java

@@ -60,10 +60,8 @@ public class SourceInterpreter extends Interpreter<SourceValue> implements Opcod
   /**
    * Constructs a new {@link SourceInterpreter}.
    *
-   * @param api the ASM API version supported by this interpreter. Must be one of {@link
-   *     org.objectweb.asm.Opcodes#ASM4}, {@link org.objectweb.asm.Opcodes#ASM5}, {@link
-   *     org.objectweb.asm.Opcodes#ASM6}, {@link org.objectweb.asm.Opcodes#ASM7}, {@link
-   *     org.objectweb.asm.Opcodes#ASM8} or or {@link org.objectweb.asm.Opcodes#ASM9}.
+   * @param api the ASM API version supported by this interpreter. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    */
   protected SourceInterpreter(final int api) {
     super(api);

asm-commons/src/main/java/org/objectweb/asm/commons/AdviceAdapter.java

@@ -98,8 +98,8 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
   /**
    * Constructs a new {@link AdviceAdapter}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param methodVisitor the method visitor to which this adapter delegates calls.
    * @param access the method's access flags (see {@link Opcodes}).
    * @param name the method's name.

asm-commons/src/main/java/org/objectweb/asm/commons/AnalyzerAdapter.java

@@ -125,9 +125,8 @@ public class AnalyzerAdapter extends MethodVisitor {
   /**
    * Constructs a new {@link AnalyzerAdapter}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
-   *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param owner the owner's class name.
    * @param access the method's access flags (see {@link Opcodes}).
    * @param name the method's name.

asm-commons/src/main/java/org/objectweb/asm/commons/AnnotationRemapper.java

@@ -77,10 +77,8 @@ public class AnnotationRemapper extends AnnotationVisitor {
   /**
    * Constructs a new {@link AnnotationRemapper}.
    *
-   * @param api the ASM API version supported by this remapper. Must be one of {@link
-   *     org.objectweb.asm.Opcodes#ASM4}, {@link org.objectweb.asm.Opcodes#ASM5}, {@link
-   *     org.objectweb.asm.Opcodes#ASM6}, {@link org.objectweb.asm.Opcodes#ASM7}, {@link
-   *     org.objectweb.asm.Opcodes#ASM8} or {@link org.objectweb.asm.Opcodes#ASM9}.
+   * @param api the ASM API version supported by this remapper. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param annotationVisitor the annotation visitor this remapper must delegate to.
    * @param remapper the remapper to use to remap the types in the visited annotation.
    * @deprecated use {@link #AnnotationRemapper(int, String, AnnotationVisitor, Remapper)} instead.
@@ -94,10 +92,8 @@ public class AnnotationRemapper extends AnnotationVisitor {
   /**
    * Constructs a new {@link AnnotationRemapper}.
    *
-   * @param api the ASM API version supported by this remapper. Must be one of {@link
-   *     org.objectweb.asm.Opcodes#ASM4}, {@link org.objectweb.asm.Opcodes#ASM5}, {@link
-   *     org.objectweb.asm.Opcodes#ASM6}, {@link org.objectweb.asm.Opcodes#ASM7}, {@link
-   *     org.objectweb.asm.Opcodes#ASM8} or {@link org.objectweb.asm.Opcodes#ASM9}.
+   * @param api the ASM API version supported by this remapper. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param descriptor the descriptor of the visited annotation. May be {@literal null}.
    * @param annotationVisitor the annotation visitor this remapper must delegate to.
    * @param remapper the remapper to use to remap the types in the visited annotation.

asm-commons/src/main/java/org/objectweb/asm/commons/ClassRemapper.java

@@ -80,10 +80,8 @@ public class ClassRemapper extends ClassVisitor {
   /**
    * Constructs a new {@link ClassRemapper}.
    *
-   * @param api the ASM API version supported by this remapper. Must be one of {@link
-   *     org.objectweb.asm.Opcodes#ASM4}, {@link org.objectweb.asm.Opcodes#ASM5}, {@link
-   *     org.objectweb.asm.Opcodes#ASM6}, {@link org.objectweb.asm.Opcodes#ASM7}, {@link
-   *     org.objectweb.asm.Opcodes#ASM8} or {@link org.objectweb.asm.Opcodes#ASM9}.
+   * @param api the ASM API version supported by this remapper. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param classVisitor the class visitor this remapper must delegate to.
    * @param remapper the remapper to use to remap the types in the visited class.
    */

asm-commons/src/main/java/org/objectweb/asm/commons/FieldRemapper.java

@@ -57,9 +57,8 @@ public class FieldRemapper extends FieldVisitor {
   /**
    * Constructs a new {@link FieldRemapper}.
    *
-   * @param api the ASM API version supported by this remapper. Must be one of {@link Opcodes#ASM4},
-   *     {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link Opcodes#ASM8}, or
-   *     {@link Opcodes#ASM9}.
+   * @param api the ASM API version supported by this remapper. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param fieldVisitor the field visitor this remapper must delegate to.
    * @param remapper the remapper to use to remap the types in the visited field.
    */

asm-commons/src/main/java/org/objectweb/asm/commons/GeneratorAdapter.java

@@ -210,9 +210,8 @@ public class GeneratorAdapter extends LocalVariablesSorter {
   /**
    * Constructs a new {@link GeneratorAdapter}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
-   *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param methodVisitor the method visitor to which this adapter delegates calls.
    * @param access the method's access flags (see {@link Opcodes}).
    * @param name the method's name.

asm-commons/src/main/java/org/objectweb/asm/commons/InstructionAdapter.java

@@ -62,9 +62,8 @@ public class InstructionAdapter extends MethodVisitor {
   /**
    * Constructs a new {@link InstructionAdapter}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
-   *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param methodVisitor the method visitor to which this adapter delegates calls.
    */
   protected InstructionAdapter(final int api, final MethodVisitor methodVisitor) {

asm-commons/src/main/java/org/objectweb/asm/commons/JSRInlinerAdapter.java

@@ -114,9 +114,8 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
   /**
    * Constructs a new {@link JSRInlinerAdapter}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
-   *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param methodVisitor the method visitor to send the resulting inlined method code to, or <code>
    *     null</code>.
    * @param access the method's access flags (see {@link Opcodes}). This parameter also indicates if

asm-commons/src/main/java/org/objectweb/asm/commons/LocalVariablesSorter.java

@@ -90,9 +90,8 @@ public class LocalVariablesSorter extends MethodVisitor {
   /**
    * Constructs a new {@link LocalVariablesSorter}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
-   *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param access access flags of the adapted method.
    * @param descriptor the method's descriptor (see {@link Type}).
    * @param methodVisitor the method visitor to which this adapter delegates calls.

asm-commons/src/main/java/org/objectweb/asm/commons/MethodRemapper.java

@@ -59,10 +59,8 @@ public class MethodRemapper extends MethodVisitor {
   /**
    * Constructs a new {@link MethodRemapper}.
    *
-   * @param api the ASM API version supported by this remapper. Must be one of {@link
-   *     org.objectweb.asm.Opcodes#ASM4}, {@link org.objectweb.asm.Opcodes#ASM5}, {@link
-   *     org.objectweb.asm.Opcodes#ASM6}, {@link org.objectweb.asm.Opcodes#ASM7}, {@link
-   *     org.objectweb.asm.Opcodes#ASM8} or {@link org.objectweb.asm.Opcodes#ASM9}.
+   * @param api the ASM API version supported by this remapper. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param methodVisitor the method visitor this remapper must delegate to.
    * @param remapper the remapper to use to remap the types in the visited method.
    */

asm-commons/src/main/java/org/objectweb/asm/commons/ModuleRemapper.java

@@ -55,10 +55,8 @@ public class ModuleRemapper extends ModuleVisitor {
   /**
    * Constructs a new {@link ModuleRemapper}.
    *
-   * @param api the ASM API version supported by this remapper. Must be one of {@link
-   *     org.objectweb.asm.Opcodes#ASM4}, {@link org.objectweb.asm.Opcodes#ASM5}, {@link
-   *     org.objectweb.asm.Opcodes#ASM6}, {@link org.objectweb.asm.Opcodes#ASM7}, {@link
-   *     org.objectweb.asm.Opcodes#ASM8} or {@link org.objectweb.asm.Opcodes#ASM9}.
+   * @param api the ASM API version supported by this remapper. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param moduleVisitor the module visitor this remapper must delegate to.
    * @param remapper the remapper to use to remap the types in the visited module.
    */

asm-commons/src/main/java/org/objectweb/asm/commons/SerialVersionUIDAdder.java

@@ -159,9 +159,8 @@ public class SerialVersionUIDAdder extends ClassVisitor {
   /**
    * Constructs a new {@link SerialVersionUIDAdder}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
-   *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param classVisitor a {@link ClassVisitor} to which this visitor will delegate calls.
    */
   protected SerialVersionUIDAdder(final int api, final ClassVisitor classVisitor) {

asm-commons/src/main/java/org/objectweb/asm/commons/SignatureRemapper.java

@@ -59,10 +59,8 @@ public class SignatureRemapper extends SignatureVisitor {
   /**
    * Constructs a new {@link SignatureRemapper}.
    *
-   * @param api the ASM API version supported by this remapper. Must be one of {@link
-   *     org.objectweb.asm.Opcodes#ASM4}, {@link org.objectweb.asm.Opcodes#ASM5},{@link
-   *     org.objectweb.asm.Opcodes#ASM6}, {@link org.objectweb.asm.Opcodes#ASM7}, {@link
-   *     org.objectweb.asm.Opcodes#ASM8} or {@link org.objectweb.asm.Opcodes#ASM9}.
+   * @param api the ASM API version supported by this remapper. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param signatureVisitor the signature visitor this remapper must delegate to.
    * @param remapper the remapper to use to remap the types in the visited signature.
    */

asm-commons/src/main/java/org/objectweb/asm/commons/StaticInitMerger.java

@@ -67,9 +67,8 @@ public class StaticInitMerger extends ClassVisitor {
   /**
    * Constructs a new {@link StaticInitMerger}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
-   *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param prefix the prefix to use to rename the existing &lt;clinit&gt; methods.
    * @param classVisitor the class visitor to which this visitor must delegate method calls. May be
    *     null.

asm-tree/src/main/java/org/objectweb/asm/tree/AnnotationNode.java

@@ -69,9 +69,8 @@ public class AnnotationNode extends AnnotationVisitor {
   /**
    * Constructs a new {@link AnnotationNode}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
-   *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param descriptor the class descriptor of the annotation class.
    */
   public AnnotationNode(final int api, final String descriptor) {
@@ -173,8 +172,8 @@ public class AnnotationNode extends AnnotationVisitor {
    * checks that this node, and all its children recursively, do not contain elements that were
    * introduced in more recent versions of the ASM API than the given version.
    *
-   * @param api an ASM API version. Must be one of {@link Opcodes#ASM4}, {@link Opcodes#ASM5},
-   *     {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link Opcodes#ASM8} or {@link Opcodes#ASM9}.
+   * @param api an ASM API version. Must be one of the {@code ASM}<i>x</i> values in {@link
+   *     Opcodes}.
    */
   public void check(final int api) {
     // nothing to do