Author: markt
Date: Wed Sep 10 22:42:31 2014
New Revision: 1624164
URL: http://svn.apache.org/r1624164
Log:
Simplify constructors. No functional change.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java?rev=1624164&r1=1624163&r2=1624164&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
Wed Sep 10 22:42:31 2014
@@ -56,9 +56,6 @@ public class FieldOrMethod extends Acces
protected ConstantPool constant_pool;
- FieldOrMethod() {
- }
-
/**
* Construct object from file stream.
@@ -68,8 +65,11 @@ public class FieldOrMethod extends Acces
*/
protected FieldOrMethod(DataInputStream file, ConstantPool constant_pool)
throws IOException,
ClassFormatException {
- this(file.readUnsignedShort(), file.readUnsignedShort(),
file.readUnsignedShort(), null,
- constant_pool);
+ this.access_flags = file.readUnsignedShort();
+ this.name_index = file.readUnsignedShort();
+ this.signature_index = file.readUnsignedShort();
+ this.constant_pool = constant_pool;
+
attributes_count = file.readUnsignedShort();
attributes = new Attribute[attributes_count];
for (int i = 0; i < attributes_count; i++) {
@@ -79,23 +79,6 @@ public class FieldOrMethod extends Acces
/**
- * @param access_flags Access rights of method
- * @param name_index Points to field name in constant pool
- * @param signature_index Points to encoded signature
- * @param attributes Collection of attributes
- * @param constant_pool Array of constants
- */
- protected FieldOrMethod(int access_flags, int name_index, int
signature_index,
- Attribute[] attributes, ConstantPool constant_pool) {
- this.access_flags = access_flags;
- this.name_index = name_index;
- this.signature_index = signature_index;
- this.constant_pool = constant_pool;
- setAttributes(attributes);
- }
-
-
- /**
* @param attributes Collection of object attributes.
*/
public final void setAttributes( Attribute[] attributes ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
