0.3.0 - Update to Java 9 and support for class file changes in Java 9. Combined several attribute classes, simplified tag and fields in constantPool classes to single 'TAG' field. Renamed UnitTest -> UsageCliMain and added some more functionality for playing with class file parsing.

Author: TeamworkGuy2

.classpath

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre-9.0.1">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/java/eclipse/jar/ecj-4.4M2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

CHANGELOG.md

@@ -4,7 +4,22 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/
 
 
 --------
-### [0.2.1](N/A) - 2017-08-14
+### [0.3.0](N/A) - 2017-12-22
+#### Changed
+* Upgrade to Java 9
+* Java 9 ClassFile format support:
+  * New Attributes: `Module`, `ModuleMainClass`, `ModulePackages`
+  * New constant pool types: `CONSTANT_Module`, `CONSTANT_Package`
+* Renamed/changed the `public static final int CONSTANT_*_info` field to `public static final byte TAG` and removed the instanced `tag` field from all constantPool classes
+* Renamed `Target_Info_Type` -> `Target_Info_Union`
+* Consolidated `twg2.jbcm.classFormat.attributes`, nested classes that are only used by one class inside the class
+* Added/fixed several attributes' `toString()` methods
+* Cleaned up some attributes field documentation
+* Renamed `UnitTest` -> `UsageCliMain` and added support for printing dependencies and loading multiple classes, printing multiple classes, and clearing loaded classes
+
+
+--------
+### [0.2.1](https://github.com/TeamworkGuy2/ClassLoading/commit/555e988ff0c21d0510296cefd9b300d46fd6eb04) - 2017-08-14
 #### Changed
 * Forgot to update jar file
 

README.md

@@ -1,19 +1,22 @@
 ClassLoading
 ==========
-version: 0.2.0
+version: 0.3.0
 
 Java class file parsing and manipulation library.
