Author: ebourg
Date: Mon Jan 26 23:47:56 2015
New Revision: 1654916
URL: http://svn.apache.org/r1654916
Log:
Replaced more DataInputStream with DataInput
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTableEntry.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java
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=1654916&r1=1654915&r2=1654916&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
Mon Jan 26 23:47:56 2015
@@ -44,7 +44,7 @@ public class AnnotationEntry implements
private List<ElementValuePair> element_value_pairs;
/**
- * Factory method to create an AnnotionEntry from a DataInputStream
+ * Factory method to create an AnnotionEntry from a DataInput
*
* @param input
* @param constant_pool
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTable.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTable.java?rev=1654916&r1=1654915&r2=1654916&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTable.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTable.java
Mon Jan 26 23:47:56 2015
@@ -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,7 +65,7 @@ public final class StackMapTable extends
* @param constant_pool Array of constants
* @throws IOException
*/
- StackMapTable(int name_index, int length, DataInputStream file,
ConstantPool constant_pool)
+ StackMapTable(int name_index, int length, DataInput file, ConstantPool
constant_pool)
throws IOException {
this(name_index, length, (StackMapTableEntry[]) null, constant_pool);
map_length = file.readUnsignedShort();
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTableEntry.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTableEntry.java?rev=1654916&r1=1654915&r2=1654916&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTableEntry.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTableEntry.java
Mon Jan 26 23:47:56 2015
@@ -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;
@@ -53,8 +53,8 @@ public final class StackMapTableEntry im
* @param file Input stream
* @throws IOException
*/
- StackMapTableEntry(DataInputStream file, ConstantPool constant_pool)
throws IOException {
- this(file.read(), -1, -1, null, -1, null, constant_pool);
+ StackMapTableEntry(DataInput file, ConstantPool constant_pool) throws
IOException {
+ this(file.readByte() & 0xFF, -1, -1, null, -1, null, constant_pool);
if (frame_type >= Constants.SAME_FRAME && frame_type <=
Constants.SAME_FRAME_MAX) {
byte_code_offset_delta = frame_type - Constants.SAME_FRAME;
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=1654916&r1=1654915&r2=1654916&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
Mon Jan 26 23:47:56 2015
@@ -27,7 +27,7 @@ import org.apache.bcel.Constants;
/**
* This class represents a reference to an unknown (i.e.,
* application-specific) attribute of a class. It is instantiated from the
- * {@link Attribute#readAttribute(java.io.DataInputStream, ConstantPool)}
method.
+ * {@link Attribute#readAttribute(java.io.DataInput, ConstantPool)} method.
* Applications that need to read in application-specific attributes should
create an
* {@link AttributeReader} implementation and attach it via
* {@link Attribute#addAttributeReader(String, AttributeReader)}.
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java?rev=1654916&r1=1654915&r2=1654916&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
Mon Jan 26 23:47:56 2015
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.generic;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.ArrayList;
@@ -103,7 +103,7 @@ public class AnnotationEntryGen
isRuntimeVisible = vis;
}
- public static AnnotationEntryGen read(DataInputStream dis,
+ public static AnnotationEntryGen read(DataInput dis,
ConstantPoolGen cpool, boolean b) throws IOException
{
AnnotationEntryGen a = new AnnotationEntryGen(cpool);
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java?rev=1654916&r1=1654915&r2=1654916&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java
Mon Jan 26 23:47:56 2015
@@ -17,7 +17,7 @@
*/
package org.apache.bcel.generic;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -84,7 +84,7 @@ public abstract class ElementValueGen
public static final int PRIMITIVE_BOOLEAN = 'Z';
- public static ElementValueGen readElementValue(DataInputStream dis,
+ public static ElementValueGen readElementValue(DataInput dis,
ConstantPoolGen cpGen) throws IOException
{
int type = dis.readUnsignedByte();
