--- old/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java Thu Apr 25 10:11:26 2013 +++ new/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java Thu Apr 25 10:11:26 2013 @@ -70,19 +70,22 @@ /** * Type to be used to check class signatures. See - * {@link #CheckSignatureAdapter(int, SignatureVisitor) CheckSignatureAdapter}. + * {@link #CheckSignatureAdapter(int, SignatureVisitor) + * CheckSignatureAdapter}. */ public static final int CLASS_SIGNATURE = 0; /** * Type to be used to check method signatures. See - * {@link #CheckSignatureAdapter(int, SignatureVisitor) CheckSignatureAdapter}. + * {@link #CheckSignatureAdapter(int, SignatureVisitor) + * CheckSignatureAdapter}. */ public static final int METHOD_SIGNATURE = 1; /** * Type to be used to check type signatures.See - * {@link #CheckSignatureAdapter(int, SignatureVisitor) CheckSignatureAdapter}. + * {@link #CheckSignatureAdapter(int, SignatureVisitor) + * CheckSignatureAdapter}. */ public static final int TYPE_SIGNATURE = 2; @@ -130,32 +133,34 @@ * not use this constructor. Instead, they must use the * {@link #CheckSignatureAdapter(int, int, SignatureVisitor)} version. * - * @param type the type of signature to be checked. See - * {@link #CLASS_SIGNATURE}, {@link #METHOD_SIGNATURE} and - * {@link #TYPE_SIGNATURE}. - * @param sv the visitor to which this adapter must delegate calls. May be - * null. + * @param type + * the type of signature to be checked. See + * {@link #CLASS_SIGNATURE}, {@link #METHOD_SIGNATURE} and + * {@link #TYPE_SIGNATURE}. + * @param sv + * the visitor to which this adapter must delegate calls. May be + * null. */ public CheckSignatureAdapter(final int type, final SignatureVisitor sv) { - this(Opcodes.ASM4, type, sv); + this(Opcodes.ASM5, type, sv); } /** * Creates a new {@link CheckSignatureAdapter} object. * - * @param api the ASM API version implemented by this visitor. Must be one - * of {@link Opcodes#ASM4}. - * @param type the type of signature to be checked. See - * {@link #CLASS_SIGNATURE}, {@link #METHOD_SIGNATURE} and - * {@link #TYPE_SIGNATURE}. - * @param sv the visitor to which this adapter must delegate calls. May be - * null. + * @param api + * the ASM API version implemented by this visitor. Must be one + * of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + * @param type + * the type of signature to be checked. See + * {@link #CLASS_SIGNATURE}, {@link #METHOD_SIGNATURE} and + * {@link #TYPE_SIGNATURE}. + * @param sv + * the visitor to which this adapter must delegate calls. May be + * null. */ - protected CheckSignatureAdapter( - final int api, - final int type, - final SignatureVisitor sv) - { + protected CheckSignatureAdapter(final int api, final int type, + final SignatureVisitor sv) { super(api); this.type = type; this.state = EMPTY; @@ -167,8 +172,7 @@ @Override public void visitFormalTypeParameter(final String name) { if (type == TYPE_SIGNATURE - || (state != EMPTY && state != FORMAL && state != BOUND)) - { + || (state != EMPTY && state != FORMAL && state != BOUND)) { throw new IllegalStateException(); } CheckMethodAdapter.checkIdentifier(name, "formal type parameter"); @@ -201,8 +205,7 @@ @Override public SignatureVisitor visitSuperclass() { - if (type != CLASS_SIGNATURE || (state & (EMPTY | FORMAL | BOUND)) == 0) - { + if (type != CLASS_SIGNATURE || (state & (EMPTY | FORMAL | BOUND)) == 0) { throw new IllegalArgumentException(); } state = SUPER; @@ -224,8 +227,7 @@ @Override public SignatureVisitor visitParameterType() { if (type != METHOD_SIGNATURE - || (state & (EMPTY | FORMAL | BOUND | PARAM)) == 0) - { + || (state & (EMPTY | FORMAL | BOUND | PARAM)) == 0) { throw new IllegalArgumentException(); } state = PARAM; @@ -236,8 +238,7 @@ @Override public SignatureVisitor visitReturnType() { if (type != METHOD_SIGNATURE - || (state & (EMPTY | FORMAL | BOUND | PARAM)) == 0) - { + || (state & (EMPTY | FORMAL | BOUND | PARAM)) == 0) { throw new IllegalArgumentException(); } state = RETURN;