+ * See {@link ConstantUtf8} class Javadoc for details. + *
+ * + * @param value the value. + * @return a new or cached instance of the given value. * @since 6.0 */ - public static ConstantUtf8 getCachedInstance(final String s) { - if (s.length() > MAX_CACHED_SIZE) { - skipped++; - return new ConstantUtf8(s); + public static ConstantUtf8 getCachedInstance(final String value) { + if (value.length() > Cache.MAX_ENTRY_SIZE) { + return new ConstantUtf8(value); } - considered++; + synchronized (ConstantUtf8.class) { // might be better with a specific lock object - ConstantUtf8 result = CACHE_HOLDER.CACHE.get(s); + ConstantUtf8 result = Cache.CACHE.get(value); if (result != null) { - hits++; - return result; - } - result = new ConstantUtf8(s); - CACHE_HOLDER.CACHE.put(s, result); + return result; + } + result = new ConstantUtf8(value); + Cache.CACHE.put(value, result); return result; } } /** + * Gets a new or cached instance of the given value. + *+ * See {@link ConstantUtf8} class Javadoc for details. + *
+ * + * @param dataInput the value. + * @return a new or cached instance of the given value. + * @throws IOException if an I/O error occurs. * @since 6.0 */ - public static ConstantUtf8 getInstance(final String s) { - return new ConstantUtf8(s); + public static ConstantUtf8 getInstance(final DataInput dataInput) throws IOException { + return getInstance(dataInput.readUTF()); } /** + * Gets a new or cached instance of the given value. + *+ * See {@link ConstantUtf8} class Javadoc for details. + *
+ * + * @param value the value. + * @return a new or cached instance of the given value. * @since 6.0 */ - public static ConstantUtf8 getInstance (final DataInput input) throws IOException { - return getInstance(input.readUTF()); + public static ConstantUtf8 getInstance(final String value) { + return Cache.isEnabled() ? getCachedInstance(value) : new ConstantUtf8(value); } + private final String value; + /** - * Initialize from another object. + * Initializes from another object. + * + * @param constantUtf8 the value. */ - public ConstantUtf8(final ConstantUtf8 c) { - this(c.getBytes()); + public ConstantUtf8(final ConstantUtf8 constantUtf8) { + this(constantUtf8.getBytes()); } - /** - * Initialize instance from file data. + * Initializes instance from file data. * - * @param file Input stream + * @param dataInput Input stream * @throws IOException */ - ConstantUtf8(final DataInput file) throws IOException { + ConstantUtf8(final DataInput dataInput) throws IOException { super(Const.CONSTANT_Utf8); - bytes = file.readUTF(); - created++; + value = dataInput.readUTF(); } - /** - * @param bytes Data + * @param value Data */ - public ConstantUtf8(final String bytes) { + public ConstantUtf8(final String value) { super(Const.CONSTANT_Utf8); - if (bytes == null) { - throw new IllegalArgumentException("bytes must not be null!"); + if (value == null) { + throw new IllegalArgumentException("Value must not be null."); } - this.bytes = bytes; - created++; + this.value = value; } - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. + * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. + * I.e., the hierarchy of methods, fields, attributes, etc. spawns a tree of objects. * * @param v Visitor object */ @Override - public void accept( final Visitor v ) { + public void accept(final Visitor v) { v.visitConstantUtf8(this); } - /** - * Dump String in Utf8 format to file stream. + * Dumps String in Utf8 format to file stream. * * @param file Output file stream * @throws IOException */ @Override - public final void dump( final DataOutputStream file ) throws IOException { + public void dump(final DataOutputStream file) throws IOException { file.writeByte(super.getTag()); - file.writeUTF(bytes); + file.writeUTF(value); } - /** * @return Data converted to string. */ - public final String getBytes() { - return bytes; + public String getBytes() { + return value; } - /** - * @param bytes the raw bytes of this Utf-8 + * @param bytes the raw bytes of this UTF-8 * @deprecated (since 6.0) */ @java.lang.Deprecated - public final void setBytes( final String bytes ) { + public void setBytes(final String bytes) { throw new UnsupportedOperationException(); } - /** * @return String representation */ @Override - public final String toString() { - return super.toString() + "(\"" + Utility.replace(bytes, "\n", "\\n") + "\")"; + public String toString() { + return super.toString() + "(\"" + Utility.replace(value, "\n", "\\n") + "\")"; } } diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java index f6b738f1776..6be8e237e1a 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java @@ -32,7 +32,6 @@ * value, i.e., a default value for initializing a class field. * This class is instantiated by the Attribute.readAttribute() method. * - * @version $Id$ * @see Attribute */ public final class ConstantValue extends Attribute { @@ -96,7 +95,7 @@ public void accept( final Visitor v ) { * @throws IOException */ @Override - public final void dump( final DataOutputStream file ) throws IOException { + public void dump( final DataOutputStream file ) throws IOException { super.dump(file); file.writeShort(constantvalue_index); } @@ -105,7 +104,7 @@ public final void dump( final DataOutputStream file ) throws IOException { /** * @return Index in constant pool of constant value. */ - public final int getConstantValueIndex() { + public int getConstantValueIndex() { return constantvalue_index; } @@ -113,7 +112,7 @@ public final int getConstantValueIndex() { /** * @param constantvalue_index the index info the constant pool of this constant value */ - public final void setConstantValueIndex( final int constantvalue_index ) { + public void setConstantValueIndex( final int constantvalue_index ) { this.constantvalue_index = constantvalue_index; } @@ -122,7 +121,7 @@ public final void setConstantValueIndex( final int constantvalue_index ) { * @return String representation of constant value. */ @Override - public final String toString() { + public String toString() { Constant c = super.getConstantPool().getConstant(constantvalue_index); String buf; int i; diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Deprecated.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Deprecated.java index 0216ae3e62b..5b530f59b1c 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Deprecated.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Deprecated.java @@ -31,7 +31,6 @@ * deprecated method. * It is instantiated from the Attribute.readAttribute() method. * - * @version $Id$ * @see Attribute */ public final class Deprecated extends Attribute { @@ -75,7 +74,7 @@ public Deprecated(final int name_index, final int length, final byte[] bytes, fi if (length > 0) { bytes = new byte[length]; input.readFully(bytes); - System.err.println("Deprecated attribute with length > 0"); + println("Deprecated attribute with length > 0"); } } @@ -100,7 +99,7 @@ public void accept( final Visitor v ) { * @throws IOException */ @Override - public final void dump( final DataOutputStream file ) throws IOException { + public void dump( final DataOutputStream file ) throws IOException { super.dump(file); if (super.getLength() > 0) { file.write(bytes, 0, super.getLength()); @@ -111,7 +110,7 @@ public final void dump( final DataOutputStream file ) throws IOException { /** * @return data bytes. */ - public final byte[] getBytes() { + public byte[] getBytes() { return bytes; } @@ -119,7 +118,7 @@ public final byte[] getBytes() { /** * @param bytes the raw bytes that represents this byte array */ - public final void setBytes( final byte[] bytes ) { + public void setBytes( final byte[] bytes ) { this.bytes = bytes; } @@ -128,7 +127,7 @@ public final void setBytes( final byte[] bytes ) { * @return attribute name */ @Override - public final String toString() { + public String toString() { return Const.getAttributeName(Const.ATTR_DEPRECATED); } diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java index 757789e3767..e57eec78311 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java @@ -26,7 +26,6 @@ * applied to all components of a JavaClass object. I.e. this class supplies the * traversal strategy, other classes can make use of it. * - * @version $Id$ */ public class DescendingVisitor implements Visitor { @@ -500,6 +499,21 @@ public void visitParameterAnnotation(final ParameterAnnotations obj) */ @Override public void visitMethodParameters(final MethodParameters obj) + { + stack.push(obj); + obj.accept(visitor); + final MethodParameter[] table = obj.getParameters(); + for (final MethodParameter element : table) { + element.accept(this); + } + stack.pop(); + } + + /** + * @since 6.4.0 + */ + @Override + public void visitMethodParameter(final MethodParameter obj) { stack.push(obj); obj.accept(visitor); @@ -553,4 +567,92 @@ public void visitConstantDynamic(final ConstantDynamic obj) { obj.accept(visitor); stack.pop(); } + + /** @since 6.4.0 */ + @Override + public void visitModule(final Module obj) { + stack.push(obj); + obj.accept(visitor); + final ModuleRequires[] rtable = obj.getRequiresTable(); + for (final ModuleRequires element : rtable) { + element.accept(this); + } + final ModuleExports[] etable = obj.getExportsTable(); + for (final ModuleExports element : etable) { + element.accept(this); + } + final ModuleOpens[] otable = obj.getOpensTable(); + for (final ModuleOpens element : otable) { + element.accept(this); + } + final ModuleProvides[] ptable = obj.getProvidesTable(); + for (final ModuleProvides element : ptable) { + element.accept(this); + } + stack.pop(); + } + + /** @since 6.4.0 */ + @Override + public void visitModuleRequires(final ModuleRequires obj) { + stack.push(obj); + obj.accept(visitor); + stack.pop(); + } + + /** @since 6.4.0 */ + @Override + public void visitModuleExports(final ModuleExports obj) { + stack.push(obj); + obj.accept(visitor); + stack.pop(); + } + + /** @since 6.4.0 */ + @Override + public void visitModuleOpens(final ModuleOpens obj) { + stack.push(obj); + obj.accept(visitor); + stack.pop(); + } + + /** @since 6.4.0 */ + @Override + public void visitModuleProvides(final ModuleProvides obj) { + stack.push(obj); + obj.accept(visitor); + stack.pop(); + } + + /** @since 6.4.0 */ + @Override + public void visitModulePackages(final ModulePackages obj) { + stack.push(obj); + obj.accept(visitor); + stack.pop(); + } + + /** @since 6.4.0 */ + @Override + public void visitModuleMainClass(final ModuleMainClass obj) { + stack.push(obj); + obj.accept(visitor); + stack.pop(); + } + + /** @since 6.4.0 */ + @Override + public void visitNestHost(final NestHost obj) { + stack.push(obj); + obj.accept(visitor); + stack.pop(); + } + + /** @since 6.4.0 */ + @Override + public void visitNestMembers(final NestMembers obj) { + stack.push(obj); + obj.accept(visitor); + stack.pop(); + } } diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValue.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValue.java index dd25eddd9c6..738776d78be 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValue.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValue.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -25,9 +25,8 @@ import java.io.IOException; /** - * @version $Id: ElementValue * @since 6.0 - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public abstract class ElementValue { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValuePair.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValuePair.java index 6744d1f098b..a1fa26593d6 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValuePair.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ElementValuePair.java @@ -29,7 +29,6 @@ /** * an annotation's element value pair * - * @version $Id: ElementValuePair * @since 6.0 */ public class ElementValuePair diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java index 0d9165a1558..231e4e64c1a 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java @@ -26,7 +26,6 @@ * with the DescendingVisitor class, e.g. By courtesy of David Spencer. * * @see DescendingVisitor - * @version $Id$ */ public class EmptyVisitor implements Visitor { @@ -279,6 +278,14 @@ public void visitMethodParameters(final MethodParameters obj) { } + /** + * @since 6.4.0 + */ + @Override + public void visitMethodParameter(final MethodParameter obj) + { + } + /** * @since 6.0 */ @@ -315,11 +322,55 @@ public void visitConstantPackage(final ConstantPackage constantPackage) { public void visitConstantModule(final ConstantModule constantModule) { } - /** * @since 6.3 */ @Override public void visitConstantDynamic(final ConstantDynamic obj) { } + + /** @since 6.4.0 */ + @Override + public void visitModule(final Module obj) { + } + + /** @since 6.4.0 */ + @Override + public void visitModuleRequires(final ModuleRequires obj) { + } + + /** @since 6.4.0 */ + @Override + public void visitModuleExports(final ModuleExports obj) { + } + + /** @since 6.4.0 */ + @Override + public void visitModuleOpens(final ModuleOpens obj) { + } + + /** @since 6.4.0 */ + @Override + public void visitModuleProvides(final ModuleProvides obj) { + } + + /** @since 6.4.0 */ + @Override + public void visitModulePackages(final ModulePackages obj) { + } + + /** @since 6.4.0 */ + @Override + public void visitModuleMainClass(final ModuleMainClass obj) { + } + + /** @since 6.4.0 */ + @Override + public void visitNestHost(final NestHost obj) { + } + + /** @since 6.4.0 */ + @Override + public void visitNestMembers(final NestMembers obj) { + } } diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java index a55d0f74e0d..b851792dff9 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java @@ -35,7 +35,6 @@ * attribute using the name Exceptions (which is inconsistent * with the other classes). * - * @version $Id$ * @see Code */ public final class ExceptionTable extends Attribute { @@ -103,7 +102,7 @@ public void accept( final Visitor v ) { * @throws IOException */ @Override - public final void dump( final DataOutputStream file ) throws IOException { + public void dump( final DataOutputStream file ) throws IOException { super.dump(file); file.writeShort(exception_index_table.length); for (final int index : exception_index_table) { @@ -115,7 +114,7 @@ public final void dump( final DataOutputStream file ) throws IOException { /** * @return Array of indices into constant pool of thrown exceptions. */ - public final int[] getExceptionIndexTable() { + public int[] getExceptionIndexTable() { return exception_index_table; } @@ -123,7 +122,7 @@ public final int[] getExceptionIndexTable() { /** * @return Length of exception table. */ - public final int getNumberOfExceptions() { + public int getNumberOfExceptions() { return exception_index_table == null ? 0 : exception_index_table.length; } @@ -131,7 +130,7 @@ public final int getNumberOfExceptions() { /** * @return class names of thrown exceptions */ - public final String[] getExceptionNames() { + public String[] getExceptionNames() { final String[] names = new String[exception_index_table.length]; for (int i = 0; i < exception_index_table.length; i++) { names[i] = super.getConstantPool().getConstantString(exception_index_table[i], @@ -145,7 +144,7 @@ public final String[] getExceptionNames() { * @param exception_index_table the list of exception indexes * Also redefines number_of_exceptions according to table length. */ - public final void setExceptionIndexTable( final int[] exception_index_table ) { + public void setExceptionIndexTable( final int[] exception_index_table ) { this.exception_index_table = exception_index_table != null ? exception_index_table : new int[0]; } @@ -154,7 +153,7 @@ public final void setExceptionIndexTable( final int[] exception_index_table ) { * @return String representation, i.e., a list of thrown exceptions. */ @Override - public final String toString() { + public String toString() { final StringBuilder buf = new StringBuilder(); String str; buf.append("Exceptions: "); diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Field.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Field.java index d320dfad08f..f3ad1c45f94 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Field.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Field.java @@ -33,7 +33,6 @@ * This class represents the field info structure, i.e., the representation * for a variable in the class. See JVM specification for details. * - * @version $Id$ */ public final class Field extends FieldOrMethod { @@ -104,7 +103,7 @@ public void accept( final Visitor v ) { /** * @return constant value associated with this field (may be null) */ - public final ConstantValue getConstantValue() { + public ConstantValue getConstantValue() { for (final Attribute attribute : super.getAttributes()) { if (attribute.getTag() == Const.ATTR_CONSTANT_VALUE) { return (ConstantValue) attribute; @@ -121,7 +120,7 @@ public final ConstantValue getConstantValue() { * @return String representation of field, including the signature. */ @Override - public final String toString() { + public String toString() { String name; String signature; String access; // Short cuts to constant pool @@ -149,7 +148,7 @@ public final String toString() { /** * @return deep copy of this field */ - public final Field copy( final ConstantPool _constant_pool ) { + public Field copy( final ConstantPool _constant_pool ) { return (Field) copy_(_constant_pool); } diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java index d27d1159e8f..40e3ad4675a 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -29,8 +29,7 @@ /** * Abstract super class for fields and methods. * - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public abstract class FieldOrMethod extends AccessFlags implements Cloneable, Node { private int name_index; // Points to field name in constant pool @@ -69,7 +68,8 @@ protected FieldOrMethod(final FieldOrMethod c) { * @deprecated (6.0) Use {@link #FieldOrMethod(java.io.DataInput, ConstantPool)} instead. */ @java.lang.Deprecated - protected FieldOrMethod(final DataInputStream file, final ConstantPool constant_pool) throws IOException, + protected FieldOrMethod(final DataInputStream file, final ConstantPool constant_pool) + throws IOException, ClassFormatException { this((DataInput) file, constant_pool); } @@ -80,8 +80,8 @@ protected FieldOrMethod(final DataInputStream file, final ConstantPool constant_ * @throws IOException * @throws ClassFormatException */ - protected FieldOrMethod(final DataInput file, - final ConstantPool constant_pool) throws IOException, ClassFormatException { + protected FieldOrMethod(final DataInput file, final ConstantPool constant_pool) + throws IOException, ClassFormatException { this(file.readUnsignedShort(), file.readUnsignedShort(), file.readUnsignedShort(), null, constant_pool); final int attributes_count = file.readUnsignedShort(); diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClass.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClass.java index baecba1a7f8..6f2078d6285 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClass.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClass.java @@ -32,7 +32,6 @@ * indices of the inner and outer classes, the name and the attributes * of the inner class. * - * @version $Id$ * @see InnerClasses */ public final class InnerClass implements Cloneable, Node { @@ -97,7 +96,7 @@ public void accept( final Visitor v ) { * @param file Output file stream * @throws IOException */ - public final void dump( final DataOutputStream file ) throws IOException { + public void dump( final DataOutputStream file ) throws IOException { file.writeShort(inner_class_index); file.writeShort(outer_class_index); file.writeShort(inner_name_index); @@ -108,7 +107,7 @@ public final void dump( final DataOutputStream file ) throws IOException { /** * @return access flags of inner class. */ - public final int getInnerAccessFlags() { + public int getInnerAccessFlags() { return inner_access_flags; } @@ -116,7 +115,7 @@ public final int getInnerAccessFlags() { /** * @return class index of inner class. */ - public final int getInnerClassIndex() { + public int getInnerClassIndex() { return inner_class_index; } @@ -124,7 +123,7 @@ public final int getInnerClassIndex() { /** * @return name index of inner class. */ - public final int getInnerNameIndex() { + public int getInnerNameIndex() { return inner_name_index; } @@ -132,7 +131,7 @@ public final int getInnerNameIndex() { /** * @return class index of outer class. */ - public final int getOuterClassIndex() { + public int getOuterClassIndex() { return outer_class_index; } @@ -140,7 +139,7 @@ public final int getOuterClassIndex() { /** * @param inner_access_flags access flags for this inner class */ - public final void setInnerAccessFlags( final int inner_access_flags ) { + public void setInnerAccessFlags( final int inner_access_flags ) { this.inner_access_flags = inner_access_flags; } @@ -148,7 +147,7 @@ public final void setInnerAccessFlags( final int inner_access_flags ) { /** * @param inner_class_index index into the constant pool for this class */ - public final void setInnerClassIndex( final int inner_class_index ) { + public void setInnerClassIndex( final int inner_class_index ) { this.inner_class_index = inner_class_index; } @@ -156,7 +155,7 @@ public final void setInnerClassIndex( final int inner_class_index ) { /** * @param inner_name_index index into the constant pool for this class's name */ - public final void setInnerNameIndex( final int inner_name_index ) { // TODO unused + public void setInnerNameIndex( final int inner_name_index ) { // TODO unused this.inner_name_index = inner_name_index; } @@ -164,7 +163,7 @@ public final void setInnerNameIndex( final int inner_name_index ) { // TODO unus /** * @param outer_class_index index into the constant pool for the owning class */ - public final void setOuterClassIndex( final int outer_class_index ) { // TODO unused + public void setOuterClassIndex( final int outer_class_index ) { // TODO unused this.outer_class_index = outer_class_index; } @@ -173,7 +172,7 @@ public final void setOuterClassIndex( final int outer_class_index ) { // TODO un * @return String representation. */ @Override - public final String toString() { + public String toString() { return "InnerClass(" + inner_class_index + ", " + outer_class_index + ", " + inner_name_index + ", " + inner_access_flags + ")"; } @@ -182,16 +181,16 @@ public final String toString() { /** * @return Resolved string representation */ - public final String toString( final ConstantPool constant_pool ) { + public String toString( final ConstantPool constant_pool ) { String outer_class_name; String inner_name; String inner_class_name = constant_pool.getConstantString(inner_class_index, Const.CONSTANT_Class); - inner_class_name = Utility.compactClassName(inner_class_name); + inner_class_name = Utility.compactClassName(inner_class_name, false); if (outer_class_index != 0) { outer_class_name = constant_pool.getConstantString(outer_class_index, Const.CONSTANT_Class); - outer_class_name = " of class " + Utility.compactClassName(outer_class_name); + outer_class_name = " of class " + Utility.compactClassName(outer_class_name, false); } else { outer_class_name = ""; } diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java index 9deac3e83f8..24cbb3f58c1 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java @@ -33,7 +33,6 @@ * to the source file of this class. * It is instantiated from the Attribute.readAttribute() method. * - * @version $Id$ * @see Attribute */ public final class InnerClasses extends Attribute { @@ -103,7 +102,7 @@ public void accept( final Visitor v ) { * @throws IOException */ @Override - public final void dump( final DataOutputStream file ) throws IOException { + public void dump( final DataOutputStream file ) throws IOException { super.dump(file); file.writeShort(inner_classes.length); for (final InnerClass inner_class : inner_classes) { @@ -115,7 +114,7 @@ public final void dump( final DataOutputStream file ) throws IOException { /** * @return array of inner class "records" */ - public final InnerClass[] getInnerClasses() { + public InnerClass[] getInnerClasses() { return inner_classes; } @@ -123,7 +122,7 @@ public final InnerClass[] getInnerClasses() { /** * @param inner_classes the array of inner classes */ - public final void setInnerClasses( final InnerClass[] inner_classes ) { + public void setInnerClasses( final InnerClass[] inner_classes ) { this.inner_classes = inner_classes != null ? inner_classes : new InnerClass[0]; } @@ -132,7 +131,7 @@ public final void setInnerClasses( final InnerClass[] inner_classes ) { * @return String representation. */ @Override - public final String toString() { + public String toString() { final StringBuilder buf = new StringBuilder(); buf.append("InnerClasses("); buf.append(inner_classes.length); @@ -140,7 +139,7 @@ public final String toString() { for (final InnerClass inner_class : inner_classes) { buf.append(inner_class.toString(super.getConstantPool())).append("\n"); } - return buf.toString(); + return buf.substring(0, buf.length()-1); // remove the last newline } diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/JavaClass.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/JavaClass.java index cde620eae6e..f74aa6eabcb 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/JavaClass.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/JavaClass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -39,16 +39,15 @@ import com.sun.org.apache.bcel.internal.util.SyntheticRepository; /** - * Represents a Java class, i.e., the data structures, constant pool, fields, - * methods and commands contained in a Java .class file. See JVM specification for - * details. The intent of this class is to represent a parsed or otherwise - * existing class file. Those interested in programatically generating classes + * Represents a Java class, i.e., the data structures, constant pool, + * fields, methods and commands contained in a Java .class file. + * See JVM specification for details. + * The intent of this class is to represent a parsed or otherwise existing + * class file. Those interested in programatically generating classes * should see the ClassGen class. - * @version $Id$ * @see com.sun.org.apache.bcel.internal.generic.ClassGen - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class JavaClass extends AccessFlags implements Cloneable, Node, Comparable- * <return_signature> ::= <field_type> | V - *- * - * The character V indicates that the method returns no value. Otherwise, the - * signature indicates the type of the return value. - * An argument signature represents an argument passed to a method: - * - *
- * <argument_signature> ::= <field_type> - *- * - * A method signature represents the arguments that the method expects, and - * the value that it returns. - *
- * <method_signature> ::= (<arguments_signature>) <return_signature> - * <arguments_signature>::= <argument_signature>* - *- * - * This method converts such a string into a Java type declaration like + * This method converts a method signature string into a Java type declaration like * `void main(String[])' and throws a `ClassFormatException' when the parsed * type is invalid. * * @param signature Method signature * @param name Method name * @param access Method access rights - * @param chopit - * @param vars + * @param chopit flag that determines whether chopping is executed or not + * @param vars the LocalVariableTable for the method * @return Java type declaration - * @throws ClassFormatException + * @throws ClassFormatException */ public static String methodSignatureToString( final String signature, final String name, final String access, final boolean chopit, final LocalVariableTable vars ) throws ClassFormatException { @@ -689,13 +688,14 @@ public static String methodSignatureToString( final String signature, final Stri String type; int index; int var_index = access.contains("static") ? 0 : 1; - try { // Read all declarations between for `(' and `)' - if (signature.charAt(0) != '(') { + try { + // Skip any type arguments to read argument declarations between `(' and `)' + index = signature.indexOf('(') + 1; + if (index <= 0) { throw new ClassFormatException("Invalid method signature: " + signature); } - index = 1; // current string position while (signature.charAt(index) != ')') { - final String param_type = signatureToString(signature.substring(index), chopit); + final String param_type = typeSignatureToString(signature.substring(index), chopit); buf.append(param_type); if (vars != null) { final LocalVariable l = vars.getLocalVariable(var_index, 0); @@ -716,10 +716,11 @@ public static String methodSignatureToString( final String signature, final Stri } index++; // update position // Read return type after `)' - type = signatureToString(signature.substring(index), chopit); + type = typeSignatureToString(signature.substring(index), chopit); } catch (final StringIndexOutOfBoundsException e) { // Should never occur throw new ClassFormatException("Invalid method signature: " + signature, e); } + // ignore any throws information in the signature if (buf.length() > 1) { buf.setLength(buf.length() - 2); } @@ -729,7 +730,6 @@ public static String methodSignatureToString( final String signature, final Stri } - // Guess what this does private static int pow2( final int n ) { return 1 << n; } @@ -767,10 +767,40 @@ public static String replace( String str, final String old, final String new_ ) /** - * Converts signature to string with all class names compacted. + * WARNING: * - * @param signature to convert - * @return Human readable signature + * There is some nomenclature confusion through much of the BCEL code base with + * respect to the terms Descriptor and Signature. For the offical definitions see: + * + * @see + * Descriptors in The Java Virtual Machine Specification + * + * @see + * Signatures in The Java Virtual Machine Specification + * + * In brief, a descriptor is a string representing the type of a field or method. + * Signatures are similar, but more complex. Signatures are used to encode declarations + * written in the Java programming language that use types outside the type system of the + * Java Virtual Machine. They are used to describe the type of any class, interface, + * constructor, method or field whose declaration uses type variables or parameterized types. + * + * To parse a descriptor, call typeSignatureToString. + * To parse a signature, call signatureToString. + * + * Note that if the signature string is a single, non-generic item, the call to + * signatureToString reduces to a call to typeSignatureToString. + * Also note, that if you only wish to parse the first item in a longer signature + * string, you should call typeSignatureToString directly. + */ + + + /** + * Converts a signature to a string with all class names compacted. + * Class, Method and Type signatures are supported. + * Enum and Interface signatures are not supported. + * + * @param signature signature to convert + * @return String containg human readable signature */ public static String signatureToString( final String signature ) { return signatureToString(signature, true); @@ -778,40 +808,158 @@ public static String signatureToString( final String signature ) { /** - * The field signature represents the value of an argument to a function or - * the value of a variable. It is a series of bytes generated by the - * following grammar: + * Converts a signature to a string. + * Class, Method and Type signatures are supported. + * Enum and Interface signatures are not supported. + * + * @param signature signature to convert + * @param chopit flag that determines whether chopping is executed or not + * @return String containg human readable signature + */ + public static String signatureToString( final String signature, final boolean chopit ) { + String type = ""; + String typeParams = ""; + int index = 0; + if (signature.charAt(0) == '<') { + // we have type paramters + typeParams = typeParamTypesToString(signature, chopit); + index += unwrap(consumed_chars); // update position + } + if (signature.charAt(index) == '(') { + // We have a Method signature. + // add types of arguments + type = typeParams + typeSignaturesToString(signature.substring(index), chopit, ')'); + index += unwrap(consumed_chars); // update position + // add return type + type = type + typeSignatureToString(signature.substring(index), chopit); + index += unwrap(consumed_chars); // update position + // ignore any throws information in the signature + return type; + } else { + // Could be Class or Type... + type = typeSignatureToString(signature.substring(index), chopit); + index += unwrap(consumed_chars); // update position + if ((typeParams.length() == 0) && (index == signature.length())) { + // We have a Type signature. + return type; + } + // We have a Class signature. + final StringBuilder typeClass = new StringBuilder(typeParams); + typeClass.append(" extends "); + typeClass.append(type); + if (index < signature.length()) { + typeClass.append(" implements "); + typeClass.append(typeSignatureToString(signature.substring(index), chopit)); + index += unwrap(consumed_chars); // update position + } + while (index < signature.length()) { + typeClass.append(", "); + typeClass.append(typeSignatureToString(signature.substring(index), chopit)); + index += unwrap(consumed_chars); // update position + } + return typeClass.toString(); + } + } + + + /** + * Converts a type parameter list signature to a string. * - *
- * <field_signature> ::= <field_type> - * <field_type> ::= <base_type>|<object_type>|<array_type> - * <base_type> ::= B|C|D|F|I|J|S|Z - * <object_type> ::= L<fullclassname>; - * <array_type> ::= [<field_type> + * @param signature signature to convert + * @param chopit flag that determines whether chopping is executed or not + * @return String containg human readable signature + */ + private static String typeParamTypesToString( final String signature, final boolean chopit ) { + // The first character is guranteed to be '<' + final StringBuilder typeParams = new StringBuilder("<"); + int index = 1; // skip the '<' + // get the first TypeParameter + typeParams.append(typeParamTypeToString(signature.substring(index), chopit)); + index += unwrap(consumed_chars); // update position + // are there more TypeParameters? + while (signature.charAt(index) != '>') { + typeParams.append(", "); + typeParams.append(typeParamTypeToString(signature.substring(index), chopit)); + index += unwrap(consumed_chars); // update position + } + wrap(consumed_chars, index + 1); // account for the '>' char + return typeParams.append(">").toString(); + } + + + /** + * Converts a type parameter signature to a string. * - * The meaning of the base types is as follows: - * B byte signed byte - * C char character - * D double double precision IEEE float - * F float single precision IEEE float - * I int integer - * J long long integer - * L<fullclassname>; ... an object of the given class - * S short signed short - * Z boolean true or false - * [<field sig> ... array - *+ * @param signature signature to convert + * @param chopit flag that determines whether chopping is executed or not + * @return String containg human readable signature + */ + private static String typeParamTypeToString( final String signature, final boolean chopit ) { + int index = signature.indexOf(':'); + if (index <= 0) { + throw new ClassFormatException("Invalid type parameter signature: " + signature); + } + // get the TypeParameter identifier + final StringBuilder typeParam = new StringBuilder(signature.substring(0, index)); + index++; // account for the ':' + if (signature.charAt(index) != ':') { + // we have a class bound + typeParam.append(" extends "); + typeParam.append(typeSignatureToString(signature.substring(index), chopit)); + index += unwrap(consumed_chars); // update position + } + // look for interface bounds + while (signature.charAt(index) == ':') { + index++; // skip over the ':' + typeParam.append(" & "); + typeParam.append(typeSignatureToString(signature.substring(index), chopit)); + index += unwrap(consumed_chars); // update position + } + wrap(consumed_chars, index); + return typeParam.toString(); + } + + + /** + * Converts a list of type signatures to a string. * - * This method converts this string into a Java type declaration such as - * `String[]' and throws a `ClassFormatException' when the parsed type is - * invalid. + * @param signature signature to convert + * @param chopit flag that determines whether chopping is executed or not + * @param term character indicating the end of the list + * @return String containg human readable signature + */ + private static String typeSignaturesToString( final String signature, final boolean chopit, final char term ) { + // The first character will be an 'open' that matches the 'close' contained in term. + final StringBuilder typeList = new StringBuilder(signature.substring(0, 1)); + int index = 1; // skip the 'open' character + // get the first Type in the list + if (signature.charAt(index) != term) { + typeList.append(typeSignatureToString(signature.substring(index), chopit)); + index += unwrap(consumed_chars); // update position + } + // are there more types in the list? + while (signature.charAt(index) != term) { + typeList.append(", "); + typeList.append(typeSignatureToString(signature.substring(index), chopit)); + index += unwrap(consumed_chars); // update position + } + wrap(consumed_chars, index + 1); // account for the term char + return typeList.append(term).toString(); + } + + + /** * - * @param signature Class signature - * @param chopit Flag that determines whether chopping is executed or not - * @return Java type declaration + * This method converts a type signature string into a Java type declaration such as + * `String[]' and throws a `ClassFormatException' when the parsed type is invalid. + * + * @param signature type signature + * @param chopit flag that determines whether chopping is executed or not + * @return string containing human readable type signature * @throws ClassFormatException + * @since 6.4.0 */ - public static String signatureToString( final String signature, final boolean chopit ) { + public static String typeSignatureToString( final String signature, final boolean chopit ) throws ClassFormatException { //corrected concurrent private static field acess wrap(consumed_chars, 1); // This is the default, read just one char like `B' try { @@ -831,7 +979,7 @@ public static String signatureToString( final String signature, final boolean ch case 'T': { // TypeVariableSignature final int index = signature.indexOf(';'); // Look for closing `;' if (index < 0) { - throw new ClassFormatException("Invalid signature: " + signature); + throw new ClassFormatException("Invalid type variable signature: " + signature); } //corrected concurrent private static field acess wrap(consumed_chars, index + 1); // "Tblabla;" `T' and `;' are removed @@ -891,7 +1039,7 @@ public static String signatureToString( final String signature, final boolean ch type.append("?"); consumed_chars++; } else { - type.append(signatureToString(signature.substring(consumed_chars), chopit)); + type.append(typeSignatureToString(signature.substring(consumed_chars), chopit)); // update our consumed count by the number of characters the for type argument consumed_chars = unwrap(Utility.consumed_chars) + consumed_chars; wrap(Utility.consumed_chars, consumed_chars); @@ -912,7 +1060,7 @@ public static String signatureToString( final String signature, final boolean ch type.append("?"); consumed_chars++; } else { - type.append(signatureToString(signature.substring(consumed_chars), chopit)); + type.append(typeSignatureToString(signature.substring(consumed_chars), chopit)); // update our consumed count by the number of characters the for type argument consumed_chars = unwrap(Utility.consumed_chars) + consumed_chars; wrap(Utility.consumed_chars, consumed_chars); @@ -928,7 +1076,7 @@ public static String signatureToString( final String signature, final boolean ch type.append("."); // convert SimpleClassTypeSignature to fake ClassTypeSignature // and then recurse to parse it - type.append(signatureToString("L" + signature.substring(consumed_chars+1), chopit)); + type.append(typeSignatureToString("L" + signature.substring(consumed_chars+1), chopit)); // update our consumed count by the number of characters the for type argument // note that this count includes the "L" we added, but that is ok // as it accounts for the "." we didn't consume @@ -958,7 +1106,7 @@ public static String signatureToString( final String signature, final boolean ch } consumed_chars = n; // Remember value // The rest of the string denotes a `
Stack: ..., arrayref, index -> value* - * @version $Id$ */ public class AALOAD extends ArrayInstruction implements StackProducer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AASTORE.java index ca2503f4d59..1dab21a2ff5 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AASTORE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AASTORE.java @@ -25,7 +25,6 @@ * AASTORE - Store into reference array *
Stack: ..., arrayref, index, value -> ...* - * @version $Id$ */ public class AASTORE extends ArrayInstruction implements StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java index dd9797d9708..a15aa1af40d 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java @@ -25,7 +25,6 @@ * ACONST_NULL - Push null reference *
Stack: ... -> ..., null* - * @version $Id$ */ public class ACONST_NULL extends Instruction implements PushInstruction, TypedInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ALOAD.java index f053605e384..ec2bcb657b0 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ALOAD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ALOAD.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -26,8 +26,7 @@ * ALOAD - Load reference from local variable *
Stack: ... -> ..., objectref* - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class ALOAD extends LoadInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java index 33bf0b98dc1..f81d6213ae5 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java @@ -27,7 +27,6 @@ * ANEWARRAY - Create new array of references *
Stack: ..., count -> ..., arrayref* - * @version $Id$ */ public class ANEWARRAY extends CPInstruction implements LoadClass, AllocationInstruction, ExceptionThrower, StackConsumer, StackProducer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARETURN.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARETURN.java index 52b55f94827..7231236e28b 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARETURN.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARETURN.java @@ -25,7 +25,6 @@ * ARETURN - Return reference from method *
Stack: ..., objectref -> <empty>* - * @version $Id$ */ public class ARETURN extends ReturnInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java index b52e8834870..287a86de707 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -26,7 +26,6 @@ * ARRAYLENGTH - Get length of array *
Stack: ..., arrayref -> ..., length* - * @version $Id$ * @LastModified: Jun 2019 */ public class ARRAYLENGTH extends Instruction diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ASTORE.java index 349a238fc06..e68b2935762 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ASTORE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ASTORE.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -25,8 +25,7 @@ * ASTORE - Store reference into local variable *
Stack ..., objectref -> ...* - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class ASTORE extends StoreInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java index c94c24a0d6e..50d38bc353c 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -26,8 +26,7 @@ * ATHROW - Throw exception *
Stack: ..., objectref -> objectref* - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class ATHROW extends Instruction implements UnconditionalBranch, ExceptionThrower { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java index c82cd553913..bf88d81087c 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java @@ -24,7 +24,6 @@ /** * Denote family of instructions that allocates space in the heap. * - * @version $Id$ */ public interface AllocationInstruction { } diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AnnotationEntryGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AnnotationEntryGen.java index c3edddc60c7..0223ee1b598 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AnnotationEntryGen.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AnnotationEntryGen.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -40,7 +40,7 @@ /** * @since 6.0 - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class AnnotationEntryGen { private int typeIndex; diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java index 25c8f0e6c86..cea2317e395 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java @@ -26,7 +26,6 @@ /** * Super class for the family of arithmetic instructions. * - * @version $Id$ */ public abstract class ArithmeticInstruction extends Instruction implements TypedInstruction, StackProducer, StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java index 8a017f03fda..f38e6bb0d12 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java @@ -26,7 +26,6 @@ /** * Super class for instructions dealing with array access such as IALOAD. * - * @version $Id$ */ public abstract class ArrayInstruction extends Instruction implements ExceptionThrower, TypedInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayType.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayType.java index 0854bfcc436..68de2f36da0 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayType.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayType.java @@ -25,7 +25,6 @@ /** * Denotes array type, such as int[][] * - * @version $Id$ */ public final class ArrayType extends ReferenceType { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BALOAD.java index 1d95fb5db9c..27f11125889 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BALOAD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BALOAD.java @@ -24,7 +24,6 @@ * BALOAD - Load byte or boolean from array *
Stack: ..., arrayref, index -> ..., value* - * @version $Id$ */ public class BALOAD extends ArrayInstruction implements StackProducer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BASTORE.java index 3e63174ce18..9a71e9f6e1b 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BASTORE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BASTORE.java @@ -24,7 +24,6 @@ * BASTORE - Store into byte or boolean array *
Stack: ..., arrayref, index, value -> ...* - * @version $Id$ */ public class BASTORE extends ArrayInstruction implements StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BIPUSH.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BIPUSH.java index 75f74e5aefb..d5cd303508e 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BIPUSH.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BIPUSH.java @@ -29,7 +29,6 @@ * *
Stack: ... -> ..., value* - * @version $Id$ */ public class BIPUSH extends Instruction implements ConstantPushInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java index 9fc2c1690f3..857f628df51 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java @@ -23,7 +23,6 @@ /** * BREAKPOINT, JVM dependent, ignored by default * - * @version $Id$ */ public class BREAKPOINT extends Instruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BasicType.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BasicType.java index 4ac8c7ae26a..8d201b861a3 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BasicType.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BasicType.java @@ -25,7 +25,6 @@ /** * Denotes basic type such as int. * - * @version $Id$ */ public final class BasicType extends Type { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchHandle.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchHandle.java index 90d9d9fe83f..d35800d4d96 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchHandle.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchHandle.java @@ -29,7 +29,6 @@ * @see InstructionHandle * @see Instruction * @see InstructionList - * @version $Id$ */ public final class BranchHandle extends InstructionHandle { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java index 5abeeb7e450..e650bea8ec5 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CALOAD.java index b27cf469a13..750a6948bbc 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CALOAD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CALOAD.java @@ -25,7 +25,6 @@ * CALOAD - Load char from array *
Stack: ..., arrayref, index -> ..., value* - * @version $Id$ */ public class CALOAD extends ArrayInstruction implements StackProducer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CASTORE.java index 3d2975f0dd7..499de83b9dd 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CASTORE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CASTORE.java @@ -25,7 +25,6 @@ * CASTORE - Store into char array *
Stack: ..., arrayref, index, value -> ...* - * @version $Id$ */ public class CASTORE extends ArrayInstruction implements StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java index b47f460ee52..a329f359f5f 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java @@ -27,7 +27,6 @@ * CHECKCAST - Check whether object is of given type *
Stack: ..., objectref -> ..., objectref* - * @version $Id$ */ public class CHECKCAST extends CPInstruction implements LoadClass, ExceptionThrower, StackProducer, StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CPInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CPInstruction.java index 56c2c498dfe..5f904459751 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CPInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CPInstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -35,8 +35,7 @@ * @see LDC * @see INVOKEVIRTUAL * - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public abstract class CPInstruction extends Instruction implements TypedInstruction, IndexedInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGen.java index bc713f040c3..cd3de5a3228 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGen.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGen.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -42,8 +42,7 @@ * existing java class (file). * * @see JavaClass - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class ClassGen extends AccessFlags implements Cloneable { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGenException.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGenException.java index 899fe60b399..8fd54651af8 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGenException.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGenException.java @@ -25,7 +25,6 @@ * Thrown on internal errors. Extends RuntimeException so it hasn't to be declared * in the throws clause every time. * - * @version $Id$ */ public class ClassGenException extends RuntimeException { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassObserver.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassObserver.java index 485120279c9..62ec3139efe 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassObserver.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassObserver.java @@ -25,7 +25,6 @@ * Implement this interface if you're interested in changes to a ClassGen object * and register yourself with addObserver(). * - * @version $Id$ */ public interface ClassObserver { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java index c95cfe038fa..1915d9274c5 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java @@ -31,7 +31,6 @@ * The end of the region is automatically mapped to be exclusive when calling * getCodeException(), i.e., there is no difference semantically. * - * @version $Id$ * @see MethodGen * @see CodeException * @see InstructionHandle diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java index e6a109a40e5..f487d51fcfd 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java @@ -32,7 +32,6 @@ * The interface provides the possibilty for the user to write * `templates' or `macros' for such reuseable code patterns. * - * @version $Id$ * @see PUSH * @see SWITCH */ diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java index c689298e07f..b430b6e2c4e 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -49,9 +49,8 @@ * Constants.MAX_SHORT entries. Note that the first (0) is used by the * JVM and that Double and Long constants need two slots. * - * @version $Id$ * @see Constant - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class ConstantPoolGen { @@ -182,6 +181,10 @@ public ConstantPoolGen(final Constant[] cs) { // TODO should this be handled somehow? } else if (c instanceof com.sun.org.apache.bcel.internal.classfile.ConstantMethodHandle) { // TODO should this be handled somehow? + } else if (c instanceof com.sun.org.apache.bcel.internal.classfile.ConstantModule) { + // TODO should this be handled somehow? + } else if (c instanceof com.sun.org.apache.bcel.internal.classfile.ConstantPackage) { + // TODO should this be handled somehow? } else { assert false : "Unexpected constant type: " + c.getClass().getName(); } diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java index 93b1df6443b..3d752246a59 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java @@ -25,7 +25,6 @@ * Denotes a push instruction that produces a literal on the stack * such as SIPUSH, BIPUSH, ICONST, etc. * - * @version $Id$ * @see ICONST * @see SIPUSH diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java index 5f9f7a7842d..20750fefb54 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java @@ -26,7 +26,6 @@ /** * Super class for the x2y family of instructions. * - * @version $Id$ */ public abstract class ConversionInstruction extends Instruction implements TypedInstruction, StackProducer, StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2F.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2F.java index 702215ceb1b..e857a41f5ee 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2F.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2F.java @@ -25,7 +25,6 @@ * D2F - Convert double to float *
Stack: ..., value.word1, value.word2 -> ..., result* - * @version $Id$ */ public class D2F extends ConversionInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2I.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2I.java index 1856b27efd7..97519bb5f8a 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2I.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2I.java @@ -25,7 +25,6 @@ * D2I - Convert double to int *
Stack: ..., value.word1, value.word2 -> ..., result* - * @version $Id$ */ public class D2I extends ConversionInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2L.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2L.java index 7f06775a0cf..975eec6a39d 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2L.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2L.java @@ -25,7 +25,6 @@ * D2L - Convert double to long *
Stack: ..., value.word1, value.word2 -> ..., result.word1, result.word2* - * @version $Id$ */ public class D2L extends ConversionInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DADD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DADD.java index 9caeaf4958d..8c787b60b66 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DADD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DADD.java @@ -26,7 +26,6 @@ *
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->* ..., result.word1, result1.word2 * - * @version $Id$ */ public class DADD extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DALOAD.java index 6f3de239fad..3f901b335d3 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DALOAD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DALOAD.java @@ -25,7 +25,6 @@ * DALOAD - Load double from array *
Stack: ..., arrayref, index -> ..., result.word1, result.word2* - * @version $Id$ */ public class DALOAD extends ArrayInstruction implements StackProducer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DASTORE.java index 4e53efda9c7..53178fc3108 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DASTORE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DASTORE.java @@ -25,7 +25,6 @@ * DASTORE - Store into double array *
Stack: ..., arrayref, index, value.word1, value.word2 -> ...* - * @version $Id$ */ public class DASTORE extends ArrayInstruction implements StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPG.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPG.java index 6a7515b56ca..338c5906d6a 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPG.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPG.java @@ -25,7 +25,6 @@ * DCMPG - Compare doubles: value1 > value2 *
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 -> ..., result* - * @version $Id$ */ public class DCMPG extends Instruction implements TypedInstruction, StackProducer, StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPL.java index efad54a7919..e654310fe99 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPL.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPL.java @@ -25,7 +25,6 @@ * DCMPL - Compare doubles: value1 < value2 *
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 -> ..., result* - * @version $Id$ */ public class DCMPL extends Instruction implements TypedInstruction, StackProducer, StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java index fa447c43a20..39375bd5a89 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -25,8 +25,7 @@ * *
Stack: ... -> ...,* - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class DCONST extends Instruction implements ConstantPushInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DDIV.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DDIV.java index 1d02bbd289f..ae43ba11ace 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DDIV.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DDIV.java @@ -26,7 +26,6 @@ *
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->* ..., result.word1, result.word2 * - * @version $Id$ */ public class DDIV extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DLOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DLOAD.java index b1b9ff36a27..e13896bb009 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DLOAD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DLOAD.java @@ -25,7 +25,6 @@ * DLOAD - Load double from local variable *
Stack ... -> ..., result.word1, result.word2* - * @version $Id$ */ public class DLOAD extends LoadInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DMUL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DMUL.java index 990bc141184..98ee17fad47 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DMUL.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DMUL.java @@ -26,7 +26,6 @@ *
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->* ..., result.word1, result.word2 * - * @version $Id$ */ public class DMUL extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DNEG.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DNEG.java index 1c261102edf..42043492537 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DNEG.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DNEG.java @@ -25,7 +25,6 @@ * DNEG - Negate double *
Stack: ..., value.word1, value.word2 -> ..., result.word1, result.word2* - * @version $Id$ */ public class DNEG extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DREM.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DREM.java index 92bd9dbac93..41ad3be2165 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DREM.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DREM.java @@ -26,7 +26,6 @@ *
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->* ..., result.word1, result.word2 * - * @version $Id$ */ public class DREM extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DRETURN.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DRETURN.java index 61ff6f2d969..929ba33ef5f 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DRETURN.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DRETURN.java @@ -25,7 +25,6 @@ * DRETURN - Return double from method *
Stack: ..., value.word1, value.word2 -> <empty>* - * @version $Id$ */ public class DRETURN extends ReturnInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSTORE.java index a5ae09bc996..aad12e19aeb 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSTORE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSTORE.java @@ -25,7 +25,6 @@ * DSTORE - Store double into local variable *
Stack: ..., value.word1, value.word2 -> ...* - * @version $Id$ */ public class DSTORE extends StoreInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSUB.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSUB.java index 9459c605e3d..efe66fb3b43 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSUB.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSUB.java @@ -26,7 +26,6 @@ *
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->* ..., result.word1, result.word2 * - * @version $Id$ */ public class DSUB extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP.java index 52c679a9710..8f697a29d73 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP.java @@ -25,7 +25,6 @@ * DUP - Duplicate top operand stack word *
Stack: ..., word -> ..., word, word* - * @version $Id$ */ public class DUP extends StackInstruction implements PushInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2.java index 391c9145ccf..c3560979377 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2.java @@ -25,7 +25,6 @@ * DUP2 - Duplicate two top operand stack words *
Stack: ..., word2, word1 -> ..., word2, word1, word2, word1* - * @version $Id$ */ public class DUP2 extends StackInstruction implements PushInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java index 57ad58473ab..b2c90b428b1 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java @@ -25,7 +25,6 @@ * DUP2_X1 - Duplicate two top operand stack words and put three down *
Stack: ..., word3, word2, word1 -> ..., word2, word1, word3, word2, word1* - * @version $Id$ */ public class DUP2_X1 extends StackInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java index 32d7037ba1f..74ed06ef58b 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java @@ -25,7 +25,6 @@ * DUP2_X2 - Duplicate two top operand stack words and put four down *
Stack: ..., word4, word3, word2, word1 -> ..., word2, word1, word4, word3, word2, word1* - * @version $Id$ */ public class DUP2_X2 extends StackInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X1.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X1.java index 65f3bf8f1e7..81b1e01f0db 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X1.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X1.java @@ -25,7 +25,6 @@ * DUP_X1 - Duplicate top operand stack word and put two down *
Stack: ..., word2, word1 -> ..., word1, word2, word1* - * @version $Id$ */ public class DUP_X1 extends StackInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X2.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X2.java index e23167b06fd..344f0068e2f 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X2.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X2.java @@ -25,7 +25,6 @@ * DUP_X2 - Duplicate top operand stack word and put three down *
Stack: ..., word3, word2, word1 -> ..., word1, word3, word2, word1* - * @version $Id$ */ public class DUP_X2 extends StackInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ElementValueGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ElementValueGen.java index 50569636ab1..0e730e6b66b 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ElementValueGen.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ElementValueGen.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -34,7 +34,7 @@ /** * @since 6.0 - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public abstract class ElementValueGen { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java index e60b5c676bf..5ae39f2d4ad 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java @@ -24,7 +24,6 @@ /** * Supplies empty method bodies to be overridden by subclasses. * - * @version $Id$ */ public abstract class EmptyVisitor implements Visitor { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java index 72d9eb7da4f..9d6adb4e6c3 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java @@ -38,7 +38,6 @@ * "Throwable" object; so this term is equally used for "Exception" * and "Error" objects. * - * @version $Id$ */ public interface ExceptionThrower { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2D.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2D.java index 87da082b63f..a49d9bb7b18 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2D.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2D.java @@ -25,7 +25,6 @@ * F2D - Convert float to double *
Stack: ..., value -> ..., result.word1, result.word2* - * @version $Id$ */ public class F2D extends ConversionInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2I.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2I.java index 1ad2b52790c..f3bd65485ef 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2I.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2I.java @@ -25,7 +25,6 @@ * F2I - Convert float to int *
Stack: ..., value -> ..., result* - * @version $Id$ */ public class F2I extends ConversionInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2L.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2L.java index 7d53e14d154..8d0ed680c1b 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2L.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2L.java @@ -25,7 +25,6 @@ * F2L - Convert float to long *
Stack: ..., value -> ..., result.word1, result.word2* - * @version $Id$ */ public class F2L extends ConversionInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FADD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FADD.java index 0c839a7ab91..e89d1a4f6e6 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FADD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FADD.java @@ -25,7 +25,6 @@ * FADD - Add floats *
Stack: ..., value1, value2 -> result* - * @version $Id$ */ public class FADD extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FALOAD.java index e7550375410..be3b8f07ab7 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FALOAD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FALOAD.java @@ -25,7 +25,6 @@ * FALOAD - Load float from array *
Stack: ..., arrayref, index -> ..., value* - * @version $Id$ */ public class FALOAD extends ArrayInstruction implements StackProducer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FASTORE.java index e6e5d925489..9d0c0685c02 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FASTORE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FASTORE.java @@ -25,7 +25,6 @@ * FASTORE - Store into float array *
Stack: ..., arrayref, index, value -> ...* - * @version $Id$ */ public class FASTORE extends ArrayInstruction implements StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPG.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPG.java index 7e24110ffd3..24b2655f05f 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPG.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPG.java @@ -25,7 +25,6 @@ * FCMPG - Compare floats: value1 > value2 *
Stack: ..., value1, value2 -> ..., result* - * @version $Id$ */ public class FCMPG extends Instruction implements TypedInstruction, StackProducer, StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPL.java index dc1e7b6b185..5d4cf811e83 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPL.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPL.java @@ -25,7 +25,6 @@ * FCMPL - Compare floats: value1 < value2 *
Stack: ..., value1, value2 -> ..., result* - * @version $Id$ */ public class FCMPL extends Instruction implements TypedInstruction, StackProducer, StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java index 5341cbab519..717ace5abfb 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -25,8 +25,7 @@ * *
Stack: ... -> ...,* - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class FCONST extends Instruction implements ConstantPushInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FDIV.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FDIV.java index c78b180667c..720709b47a4 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FDIV.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FDIV.java @@ -25,7 +25,6 @@ * FDIV - Divide floats *
Stack: ..., value1, value2 -> result* - * @version $Id$ */ public class FDIV extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FLOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FLOAD.java index 7eb257e37cc..8fecdd219ce 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FLOAD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FLOAD.java @@ -25,7 +25,6 @@ * FLOAD - Load float from local variable *
Stack ... -> ..., result* - * @version $Id$ */ public class FLOAD extends LoadInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FMUL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FMUL.java index 7c04e95e623..e6c7cbcc9a4 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FMUL.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FMUL.java @@ -25,7 +25,6 @@ * FMUL - Multiply floats *
Stack: ..., value1, value2 -> result* - * @version $Id$ */ public class FMUL extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FNEG.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FNEG.java index 3e3005ddda5..55311300005 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FNEG.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FNEG.java @@ -25,7 +25,6 @@ * FNEG - Negate float *
Stack: ..., value -> ..., result* - * @version $Id$ */ public class FNEG extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FREM.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FREM.java index 4f2a83cf740..aa65abb8aef 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FREM.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FREM.java @@ -25,7 +25,6 @@ * FREM - Remainder of floats *
Stack: ..., value1, value2 -> result* - * @version $Id$ */ public class FREM extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FRETURN.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FRETURN.java index a3f0ae018d7..d232625f7cb 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FRETURN.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FRETURN.java @@ -25,7 +25,6 @@ * FRETURN - Return float from method *
Stack: ..., value -> <empty>* - * @version $Id$ */ public class FRETURN extends ReturnInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSTORE.java index c988a88aa3a..eb366e3a203 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSTORE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSTORE.java @@ -25,7 +25,6 @@ * FSTORE - Store float into local variable *
Stack: ..., value -> ...* - * @version $Id$ */ public class FSTORE extends StoreInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSUB.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSUB.java index 9a59bbf4b11..ecb791b4398 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSUB.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSUB.java @@ -25,7 +25,6 @@ * FSUB - Substract floats *
Stack: ..., value1, value2 -> result* - * @version $Id$ */ public class FSUB extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGen.java index 1b6b5cdd3e7..1e5e861efa6 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGen.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGen.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -40,9 +40,8 @@ * one can do is to add a constant value attribute to a field (which must of * course be compatible with to the declared type). * - * @version $Id$ * @see Field - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class FieldGen extends FieldGenOrMethodGen { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java index f8d4ebf4549..e0e07eeffd4 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -30,8 +30,7 @@ * Super class for FieldGen and MethodGen objects, since they have * some methods in common! * - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jun 2020 */ public abstract class FieldGenOrMethodGen extends AccessFlags implements NamedAndTyped, Cloneable { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java index 973015fe0e1..604a47ca330 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java @@ -26,7 +26,6 @@ /** * Super class for the GET/PUTxxx family of instructions. * - * @version $Id$ */ public abstract class FieldInstruction extends FieldOrMethod { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldObserver.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldObserver.java index 068b117a800..4bcbee8d922 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldObserver.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldObserver.java @@ -25,7 +25,6 @@ * Imnplement this interface if you're interested in changes to a FieldGen object * and register yourself with addObserver(). * - * @version $Id$ */ public interface FieldObserver { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java index ac810689980..182c3972601 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java @@ -31,7 +31,6 @@ * Super class for InvokeInstruction and FieldInstruction, since they have * some methods in common! * - * @version $Id$ */ public abstract class FieldOrMethod extends CPInstruction implements LoadClass { @@ -40,6 +39,7 @@ public abstract class FieldOrMethod extends CPInstruction implements LoadClass { * Not to be used otherwise. */ FieldOrMethod() { + // no init } @@ -53,7 +53,7 @@ protected FieldOrMethod(final short opcode, final int index) { /** @return signature of referenced method/field. */ - public String getSignature( final ConstantPoolGen cpg ) { + public String getSignature(final ConstantPoolGen cpg) { final ConstantPool cp = cpg.getConstantPool(); final ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex()); final ConstantNameAndType cnat = (ConstantNameAndType) cp.getConstant(cmr.getNameAndTypeIndex()); @@ -63,7 +63,7 @@ public String getSignature( final ConstantPoolGen cpg ) { /** @return name of referenced method/field. */ - public String getName( final ConstantPoolGen cpg ) { + public String getName(final ConstantPoolGen cpg) { final ConstantPool cp = cpg.getConstantPool(); final ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex()); final ConstantNameAndType cnat = (ConstantNameAndType) cp.getConstant(cmr.getNameAndTypeIndex()); @@ -83,7 +83,7 @@ public String getName( final ConstantPoolGen cpg ) { * */ @Deprecated - public String getClassName( final ConstantPoolGen cpg ) { + public String getClassName(final ConstantPoolGen cpg) { final ConstantPool cp = cpg.getConstantPool(); final ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex()); final String className = cp.getConstantString(cmr.getClassIndex(), Const.CONSTANT_Class); @@ -101,20 +101,20 @@ public String getClassName( final ConstantPoolGen cpg ) { * getReferenceType() instead. */ @Deprecated - public ObjectType getClassType( final ConstantPoolGen cpg ) { + public ObjectType getClassType(final ConstantPoolGen cpg) { return ObjectType.getInstance(getClassName(cpg)); } /** - * Return the reference type representing the class, interface, + * Gets the reference type representing the class, interface, * or array class referenced by the instruction. * @param cpg the ConstantPoolGen used to create the instruction * @return an ObjectType (if the referenced class type is a class * or interface), or an ArrayType (if the referenced class * type is an array class) */ - public ReferenceType getReferenceType( final ConstantPoolGen cpg ) { + public ReferenceType getReferenceType(final ConstantPoolGen cpg) { final ConstantPool cp = cpg.getConstantPool(); final ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex()); String className = cp.getConstantString(cmr.getClassIndex(), Const.CONSTANT_Class); @@ -127,17 +127,18 @@ public ReferenceType getReferenceType( final ConstantPoolGen cpg ) { /** - * Get the ObjectType of the method return or field. + * Gets the ObjectType of the method return or field. * * @return type of the referenced class/interface * @throws ClassGenException when the field is (or method returns) an array, */ @Override - public ObjectType getLoadClassType( final ConstantPoolGen cpg ) { + public ObjectType getLoadClassType(final ConstantPoolGen cpg) { final ReferenceType rt = getReferenceType(cpg); - if(rt instanceof ObjectType) { - return (ObjectType)rt; + if (rt instanceof ObjectType) { + return (ObjectType) rt; } - throw new ClassGenException(rt.getSignature() + " does not represent an ObjectType"); + throw new ClassGenException(rt.getClass().getCanonicalName() + " " + + rt.getSignature() + " does not represent an ObjectType"); } } diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETFIELD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETFIELD.java index a1a67854477..1e1a652daec 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETFIELD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETFIELD.java @@ -29,7 +29,6 @@ * OR *
Stack: ..., objectref -> ..., value.word1, value.word2* - * @version $Id$ */ public class GETFIELD extends FieldInstruction implements ExceptionThrower, StackConsumer, StackProducer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java index ff20d7cb088..a8ff0989fbb 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java @@ -30,7 +30,6 @@ * OR *
Stack: ..., -> ..., value.word1, value.word2* - * @version $Id$ */ public class GETSTATIC extends FieldInstruction implements PushInstruction, ExceptionThrower { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO.java index 097a35b41be..64b7de98d62 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO.java @@ -27,7 +27,6 @@ /** * GOTO - Branch always (to relative offset, not absolute address) * - * @version $Id$ */ public class GOTO extends GotoInstruction implements VariableLengthInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO_W.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO_W.java index cc31a36fec3..5c97a0c9d55 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO_W.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO_W.java @@ -29,7 +29,6 @@ /** * GOTO_W - Branch always (to relative offset, not absolute address) * - * @version $Id$ */ public class GOTO_W extends GotoInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java index e206a02f690..766f68a95f1 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java @@ -24,7 +24,6 @@ /** * Super class for GOTO * - * @version $Id$ */ public abstract class GotoInstruction extends BranchInstruction implements UnconditionalBranch { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2B.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2B.java index 67993be83ee..0daab14fccb 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2B.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2B.java @@ -25,7 +25,6 @@ * I2B - Convert int to byte *
Stack: ..., value -> ..., result* - * @version $Id$ */ public class I2B extends ConversionInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2C.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2C.java index b2ada9dbdd2..1222026e4ff 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2C.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2C.java @@ -25,7 +25,6 @@ * I2C - Convert int to char *
Stack: ..., value -> ..., result* - * @version $Id$ */ public class I2C extends ConversionInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2D.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2D.java index 20e7d2b928e..70c83845e69 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2D.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2D.java @@ -25,7 +25,6 @@ * I2D - Convert int to double *
Stack: ..., value -> ..., result.word1, result.word2* - * @version $Id$ */ public class I2D extends ConversionInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2F.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2F.java index a7c1af6763c..f4b10e91d27 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2F.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2F.java @@ -25,7 +25,6 @@ * I2F - Convert int to float *
Stack: ..., value -> ..., result* - * @version $Id$ */ public class I2F extends ConversionInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2L.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2L.java index 6ef84ad1c8b..0ab03dd8413 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2L.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2L.java @@ -25,7 +25,6 @@ * I2L - Convert int to long *
Stack: ..., value -> ..., result.word1, result.word2* - * @version $Id$ */ public class I2L extends ConversionInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2S.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2S.java index ae2db737b65..7fc76358385 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2S.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2S.java @@ -25,7 +25,6 @@ * I2S - Convert int to short *
Stack: ..., value -> ..., result* - * @version $Id$ */ public class I2S extends ConversionInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IADD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IADD.java index d1d30a471a0..2e454f30c6b 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IADD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IADD.java @@ -25,7 +25,6 @@ * IADD - Add ints *
Stack: ..., value1, value2 -> result* - * @version $Id$ */ public class IADD extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IALOAD.java index 10d4ca69fc3..79b6a66deb1 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IALOAD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IALOAD.java @@ -25,7 +25,6 @@ * IALOAD - Load int from array *
Stack: ..., arrayref, index -> ..., value* - * @version $Id$ */ public class IALOAD extends ArrayInstruction implements StackProducer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IAND.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IAND.java index 07b4379e000..be4420e4f43 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IAND.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IAND.java @@ -25,7 +25,6 @@ * IAND - Bitwise AND int *
Stack: ..., value1, value2 -> ..., result* - * @version $Id$ */ public class IAND extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IASTORE.java index 1e047c38f40..ff954de48ed 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IASTORE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IASTORE.java @@ -25,7 +25,6 @@ * IASTORE - Store into int array *
Stack: ..., arrayref, index, value -> ...* - * @version $Id$ */ public class IASTORE extends ArrayInstruction implements StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java index b9880fb685f..4c00097cb69 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java @@ -24,7 +24,6 @@ * *
Stack: ... -> ...,* - * @version $Id$ */ public class ICONST extends Instruction implements ConstantPushInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java index 2c5bda9dc2c..078eefe1113 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -26,8 +26,7 @@ * IDIV - Divide ints *
Stack: ..., value1, value2 -> result* - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class IDIV extends ArithmeticInstruction implements ExceptionThrower { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFEQ.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFEQ.java index 2543e8fd9c2..7518c24ee31 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFEQ.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFEQ.java @@ -26,7 +26,6 @@ * *
Stack: ..., value -> ...* - * @version $Id$ */ public class IFEQ extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGE.java index ce4671c258c..ed5337de2ba 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGE.java @@ -26,7 +26,6 @@ * *
Stack: ..., value -> ...* - * @version $Id$ */ public class IFGE extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGT.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGT.java index aa6f043adc2..08a9788779b 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGT.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGT.java @@ -26,7 +26,6 @@ * *
Stack: ..., value -> ...* - * @version $Id$ */ public class IFGT extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLE.java index 1b38576f2f0..3eeced2aa4f 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLE.java @@ -26,7 +26,6 @@ * *
Stack: ..., value -> ...* - * @version $Id$ */ public class IFLE extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLT.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLT.java index d0d85919fda..36d086093fc 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLT.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLT.java @@ -26,7 +26,6 @@ * *
Stack: ..., value -> ...* - * @version $Id$ */ public class IFLT extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNE.java index c711796f88c..46a4ed659fa 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNE.java @@ -26,7 +26,6 @@ * *
Stack: ..., value -> ...* - * @version $Id$ */ public class IFNE extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java index 2bb7a0fa764..221ef55f1d1 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java @@ -26,7 +26,6 @@ * *
Stack: ..., reference -> ...* - * @version $Id$ */ public class IFNONNULL extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNULL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNULL.java index 9aa4c626b1b..c5d01005c19 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNULL.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNULL.java @@ -26,7 +26,6 @@ * *
Stack: ..., reference -> ...* - * @version $Id$ */ public class IFNULL extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java index adcccf4d46e..a01749f90d1 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java @@ -26,7 +26,6 @@ * *
Stack: ..., value1, value2 -> ...* - * @version $Id$ */ public class IF_ACMPEQ extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java index 322d67c923e..3115e4f70ee 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java @@ -26,7 +26,6 @@ * *
Stack: ..., value1, value2 -> ...* - * @version $Id$ */ public class IF_ACMPNE extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java index bf75dcde29f..e9850f886c9 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java @@ -26,7 +26,6 @@ * *
Stack: ..., value1, value2 -> ...* - * @version $Id$ */ public class IF_ICMPEQ extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java index 486fd8d7b7c..59fb4e1c089 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java @@ -26,7 +26,6 @@ * *
Stack: ..., value1, value2 -> ...* - * @version $Id$ */ public class IF_ICMPGE extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java index 8a61dfc4ad1..b9e4b379e6f 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java @@ -26,7 +26,6 @@ * *
Stack: ..., value1, value2 -> ...* - * @version $Id$ */ public class IF_ICMPGT extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java index ef727aef8ef..8227630a88f 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java @@ -26,7 +26,6 @@ * *
Stack: ..., value1, value2 -> ...* - * @version $Id$ */ public class IF_ICMPLE extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java index 88c63b7606d..92800955831 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java @@ -26,7 +26,6 @@ * *
Stack: ..., value1, value2 -> ...* - * @version $Id$ */ public class IF_ICMPLT extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java index f6f4e83e65a..e1de79ab77e 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java @@ -26,7 +26,6 @@ * *
Stack: ..., value1, value2 -> ...* - * @version $Id$ */ public class IF_ICMPNE extends IfInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IINC.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IINC.java index 0fbd3468e75..7b4e80c274c 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IINC.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IINC.java @@ -29,7 +29,6 @@ /** * IINC - Increment local variable by constant * - * @version $Id$ */ public class IINC extends LocalVariableInstruction { @@ -50,7 +49,7 @@ public class IINC extends LocalVariableInstruction { * @param c increment factor */ public IINC(final int n, final int c) { - super(); // Default behaviour of LocalVariableInstruction causes error + super(); // Default behavior of LocalVariableInstruction causes error super.setOpcode(com.sun.org.apache.bcel.internal.Const.IINC); super.setLength((short) 3); setIndex(n); // May set wide as side effect diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ILOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ILOAD.java index 78aee01497a..55f9c29fbbd 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ILOAD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ILOAD.java @@ -25,7 +25,6 @@ * ILOAD - Load int from local variable onto stack *
Stack: ... -> ..., result* - * @version $Id$ */ public class ILOAD extends LoadInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java index b1d3756b195..a93c1808017 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java @@ -24,7 +24,6 @@ /** * IMPDEP1 - Implementation dependent * - * @version $Id$ */ public class IMPDEP1 extends Instruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java index a5a1c888a06..e77c250531c 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java @@ -24,7 +24,6 @@ /** * IMPDEP2 - Implementation dependent * - * @version $Id$ */ public class IMPDEP2 extends Instruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMUL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMUL.java index 7e891845198..f8fa6a18792 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMUL.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMUL.java @@ -25,7 +25,6 @@ * IMUL - Multiply ints *
Stack: ..., value1, value2 -> result* - * @version $Id$ */ public class IMUL extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INEG.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INEG.java index 1ab7c4a2fe4..1acc2886718 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INEG.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INEG.java @@ -25,7 +25,6 @@ * INEG - Negate int *
Stack: ..., value -> ..., result* - * @version $Id$ */ public class INEG extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java index aa861f65886..48500a4744b 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java @@ -27,7 +27,6 @@ * INSTANCEOF - Determine if object is of given type *
Stack: ..., objectref -> ..., result* - * @version $Id$ */ public class INSTANCEOF extends CPInstruction implements LoadClass, ExceptionThrower, StackProducer, StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEDYNAMIC.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEDYNAMIC.java index bf784cc6775..46f026cffee 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEDYNAMIC.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEDYNAMIC.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -35,12 +35,11 @@ * expects to be able to get the class of the method. Ignores the bootstrap * mechanism entirely. * - * @version $Id: InvokeInstruction.java 1152072 2011-07-29 01:54:05Z dbrosius $ * @see * * The invokedynamic instruction in The Java Virtual Machine Specification * @since 6.0 - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class INVOKEDYNAMIC extends InvokeInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java index a202e3e5515..6f1736c3707 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java @@ -33,7 +33,6 @@ * INVOKEINTERFACE - Invoke interface method *
Stack: ..., objectref, [arg1, [arg2 ...]] -> ...* - * @version $Id$ * @see * * The invokeinterface instruction in The Java Virtual Machine Specification diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java index 93f4e0883cd..d3eed22dae5 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java @@ -33,7 +33,6 @@ * *
Stack: ..., objectref, [arg1, [arg2 ...]] -> ...* - * @version $Id$ * @see * * The invokespecial instruction in The Java Virtual Machine Specification diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java index 2aed3bb1816..356e13133e7 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java @@ -32,7 +32,6 @@ * *
Stack: ..., [arg1, [arg2 ...]] -> ...* - * @version $Id$ * @see * * The invokestatic instruction in The Java Virtual Machine Specification diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java index 227538c15ca..a9652fd3403 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java @@ -32,7 +32,6 @@ * *
Stack: ..., objectref, [arg1, [arg2 ...]] -> ...* - * @version $Id$ * @see * * The invokevirtual instruction in The Java Virtual Machine Specification diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IOR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IOR.java index 662fc5af771..0589c4b8297 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IOR.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IOR.java @@ -25,7 +25,6 @@ * IOR - Bitwise OR int *
Stack: ..., value1, value2 -> ..., result* - * @version $Id$ */ public class IOR extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java index fe20ad85669..984cf31fcf7 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -26,8 +26,7 @@ * IREM - Remainder of int *
Stack: ..., value1, value2 -> result* - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class IREM extends ArithmeticInstruction implements ExceptionThrower { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IRETURN.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IRETURN.java index d61ddc8362c..894738ffe4a 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IRETURN.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IRETURN.java @@ -25,7 +25,6 @@ * IRETURN - Return int from method *
Stack: ..., value -> <empty>* - * @version $Id$ */ public class IRETURN extends ReturnInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHL.java index 326f839acb9..67482bf7633 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHL.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHL.java @@ -25,7 +25,6 @@ * ISHL - Arithmetic shift left int *
Stack: ..., value1, value2 -> ..., result* - * @version $Id$ */ public class ISHL extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHR.java index 7e042f18da5..1729abb7ecd 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHR.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHR.java @@ -25,7 +25,6 @@ * ISHR - Arithmetic shift right int *
Stack: ..., value1, value2 -> ..., result* - * @version $Id$ */ public class ISHR extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISTORE.java index ace8715719a..d27b087dc30 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISTORE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISTORE.java @@ -25,7 +25,6 @@ * ISTORE - Store int from stack into local variable *
Stack: ..., value -> ...* - * @version $Id$ */ public class ISTORE extends StoreInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISUB.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISUB.java index da8e07ac294..60d67a47e25 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISUB.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISUB.java @@ -25,7 +25,6 @@ * ISUB - Substract ints *
Stack: ..., value1, value2 -> result* - * @version $Id$ */ public class ISUB extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IUSHR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IUSHR.java index f3a3f7ca730..0434d28889c 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IUSHR.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IUSHR.java @@ -25,7 +25,6 @@ * IUSHR - Logical shift right int *
Stack: ..., value1, value2 -> ..., result* - * @version $Id$ */ public class IUSHR extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IXOR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IXOR.java index b546353d601..5aae103fd61 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IXOR.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IXOR.java @@ -25,7 +25,6 @@ * IXOR - Bitwise XOR int *
Stack: ..., value1, value2 -> ..., result* - * @version $Id$ */ public class IXOR extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IfInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IfInstruction.java index b11aafdf367..be02b847107 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IfInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IfInstruction.java @@ -24,7 +24,6 @@ /** * Super class for the IFxxx family of instructions. * - * @version $Id$ */ public abstract class IfInstruction extends BranchInstruction implements StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java index 0d79105ad05..f84d2839d30 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java @@ -25,7 +25,6 @@ * Denote entity that refers to an index, e.g. local variable instructions, * RET, CPInstruction, etc. * - * @version $Id$ */ public interface IndexedInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Instruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Instruction.java index 0e59f9836b9..20188a9f16a 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Instruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Instruction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java index 0a5d3cc3001..a3f3c2d45e9 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java @@ -25,40 +25,38 @@ * Equality of instructions isn't clearly to be defined. You might * wish, for example, to compare whether instructions have the same * meaning. E.g., whether two INVOKEVIRTUALs describe the same - * call.
+ * The DEFAULT comparator however, considers two instructions * to be equal if they have same opcode and point to the same indexes * (if any) in the constant pool or the same local variable index. Branch * instructions must have the same target. + *
* * @see Instruction - * @version $Id$ */ public interface InstructionComparator { - InstructionComparator DEFAULT = new InstructionComparator() { - - @Override - public boolean equals( final Instruction i1, final Instruction i2 ) { - if (i1.getOpcode() == i2.getOpcode()) { - if (i1 instanceof BranchInstruction) { - // BIs are never equal to make targeters work correctly (BCEL-195) - return false; + InstructionComparator DEFAULT = (i1, i2) -> { + if (i1.getOpcode() == i2.getOpcode()) { + if (i1 instanceof BranchInstruction) { + // BIs are never equal to make targeters work correctly (BCEL-195) + return false; // } else if (i1 == i2) { TODO consider adding this shortcut // return true; // this must be AFTER the BI test - } else if (i1 instanceof ConstantPushInstruction) { - return ((ConstantPushInstruction) i1).getValue().equals( - ((ConstantPushInstruction) i2).getValue()); - } else if (i1 instanceof IndexedInstruction) { - return ((IndexedInstruction) i1).getIndex() == ((IndexedInstruction) i2) - .getIndex(); - } else if (i1 instanceof NEWARRAY) { - return ((NEWARRAY) i1).getTypecode() == ((NEWARRAY) i2).getTypecode(); - } else { - return true; - } + } else if (i1 instanceof ConstantPushInstruction) { + return ((ConstantPushInstruction) i1).getValue().equals( + ((ConstantPushInstruction) i2).getValue()); + } else if (i1 instanceof IndexedInstruction) { + return ((IndexedInstruction) i1).getIndex() == ((IndexedInstruction) i2) + .getIndex(); + } else if (i1 instanceof NEWARRAY) { + return ((NEWARRAY) i1).getTypecode() == ((NEWARRAY) i2).getTypecode(); + } else { + return true; } - return false; } + return false; }; diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionConst.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionConst.java index 69c7bac382f..fece96b10ca 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionConst.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionConst.java @@ -37,7 +37,6 @@ * The Instructions can also accessed directly under their names, so * it's possible to write il.append(Instruction.ICONST_0); * - * @version $Id: InstructionConstants.java 1695415 2015-08-12 01:02:39Z chas $ */ public final class InstructionConst { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java index 86d6e1e163f..bb78cb97ff5 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -30,10 +30,9 @@ * Note: The static createXXX methods return singleton instances * from the {@link InstructionConst} class. * - * @version $Id$ * @see Const * @see InstructionConst - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class InstructionFactory { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java index ea6712f7fb1..25008e69d78 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -39,10 +39,10 @@ * can traverse the list via an Enumeration returned by * InstructionList.elements(). * - * @version $Id$ * @see Instruction * @see BranchHandle * @see InstructionList + * @LastModified: Jan 2020 */ public class InstructionHandle { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionList.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionList.java index fb3e448ca12..0e90723c530 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionList.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionList.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -44,11 +44,10 @@ * A list is finally dumped to a byte code array with getByteCode. * - * @version $Id$ * @see Instruction * @see InstructionHandle * @see BranchHandle - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class InstructionList implements Iterable* Any instruction targeters pointing to handles within the block, keep * their targets. * - * @param start of moved block - * @param end of moved block - * @param target of moved block + * @param start + * of moved block + * @param end + * of moved block + * @param target + * of moved block */ public void move(final InstructionHandle start, final InstructionHandle end, final InstructionHandle target) { // Step 1: Check constraints @@ -648,8 +688,10 @@ public void move(final InstructionHandle start, final InstructionHandle end, fin /** * Move a single instruction (handle) to a new location. * - * @param ih moved instruction - * @param target new location of moved instruction + * @param ih + * moved instruction + * @param target + * new location of moved instruction */ public void move(final InstructionHandle ih, final InstructionHandle target) { move(ih, ih, target); @@ -660,8 +702,10 @@ public void move(final InstructionHandle ih, final InstructionHandle target) { * this list. Throws TargetLostException when one of the removed instruction * handles is still being targeted. * - * @param prev where to start deleting (predecessor, exclusive) - * @param next where to end deleting (successor, exclusive) + * @param prev + * where to start deleting (predecessor, exclusive) + * @param next + * where to end deleting (successor, exclusive) */ private void remove(final InstructionHandle prev, InstructionHandle next) throws TargetLostException { InstructionHandle first; @@ -716,17 +760,18 @@ private void remove(final InstructionHandle prev, InstructionHandle next) throws * Remove instruction from this list. The corresponding Instruction handles * must not be reused! * - * @param ih instruction (handle) to remove + * @param ih + * instruction (handle) to remove */ public void delete(final InstructionHandle ih) throws TargetLostException { remove(ih.getPrev(), ih.getNext()); } /** - * Remove instruction from this list. The corresponding Instruction handles - * must not be reused! + * Remove instruction from this list. The corresponding Instruction handles must not be reused! * - * @param i instruction to remove + * @param i + * instruction to remove */ public void delete(final Instruction i) throws TargetLostException { InstructionHandle ih; @@ -742,8 +787,10 @@ public void delete(final Instruction i) throws TargetLostException { * `to', or risk havoc. The corresponding Instruction handles must not be * reused! * - * @param from where to start deleting (inclusive) - * @param to where to end deleting (inclusive) + * @param from + * where to start deleting (inclusive) + * @param to + * where to end deleting (inclusive) */ public void delete(final InstructionHandle from, final InstructionHandle to) throws TargetLostException { remove(from.getPrev(), to.getNext()); @@ -755,8 +802,10 @@ public void delete(final InstructionHandle from, final InstructionHandle to) thr * `to', or risk havoc. The corresponding Instruction handles must not be * reused! * - * @param from where to start deleting (inclusive) - * @param to where to end deleting (inclusive) + * @param from + * where to start deleting (inclusive) + * @param to + * where to end deleting (inclusive) */ public void delete(final Instruction from, final Instruction to) throws TargetLostException { InstructionHandle from_ih; @@ -773,7 +822,8 @@ public void delete(final Instruction from, final Instruction to) throws TargetLo /** * Search for given Instruction reference, start at beginning of list. * - * @param i instruction to search for + * @param i + * instruction to search for * @return instruction found on success, null otherwise */ private InstructionHandle findInstruction1(final Instruction i) { @@ -788,7 +838,8 @@ private InstructionHandle findInstruction1(final Instruction i) { /** * Search for given Instruction reference, start at end of list * - * @param i instruction to search for + * @param i + * instruction to search for * @return instruction found on success, null otherwise */ private InstructionHandle findInstruction2(final Instruction i) { @@ -824,8 +875,8 @@ public void setPositions() { // TODO could be package-protected? (some test code * Give all instructions their position number (offset in byte stream), * i.e., make the list ready to be dumped. * - * @param check Perform sanity checks, e.g. if all targeted instructions - * really belong to this list + * @param check + * Perform sanity checks, e.g. if all targeted instructions really belong to this list */ public void setPositions(final boolean check) { // called by code in other packages int max_additional_bytes = 0; @@ -882,11 +933,11 @@ public void setPositions(final boolean check) { // called by code in other packa case Const.JSR: case Const.GOTO: max_additional_bytes += 2; - break; + break; case Const.TABLESWITCH: case Const.LOOKUPSWITCH: max_additional_bytes += 3; - break; + break; } index += i.getLength(); } @@ -909,12 +960,8 @@ public void setPositions(final boolean check) { // called by code in other packa pos[count++] = index; index += i.getLength(); } - if (length == count) { - byte_positions = pos; - } else { - byte_positions = new int[count]; // Trim to proper size - System.arraycopy(pos, 0, byte_positions, 0, count); - } + byte_positions = new int[count]; // Trim to proper size + System.arraycopy(pos, 0, byte_positions, 0, count); } /** @@ -963,7 +1010,8 @@ public String toString() { } /** - * @param verbose toggle output format + * @param verbose + * toggle output format * @return String containing all instructions in this list. */ public String toString(final boolean verbose) { @@ -1145,11 +1193,12 @@ public int size() { * Redirect all references from old_target to new_target, i.e., update * targets of branch instructions. * - * @param old_target the old target instruction handle - * @param new_target the new target instruction handle + * @param old_target + * the old target instruction handle + * @param new_target + * the new target instruction handle */ - public void redirectBranches(final InstructionHandle old_target, - final InstructionHandle new_target) { + public void redirectBranches(final InstructionHandle old_target, final InstructionHandle new_target) { for (InstructionHandle ih = start; ih != null; ih = ih.getNext()) { final Instruction i = ih.getInstruction(); if (i instanceof BranchInstruction) { @@ -1173,13 +1222,15 @@ public void redirectBranches(final InstructionHandle old_target, /** * Redirect all references of local variables from old_target to new_target. * - * @param lg array of local variables - * @param old_target the old target instruction handle - * @param new_target the new target instruction handle + * @param lg + * array of local variables + * @param old_target + * the old target instruction handle + * @param new_target + * the new target instruction handle * @see MethodGen */ - public void redirectLocalVariables(final LocalVariableGen[] lg, - final InstructionHandle old_target, final InstructionHandle new_target) { + public void redirectLocalVariables(final LocalVariableGen[] lg, final InstructionHandle old_target, final InstructionHandle new_target) { for (final LocalVariableGen element : lg) { final InstructionHandle start = element.getStart(); final InstructionHandle end = element.getEnd(); @@ -1193,12 +1244,14 @@ public void redirectLocalVariables(final LocalVariableGen[] lg, } /** - * Redirect all references of exception handlers from old_target to - * new_target. + * Redirect all references of exception handlers from old_target to new_target. * - * @param exceptions array of exception handlers - * @param old_target the old target instruction handle - * @param new_target the new target instruction handle + * @param exceptions + * array of exception handlers + * @param old_target + * the old target instruction handle + * @param new_target + * the new target instruction handle * @see MethodGen */ public void redirectExceptionHandlers(final CodeExceptionGen[] exceptions, diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java index 886ea8d77e3..116273a44d7 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java @@ -25,7 +25,6 @@ * Implement this interface if you're interested in changes to an InstructionList object * and register yourself with addObserver(). * - * @version $Id$ */ public interface InstructionListObserver { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java index f08cf5a53a5..8cd436b38ce 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java @@ -28,7 +28,6 @@ * @see BranchHandle * @see LocalVariableGen * @see CodeExceptionGen - * @version $Id$ */ public interface InstructionTargeter { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java index cfa9981f38e..73948914077 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -30,8 +30,7 @@ /** * Super class for the INVOKExxx family of instructions. * - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public abstract class InvokeInstruction extends FieldOrMethod implements ExceptionThrower, StackConsumer, StackProducer { @@ -59,8 +58,19 @@ protected InvokeInstruction(final short opcode, final int index) { public String toString( final ConstantPool cp ) { final Constant c = cp.getConstant(super.getIndex()); final StringTokenizer tok = new StringTokenizer(cp.constantToString(c)); - return Const.getOpcodeName(super.getOpcode()) + " " + tok.nextToken().replace('.', '/') - + tok.nextToken(); + + final String opcodeName = Const.getOpcodeName(super.getOpcode()); + + final StringBuilder sb = new StringBuilder(opcodeName); + if (tok.hasMoreTokens()) { + sb.append(" "); + sb.append(tok.nextToken().replace('.', '/')); + if (tok.hasMoreTokens()) { + sb.append(tok.nextToken()); + } + } + + return sb.toString(); } diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR.java index d0d17cfb29e..edcc569ec03 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR.java @@ -27,7 +27,6 @@ /** * JSR - Jump to subroutine * - * @version $Id$ */ public class JSR extends JsrInstruction implements VariableLengthInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR_W.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR_W.java index 42998b62c16..7cf3c9289ec 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR_W.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR_W.java @@ -29,7 +29,6 @@ /** * JSR_W - Jump to subroutine * - * @version $Id$ */ public class JSR_W extends JsrInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java index 05174fcebb1..b679d6bb115 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java @@ -24,7 +24,6 @@ /** * Super class for JSR - Jump to subroutine * - * @version $Id$ */ public abstract class JsrInstruction extends BranchInstruction implements UnconditionalBranch, TypedInstruction, StackProducer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2D.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2D.java index cce506e19d0..9bfed38607f 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2D.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2D.java @@ -25,7 +25,6 @@ * L2D - Convert long to double *
Stack: ..., value.word1, value.word2 -> ..., result.word1, result.word2* - * @version $Id$ */ public class L2D extends ConversionInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2F.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2F.java index 8e5d58802d1..460ea64d0f6 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2F.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2F.java @@ -25,7 +25,6 @@ * L2F - Convert long to float *
Stack: ..., value.word1, value.word2 -> ..., result* - * @version $Id$ */ public class L2F extends ConversionInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2I.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2I.java index a577bc7d3f3..efcb614abdc 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2I.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2I.java @@ -25,7 +25,6 @@ * L2I - Convert long to int *
Stack: ..., value.word1, value.word2 -> ..., result* - * @version $Id$ */ public class L2I extends ConversionInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LADD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LADD.java index 875eb295b41..2bbd2681ae5 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LADD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LADD.java @@ -26,7 +26,6 @@ *
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->* ..., result.word1, result.word2 * - * @version $Id$ */ public class LADD extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LALOAD.java index 2ca766fd6ed..0d19b09c867 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LALOAD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LALOAD.java @@ -25,7 +25,6 @@ * LALOAD - Load long from array *
Stack: ..., arrayref, index -> ..., value1, value2* - * @version $Id$ */ public class LALOAD extends ArrayInstruction implements StackProducer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LAND.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LAND.java index 852d71ebd7e..03f67c86640 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LAND.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LAND.java @@ -26,7 +26,6 @@ *
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->* ..., result.word1, result.word2 * - * @version $Id$ */ public class LAND extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LASTORE.java index b5d2eceb809..b59856fc0fc 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LASTORE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LASTORE.java @@ -25,7 +25,6 @@ * LASTORE - Store into long array *
Stack: ..., arrayref, index, value.word1, value.word2 -> ...* - * @version $Id$ */ public class LASTORE extends ArrayInstruction implements StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCMP.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCMP.java index 0586b1d4d99..9cf73c1ca03 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCMP.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCMP.java @@ -26,7 +26,6 @@ *
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 -> ..., result <= -1, 0, 1>* * - * @version $Id$ */ public class LCMP extends Instruction implements TypedInstruction, StackProducer, StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCONST.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCONST.java index 53fb8dc1fa4..af1ced8e90a 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCONST.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCONST.java @@ -25,7 +25,6 @@ * *
Stack: ... -> ...,* - * @version $Id$ */ public class LCONST extends Instruction implements ConstantPushInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java index b010a920c7c..3b7ceec2f91 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -31,8 +31,7 @@ * *
Stack: ... -> ..., item* - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class LDC extends CPInstruction implements PushInstruction, ExceptionThrower { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java index 70bf0169d12..544b879647c 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -25,8 +25,7 @@ * *
Stack: ... -> ..., item.word1, item.word2* - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class LDC2_W extends CPInstruction implements PushInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC_W.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC_W.java index ea6e6516366..c0c0ff7c9ac 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC_W.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC_W.java @@ -30,7 +30,6 @@ * *
Stack: ... -> ..., item.word1, item.word2* - * @version $Id$ */ public class LDC_W extends LDC { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java index 71b9ef83128..3d08e15a0b5 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -27,8 +27,7 @@ *
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->* ..., result.word1, result.word2 * - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class LDIV extends ArithmeticInstruction implements ExceptionThrower { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LLOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LLOAD.java index 753df6a3a97..75a3c753dba 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LLOAD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LLOAD.java @@ -25,7 +25,6 @@ * LLOAD - Load long from local variable *
Stack ... -> ..., result.word1, result.word2* - * @version $Id$ */ public class LLOAD extends LoadInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LMUL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LMUL.java index fa0942e64e0..9ea55ffbf2b 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LMUL.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LMUL.java @@ -26,7 +26,6 @@ *
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->* ..., result.word1, result.word2 * - * @version $Id$ */ public class LMUL extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LNEG.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LNEG.java index d078d7e9940..39c1c636663 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LNEG.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LNEG.java @@ -25,7 +25,6 @@ * LNEG - Negate long *
Stack: ..., value.word1, value.word2 -> ..., result.word1, result.word2* - * @version $Id$ */ public class LNEG extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java index d68121c4c87..1803e565f36 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java @@ -29,7 +29,6 @@ /** * LOOKUPSWITCH - Switch with unordered set of values * - * @version $Id$ * @see SWITCH */ public class LOOKUPSWITCH extends Select { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOR.java index 2d07a91c7bd..ec1cef11bdc 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOR.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOR.java @@ -25,7 +25,6 @@ * LOR - Bitwise OR long *
Stack: ..., value1, value2 -> ..., result* - * @version $Id$ */ public class LOR extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java index a1dd2336aa5..786cb80ca96 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -26,8 +26,7 @@ * LREM - Remainder of long *
Stack: ..., value1, value2 -> result* - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class LREM extends ArithmeticInstruction implements ExceptionThrower { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LRETURN.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LRETURN.java index fc59f283234..4523f77e2a9 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LRETURN.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LRETURN.java @@ -25,7 +25,6 @@ * LRETURN - Return long from method *
Stack: ..., value.word1, value.word2 -> <empty>* - * @version $Id$ */ public class LRETURN extends ReturnInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHL.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHL.java index dd037070418..491f035e813 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHL.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHL.java @@ -25,7 +25,6 @@ * LSHL - Arithmetic shift left long *
Stack: ..., value1.word1, value1.word2, value2 -> ..., result.word1, result.word2* - * @version $Id$ */ public class LSHL extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHR.java index 181481609f9..c3e238d25f7 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHR.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHR.java @@ -25,7 +25,6 @@ * LSHR - Arithmetic shift right long *
Stack: ..., value1.word1, value1.word2, value2 -> ..., result.word1, result.word2* - * @version $Id$ */ public class LSHR extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSTORE.java index 09d3eb0239d..1bbdc2c52e2 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSTORE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSTORE.java @@ -25,7 +25,6 @@ * LSTORE - Store long into local variable *
Stack: ..., value.word1, value.word2 -> ...* - * @version $Id$ */ public class LSTORE extends StoreInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSUB.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSUB.java index ed29921b64a..b33771a6d10 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSUB.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSUB.java @@ -26,7 +26,6 @@ *
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->* ..., result.word1, result.word2 * - * @version $Id$ */ public class LSUB extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LUSHR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LUSHR.java index f3d70d981fc..c7b7e472c1c 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LUSHR.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LUSHR.java @@ -25,7 +25,6 @@ * LUSHR - Logical shift right long *
Stack: ..., value1, value2 -> ..., result* - * @version $Id$ */ public class LUSHR extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LXOR.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LXOR.java index 4f0c133a598..fc8dafcaaab 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LXOR.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LXOR.java @@ -25,7 +25,6 @@ * LXOR - Bitwise XOR long *
Stack: ..., value1, value2 -> ..., result* - * @version $Id$ */ public class LXOR extends ArithmeticInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java index 36c8583ddce..a9ab4a8012e 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java @@ -27,7 +27,6 @@ * This class represents a line number within a method, i.e., give an instruction * a line number corresponding to the source code line. * - * @version $Id$ * @see LineNumber * @see MethodGen */ diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadClass.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadClass.java index ce2570f035d..cc697fe99cb 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadClass.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadClass.java @@ -25,7 +25,6 @@ * Denotes that an instruction may start the process of loading and resolving * the referenced class in the Virtual Machine. * - * @version $Id$ */ public interface LoadClass { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java index 9f486596db3..245fd08cc54 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java @@ -25,7 +25,6 @@ * Denotes an unparameterized instruction to load a value from a local * variable, e.g. ILOAD. * - * @version $Id$ */ public abstract class LoadInstruction extends LocalVariableInstruction implements PushInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java index 2e20ff3dc7e..57961f346dc 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java @@ -24,12 +24,11 @@ import com.sun.org.apache.bcel.internal.classfile.LocalVariable; /** - * This class represents a local variable within a method. It contains its + * Represents a local variable within a method. It contains its * scope, name and type. The generated LocalVariable object can be obtained * with getLocalVariable which needs the instruction list and the constant * pool as parameters. * - * @version $Id$ * @see LocalVariable * @see MethodGen */ @@ -70,7 +69,7 @@ public LocalVariableGen(final int index, final String name, final Type type, fin /** - * Generate a local variable that with index `index'. Note that double and long + * Generates a local variable that with index `index'. Note that double and long * variables need two indexs. Index indices have to be provided by the user. * * @param index index of local variable @@ -88,7 +87,7 @@ public LocalVariableGen(final int index, final String name, final Type type, fin /** - * Get LocalVariable object. + * Gets LocalVariable object. * * This relies on that the instruction list has already been dumped to byte code or * or that the `setPositions' methods has been called for the instruction list. diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java index a7705249726..5f009b2ade0 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -28,8 +28,7 @@ /** * Abstract super class for instructions dealing with local variables. * - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public abstract class LocalVariableInstruction extends Instruction implements TypedInstruction, IndexedInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java index d958bf3c570..a8cb953051f 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -26,8 +26,7 @@ * MONITORENTER - Enter monitor for object *
Stack: ..., objectref -> ...* - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class MONITORENTER extends Instruction implements ExceptionThrower, StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java index 94f00724cb6..9c83d55577b 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -26,8 +26,7 @@ * MONITOREXIT - Exit monitor for object *
Stack: ..., objectref -> ...* - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class MONITOREXIT extends Instruction implements ExceptionThrower, StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java index d474fcfca02..208410b3c98 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java @@ -32,7 +32,6 @@ * MULTIANEWARRAY - Create new mutidimensional array of references *
Stack: ..., count1, [count2, ...] -> ..., arrayref* - * @version $Id$ */ public class MULTIANEWARRAY extends CPInstruction implements LoadClass, AllocationInstruction, ExceptionThrower { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java index 92c02d46793..478082cc13f 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -39,10 +39,10 @@ import com.sun.org.apache.bcel.internal.util.BCELComparator; import java.util.ArrayList; import java.util.Arrays; -import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Stack; /** @@ -55,10 +55,9 @@ * use the `removeNOPs' method to get rid off them. * The resulting method object can be obtained via the `getMethod()' method. * - * @version $Id$ * @see InstructionList * @see Method - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class MethodGen extends FieldGenOrMethodGen { @@ -86,8 +85,8 @@ public class MethodGen extends FieldGenOrMethodGen { public boolean equals( final Object o1, final Object o2 ) { final MethodGen THIS = (MethodGen) o1; final MethodGen THAT = (MethodGen) o2; - return THIS.getName().equals(THAT.getName()) - && THIS.getSignature().equals(THAT.getSignature()); + return Objects.equals(THIS.getName(), THAT.getName()) + && Objects.equals(THIS.getSignature(), THAT.getSignature()); } @@ -357,12 +356,7 @@ public LocalVariableGen[] getLocalVariables() { } } if (size > 1) { - Arrays.sort(lg, new Comparator
Stack: ... -> ..., objectref* - * @version $Id$ */ public class NEW extends CPInstruction implements LoadClass, AllocationInstruction, ExceptionThrower, StackProducer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java index 20b331a6d42..e12aee50ced 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -31,8 +31,7 @@ *
Stack: ..., count -> ..., arrayref* type must be one of T_INT, T_SHORT, ... * - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public class NEWARRAY extends Instruction implements AllocationInstruction, ExceptionThrower, StackProducer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NOP.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NOP.java index 008dcff7ead..4408334f365 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NOP.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NOP.java @@ -24,7 +24,6 @@ /** * NOP - Do nothing * - * @version $Id$ */ public class NOP extends Instruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NameSignatureInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NameSignatureInstruction.java index 1e8398f7437..58ea53cf497 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NameSignatureInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NameSignatureInstruction.java @@ -30,7 +30,6 @@ * Super class for FieldOrMethod and INVOKEDYNAMIC, since they both have * names and signatures * - * @version $Id: FieldOrMethod.java 1481383 2013-05-11 17:34:32Z dbrosius $ * @since 6.0 */ public abstract class NameSignatureInstruction extends CPInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java index b9c06935c17..25d9a50a176 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java @@ -25,7 +25,6 @@ * Denote entity that has both name and type. This is true for local variables, * methods and fields. * - * @version $Id$ */ public interface NamedAndTyped { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ObjectType.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ObjectType.java index 3950901294a..bca11994303 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ObjectType.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ObjectType.java @@ -28,7 +28,6 @@ /** * Denotes reference such as java.lang.String. * - * @version $Id$ */ public class ObjectType extends ReferenceType { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP.java index a3d2f3c8cc5..9683a24cebf 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP.java @@ -26,7 +26,6 @@ * *
Stack: ..., word -> ...* - * @version $Id$ */ public class POP extends StackInstruction implements PopInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java index ea0dd57f4de..0f52de75fc1 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java @@ -26,7 +26,6 @@ * *
Stack: ..., word2, word1 -> ...* - * @version $Id$ */ public class POP2 extends StackInstruction implements PopInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUSH.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUSH.java index 4c5ae955e1b..532575bc519 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUSH.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUSH.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -26,8 +26,7 @@ * Wrapper class for push operations, which are implemented either as BIPUSH, * LDC or xCONST_n instructions. * - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public final class PUSH implements CompoundInstruction, VariableLengthInstruction { @@ -176,12 +175,12 @@ public PUSH(final ConstantPoolGen cp, final Boolean value) { @Override - public final InstructionList getInstructionList() { + public InstructionList getInstructionList() { return new InstructionList(instruction); } - public final Instruction getInstruction() { + public Instruction getInstruction() { return instruction; } diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java index a190c99bcc2..10979bd2374 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java @@ -30,7 +30,6 @@ * OR *
Stack: ..., objectref, value.word1, value.word2 -> ...* - * @version $Id$ */ public class PUTFIELD extends FieldInstruction implements PopInstruction, ExceptionThrower { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java index 7b4b0788076..0a482566844 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java @@ -30,7 +30,6 @@ * OR *
Stack: ..., value.word1, value.word2 -> ...* - * @version $Id$ */ public class PUTSTATIC extends FieldInstruction implements ExceptionThrower, PopInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PopInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PopInstruction.java index 40b0dcc0d31..e9ac138377f 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PopInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PopInstruction.java @@ -25,7 +25,6 @@ * Denotes an unparameterized instruction to pop a value on top from the stack, * such as ISTORE, POP, PUTSTATIC. * - * @version $Id$ * @see ISTORE * @see POP */ diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PushInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PushInstruction.java index 4d5c93c01cd..6359f85ef6b 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PushInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PushInstruction.java @@ -25,7 +25,6 @@ * Denotes an unparameterized instruction to produce a value on top of the stack, * such as ILOAD, LDC, SIPUSH, DUP, ICONST, etc. * - * @version $Id$ * @see ILOAD * @see ICONST diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RET.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RET.java index 5d0191e7f49..e6d2c99fbd4 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RET.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RET.java @@ -31,7 +31,6 @@ * *
Stack: ... -> ...* - * @version $Id$ */ public class RET extends Instruction implements IndexedInstruction, TypedInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RETURN.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RETURN.java index 5f817a25d33..271d2c91e2c 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RETURN.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RETURN.java @@ -25,7 +25,6 @@ * RETURN - Return from void method *
Stack: ... -> <empty>* - * @version $Id$ */ public class RETURN extends ReturnInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java index c5060848e5f..ebe3db5cfbf 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java @@ -27,7 +27,6 @@ /** * Super class for object and array types. * - * @version $Id$ */ public abstract class ReferenceType extends Type { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java index 3fcd0979bdd..90a0fcbc72d 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -26,8 +26,7 @@ /** * Super class for the xRETURN family of instructions. * - * @version $Id$ - * @LastModified: Jun 2019 + * @LastModified: Jan 2020 */ public abstract class ReturnInstruction extends Instruction implements ExceptionThrower, TypedInstruction, StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java index ec4402dee7d..63ba12a15b7 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java @@ -27,7 +27,6 @@ * Returnaddress, the type JSR or JSR_W instructions push upon the stack. * * see vmspec2 3.3.3 - * @version $Id$ */ public class ReturnaddressType extends Type { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SALOAD.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SALOAD.java index baa794b700e..b25da298870 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SALOAD.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SALOAD.java @@ -25,7 +25,6 @@ * SALOAD - Load short from array *
Stack: ..., arrayref, index -> ..., value* - * @version $Id$ */ public class SALOAD extends ArrayInstruction implements StackProducer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SASTORE.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SASTORE.java index 78ac6d26e7f..2c5e6565677 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SASTORE.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SASTORE.java @@ -25,7 +25,6 @@ * SASTORE - Store into short array *
Stack: ..., arrayref, index, value -> ...* - * @version $Id$ */ public class SASTORE extends ArrayInstruction implements StackConsumer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java index 71d0c7f57e9..6d3a38804e4 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java @@ -30,7 +30,6 @@ * *
Stack: ... -> ..., value* - * @version $Id$ */ public class SIPUSH extends Instruction implements ConstantPushInstruction { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWAP.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWAP.java index 437b3beaa1f..57bf1b7df22 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWAP.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWAP.java @@ -25,7 +25,6 @@ * SWAP - Swa top operand stack word *
Stack: ..., word2, word1 -> ..., word1, word2* - * @version $Id$ */ public class SWAP extends StackInstruction implements StackConsumer, StackProducer { diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWITCH.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWITCH.java index 0a3b5b54402..6f7c7a88a12 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWITCH.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWITCH.java @@ -26,7 +26,6 @@ * TABLESWITCH instruction, depending on whether the match values (int[]) can be * sorted with no gaps between the numbers. * - * @version $Id$ */ public final class SWITCH implements CompoundInstruction { @@ -106,7 +105,7 @@ private void sort( final int l, final int r ) { int i = l; int j = r; int h; - final int m = match[(l + r) / 2]; + final int m = match[(l + r) >>> 1]; InstructionHandle h2; do { while (match[i] < m) { @@ -149,12 +148,12 @@ private boolean matchIsOrdered( final int max_gap ) { @Override - public final InstructionList getInstructionList() { + public InstructionList getInstructionList() { return new InstructionList(instruction); } - public final Instruction getInstruction() { + public Instruction getInstruction() { return instruction; } } diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Select.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Select.java index 33b5e2cba07..244507a8853 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Select.java +++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Select.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -29,11 +29,10 @@ * *
We use our super's target
property as the default target.
*
- * @version $Id$
* @see LOOKUPSWITCH
* @see TABLESWITCH
* @see InstructionList
- * @LastModified: Jun 2019
+ * @LastModified: Jan 2020
*/
public abstract class Select extends BranchInstruction implements VariableLengthInstruction,
StackConsumer /* @since 6.0 */, StackProducer {
@@ -46,8 +45,8 @@ public abstract class Select extends BranchInstruction implements VariableLength
private int padding = 0; // number of pad bytes for alignment TODO could be package-protected?
/**
- * Empty constructor needed for the Class.newInstance() statement in
- * Instruction.readInstruction(). Not to be used otherwise.
+ * Empty constructor needed for Instruction.readInstruction.
+ * Not to be used otherwise.
*/
Select() {
}
diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackConsumer.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackConsumer.java
index 284b2f1469e..2740be3eedc 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackConsumer.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackConsumer.java
@@ -24,7 +24,6 @@
/**
* Denote an instruction that may consume a value from the stack.
*
- * @version $Id$
*/
public interface StackConsumer {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackInstruction.java
index edda0202ab6..4306800468c 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackInstruction.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackInstruction.java
@@ -24,7 +24,6 @@
/**
* Super class for stack operations like DUP and POP.
*
- * @version $Id$
*/
public abstract class StackInstruction extends Instruction {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackProducer.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackProducer.java
index 1f0b29ab29e..fa3c00eec27 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackProducer.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackProducer.java
@@ -25,7 +25,6 @@
* Denote an instruction that may produce a value on top of the stack
* (this excludes DUP_X1, e.g.)
*
- * @version $Id$
*/
public interface StackProducer {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java
index be2cbee3f2a..be039391012 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java
@@ -25,7 +25,6 @@
* Denotes an unparameterized instruction to store a value into a local variable,
* e.g. ISTORE.
*
- * @version $Id$
*/
public abstract class StoreInstruction extends LocalVariableInstruction implements PopInstruction {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java
index fdcf1bb33b9..3ed2e100fe4 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java
@@ -29,7 +29,6 @@
/**
* TABLESWITCH - Switch within given range of values, i.e., low..high
*
- * @version $Id$
* @see SWITCH
*/
public class TABLESWITCH extends Select {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TargetLostException.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TargetLostException.java
index f58d936fdad..e0aa29747f5 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TargetLostException.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TargetLostException.java
@@ -47,7 +47,6 @@
* @see InstructionHandle
* @see InstructionList
* @see InstructionTargeter
- * @version $Id$
*/
public final class TargetLostException extends Exception {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Type.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Type.java
index f10530b9ca1..ced2f1832e8 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Type.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Type.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,8 +30,7 @@
* Abstract super class for all possible java types, namely basic types
* such as int, object types like String and array types, e.g. int[]
*
- * @version $Id$
- * @LastModified: Jun 2019
+ * @LastModified: Jan 2020
*/
public abstract class Type {
@@ -207,9 +206,8 @@ public static Type getType( final String signature ) throws StringIndexOutOfBoun
wrap(consumed_chars, _temp);
return new ArrayType(t, dim);
} else { // type == T_REFERENCE
- // Utility.signatureToString understands how to parse
- // generic types.
- final String parsedSignature = Utility.signatureToString(signature, false);
+ // Utility.typeSignatureToString understands how to parse generic types.
+ final String parsedSignature = Utility.typeSignatureToString(signature, false);
wrap(consumed_chars, parsedSignature.length() + 2); // "Lblabla;" `L' and `;' are removed
return ObjectType.getInstance(parsedSignature.replace('/', '.'));
}
@@ -242,11 +240,12 @@ public static Type[] getArgumentTypes( final String signature ) {
final List