summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchibash <chiba@javassist.org>2019-09-01 17:32:52 +0900
committerchibash <chiba@javassist.org>2019-09-01 17:32:52 +0900
commit10a92c6aa966859a3e6f1a5eb6efae6b8a37a426 (patch)
tree1ed5b57750c95b865c19763086426adf6e43a919
parent3dcbf5e3919d75f8f650ddb068db0ed7dcb2563d (diff)
downloadjavassist-10a92c6aa966859a3e6f1a5eb6efae6b8a37a426.tar.gz
javassist-10a92c6aa966859a3e6f1a5eb6efae6b8a37a426.zip
fixes typos included in PR #272 (Issue #270)
-rw-r--r--Readme.html5
-rw-r--r--pom.xml2
-rw-r--r--src/main/javassist/CtClass.java2
-rw-r--r--src/main/javassist/bytecode/ConstPool.java319
4 files changed, 164 insertions, 164 deletions
diff --git a/Readme.html b/Readme.html
index 92ba667f..c8d0df8c 100644
--- a/Readme.html
+++ b/Readme.html
@@ -281,6 +281,11 @@ see javassist.Dump.
<h2>Changes</h2>
+<p>-version 3.26
+<ul>
+ <li>GitHub Issue #270 (PR #272).
+</ul>
+
<p>-version 3.25 on April 16, 2019
<ul>
<li>GitHub Issue #72 (PR #231), #241, #242 (PR #243), PR #244,
diff --git a/pom.xml b/pom.xml
index c7b4bf81..cbc25375 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
Javassist (JAVA programming ASSISTant) makes Java bytecode manipulation
simple. It is a class library for editing bytecodes in Java.
</description>
- <version>3.25.1-GA</version>
+ <version>3.26.0-GA</version>
<name>Javassist</name>
<url>http://www.javassist.org/</url>
diff --git a/src/main/javassist/CtClass.java b/src/main/javassist/CtClass.java
index 21ac299e..09cf4b3e 100644
--- a/src/main/javassist/CtClass.java
+++ b/src/main/javassist/CtClass.java
@@ -69,7 +69,7 @@ public abstract class CtClass {
/**
* The version number of this release.
*/
- public static final String version = "3.25.0-GA";
+ public static final String version = "3.26.0-GA";
/**
* Prints the version number and the copyright notice.
diff --git a/src/main/javassist/bytecode/ConstPool.java b/src/main/javassist/bytecode/ConstPool.java
index a7537c49..028aad08 100644
--- a/src/main/javassist/bytecode/ConstPool.java
+++ b/src/main/javassist/bytecode/ConstPool.java
@@ -721,99 +721,99 @@ public final class ConstPool
return mtinfo.descriptor;
}
- /**
- * Reads the <code>bootstrap_method_attr_index</code> field of the
- * <code>CONSTANT_InvokeDynamic_info</code> structure
- * at the given index.
- *
- * @since 3.17
- */
- public int getInvokeDynamicBootstrap(int index)
- {
- InvokeDynamicInfo iv = (InvokeDynamicInfo)getItem(index);
- return iv.bootstrap;
- }
-
- /**
- * Reads the <code>name_and_type_index</code> field of the
- * <code>CONSTANT_InvokeDynamic_info</code> structure
- * at the given index.
- *
- * @since 3.17
- */
- public int getInvokeDynamicNameAndType(int index)
- {
- InvokeDynamicInfo iv = (InvokeDynamicInfo)getItem(index);
- return iv.nameAndType;
- }
-
- /**
- * Reads the <code>descriptor_index</code> field of the
- * <code>CONSTANT_NameAndType_info</code> structure
- * indirectly specified by the given index.
- *
- * @param index an index to a <code>CONSTANT_InvokeDynamic_info</code>.
- * @return the descriptor of the method.
- * @since 3.17
- */
- public String getInvokeDynamicType(int index)
- {
- InvokeDynamicInfo iv = (InvokeDynamicInfo)getItem(index);
- if (iv == null)
- return null;
- NameAndTypeInfo n = (NameAndTypeInfo)getItem(iv.nameAndType);
- if(n == null)
- return null;
- return getUtf8Info(n.typeDescriptor);
- }
-
- /**
- * Reads the <code>bootstrap_method_attr_index</code> field of the
- * <code>CONSTANT_Dynamic_info</code> structure
- * at the given index.
- *
- * @since 3.17
- */
- public int getDynamicBootstrap(int index)
- {
- DynamicInfo iv = (DynamicInfo)getItem(index);
- return iv.bootstrap;
- }
-
- /**
- * Reads the <code>name_and_type_index</code> field of the
- * <code>CONSTANT_Dynamic_info</code> structure
- * at the given index.
- *
- * @since 3.17
- */
- public int getDynamicNameAndType(int index)
- {
- DynamicInfo iv = (DynamicInfo)getItem(index);
- return iv.nameAndType;
- }
-
- /**
- * Reads the <code>descriptor_index</code> field of the
- * <code>CONSTANT_NameAndType_info</code> structure
- * indirectly specified by the given index.
- *
- * @param index an index to a <code>CONSTANT_Dynamic_info</code>.
- * @return the descriptor of the method.
- * @since 3.17
- */
- public String getDynamicType(int index)
- {
- DynamicInfo iv = (DynamicInfo)getItem(index);
- if (iv == null)
- return null;
- NameAndTypeInfo n = (NameAndTypeInfo)getItem(iv.nameAndType);
- if(n == null)
- return null;
- return getUtf8Info(n.typeDescriptor);
- }
-
- /**
+ /**
+ * Reads the <code>bootstrap_method_attr_index</code> field of the
+ * <code>CONSTANT_InvokeDynamic_info</code> structure
+ * at the given index.
+ *
+ * @since 3.17
+ */
+ public int getInvokeDynamicBootstrap(int index)
+ {
+ InvokeDynamicInfo iv = (InvokeDynamicInfo)getItem(index);
+ return iv.bootstrap;
+ }
+
+ /**
+ * Reads the <code>name_and_type_index</code> field of the
+ * <code>CONSTANT_InvokeDynamic_info</code> structure
+ * at the given index.
+ *
+ * @since 3.17
+ */
+ public int getInvokeDynamicNameAndType(int index)
+ {
+ InvokeDynamicInfo iv = (InvokeDynamicInfo)getItem(index);
+ return iv.nameAndType;
+ }
+
+ /**
+ * Reads the <code>descriptor_index</code> field of the
+ * <code>CONSTANT_NameAndType_info</code> structure
+ * indirectly specified by the given index.
+ *
+ * @param index an index to a <code>CONSTANT_InvokeDynamic_info</code>.
+ * @return the descriptor of the bootstrap method.
+ * @since 3.17
+ */
+ public String getInvokeDynamicType(int index)
+ {
+ InvokeDynamicInfo iv = (InvokeDynamicInfo)getItem(index);
+ if (iv == null)
+ return null;
+ NameAndTypeInfo n = (NameAndTypeInfo)getItem(iv.nameAndType);
+ if(n == null)
+ return null;
+ return getUtf8Info(n.typeDescriptor);
+ }
+
+ /**
+ * Reads the <code>bootstrap_method_attr_index</code> field of the
+ * <code>CONSTANT_Dynamic_info</code> structure
+ * at the given index.
+ *
+ * @since 3.26
+ */
+ public int getDynamicBootstrap(int index)
+ {
+ DynamicInfo iv = (DynamicInfo)getItem(index);
+ return iv.bootstrap;
+ }
+
+ /**
+ * Reads the <code>name_and_type_index</code> field of the
+ * <code>CONSTANT_Dynamic_info</code> structure
+ * at the given index.
+ *
+ * @since 3.26
+ */
+ public int getDynamicNameAndType(int index)
+ {
+ DynamicInfo iv = (DynamicInfo)getItem(index);
+ return iv.nameAndType;
+ }
+
+ /**
+ * Reads the <code>descriptor_index</code> field of the
+ * <code>CONSTANT_NameAndType_info</code> structure
+ * indirectly specified by the given index.
+ *
+ * @param index an index to a <code>CONSTANT_Dynamic_info</code>.
+ * @return the descriptor of the bootstrap method.
+ * @since 3.26
+ */
+ public String getDynamicType(int index)
+ {
+ DynamicInfo iv = (DynamicInfo)getItem(index);
+ if (iv == null)
+ return null;
+ NameAndTypeInfo n = (NameAndTypeInfo)getItem(iv.nameAndType);
+ if(n == null)
+ return null;
+ return getUtf8Info(n.typeDescriptor);
+ }
+
+ /**
* Reads the <code>name_index</code> field of the
* <code>CONSTANT_Module_info</code> structure at the given index.
*
@@ -1247,18 +1247,18 @@ public final class ConstPool
}
/**
- * Adds a new <code>CONSTANT_Dynamic_info</code> structure.
- *
- * @param bootstrap <code>bootstrap_method_attr_index</code>.
- * @param nameAndType <code>name_and_type_index</code>.
- * @return the index of the added entry.
- * @since 3.17
- */
- public int addDynamicInfo(int bootstrap, int nameAndType) {
- return addItem(new DynamicInfo(bootstrap, nameAndType, numOfItems));
- }
+ * Adds a new <code>CONSTANT_Dynamic_info</code> structure.
+ *
+ * @param bootstrap <code>bootstrap_method_attr_index</code>.
+ * @param nameAndType <code>name_and_type_index</code>.
+ * @return the index of the added entry.
+ * @since 3.26
+ */
+ public int addDynamicInfo(int bootstrap, int nameAndType) {
+ return addItem(new DynamicInfo(bootstrap, nameAndType, numOfItems));
+ }
- /**
+ /**
* Adds a new <code>CONSTANT_Module_info</code>
* @param nameIndex the index of the Utf8 entry.
* @return the index of the added entry.
@@ -2390,64 +2390,59 @@ class InvokeDynamicInfo extends ConstInfo
class DynamicInfo extends ConstInfo {
- static final int tag = 17;
- int bootstrap, nameAndType;
-
- public DynamicInfo(int bootstrapMethod,
- int ntIndex, int index) {
- super(index);
- bootstrap = bootstrapMethod;
- nameAndType = ntIndex;
- }
-
- public DynamicInfo(DataInputStream in, int index)
- throws IOException {
- super(index);
- bootstrap = in.readUnsignedShort();
- nameAndType = in.readUnsignedShort();
- }
-
- @Override
- public int hashCode() {
- return (bootstrap << 16) ^ nameAndType;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj instanceof DynamicInfo) {
- DynamicInfo iv = (DynamicInfo) obj;
- return iv.bootstrap == bootstrap
- && iv.nameAndType == nameAndType;
- }
- return false;
- }
-
- @Override
- public int getTag() {
- return tag;
- }
-
- @Override
- public int copy(ConstPool src, ConstPool dest,
- Map<String, String> map) {
- return dest.addDynamicInfo(bootstrap,
- src.getItem(nameAndType).copy(src, dest, map));
- }
-
- @Override
- public void write(DataOutputStream out) throws IOException {
- out.writeByte(tag);
- out.writeShort(bootstrap);
- out.writeShort(nameAndType);
- }
-
- @Override
- public void print(PrintWriter out) {
- out.print("Dynamic #");
- out.print(bootstrap);
- out.print(", name&type #");
- out.println(nameAndType);
- }
+ static final int tag = 17;
+ int bootstrap, nameAndType;
+
+ public DynamicInfo(int bootstrapMethod, int ntIndex, int index) {
+ super(index);
+ bootstrap = bootstrapMethod;
+ nameAndType = ntIndex;
+ }
+
+ public DynamicInfo(DataInputStream in, int index) throws IOException {
+ super(index);
+ bootstrap = in.readUnsignedShort();
+ nameAndType = in.readUnsignedShort();
+ }
+
+ @Override
+ public int hashCode() {
+ return (bootstrap << 16) ^ nameAndType;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof DynamicInfo) {
+ DynamicInfo iv = (DynamicInfo)obj;
+ return iv.bootstrap == bootstrap && iv.nameAndType == nameAndType;
+ }
+ return false;
+ }
+
+ @Override
+ public int getTag() {
+ return tag;
+ }
+
+ @Override
+ public int copy(ConstPool src, ConstPool dest, Map<String, String> map) {
+ return dest.addDynamicInfo(bootstrap, src.getItem(nameAndType).copy(src, dest, map));
+ }
+
+ @Override
+ public void write(DataOutputStream out) throws IOException {
+ out.writeByte(tag);
+ out.writeShort(bootstrap);
+ out.writeShort(nameAndType);
+ }
+
+ @Override
+ public void print(PrintWriter out) {
+ out.print("Dynamic #");
+ out.print(bootstrap);
+ out.print(", name&type #");
+ out.println(nameAndType);
+ }
}
class ModuleInfo extends ConstInfo