-Reference: [Java Virtual Machine Spec](http://docs.oracle.com/javase/specs/jvms/se8/html/index.html)
+This library is mostly experimental for my own personal learning.
+It can load and save class files and lookup class file dependencies, but contains very little code for making changes to class files or validating those changes.
+See the `twg2.jbcm.main.UsageCliMain` class for a simple command line interface you can use to load and print info about class files.
+Reference: [Java Virtual Machine Spec (Java 9)](http://docs.oracle.com/javase/specs/jvms/se9/html/index.html)
 
 ### `twg2.jbcm.classFormat`
-Contains implementation of the [class file format](http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html)
-with related attributes and constant pool types.
+Contains implementation of the [class file format](http://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html)
+with related attributes (`twg2.jbcm.classFormat.attributes`) and constant pool types (`twg2.jbcm.classFormat.constantPool`).
 
 ### `twg2.jbcm` and `twg2.jbcm.modify`
 Interfaces and utilities for searching and modifying class files.
 
 ### `twg2.jbcm.opcode`
-Partial implementation of [Java instruction set opcodes](http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5).
+Partial implementation of [Java instruction set opcodes](http://docs.oracle.com/javase/specs/jvms/se9/html/jvms-6.html#jvms-6.5).
 
 ### `twg2.jbcm.dynamicModification` and `twg2.jbcm.parserExamples`
 Classes used by the example and test packages.

bin/class_loading.jar

@@ -1,5 +1,5 @@
 {
-	"version" : "0.2.0",
+	"version" : "0.3.0",
 	"name" : "class-loading",
 	"description" : "Java class file parsing and manipulation",
 	"homepage" : "https://github.com/TeamworkGuy2/ClassLoading",

package-lib.json

@@ -252,8 +252,8 @@ private static final int loadOperands(int numOperands, byte[] code, int index) {
 
 
 	/** A default implementation of {@link CodeOffsetChanger}.
-	 * The {@link #accept(byte[], int, int)} in this implementation simply calls {@code IoUtility.shiftOffset(...)}
-	 * using the parameters from the constructor and the {@link CodeOffsetChanger#accept(byte[], int, int)} method.
+	 * The {@link CodeOffsetChanger#shiftIndex(byte[], int, int)} in this implementation simply calls {@code IoUtility.shiftOffset(...)}
+	 * using the parameters from the constructor and the {@link CodeOffsetChanger#shiftIndex(byte[], int, int)} method.
 	 * @author TeamworkGuy2
 	 * @since 2014-419
 	 */

src/twg2/jbcm/IoUtility.java

@@ -175,15 +175,22 @@ public String getCpString(int attributeNameIndex) {
 
 	public CpIndex<CONSTANT_CP_Info> getCpIndex(int index) {
 		if(index > 0 && index < constant_pool_count) {
-			CpIndex<CONSTANT_CP_Info> result = (CpIndex<CONSTANT_CP_Info>)constant_pool.get(index);
+			CpIndex<CONSTANT_CP_Info> result = constant_pool.get(index);
 			return result;
 		}
-		if(Settings.checkCPIndex) { throw new IllegalStateException("constant pool index " + index + " out of constant pool size bounds"); }
+		if(Settings.checkCPIndex) {
+			throw new IllegalStateException("constant pool index " + index + " out of constant pool size bounds");
+		}
 		return null;
 	}
 
 
 	public <T extends CONSTANT_CP_Info> CpIndex<T> getCheckCpIndex(int index, Class<T> clazz) {
+		return getCheckCpIndex(index, clazz, false);
+	}
+
+
+	public <T extends CONSTANT_CP_Info> CpIndex<T> getCheckCpIndex(int index, Class<T> clazz, boolean allowZero) {
 		if(index > 0 && index < constant_pool_count) {
 			@SuppressWarnings("unchecked")
 			CpIndex<T> result = (CpIndex<T>)constant_pool.get(index);
@@ -195,7 +202,9 @@ public <T extends CONSTANT_CP_Info> CpIndex<T> getCheckCpIndex(int index, Class<
 			}
 			return result;
 		}
-		if(Settings.checkCPIndex) { throw new IllegalStateException("constant pool index " + index + " out of constant pool size bounds"); }
+		if(!allowZero && Settings.checkCPIndex) {
+			throw new IllegalStateException("constant pool index " + index + " out of constant pool size bounds");
+		}
 		return null;
 	}
 
@@ -322,7 +331,9 @@ public <T extends CONSTANT_CP_Info> CpIndex<T> addToConstantPool(T cpObj) {
 
 
 	public void setConstantPool(int index, CONSTANT_CP_Info cpObj) {
-		if(index < 1 || index >= constant_pool_count) { throw new IndexOutOfBoundsException("Illegal class file constant pool index: " + index); }
+		if(index < 1 || index >= constant_pool_count) {
+			throw new IndexOutOfBoundsException("Illegal class file constant pool index: " + index);
+		}
 		constant_pool.get(index).setCpObject(cpObj);
 	}
 
@@ -368,6 +379,7 @@ public CONSTANT_Class getInterface(int index) {
 	}
 
 
+	@SuppressWarnings("unchecked")
 	public void addInterface(CpIndex<CONSTANT_Class> interfaceClassIndex) {
 		CONSTANT_CP_Info interfaceClass = interfaceClassIndex.getCpObject();
 		if(!(interfaceClass instanceof CONSTANT_Class)) {
@@ -471,6 +483,7 @@ public void writeData(DataOutput out) throws IOException {
 	}
 
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public void readData(DataInput in) throws IOException {
 		magic = in.readInt();

src/twg2/jbcm/classFormat/ClassFile.java

@@ -13,6 +13,8 @@
 import twg2.jbcm.classFormat.attributes.LocalVariableTable;
 import twg2.jbcm.classFormat.attributes.LocalVariableTypeTable;
 import twg2.jbcm.classFormat.attributes.MethodParameters;
+import twg2.jbcm.classFormat.attributes.ModuleMainClass;
+import twg2.jbcm.classFormat.attributes.ModulePackages;
 import twg2.jbcm.classFormat.attributes.RuntimeInvisibleAnnotations;
 import twg2.jbcm.classFormat.attributes.RuntimeInvisibleParameterAnnotations;
 import twg2.jbcm.classFormat.attributes.RuntimeInvisibleTypeAnnotations;
@@ -81,7 +83,14 @@ public enum ClassFileAttributes {
 	RUNTIME_INVISIBLE_TYPE_ANNOTATIONS("RuntimeInvisibleTypeAnnotations") {
 		@Override public Attribute_Type create(ClassFile clazz, int cpNameIndex, Code code) { return new RuntimeInvisibleTypeAnnotations(clazz, (short)cpNameIndex); } },
 	METHOD_PARAMETERS("MethodParameters") {
-		@Override public Attribute_Type create(ClassFile clazz, int cpNameIndex, Code code) { return new MethodParameters(clazz, (short)cpNameIndex); } };
+		@Override public Attribute_Type create(ClassFile clazz, int cpNameIndex, Code code) { return new MethodParameters(clazz, (short)cpNameIndex); } },
+	// Java SE 9 (2017-12-22)
+	MODULE("Module") {
+		@Override public Attribute_Type create(ClassFile clazz, int cpNameIndex, Code code) { return new twg2.jbcm.classFormat.attributes.Module(clazz, (short)cpNameIndex); } },
+	MODULE_PACKAGES("ModulePackages") {
+			@Override public Attribute_Type create(ClassFile clazz, int cpNameIndex, Code code) { return new ModulePackages(clazz, (short)cpNameIndex); } },
+	MODULE_MAIN_CLASS("ModuleMainClass") {
+			@Override public Attribute_Type create(ClassFile clazz, int cpNameIndex, Code code) { return new ModuleMainClass(clazz, (short)cpNameIndex); } };	
 
 
 	private String binaryName;

src/twg2/jbcm/classFormat/ClassFileAttributes.java

@@ -128,7 +128,7 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-		return "CpIndex(index=" + index + ", type=" + clas.toString() + ", value=" + getCpObject() + ")";
+		return "CpIndex(index=" + index + ", value=" + getCpObject() + ")";
 	}
 
 }

src/twg2/jbcm/classFormat/CpIndex.java

@@ -16,18 +16,18 @@
  */
 public class Annotation implements ReadWritable {
 	ClassFile resolver;
-	/* The value of the type_index item must be a valid index into the constant_pool table.
+	/** The value of the type_index item must be a valid index into the constant_pool table.
 	 * The constant_pool entry at that index must be a CONSTANT_Utf8_info (§4.4.7) structure
 	 * representing a field descriptor representing the annotation type corresponding to
 	 * the annotation represented by this annotation structure. 
 	 */
 	CpIndex<CONSTANT_Utf8> type_index;
-	/* The value of the num_element_value_pairs item gives the number of element-value pairs of
+	/** The value of the num_element_value_pairs item gives the number of element-value pairs of
 	 * the annotation represented by this annotation structure.
 	 * Note that a maximum of 65535 element-value pairs may be contained in a single annotation. 
 	 */
 	short num_element_value_pairs;
-	/* Each value of the element_value_pairs table represents a single element-value pair in the
+	/** Each value of the element_value_pairs table represents a single element-value pair in the
 	 * annotation represented by this annotation structure. Each element_value_pairs entry contains
 	 * the following two items:
 	 * element_name_index,