1 files changed, 66 insertions, 7 deletions

diff --git a/src/main/javassist/bytecode/ClassFileWriter.java b/src/main/javassist/bytecode/ClassFileWriter.java
index bb7342a..931ffcb 100644
--- a/src/main/javassist/bytecode/ClassFileWriter.java
+++ b/src/main/javassist/bytecode/ClassFileWriter.java
@@ -1,11 +1,12 @@
 /*
  * Javassist, a Java-bytecode translator toolkit.
- * Copyright (C) 1999-2010 Shigeru Chiba. All Rights Reserved.
+ * Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License.  Alternatively, the contents of this file may be used under
- * the terms of the GNU Lesser General Public License Version 2.1 or later.
+ * the terms of the GNU Lesser General Public License Version 2.1 or later,
+ * or the Apache License Version 2.0.
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ -15,10 +16,9 @@
 
 package javassist.bytecode;
 
-import java.io.OutputStream;
 import java.io.DataOutputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 
 /**
  * A quick class-file writer.  This is useful when a generated
@@ -144,7 +144,7 @@ public class ClassFileWriter {
             output.writeShort(fields.size());
             fields.write(output);
 
-            output.writeShort(methods.size());
+            output.writeShort(methods.numOfMethods());
             methods.write(output);
         }
         catch (IOException e) {}
@@ -189,7 +189,7 @@ public class ClassFileWriter {
         out.writeShort(fields.size());
         fields.write(out);
 
-        out.writeShort(methods.size());
+        out.writeShort(methods.numOfMethods());
         methods.write(out);
         if (aw == null)
             out.writeShort(0);
@@ -502,7 +502,15 @@ public class ClassFileWriter {
             output.writeInt(startPos + 2, output.getPos() - startPos - 6);
         }
 
-        int size() { return methodCount; }
+        /**
+         * Returns the length of the bytecode that has been added so far.
+         *
+         * @return      the length in bytes.
+         * @since 3.19
+         */
+        public int size() { return output.getPos() - startPos - 14; } 
+
+        int numOfMethods() { return methodCount; }
 
         int dataSize() { return output.size(); }
 
@@ -642,6 +650,57 @@ public class ClassFileWriter {
         }
 
         /**
+         * Adds a new <code>CONSTANT_MethodHandle_info</code>
+         * structure.
+         *
+         * @param kind      <code>reference_kind</code>
+         *                  such as {@link ConstPool#REF_invokeStatic <code>REF_invokeStatic</code>}.
+         * @param index     <code>reference_index</code>.
+         * @return          the index of the added entry.
+         *
+         * @since 3.17.1
+         */
+        public int addMethodHandleInfo(int kind, int index) {
+            output.write(MethodHandleInfo.tag);
+            output.write(kind);
+            output.writeShort(index);
+            return num++;
+        }
+
+        /**
+         * Adds a new <code>CONSTANT_MethodType_info</code>
+         * structure.
+         *
+         * @param desc      <code>descriptor_index</code>.
+         * @return          the index of the added entry.
+         *
+         * @since 3.17.1
+         */
+        public int addMethodTypeInfo(int desc) {
+            output.write(MethodTypeInfo.tag);
+            output.writeShort(desc);
+            return num++;
+        }
+
+        /**
+         * Adds a new <code>CONSTANT_InvokeDynamic_info</code>
+         * structure.
+         *
+         * @param bootstrap         <code>bootstrap_method_attr_index</code>.
+         * @param nameAndTypeInfo   <code>name_and_type_index</code>.
+         * @return                  the index of the added entry.
+         *
+         * @since 3.17.1
+         */
+        public int addInvokeDynamicInfo(int bootstrap,
+                                        int nameAndTypeInfo) {
+            output.write(InvokeDynamicInfo.tag);
+            output.writeShort(bootstrap);
+            output.writeShort(nameAndTypeInfo);
+            return num++;
+        }
+
+        /**
          * Adds a new <code>CONSTANT_String_info</code>
          * structure.
          *