Author: markt
Date: Sun Oct 14 00:18:29 2012
New Revision: 1397973
URL: http://svn.apache.org/viewvc?rev=1397973&view=rev
Log:
Use a single constructor
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java?rev=1397973&r1=1397972&r2=1397973&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
Sun Oct 14 00:18:29 2012
@@ -41,13 +41,8 @@ public final class ConstantInvokeDynamic
* @throws IOException
*/
ConstantInvokeDynamic(DataInput file) throws IOException {
- this();
+ super(Constants.CONSTANT_InvokeDynamic);
file.readUnsignedShort(); // Unused bootstrap_method_attr_index
file.readUnsignedShort(); // Unused name_and_type_index
}
-
-
- public ConstantInvokeDynamic() {
- super(Constants.CONSTANT_InvokeDynamic);
- }
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java?rev=1397973&r1=1397972&r2=1397973&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
Sun Oct 14 00:18:29 2012
@@ -41,13 +41,8 @@ public final class ConstantMethodHandle
* @throws IOException
*/
ConstantMethodHandle(DataInput file) throws IOException {
- this();
+ super(Constants.CONSTANT_MethodHandle);
file.readUnsignedByte(); // Unused reference_kind
file.readUnsignedShort(); // Unused reference_index
}
-
-
- public ConstantMethodHandle() {
- super(Constants.CONSTANT_MethodHandle);
- }
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java?rev=1397973&r1=1397972&r2=1397973&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
Sun Oct 14 00:18:29 2012
@@ -41,12 +41,7 @@ public final class ConstantMethodType ex
* @throws IOException
*/
ConstantMethodType(DataInput file) throws IOException {
- this();
- file.readUnsignedShort(); // Unused descriptor_index
- }
-
-
- public ConstantMethodType() {
super(Constants.CONSTANT_MethodType);
+ file.readUnsignedShort(); // Unused descriptor_index
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java?rev=1397973&r1=1397972&r2=1397973&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
Sun Oct 14 00:18:29 2012
@@ -43,18 +43,8 @@ public final class ConstantValue extends
*/
ConstantValue(int name_index, int length, DataInput file, ConstantPool
constant_pool)
throws IOException {
- this(name_index, length, constant_pool);
- }
-
-
- /**
- * @param name_index Name index in constant pool
- * @param length Content length in bytes
- * @param constant_pool Array of constants
- */
- public ConstantValue(int name_index, int length,
- ConstantPool constant_pool) {
super(name_index, length, constant_pool);
+ file.readUnsignedShort(); // Unused constantvalue_index
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java?rev=1397973&r1=1397972&r2=1397973&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java Sun
Oct 14 00:18:29 2012
@@ -43,23 +43,13 @@ public final class PMGClass extends Attr
*/
PMGClass(int name_index, int length, DataInput file, ConstantPool
constant_pool)
throws IOException {
- this(name_index, length, constant_pool);
+ super(name_index, length, constant_pool);
file.readUnsignedShort(); // Unused pmg_index
file.readUnsignedShort(); // Unused pmg_class_index
}
/**
- * @param name_index Index in constant pool to CONSTANT_Utf8
- * @param length Content length in bytes
- * @param constant_pool Array of constants
- */
- public PMGClass(int name_index, int length, ConstantPool constant_pool) {
- super(name_index, length, constant_pool);
- }
-
-
- /**
* @return deep copy of this attribute
*/
@Override
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java?rev=1397973&r1=1397972&r2=1397973&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java Sun
Oct 14 00:18:29 2012
@@ -43,18 +43,8 @@ public final class Signature extends Att
*/
Signature(int name_index, int length, DataInput file, ConstantPool
constant_pool)
throws IOException {
- this(name_index, length, constant_pool);
- file.readUnsignedShort(); // Unused signature_index
- }
-
-
- /**
- * @param name_index Index in constant pool to CONSTANT_Utf8
- * @param length Content length in bytes
- * @param constant_pool Array of constants
- */
- public Signature(int name_index, int length, ConstantPool constant_pool) {
super(name_index, length, constant_pool);
+ file.readUnsignedShort(); // Unused signature_index
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java?rev=1397973&r1=1397972&r2=1397973&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java Sun
Oct 14 00:18:29 2012
@@ -45,20 +45,8 @@ public final class SourceFile extends At
*/
SourceFile(int name_index, int length, DataInput file, ConstantPool
constant_pool)
throws IOException {
- this(name_index, length, constant_pool);
- file.readUnsignedShort(); // Unused sourcefile_index
- }
-
-
- /**
- * @param name_index Index in constant pool to CONSTANT_Utf8, which
- * should represent the string "SourceFile".
- * @param length Content length in bytes, the value should be 2.
- * @param constant_pool The constant pool that this attribute is
- * associated with.
- */
- public SourceFile(int name_index, int length, ConstantPool constant_pool) {
super(name_index, length, constant_pool);
+ file.readUnsignedShort(); // Unused sourcefile_index
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
