Author: markt
Date: Thu May 28 19:15:45 2015
New Revision: 1682312
URL: http://svn.apache.org/r1682312
Log:
Merge BCEL changes from r1614166 to r1682271
The changes consist of:
- code clean-up
- Javadoc tweaks
- some renaming
There are no functional changes
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/package.html
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 28 19:15:45 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311
Propchange: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 28 19:15:45 2015
@@ -1,3 +1,3 @@
-/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1614166
+/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1682271
/jakarta/bcel/trunk/src/main/java/org/apache/bcel:886845-1149511
-/tomcat/trunk/java/org/apache/tomcat/util/bcel:1641634
+/tomcat/trunk/java/org/apache/tomcat/util/bcel:1641634,1682311
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=1682312&r1=1682311&r2=1682312&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java Thu
May 28 19:15:45 2015
@@ -24,7 +24,11 @@ package org.apache.tomcat.util.bcel;
*/
public interface Constants {
- /** One of the access flags for fields, methods, or classes.
+ /**
+ * One of the access flags for fields, methods, or classes.
+ * @see "<a
href='http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.5'>Flag
definitions for Fields in the Java Virtual Machine Specification (Java SE 8
Edition).</a>"
+ * @see "<a
href='http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.6'>Flag
definitions for Methods in the Java Virtual Machine Specification (Java SE 8
Edition).</a>"
+ * @see "<a
href='http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.6-300-D.1-D.1'>Flag
definitions for Classes in the Java Virtual Machine Specification (Java SE 8
Edition).</a>"
*/
public static final short ACC_FINAL = 0x0010;
@@ -90,5 +94,4 @@ public interface Constants {
"CONSTANT_Methodref", "CONSTANT_InterfaceMethodref",
"CONSTANT_NameAndType", "", "", "CONSTANT_MethodHandle",
"CONSTANT_MethodType", "", "CONSTANT_InvokeDynamic" };
-
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=1682312&r1=1682311&r2=1682312&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
Thu May 28 19:15:45 2015
@@ -40,20 +40,20 @@ public class AnnotationEntry implements
/**
* Creates an AnnotationEntry from a DataInputStream
*
- * @param file
+ * @param input
* @param constant_pool
* @throws IOException
*/
- AnnotationEntry(DataInput file, ConstantPool constant_pool) throws
IOException {
+ AnnotationEntry(DataInput input, ConstantPool constant_pool) throws
IOException {
this.constant_pool = constant_pool;
- type_index = file.readUnsignedShort();
- int num_element_value_pairs = file.readUnsignedShort();
+ type_index = input.readUnsignedShort();
+ int num_element_value_pairs = input.readUnsignedShort();
element_value_pairs = new ArrayList<>(num_element_value_pairs);
for (int i = 0; i < num_element_value_pairs; i++) {
- element_value_pairs.add(new ElementValuePair(file, constant_pool));
+ element_value_pairs.add(new ElementValuePair(input,
constant_pool));
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java?rev=1682312&r1=1682311&r2=1682312&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
Thu May 28 19:15:45 2015
@@ -31,15 +31,14 @@ public class Annotations {
private final AnnotationEntry[] annotation_table;
/**
- * @param file Input stream
+ * @param input Input stream
* @param constant_pool Array of constants
*/
- Annotations(DataInput file, ConstantPool constant_pool)
- throws IOException {
- final int annotation_table_length = (file.readUnsignedShort());
+ Annotations(DataInput input, ConstantPool constant_pool) throws
IOException {
+ 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] = new AnnotationEntry(file, constant_pool);
+ annotation_table[i] = new AnnotationEntry(input, constant_pool);
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1682312&r1=1682311&r2=1682312&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
Thu May 28 19:15:45 2015
@@ -33,7 +33,7 @@ import org.apache.tomcat.util.bcel.Const
* the caller.
*
* The structure and the names comply, except for a few conveniences,
- * exactly with the <A href="ftp://java.sun.com/docs/specs/vmspec.ps";>
+ * exactly with the <A href="http://docs.oracle.com/javase/specs/";>
* JVM specification 1.0</a>. See this paper for
* further details about the structure of a bytecode file.
*
@@ -43,7 +43,7 @@ public final class ClassParser {
private static final int MAGIC = 0xCAFEBABE;
- private final DataInput file;
+ private final DataInput dataInputStream;
private String class_name, superclass_name;
private int access_flags; // Access rights of parsed class
private String[] interface_names; // Names of implemented interfaces
@@ -56,10 +56,10 @@ public final class ClassParser {
/**
* Parse class from the given stream.
*
- * @param file Input stream
+ * @param inputStream Input stream
*/
- public ClassParser(InputStream file) {
- this.file = new DataInputStream(new BufferedInputStream(file,
BUFSIZE));
+ public ClassParser(InputStream inputStream) {
+ this.dataInputStream = new DataInputStream(new
BufferedInputStream(inputStream, BUFSIZE));
}
@@ -108,30 +108,29 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readAttributes() throws IOException, ClassFormatException {
- int attributes_count;
- attributes_count = file.readUnsignedShort();
+ int attributes_count = dataInputStream.readUnsignedShort();
for (int i = 0; i < attributes_count; i++) {
ConstantUtf8 c;
String name;
int name_index;
int length;
// Get class name from constant pool via `name_index' indirection
- name_index = file.readUnsignedShort();
+ name_index = dataInputStream.readUnsignedShort();
c = (ConstantUtf8) constant_pool.getConstant(name_index,
Constants.CONSTANT_Utf8);
name = c.getBytes();
// Length of data in bytes
- length = file.readInt();
+ length = dataInputStream.readInt();
if (name.equals("RuntimeVisibleAnnotations")) {
if (runtimeVisibleAnnotations != null) {
throw new ClassFormatException(
"RuntimeVisibleAnnotations attribute is not
allowed more than once in a class file");
}
- runtimeVisibleAnnotations = new Annotations(file,
constant_pool);
+ runtimeVisibleAnnotations = new Annotations(dataInputStream,
constant_pool);
} else {
// All other attributes are skipped
- Utility.skipFully(file, length);
+ Utility.skipFully(dataInputStream, length);
}
}
}
@@ -143,7 +142,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readClassInfo() throws IOException, ClassFormatException {
- access_flags = file.readUnsignedShort();
+ access_flags = dataInputStream.readUnsignedShort();
/* Interfaces are implicitely abstract, the flag should be set
* according to the JVM specification.
*/
@@ -155,10 +154,10 @@ public final class ClassParser {
throw new ClassFormatException("Class can't be both final and
abstract");
}
- int class_name_index = file.readUnsignedShort();
+ int class_name_index = dataInputStream.readUnsignedShort();
class_name = Utility.getClassName(constant_pool, class_name_index);
- int superclass_name_index = file.readUnsignedShort();
+ int superclass_name_index = dataInputStream.readUnsignedShort();
if (superclass_name_index > 0) {
// May be zero -> class is java.lang.Object
superclass_name = Utility.getClassName(constant_pool,
superclass_name_index);
@@ -174,7 +173,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readConstantPool() throws IOException, ClassFormatException {
- constant_pool = new ConstantPool(file);
+ constant_pool = new ConstantPool(dataInputStream);
}
@@ -184,9 +183,9 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readFields() throws IOException, ClassFormatException {
- int fields_count = file.readUnsignedShort();
+ int fields_count = dataInputStream.readUnsignedShort();
for (int i = 0; i < fields_count; i++) {
- Utility.swallowFieldOrMethod(file);
+ Utility.swallowFieldOrMethod(dataInputStream);
}
}
@@ -199,7 +198,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readID() throws IOException, ClassFormatException {
- if (file.readInt() != MAGIC) {
+ if (dataInputStream.readInt() != MAGIC) {
throw new ClassFormatException("It is not a Java .class file");
}
}
@@ -211,12 +210,11 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readInterfaces() throws IOException, ClassFormatException {
- int interfaces_count;
- interfaces_count = file.readUnsignedShort();
+ int interfaces_count = dataInputStream.readUnsignedShort();
if (interfaces_count > 0) {
interface_names = new String[interfaces_count];
for (int i = 0; i < interfaces_count; i++) {
- int index = file.readUnsignedShort();
+ int index = dataInputStream.readUnsignedShort();
interface_names[i] = Utility.getClassName(constant_pool,
index);
}
} else {
@@ -231,10 +229,9 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readMethods() throws IOException, ClassFormatException {
- int methods_count;
- methods_count = file.readUnsignedShort();
+ int methods_count = dataInputStream.readUnsignedShort();
for (int i = 0; i < methods_count; i++) {
- Utility.swallowFieldOrMethod(file);
+ Utility.swallowFieldOrMethod(dataInputStream);
}
}
@@ -247,6 +244,6 @@ public final class ClassParser {
private void readVersion() throws IOException, ClassFormatException {
// file.readUnsignedShort(); // Unused minor
// file.readUnsignedShort(); // Unused major
- Utility.skipFully(file, 4);
+ Utility.skipFully(dataInputStream, 4);
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1682312&r1=1682311&r2=1682312&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
Thu May 28 19:15:45 2015
@@ -57,28 +57,28 @@ public abstract class Constant {
/**
- * 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(DataInput 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
int skipSize;
switch (b) {
case Constants.CONSTANT_Class:
- return new ConstantClass(file);
+ return new ConstantClass(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_Utf8:
- return ConstantUtf8.getInstance(file);
+ return ConstantUtf8.getInstance(input);
case Constants.CONSTANT_String:
case Constants.CONSTANT_MethodType:
skipSize = 2; // unsigned short
@@ -96,7 +96,7 @@ public abstract class Constant {
default:
throw new ClassFormatException("Invalid byte tag in constant
pool: " + b);
}
- Utility.skipFully(file, skipSize);
+ Utility.skipFully(input, skipSize);
return null;
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java?rev=1682312&r1=1682311&r2=1682312&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
Thu May 28 19:15:45 2015
@@ -41,9 +41,9 @@ public final class ConstantLong extends
* @param file Input stream
* @throws IOException
*/
- ConstantLong(DataInput file) throws IOException {
+ ConstantLong(DataInput input) throws IOException {
super(Constants.CONSTANT_Long);
- this.bytes = file.readLong();
+ this.bytes = input.readLong();
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java?rev=1682312&r1=1682311&r2=1682312&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
Thu May 28 19:15:45 2015
@@ -39,20 +39,20 @@ public class ConstantPool {
/**
- * 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(DataInput file) throws IOException, ClassFormatException {
- int constant_pool_count = file.readUnsignedShort();
+ ConstantPool(DataInput input) throws IOException, ClassFormatException {
+ int 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:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java?rev=1682312&r1=1682311&r2=1682312&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
Thu May 28 19:15:45 2015
@@ -34,8 +34,8 @@ public final class ConstantUtf8 extends
private final String bytes;
- static ConstantUtf8 getInstance(DataInput file) throws IOException {
- return new ConstantUtf8(file.readUTF());
+ static ConstantUtf8 getInstance(DataInput input) throws IOException {
+ return new ConstantUtf8(input.readUTF());
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java?rev=1682312&r1=1682311&r2=1682312&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
Thu May 28 19:15:45 2015
@@ -13,7 +13,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
*/
package org.apache.tomcat.util.bcel.classfile;
@@ -38,86 +37,59 @@ public abstract class ElementValue
public abstract String stringifyValue();
- public static final int STRING = 's';
+ public static final byte STRING = 's';
+ public static final byte ENUM_CONSTANT = 'e';
+ public static final byte CLASS = 'c';
+ public static final byte ANNOTATION = '@';
+ public static final byte ARRAY = '[';
+ public static final byte PRIMITIVE_INT = 'I';
+ public static final byte PRIMITIVE_BYTE = 'B';
+ public static final byte PRIMITIVE_CHAR = 'C';
+ public static final byte PRIMITIVE_DOUBLE = 'D';
+ public static final byte PRIMITIVE_FLOAT = 'F';
+ public static final byte PRIMITIVE_LONG = 'J';
+ public static final byte PRIMITIVE_SHORT = 'S';
+ public static final byte PRIMITIVE_BOOLEAN = 'Z';
- public static final int ENUM_CONSTANT = 'e';
-
- public static final int CLASS = 'c';
-
- public static final int ANNOTATION = '@';
-
- public static final int ARRAY = '[';
-
- public static final int PRIMITIVE_INT = 'I';
-
- public static final int PRIMITIVE_BYTE = 'B';
-
- public static final int PRIMITIVE_CHAR = 'C';
-
- public static final int PRIMITIVE_DOUBLE = 'D';
-
- public static final int PRIMITIVE_FLOAT = 'F';
-
- public static final int PRIMITIVE_LONG = 'J';
-
- public static final int PRIMITIVE_SHORT = 'S';
-
- public static final int PRIMITIVE_BOOLEAN = 'Z';
-
- public static ElementValue readElementValue(DataInput dis,
- ConstantPool cpool) throws IOException
+ 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
- .readUnsignedShort(), cpool);
- case 'C': // char
- return new SimpleElementValue(PRIMITIVE_CHAR, dis
- .readUnsignedShort(), cpool);
- case 'D': // double
- return new SimpleElementValue(PRIMITIVE_DOUBLE, dis
- .readUnsignedShort(), cpool);
- case 'F': // float
- return new SimpleElementValue(PRIMITIVE_FLOAT, dis
- .readUnsignedShort(), cpool);
- case 'I': // int
- return new SimpleElementValue(PRIMITIVE_INT, dis
- .readUnsignedShort(), cpool);
- case 'J': // long
- return new SimpleElementValue(PRIMITIVE_LONG, dis
- .readUnsignedShort(), cpool);
- case 'S': // short
- return new SimpleElementValue(PRIMITIVE_SHORT, dis
- .readUnsignedShort(), cpool);
- case 'Z': // boolean
- return new SimpleElementValue(PRIMITIVE_BOOLEAN, dis
- .readUnsignedShort(), cpool);
- case 's': // String
- return new SimpleElementValue(STRING, dis.readUnsignedShort(),
- cpool);
- case 'e': // Enum constant
- dis.readUnsignedShort(); // Unused type_index
- return new EnumElementValue(ENUM_CONSTANT,
- dis.readUnsignedShort(), cpool);
- case 'c': // Class
- return new ClassElementValue(CLASS, dis.readUnsignedShort(),
cpool);
- case '@': // Annotation
- // TODO isRuntimeVisible
- return new AnnotationElementValue(ANNOTATION, new AnnotationEntry(
- dis, cpool), cpool);
- case '[': // Array
- int numArrayVals = dis.readUnsignedShort();
- ElementValue[] evalues = new ElementValue[numArrayVals];
- for (int j = 0; j < numArrayVals; j++)
- {
- evalues[j] = ElementValue.readElementValue(dis, cpool);
- }
- return new ArrayElementValue(ARRAY, evalues, cpool);
- default:
- throw new ClassFormatException(
- "Unexpected element value kind in annotation: " + type);
+ case PRIMITIVE_BYTE:
+ case PRIMITIVE_CHAR:
+ case PRIMITIVE_DOUBLE:
+ case PRIMITIVE_FLOAT:
+ case PRIMITIVE_INT:
+ case PRIMITIVE_LONG:
+ case PRIMITIVE_SHORT:
+ case PRIMITIVE_BOOLEAN:
+ case STRING:
+ return new SimpleElementValue(type, input.readUnsignedShort(),
cpool);
+
+ case ENUM_CONSTANT:
+ input.readUnsignedShort(); // Unused type_index
+ return new EnumElementValue(ENUM_CONSTANT,
input.readUnsignedShort(), cpool);
+
+ case CLASS:
+ return new ClassElementValue(CLASS, input.readUnsignedShort(),
cpool);
+
+ case ANNOTATION:
+ // TODO isRuntimeVisible
+ return new AnnotationElementValue(ANNOTATION, new
AnnotationEntry(input, cpool), cpool);
+
+ case ARRAY:
+ int numArrayVals = input.readUnsignedShort();
+ ElementValue[] evalues = new ElementValue[numArrayVals];
+ for (int j = 0; j < numArrayVals; j++)
+ {
+ evalues[j] = ElementValue.readElementValue(input, cpool);
+ }
+ return new ArrayElementValue(ARRAY, evalues, cpool);
+
+ default:
+ throw new ClassFormatException(
+ "Unexpected element value kind in annotation: " +
type);
}
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=1682312&r1=1682311&r2=1682312&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
Thu May 28 19:15:45 2015
@@ -20,7 +20,7 @@ package org.apache.tomcat.util.bcel.clas
/**
* Represents a Java class, i.e., the data structures, constant pool,
* fields, methods and commands contained in a Java .class file.
- * See <a href="ftp://java.sun.com/docs/specs/";>JVM specification</a> for
details.
+ * See <a href="http://docs.oracle.com/javase/specs/";>JVM specification</a>
for details.
* The intent of this class is to represent a parsed or otherwise existing
* class file. Those interested in programatically generating classes
* should see the <a href="../generic/ClassGen.html">ClassGen</a> class.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java?rev=1682312&r1=1682311&r2=1682312&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
Thu May 28 19:15:45 2015
@@ -13,7 +13,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
*/
package org.apache.tomcat.util.bcel.classfile;
@@ -86,5 +85,4 @@ final class Utility {
int length = file.readInt();
skipFully(file, length);
}
-
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/package.html
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/package.html?rev=1682312&r1=1682311&r2=1682312&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/package.html
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/package.html Thu May
28 19:15:45 2015
@@ -23,7 +23,7 @@
This package contains basic classes for the
<a href="http://commons.apache.org/bcel/";>Byte Code Engineering Library</a>
and constants defined by the
-<a href="http://java.sun.com/docs/books/vmspec/html/VMSpecTOC.doc.html";>
+<a href="http://docs.oracle.com/javase/specs/";>
JVM specification</a>.
</p>
</body>
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1682312&r1=1682311&r2=1682312&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu May 28 19:15:45 2015
@@ -94,6 +94,14 @@
</scode>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <update>
+ Update package renamed Apache Commons BCEL to r1682271 to pick up some
+ some code clean up. (markt)
+ </update>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.0.23 (markt)" rtext="2015-05-22">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
