Merge pull request #16 from win32kbase/master

Create a base dynamic class and make constant pool dynamic entries extend it

pom.xml

@@ -7,7 +7,7 @@
     <groupId>me.coley</groupId>
     <artifactId>cafedude</artifactId>
     <url>https://github.com/Col-E/CAFED00D/</url>
-    <version>1.9.5</version>
+    <version>1.9.6</version>
     <name>CAFED00D</name>
 
     <properties>

src/main/java/me/coley/cafedude/classfile/constant/ConstDynamic.java

@@ -0,0 +1,57 @@
+package me.coley.cafedude.classfile.constant;
+
+/**
+ * Base dynamic value pool entry. Points to a {@link CpNameType NameType} constant
+ * and a bootstrap method index in the class's bootstrap-methods attribute.
+ *
+ * @author Matt Coley
+ * @author Wolfie / win32kbase
+ */
+public abstract class ConstDynamic extends ConstPoolEntry {
+    private int bsmIndex;
+    private int nameTypeIndex;
+
+    /**
+     * @param type
+     *      Dynamic pool entry type.
+     * @param bsmIndex
+     * 		Index in the class's bootstrap method attribute-table.
+     * @param nameTypeIndex
+     * 		Index of {@link CpNameType} in pool.
+     */
+    public ConstDynamic(int type, int bsmIndex, int nameTypeIndex) {
+        super(type);
+        this.bsmIndex = bsmIndex;
+        this.nameTypeIndex = nameTypeIndex;
+    }
+
+    /**
+     * @return Index in the class's bootstrap method attribute-table.
+     */
+    public int getBsmIndex() {
+        return bsmIndex;
+    }
+
+    /**
+     * @param bsmIndex
+     * 		New index in the class's bootstrap method attribute-table.
+     */
+    public void setBsmIndex(int bsmIndex) {
+        this.bsmIndex = bsmIndex;
+    }
+
+    /**
+     * @return Index of {@link CpNameType} in pool.
+     */
+    public int getNameTypeIndex() {
+        return nameTypeIndex;
+    }
+
+    /**
+     * @param nameTypeIndex
+     * 		New index of {@link CpNameType} in pool.
+     */
+    public void setNameTypeIndex(int nameTypeIndex) {
+        this.nameTypeIndex = nameTypeIndex;
+    }
+}

src/main/java/me/coley/cafedude/classfile/constant/CpDynamic.java

@@ -5,50 +5,16 @@
  * and a bootstrap method index in the class's bootstrap-methods attribute.
  *
  * @author Matt Coley
+ * @author Wolfie / win32kbase
  */
-public class CpDynamic extends ConstPoolEntry {
-	private int bsmIndex;
-	private int nameTypeIndex;
-
+public class CpDynamic extends ConstDynamic {
 	/**
 	 * @param bsmIndex
 	 * 		Index in the class's bootstrap method attribute-table.
 	 * @param nameTypeIndex
 	 * 		Index of {@link CpNameType} in pool.
 	 */
 	public CpDynamic(int bsmIndex, int nameTypeIndex) {
-		super(DYNAMIC);
-		this.bsmIndex = bsmIndex;
-		this.nameTypeIndex = nameTypeIndex;
-	}
-
-	/**
-	 * @return Index in the class's bootstrap method attribute-table.
-	 */
-	public int getBsmIndex() {
-		return bsmIndex;
-	}
-
-	/**
-	 * @param bsmIndex
-	 * 		New index in the class's bootstrap method attribute-table.
-	 */
-	public void setBsmIndex(int bsmIndex) {
-		this.bsmIndex = bsmIndex;
-	}
-
-	/**
-	 * @return Index of {@link CpNameType} in pool.
-	 */
-	public int getNameTypeIndex() {
-		return nameTypeIndex;
-	}
-
-	/**
-	 * @param nameTypeIndex
-	 * 		New index of {@link CpNameType} in pool.
-	 */
-	public void setNameTypeIndex(int nameTypeIndex) {
-		this.nameTypeIndex = nameTypeIndex;
+		super(DYNAMIC, bsmIndex, nameTypeIndex);
 	}
 }

src/main/java/me/coley/cafedude/classfile/constant/CpInvokeDynamic.java

@@ -5,50 +5,16 @@
  * and a bootstrap method index in the class's bootstrap-methods attribute.
  *
  * @author Matt Coley
+ * @author Wolfie / win32kbase
  */
-public class CpInvokeDynamic extends ConstPoolEntry {
-	private int bsmIndex;
-	private int nameTypeIndex;
-
+public class CpInvokeDynamic extends ConstDynamic {
 	/**
 	 * @param bsmIndex
 	 * 		Index in the class's bootstrap method attribute-table.
 	 * @param nameTypeIndex
 	 * 		Index of {@link CpNameType} in pool.
 	 */
 	public CpInvokeDynamic(int bsmIndex, int nameTypeIndex) {
-		super(INVOKE_DYNAMIC);
-		this.bsmIndex = bsmIndex;
-		this.nameTypeIndex = nameTypeIndex;
-	}
-
-	/**
-	 * @return Index in the class's bootstrap method attribute-table.
-	 */
-	public int getBsmIndex() {
-		return bsmIndex;
-	}
-
-	/**
-	 * @param bsmIndex
-	 * 		New index in the class's bootstrap method attribute-table.
-	 */
-	public void setBsmIndex(int bsmIndex) {
-		this.bsmIndex = bsmIndex;
-	}
-
-	/**
-	 * @return Index of {@link CpNameType} in pool.
-	 */
-	public int getNameTypeIndex() {
-		return nameTypeIndex;
-	}
-
-	/**
-	 * @param nameTypeIndex
-	 * 		New index of {@link CpNameType} in pool.
-	 */
-	public void setNameTypeIndex(int nameTypeIndex) {
-		this.nameTypeIndex = nameTypeIndex;
+		super(INVOKE_DYNAMIC, bsmIndex, nameTypeIndex);
 	}
 }