Author: ebourg
Date: Fri Dec 19 12:57:12 2014
New Revision: 1646694
URL: http://svn.apache.org/r1646694
Log:
Replaced DataInputStream with DataInput where possible
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationDefault.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Annotations.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethod.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantFieldref.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantInterfaceMethodref.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantMethodref.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantPool.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantUtf8.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantValue.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Deprecated.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ExceptionTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClasses.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumberTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameter.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameters.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/PMGClass.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotationEntry.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotations.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleAnnotations.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleAnnotations.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleParameterAnnotations.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SourceFile.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMap.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Synthetic.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationDefault.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationDefault.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationDefault.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationDefault.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.bcel.Constants;
@@ -40,18 +40,18 @@ public class AnnotationDefault extends A
* Index pointing to the name <em>Code</em>
* @param length
* Content length in bytes
- * @param file
+ * @param input
* Input stream
* @param constant_pool
* Array of constants
*/
public AnnotationDefault(int name_index, int length,
- DataInputStream file, ConstantPool constant_pool)
+ DataInput input, ConstantPool constant_pool)
throws IOException
{
this(name_index, length, (ElementValue) null,
constant_pool);
- default_value = ElementValue.readElementValue(file,
constant_pool);
+ default_value = ElementValue.readElementValue(input,
constant_pool);
}
/**
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
@@ -46,19 +46,19 @@ public class AnnotationEntry implements
/**
* Factory method to create an AnnotionEntry from a DataInputStream
*
- * @param file
+ * @param input
* @param constant_pool
* @param isRuntimeVisible
* @return the entry
* @throws IOException
*/
- public static AnnotationEntry read(DataInputStream file, ConstantPool
constant_pool, boolean isRuntimeVisible) throws IOException {
+ public static AnnotationEntry read(DataInput input, ConstantPool
constant_pool, boolean isRuntimeVisible) throws IOException {
- final AnnotationEntry annotationEntry = new
AnnotationEntry(file.readUnsignedShort(), constant_pool, isRuntimeVisible);
- final int num_element_value_pairs = (file.readUnsignedShort());
+ final AnnotationEntry annotationEntry = new
AnnotationEntry(input.readUnsignedShort(), constant_pool, isRuntimeVisible);
+ final int num_element_value_pairs = (input.readUnsignedShort());
annotationEntry.element_value_pairs = new
ArrayList<ElementValuePair>();
for (int i = 0; i < num_element_value_pairs; i++) {
- annotationEntry.element_value_pairs.add(new
ElementValuePair(file.readUnsignedShort(), ElementValue.readElementValue(file,
constant_pool),
+ annotationEntry.element_value_pairs.add(new
ElementValuePair(input.readUnsignedShort(),
ElementValue.readElementValue(input, constant_pool),
constant_pool));
}
return annotationEntry;
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Annotations.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Annotations.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Annotations.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Annotations.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -39,15 +39,15 @@ public abstract class Annotations extend
* @param annotation_type the subclass type of the annotation
* @param name_index Index pointing to the name <em>Code</em>
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
*/
- public Annotations(byte annotation_type, int name_index, int length,
DataInputStream file, ConstantPool constant_pool, boolean isRuntimeVisible)
throws IOException {
+ public Annotations(byte annotation_type, int name_index, int length,
DataInput input, ConstantPool constant_pool, boolean isRuntimeVisible) throws
IOException {
this(annotation_type, name_index, length, (AnnotationEntry[]) null,
constant_pool, isRuntimeVisible);
- final int annotation_table_length = (file.readUnsignedShort());
+ final int annotation_table_length = (input.readUnsignedShort());
annotation_table = new AnnotationEntry[annotation_table_length];
for (int i = 0; i < annotation_table_length; i++) {
- annotation_table[i] = AnnotationEntry.read(file, constant_pool,
isRuntimeVisible);
+ annotation_table[i] = AnnotationEntry.read(input, constant_pool,
isRuntimeVisible);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java
Fri Dec 19 12:57:12 2014
@@ -120,15 +120,19 @@ public abstract class Attribute implemen
readers.remove(name);
}
- /*
+ /**
* Class method reads one attribute from the input data stream. This method
* must not be accessible from the outside. It is called by the Field and
* Method constructor methods.
*
* @see Field
- * @see Method @param file Input stream @param constant_pool Array of
- * constants @return Attribute @throws IOException @throws
- * ClassFormatException
+ * @see Method
+ *
+ * @param file Input stream
+ * @param constant_pool Array of constants
+ * @return Attribute
+ * @throws IOException
+ * @throws ClassFormatException
*/
public static Attribute readAttribute(DataInputStream file,
ConstantPool constant_pool) throws IOException,
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethod.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethod.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethod.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethod.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
@@ -42,20 +42,20 @@ public class BootstrapMethod implements
}
/**
- * Construct object from file stream.
+ * Construct object from input stream.
*
- * @param file Input stream
+ * @param input Input stream
* @throws IOException
* @throws ClassFormatException
*/
- BootstrapMethod(DataInputStream file) throws IOException,
ClassFormatException {
- bootstrap_method_ref = file.readUnsignedShort();
+ BootstrapMethod(DataInput input) throws IOException, ClassFormatException {
+ bootstrap_method_ref = input.readUnsignedShort();
- int num_bootstrap_methods = file.readUnsignedShort();
+ int num_bootstrap_methods = input.readUnsignedShort();
bootstrap_arguments = new int[num_bootstrap_methods];
for (int i = 0; i < num_bootstrap_methods; i++) {
- bootstrap_arguments[i] = file.readUnsignedShort();
+ bootstrap_arguments[i] = input.readUnsignedShort();
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -40,13 +40,13 @@ public class BootstrapMethods extends At
this.bootstrap_methods = bootstrap_methods;
}
- BootstrapMethods(int name_index, int length, DataInputStream file,
ConstantPool constant_pool) throws IOException {
+ BootstrapMethods(int name_index, int length, DataInput input, ConstantPool
constant_pool) throws IOException {
this(name_index, length, (BootstrapMethod[]) null, constant_pool);
- int num_bootstrap_methods = file.readUnsignedShort();
+ int num_bootstrap_methods = input.readUnsignedShort();
bootstrap_methods = new BootstrapMethod[num_bootstrap_methods];
for (int i = 0; i < num_bootstrap_methods; i++) {
- bootstrap_methods[i] = new BootstrapMethod(file);
+ bootstrap_methods[i] = new BootstrapMethod(input);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java
Fri Dec 19 12:57:12 2014
@@ -17,6 +17,7 @@
*/
package org.apache.bcel.classfile;
+import java.io.DataInput;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -120,43 +121,43 @@ public abstract class Constant implement
/**
- * Read one constant from the given file, the type depends on a tag byte.
+ * Read one constant from the given input, the type depends on a tag byte.
*
- * @param file Input stream
+ * @param input Input stream
* @return Constant object
*/
- static Constant readConstant( DataInputStream file ) throws IOException,
+ static Constant readConstant( DataInput input ) throws IOException,
ClassFormatException {
- byte b = file.readByte(); // Read tag byte
+ byte b = input.readByte(); // Read tag byte
switch (b) {
case Constants.CONSTANT_Class:
- return new ConstantClass(file);
+ return new ConstantClass(input);
case Constants.CONSTANT_Fieldref:
- return new ConstantFieldref(file);
+ return new ConstantFieldref(input);
case Constants.CONSTANT_Methodref:
- return new ConstantMethodref(file);
+ return new ConstantMethodref(input);
case Constants.CONSTANT_InterfaceMethodref:
- return new ConstantInterfaceMethodref(file);
+ return new ConstantInterfaceMethodref(input);
case Constants.CONSTANT_String:
- return new ConstantString(file);
+ return new ConstantString(input);
case Constants.CONSTANT_Integer:
- return new ConstantInteger(file);
+ return new ConstantInteger(input);
case Constants.CONSTANT_Float:
- return new ConstantFloat(file);
+ return new ConstantFloat(input);
case Constants.CONSTANT_Long:
- return new ConstantLong(file);
+ return new ConstantLong(input);
case Constants.CONSTANT_Double:
- return new ConstantDouble(file);
+ return new ConstantDouble(input);
case Constants.CONSTANT_NameAndType:
- return new ConstantNameAndType(file);
+ return new ConstantNameAndType(input);
case Constants.CONSTANT_Utf8:
- return ConstantUtf8.getInstance(file);
+ return ConstantUtf8.getInstance(input);
case Constants.CONSTANT_MethodHandle:
- return new ConstantMethodHandle(file);
+ return new ConstantMethodHandle(input);
case Constants.CONSTANT_MethodType:
- return new ConstantMethodType(file);
+ return new ConstantMethodType(input);
case Constants.CONSTANT_InvokeDynamic:
- return new ConstantInvokeDynamic(file);
+ return new ConstantInvokeDynamic(input);
default:
throw new ClassFormatException("Invalid byte tag in constant
pool: " + b);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantFieldref.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantFieldref.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantFieldref.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantFieldref.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.IOException;
import org.apache.bcel.Constants;
@@ -41,13 +41,13 @@ public final class ConstantFieldref exte
/**
- * Initialize instance from file data.
+ * Initialize instance from input data.
*
- * @param file input stream
+ * @param input input stream
* @throws IOException
*/
- ConstantFieldref(DataInputStream file) throws IOException {
- super(Constants.CONSTANT_Fieldref, file);
+ ConstantFieldref(DataInput input) throws IOException {
+ super(Constants.CONSTANT_Fieldref, input);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantInterfaceMethodref.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantInterfaceMethodref.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantInterfaceMethodref.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantInterfaceMethodref.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.IOException;
import org.apache.bcel.Constants;
@@ -41,13 +41,13 @@ public final class ConstantInterfaceMeth
/**
- * Initialize instance from file data.
+ * Initialize instance from input data.
*
- * @param file input stream
+ * @param input input stream
* @throws IOException
*/
- ConstantInterfaceMethodref(DataInputStream file) throws IOException {
- super(Constants.CONSTANT_InterfaceMethodref, file);
+ ConstantInterfaceMethodref(DataInput input) throws IOException {
+ super(Constants.CONSTANT_InterfaceMethodref, input);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantMethodref.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantMethodref.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantMethodref.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantMethodref.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.IOException;
import org.apache.bcel.Constants;
@@ -41,13 +41,13 @@ public final class ConstantMethodref ext
/**
- * Initialize instance from file data.
+ * Initialize instance from input data.
*
- * @param file input stream
+ * @param input input stream
* @throws IOException
*/
- ConstantMethodref(DataInputStream file) throws IOException {
- super(Constants.CONSTANT_Methodref, file);
+ ConstantMethodref(DataInput input) throws IOException {
+ super(Constants.CONSTANT_Methodref, input);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantPool.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantPool.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantPool.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
@@ -52,21 +52,21 @@ public class ConstantPool implements Clo
/**
- * Read constants from given file stream.
+ * Read constants from given input stream.
*
- * @param file Input stream
+ * @param input Input stream
* @throws IOException
* @throws ClassFormatException
*/
- ConstantPool(DataInputStream file) throws IOException,
ClassFormatException {
+ ConstantPool(DataInput input) throws IOException, ClassFormatException {
byte tag;
- constant_pool_count = file.readUnsignedShort();
+ constant_pool_count = input.readUnsignedShort();
constant_pool = new Constant[constant_pool_count];
/* constant_pool[0] is unused by the compiler and may be used freely
* by the implementation.
*/
for (int i = 1; i < constant_pool_count; i++) {
- constant_pool[i] = Constant.readConstant(file);
+ constant_pool[i] = Constant.readConstant(input);
/* Quote from the JVM specification:
* "All eight byte constants take up two spots in the constant
pool.
* If this is the n'th byte in the constant pool, then the next
item
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantUtf8.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantUtf8.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantUtf8.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantUtf8.java
Fri Dec 19 12:57:12 2014
@@ -18,7 +18,6 @@
package org.apache.bcel.classfile;
import java.io.DataInput;
-import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.HashMap;
@@ -94,8 +93,8 @@ public final class ConstantUtf8 extends
return getCachedInstance(s);
}
- public static ConstantUtf8 getInstance (DataInputStream file) throws
IOException {
- return getInstance(file.readUTF());
+ public static ConstantUtf8 getInstance (DataInput input) throws
IOException {
+ return getInstance(input.readUTF());
}
/**
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantValue.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantValue.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantValue.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantValue.java
Fri Dec 19 12:57:12 2014
@@ -48,16 +48,16 @@ public final class ConstantValue extends
/**
- * Construct object from file stream.
+ * Construct object from input stream.
* @param name_index Name index in constant pool
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
* @throws IOException
*/
- ConstantValue(int name_index, int length, DataInput file, ConstantPool
constant_pool)
+ ConstantValue(int name_index, int length, DataInput input, ConstantPool
constant_pool)
throws IOException {
- this(name_index, length, file.readUnsignedShort(), constant_pool);
+ this(name_index, length, input.readUnsignedShort(), constant_pool);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Deprecated.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Deprecated.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Deprecated.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Deprecated.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.bcel.Constants;
@@ -59,19 +59,20 @@ public final class Deprecated extends At
/**
- * Construct object from file stream.
+ * Construct object from input stream.
+ *
* @param name_index Index in constant pool to CONSTANT_Utf8
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
* @throws IOException
*/
- Deprecated(int name_index, int length, DataInputStream file, ConstantPool
constant_pool)
+ Deprecated(int name_index, int length, DataInput input, ConstantPool
constant_pool)
throws IOException {
this(name_index, length, (byte[]) null, constant_pool);
if (length > 0) {
bytes = new byte[length];
- file.readFully(bytes);
+ input.readFully(bytes);
System.err.println("Deprecated attribute with length > 0");
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -79,54 +79,54 @@ public abstract class ElementValue
public static final int PRIMITIVE_BOOLEAN = 'Z';
- public static ElementValue readElementValue(DataInputStream dis,
+ public static ElementValue readElementValue(DataInput input,
ConstantPool cpool) throws IOException
{
- byte type = dis.readByte();
+ byte type = input.readByte();
switch (type)
{
case 'B': // byte
- return new SimpleElementValue(PRIMITIVE_BYTE, dis
+ return new SimpleElementValue(PRIMITIVE_BYTE, input
.readUnsignedShort(), cpool);
case 'C': // char
- return new SimpleElementValue(PRIMITIVE_CHAR, dis
+ return new SimpleElementValue(PRIMITIVE_CHAR, input
.readUnsignedShort(), cpool);
case 'D': // double
- return new SimpleElementValue(PRIMITIVE_DOUBLE, dis
+ return new SimpleElementValue(PRIMITIVE_DOUBLE, input
.readUnsignedShort(), cpool);
case 'F': // float
- return new SimpleElementValue(PRIMITIVE_FLOAT, dis
+ return new SimpleElementValue(PRIMITIVE_FLOAT, input
.readUnsignedShort(), cpool);
case 'I': // int
- return new SimpleElementValue(PRIMITIVE_INT, dis
+ return new SimpleElementValue(PRIMITIVE_INT, input
.readUnsignedShort(), cpool);
case 'J': // long
- return new SimpleElementValue(PRIMITIVE_LONG, dis
+ return new SimpleElementValue(PRIMITIVE_LONG, input
.readUnsignedShort(), cpool);
case 'S': // short
- return new SimpleElementValue(PRIMITIVE_SHORT, dis
+ return new SimpleElementValue(PRIMITIVE_SHORT, input
.readUnsignedShort(), cpool);
case 'Z': // boolean
- return new SimpleElementValue(PRIMITIVE_BOOLEAN, dis
+ return new SimpleElementValue(PRIMITIVE_BOOLEAN, input
.readUnsignedShort(), cpool);
case 's': // String
- return new SimpleElementValue(STRING, dis.readUnsignedShort(),
+ return new SimpleElementValue(STRING, input.readUnsignedShort(),
cpool);
case 'e': // Enum constant
- return new EnumElementValue(ENUM_CONSTANT, dis.readUnsignedShort(),
- dis.readUnsignedShort(), cpool);
+ return new EnumElementValue(ENUM_CONSTANT,
input.readUnsignedShort(),
+ input.readUnsignedShort(), cpool);
case 'c': // Class
- return new ClassElementValue(CLASS, dis.readUnsignedShort(),
cpool);
+ return new ClassElementValue(CLASS, input.readUnsignedShort(),
cpool);
case '@': // Annotation
// TODO isRuntimeVisible
return new AnnotationElementValue(ANNOTATION, AnnotationEntry.read(
- dis, cpool, false), cpool);
+ input, cpool, false), cpool);
case '[': // Array
- int numArrayVals = dis.readUnsignedShort();
+ int numArrayVals = input.readUnsignedShort();
ElementValue[] evalues = new ElementValue[numArrayVals];
for (int j = 0; j < numArrayVals; j++)
{
- evalues[j] = ElementValue.readElementValue(dis, cpool);
+ evalues[j] = ElementValue.readElementValue(input, cpool);
}
return new ArrayElementValue(ARRAY, evalues, cpool);
default:
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java
Fri Dec 19 12:57:12 2014
@@ -16,7 +16,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -45,8 +45,8 @@ public class EnclosingMethod extends Att
private int methodIndex;
// Ctors - and code to read an attribute in.
- public EnclosingMethod(int nameIndex, int len, DataInputStream dis,
ConstantPool cpool) throws IOException {
- this(nameIndex, len, dis.readUnsignedShort(), dis.readUnsignedShort(),
cpool);
+ public EnclosingMethod(int nameIndex, int len, DataInput input,
ConstantPool cpool) throws IOException {
+ this(nameIndex, len, input.readUnsignedShort(),
input.readUnsignedShort(), cpool);
}
private EnclosingMethod(int nameIndex, int len, int classIdx,int
methodIdx, ConstantPool cpool) {
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ExceptionTable.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ExceptionTable.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ExceptionTable.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ExceptionTable.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.bcel.Constants;
@@ -64,20 +64,20 @@ public final class ExceptionTable extend
/**
- * Construct object from file stream.
+ * Construct object from input stream.
* @param name_index Index in constant pool
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
* @throws IOException
*/
- ExceptionTable(int name_index, int length, DataInputStream file,
ConstantPool constant_pool)
+ ExceptionTable(int name_index, int length, DataInput input, ConstantPool
constant_pool)
throws IOException {
this(name_index, length, (int[]) null, constant_pool);
- number_of_exceptions = file.readUnsignedShort();
+ number_of_exceptions = input.readUnsignedShort();
exception_index_table = new int[number_of_exceptions];
for (int i = 0; i < number_of_exceptions; i++) {
- exception_index_table[i] = file.readUnsignedShort();
+ exception_index_table[i] = input.readUnsignedShort();
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClasses.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClasses.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClasses.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClasses.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.bcel.Constants;
@@ -62,21 +62,21 @@ public final class InnerClasses extends
/**
- * Construct object from file stream.
+ * Construct object from input stream.
*
* @param name_index Index in constant pool to CONSTANT_Utf8
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
* @throws IOException
*/
- InnerClasses(int name_index, int length, DataInputStream file,
ConstantPool constant_pool)
+ InnerClasses(int name_index, int length, DataInput input, ConstantPool
constant_pool)
throws IOException {
this(name_index, length, (InnerClass[]) null, constant_pool);
- number_of_classes = file.readUnsignedShort();
+ number_of_classes = input.readUnsignedShort();
inner_classes = new InnerClass[number_of_classes];
for (int i = 0; i < number_of_classes; i++) {
- inner_classes[i] = new InnerClass(file);
+ inner_classes[i] = new InnerClass(input);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumberTable.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumberTable.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumberTable.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumberTable.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.bcel.Constants;
@@ -62,20 +62,20 @@ public final class LineNumberTable exten
/**
- * Construct object from file stream.
+ * Construct object from input stream.
* @param name_index Index of name
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
* @throws IOException
*/
- LineNumberTable(int name_index, int length, DataInputStream file,
ConstantPool constant_pool)
+ LineNumberTable(int name_index, int length, DataInput input, ConstantPool
constant_pool)
throws IOException {
this(name_index, length, (LineNumber[]) null, constant_pool);
- line_number_table_length = (file.readUnsignedShort());
+ line_number_table_length = (input.readUnsignedShort());
line_number_table = new LineNumber[line_number_table_length];
for (int i = 0; i < line_number_table_length; i++) {
- line_number_table[i] = new LineNumber(file);
+ line_number_table[i] = new LineNumber(input);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.bcel.Constants;
@@ -61,20 +61,20 @@ public class LocalVariableTable extends
/**
- * Construct object from file stream.
+ * Construct object from input stream.
* @param name_index Index in constant pool
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
* @throws IOException
*/
- LocalVariableTable(int name_index, int length, DataInputStream file,
ConstantPool constant_pool)
+ LocalVariableTable(int name_index, int length, DataInput input,
ConstantPool constant_pool)
throws IOException {
this(name_index, length, (LocalVariable[]) null, constant_pool);
- local_variable_table_length = (file.readUnsignedShort());
+ local_variable_table_length = (input.readUnsignedShort());
local_variable_table = new LocalVariable[local_variable_table_length];
for (int i = 0; i < local_variable_table_length; i++) {
- local_variable_table[i] = new LocalVariable(file, constant_pool);
+ local_variable_table[i] = new LocalVariable(input, constant_pool);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java
Fri Dec 19 12:57:12 2014
@@ -64,14 +64,14 @@ private int local_variable_t
setLocalVariableTable(local_variable_table);
}
- LocalVariableTypeTable(int nameIdx, int len, DataInputStream
dis,ConstantPool cpool) throws IOException {
+ LocalVariableTypeTable(int nameIdx, int len, DataInput input,ConstantPool
cpool) throws IOException {
this(nameIdx, len, (LocalVariable[])null, cpool);
- local_variable_type_table_length = (dis.readUnsignedShort());
+ local_variable_type_table_length = (input.readUnsignedShort());
local_variable_type_table = new
LocalVariable[local_variable_type_table_length];
for(int i=0; i < local_variable_type_table_length; i++) {
- local_variable_type_table[i] = new LocalVariable(dis, cpool);
+ local_variable_type_table[i] = new LocalVariable(input, cpool);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameter.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameter.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameter.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameter.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
@@ -44,15 +44,15 @@ public class MethodParameter implements
}
/**
- * Construct object from file stream.
+ * Construct object from input stream.
*
- * @param file Input stream
+ * @param input Input stream
* @throws java.io.IOException
* @throws ClassFormatException
*/
- MethodParameter(DataInputStream file) throws IOException {
- name_index = file.readUnsignedShort();
- access_flags = file.readUnsignedShort();
+ MethodParameter(DataInput input) throws IOException {
+ name_index = input.readUnsignedShort();
+ access_flags = input.readUnsignedShort();
}
public int getNameIndex() {
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameters.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameters.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameters.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameters.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -35,14 +35,14 @@ public class MethodParameters extends At
private MethodParameter[] parameters = new MethodParameter[0];
- MethodParameters(int name_index, int length, DataInputStream file,
ConstantPool constant_pool) throws IOException {
+ MethodParameters(int name_index, int length, DataInput input, ConstantPool
constant_pool) throws IOException {
super(Constants.ATTR_METHOD_PARAMETERS, name_index, length,
constant_pool);
System.out.println("new MethodParameters");
- int parameters_count = file.readUnsignedByte();
+ int parameters_count = input.readUnsignedByte();
parameters = new MethodParameter[parameters_count];
for (int i = 0; i < parameters_count; i++) {
- parameters[i] = new MethodParameter(file);
+ parameters[i] = new MethodParameter(input);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/PMGClass.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/PMGClass.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/PMGClass.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/PMGClass.java
Fri Dec 19 12:57:12 2014
@@ -48,16 +48,16 @@ public final class PMGClass extends Attr
/**
- * Construct object from file stream.
+ * Construct object from input stream.
* @param name_index Index in constant pool to CONSTANT_Utf8
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
* @throws IOException
*/
- PMGClass(int name_index, int length, DataInput file, ConstantPool
constant_pool)
+ PMGClass(int name_index, int length, DataInput input, ConstantPool
constant_pool)
throws IOException {
- this(name_index, length, file.readUnsignedShort(),
file.readUnsignedShort(), constant_pool);
+ this(name_index, length, input.readUnsignedShort(),
input.readUnsignedShort(), constant_pool);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotationEntry.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotationEntry.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotationEntry.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotationEntry.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.ArrayList;
@@ -40,16 +40,17 @@ public class ParameterAnnotationEntry im
/**
- * Construct object from file stream.
- * @param file Input stream
+ * Construct object from input stream.
+ *
+ * @param input Input stream
* @throws IOException
*/
- ParameterAnnotationEntry(DataInputStream file, ConstantPool constant_pool)
throws IOException {
- annotation_table_length = (file.readUnsignedShort());
+ ParameterAnnotationEntry(DataInput input, ConstantPool constant_pool)
throws IOException {
+ annotation_table_length = (input.readUnsignedShort());
annotation_table = new AnnotationEntry[annotation_table_length];
for (int i = 0; i < annotation_table_length; i++) {
// TODO isRuntimeVisible
- annotation_table[i] = AnnotationEntry.read(file, constant_pool,
false);
+ annotation_table[i] = AnnotationEntry.read(input, constant_pool,
false);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotations.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotations.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotations.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotations.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -39,17 +39,17 @@ public abstract class ParameterAnnotatio
* @param parameter_annotation_type the subclass type of the parameter
annotation
* @param name_index Index pointing to the name <em>Code</em>
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
*/
ParameterAnnotations(byte parameter_annotation_type, int name_index, int
length,
- DataInputStream file, ConstantPool constant_pool) throws
IOException {
+ DataInput input, ConstantPool constant_pool) throws IOException {
this(parameter_annotation_type, name_index, length,
(ParameterAnnotationEntry[]) null,
constant_pool);
- num_parameters = (file.readUnsignedByte());
+ num_parameters = (input.readUnsignedByte());
parameter_annotation_table = new
ParameterAnnotationEntry[num_parameters];
for (int i = 0; i < num_parameters; i++) {
- parameter_annotation_table[i] = new ParameterAnnotationEntry(file,
constant_pool);
+ parameter_annotation_table[i] = new
ParameterAnnotationEntry(input, constant_pool);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleAnnotations.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleAnnotations.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleAnnotations.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleAnnotations.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.bcel.Constants;
@@ -39,17 +39,15 @@ public class RuntimeInvisibleAnnotations
* Index pointing to the name <em>Code</em>
* @param length
* Content length in bytes
- * @param file
+ * @param input
* Input stream
* @param constant_pool
* Array of constants
*/
- RuntimeInvisibleAnnotations(int name_index, int length,
- DataInputStream file, ConstantPool constant_pool)
+ RuntimeInvisibleAnnotations(int name_index, int length, DataInput input,
ConstantPool constant_pool)
throws IOException
{
- super(Constants.ATTR_RUNTIME_INVISIBLE_ANNOTATIONS, name_index, length,
- file, constant_pool, false);
+ super(Constants.ATTR_RUNTIME_INVISIBLE_ANNOTATIONS, name_index,
length, input, constant_pool, false);
}
/**
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleParameterAnnotations.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.IOException;
import org.apache.bcel.Constants;
@@ -37,12 +37,12 @@ public class RuntimeInvisibleParameterAn
/**
* @param name_index Index pointing to the name <em>Code</em>
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
*/
- RuntimeInvisibleParameterAnnotations(int name_index, int length,
DataInputStream file,
+ RuntimeInvisibleParameterAnnotations(int name_index, int length, DataInput
input,
ConstantPool constant_pool) throws IOException {
- super(Constants.ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS,
name_index, length, file,
+ super(Constants.ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS,
name_index, length, input,
constant_pool);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleAnnotations.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleAnnotations.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleAnnotations.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleAnnotations.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.bcel.Constants;
@@ -39,17 +39,15 @@ public class RuntimeVisibleAnnotations e
* Index pointing to the name <em>Code</em>
* @param length
* Content length in bytes
- * @param file
+ * @param input
* Input stream
* @param constant_pool
* Array of constants
*/
- public RuntimeVisibleAnnotations(int name_index, int length,
- DataInputStream file, ConstantPool constant_pool)
+ public RuntimeVisibleAnnotations(int name_index, int length, DataInput
input, ConstantPool constant_pool)
throws IOException
{
- super(Constants.ATTR_RUNTIME_VISIBLE_ANNOTATIONS, name_index, length,
- file, constant_pool, true);
+ super(Constants.ATTR_RUNTIME_VISIBLE_ANNOTATIONS, name_index, length,
input, constant_pool, true);
}
/**
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleParameterAnnotations.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleParameterAnnotations.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleParameterAnnotations.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleParameterAnnotations.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.IOException;
import org.apache.bcel.Constants;
@@ -37,13 +37,12 @@ public class RuntimeVisibleParameterAnno
/**
* @param name_index Index pointing to the name <em>Code</em>
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
*/
- RuntimeVisibleParameterAnnotations(int name_index, int length,
DataInputStream file,
- ConstantPool constant_pool) throws IOException {
- super(Constants.ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS,
name_index, length, file,
- constant_pool);
+ RuntimeVisibleParameterAnnotations(int name_index, int length, DataInput
input, ConstantPool constant_pool)
+ throws IOException {
+ super(Constants.ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS,
name_index, length, input, constant_pool);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java
Fri Dec 19 12:57:12 2014
@@ -51,13 +51,13 @@ public final class Signature extends Att
* Construct object from file stream.
* @param name_index Index in constant pool to CONSTANT_Utf8
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
* @throws IOException
*/
- Signature(int name_index, int length, DataInput file, ConstantPool
constant_pool)
+ Signature(int name_index, int length, DataInput input, ConstantPool
constant_pool)
throws IOException {
- this(name_index, length, file.readUnsignedShort(), constant_pool);
+ this(name_index, length, input.readUnsignedShort(), constant_pool);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SourceFile.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SourceFile.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SourceFile.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SourceFile.java
Fri Dec 19 12:57:12 2014
@@ -49,16 +49,16 @@ public final class SourceFile extends At
/**
- * Construct object from file stream.
+ * Construct object from input stream.
* @param name_index Index in constant pool to CONSTANT_Utf8
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
* @throws IOException
*/
- SourceFile(int name_index, int length, DataInput file, ConstantPool
constant_pool)
+ SourceFile(int name_index, int length, DataInput input, ConstantPool
constant_pool)
throws IOException {
- this(name_index, length, file.readUnsignedShort(), constant_pool);
+ this(name_index, length, input.readUnsignedShort(), constant_pool);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMap.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMap.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMap.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.bcel.Constants;
@@ -57,20 +57,20 @@ public final class StackMap extends Attr
/**
- * Construct object from file stream.
+ * Construct object from input stream.
+ *
* @param name_index Index of name
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
* @throws IOException
*/
- StackMap(int name_index, int length, DataInputStream file, ConstantPool
constant_pool)
- throws IOException {
+ StackMap(int name_index, int length, DataInput input, ConstantPool
constant_pool) throws IOException {
this(name_index, length, (StackMapEntry[]) null, constant_pool);
- map_length = file.readUnsignedShort();
+ map_length = input.readUnsignedShort();
map = new StackMapEntry[map_length];
for (int i = 0; i < map_length; i++) {
- map[i] = new StackMapEntry(file, constant_pool);
+ map[i] = new StackMapEntry(input, constant_pool);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapEntry.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
@@ -45,20 +45,21 @@ public final class StackMapEntry impleme
/**
- * Construct object from file stream.
- * @param file Input stream
+ * Construct object from input stream.
+ *
+ * @param input Input stream
* @throws IOException
*/
- StackMapEntry(DataInputStream file, ConstantPool constant_pool) throws
IOException {
- this(file.readShort(), file.readShort(), null, -1, null,
constant_pool);
+ StackMapEntry(DataInput input, ConstantPool constant_pool) throws
IOException {
+ this(input.readShort(), input.readShort(), null, -1, null,
constant_pool);
types_of_locals = new StackMapType[number_of_locals];
for (int i = 0; i < number_of_locals; i++) {
- types_of_locals[i] = new StackMapType(file, constant_pool);
+ types_of_locals[i] = new StackMapType(input, constant_pool);
}
- number_of_stack_items = file.readShort();
+ number_of_stack_items = input.readShort();
types_of_stack_items = new StackMapType[number_of_stack_items];
for (int i = 0; i < number_of_stack_items; i++) {
- types_of_stack_items[i] = new StackMapType(file, constant_pool);
+ types_of_stack_items[i] = new StackMapType(input, constant_pool);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Synthetic.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Synthetic.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Synthetic.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Synthetic.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.bcel.Constants;
@@ -65,19 +65,20 @@ public final class Synthetic extends Att
/**
- * Construct object from file stream.
+ * Construct object from input stream.
+ *
* @param name_index Index in constant pool to CONSTANT_Utf8
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
* @throws IOException
*/
- Synthetic(int name_index, int length, DataInputStream file, ConstantPool
constant_pool)
+ Synthetic(int name_index, int length, DataInput input, ConstantPool
constant_pool)
throws IOException {
this(name_index, length, (byte[]) null, constant_pool);
if (length > 0) {
bytes = new byte[length];
- file.readFully(bytes);
+ input.readFully(bytes);
System.err.println("Synthetic attribute with length > 0");
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java?rev=1646694&r1=1646693&r2=1646694&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java
Fri Dec 19 12:57:12 2014
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.HashMap;
@@ -83,19 +83,20 @@ public final class Unknown extends Attri
/**
- * Construct object from file stream.
+ * Construct object from input stream.
+ *
* @param name_index Index in constant pool
* @param length Content length in bytes
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
* @throws IOException
*/
- Unknown(int name_index, int length, DataInputStream file, ConstantPool
constant_pool)
+ Unknown(int name_index, int length, DataInput input, ConstantPool
constant_pool)
throws IOException {
this(name_index, length, (byte[]) null, constant_pool);
if (length > 0) {
bytes = new byte[length];
- file.readFully(bytes);
+ input.readFully(bytes);
}
}
