You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/09/17 12:28:19 UTC
svn commit: r1625501 - in
/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile:
AnnotationEntry.java Annotations.java ClassParser.java Constant.java
ConstantPool.java ConstantUtf8.java ElementValue.java ElementValuePair.java
Author: markt
Date: Wed Sep 17 10:28:19 2014
New Revision: 1625501
URL: http://svn.apache.org/r1625501
Log:
Use the DataInput interface rather than an implementation
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=1625501&r1=1625500&r2=1625501&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java Wed Sep 17 10:28:19 2014
@@ -17,7 +17,7 @@
*/
package org.apache.tomcat.util.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -44,7 +44,7 @@ public class AnnotationEntry implements
* @param constant_pool
* @throws IOException
*/
- AnnotationEntry(DataInputStream file, ConstantPool constant_pool) throws IOException {
+ AnnotationEntry(DataInput file, ConstantPool constant_pool) throws IOException {
this.constant_pool = constant_pool;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java?rev=1625501&r1=1625500&r2=1625501&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java Wed Sep 17 10:28:19 2014
@@ -17,7 +17,7 @@
*/
package org.apache.tomcat.util.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.IOException;
/**
@@ -34,7 +34,7 @@ public class Annotations {
* @param file Input stream
* @param constant_pool Array of constants
*/
- Annotations(DataInputStream file, ConstantPool constant_pool)
+ Annotations(DataInput file, ConstantPool constant_pool)
throws IOException {
final int annotation_table_length = (file.readUnsignedShort());
annotation_table = new AnnotationEntry[annotation_table_length];
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1625501&r1=1625500&r2=1625501&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java Wed Sep 17 10:28:19 2014
@@ -18,6 +18,7 @@
package org.apache.tomcat.util.bcel.classfile;
import java.io.BufferedInputStream;
+import java.io.DataInput;
import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -42,7 +43,7 @@ public final class ClassParser {
private static final int MAGIC = 0xCAFEBABE;
- private final DataInputStream file;
+ private final DataInput file;
private String class_name, superclass_name;
private int access_flags; // Access rights of parsed class
private String[] interface_names; // Names of implemented interfaces
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1625501&r1=1625500&r2=1625501&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java Wed Sep 17 10:28:19 2014
@@ -17,7 +17,7 @@
*/
package org.apache.tomcat.util.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.IOException;
import org.apache.tomcat.util.bcel.Constants;
@@ -62,7 +62,7 @@ public abstract class Constant {
* @param file Input stream
* @return Constant object
*/
- static Constant readConstant( DataInputStream file ) throws IOException,
+ static Constant readConstant(DataInput file ) throws IOException,
ClassFormatException {
byte b = file.readByte(); // Read tag byte
int skipSize;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java?rev=1625501&r1=1625500&r2=1625501&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java Wed Sep 17 10:28:19 2014
@@ -17,7 +17,7 @@
*/
package org.apache.tomcat.util.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.IOException;
import org.apache.tomcat.util.bcel.Constants;
@@ -45,7 +45,7 @@ public class ConstantPool {
* @throws IOException
* @throws ClassFormatException
*/
- ConstantPool(DataInputStream file) throws IOException, ClassFormatException {
+ ConstantPool(DataInput file) throws IOException, ClassFormatException {
int constant_pool_count = file.readUnsignedShort();
constant_pool = new Constant[constant_pool_count];
/* constant_pool[0] is unused by the compiler and may be used freely
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java?rev=1625501&r1=1625500&r2=1625501&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java Wed Sep 17 10:28:19 2014
@@ -16,7 +16,7 @@
*/
package org.apache.tomcat.util.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.IOException;
import org.apache.tomcat.util.bcel.Constants;
@@ -34,7 +34,7 @@ public final class ConstantUtf8 extends
private final String bytes;
- static ConstantUtf8 getInstance(DataInputStream file) throws IOException {
+ static ConstantUtf8 getInstance(DataInput file) throws IOException {
return new ConstantUtf8(file.readUTF());
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java?rev=1625501&r1=1625500&r2=1625501&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java Wed Sep 17 10:28:19 2014
@@ -17,7 +17,7 @@
*/
package org.apache.tomcat.util.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.IOException;
/**
@@ -64,7 +64,7 @@ public abstract class ElementValue
public static final int PRIMITIVE_BOOLEAN = 'Z';
- public static ElementValue readElementValue(DataInputStream dis,
+ public static ElementValue readElementValue(DataInput dis,
ConstantPool cpool) throws IOException
{
byte type = dis.readByte();
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java?rev=1625501&r1=1625500&r2=1625501&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java Wed Sep 17 10:28:19 2014
@@ -17,7 +17,7 @@
*/
package org.apache.tomcat.util.bcel.classfile;
-import java.io.DataInputStream;
+import java.io.DataInput;
import java.io.IOException;
import org.apache.tomcat.util.bcel.Constants;
@@ -36,7 +36,7 @@ public class ElementValuePair
private final int elementNameIndex;
- ElementValuePair(DataInputStream file, ConstantPool constantPool) throws IOException {
+ ElementValuePair(DataInput file, ConstantPool constantPool) throws IOException {
this.constantPool = constantPool;
this.elementNameIndex = file.readUnsignedShort();
this.elementValue = ElementValue.readElementValue(file, constantPool);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org