Merge branch 'master' into cm/bug/classpath-close

# Conflicts:
#	pom.xml
#	src/main/javassist/ByteArrayClassPath.java
#	src/main/javassist/ClassClassPath.java
#	src/main/javassist/ClassPoolTail.java
#	src/main/javassist/LoaderClassPath.java
#	src/main/javassist/URLClassPath.java

1 files changed, 31 insertions, 2 deletions

diff --git a/src/main/javassist/CodeConverter.java b/src/main/javassist/CodeConverter.java
index bbc5c77d..6df3622c 100644
--- a/src/main/javassist/CodeConverter.java
+++ b/src/main/javassist/CodeConverter.java
@@ -16,8 +16,21 @@
 
 package javassist;
 
-import javassist.bytecode.*;
-import javassist.convert.*;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.MethodInfo;
+import javassist.convert.TransformAccessArrayField;
+import javassist.convert.TransformAfter;
+import javassist.convert.TransformBefore;
+import javassist.convert.TransformCall;
+import javassist.convert.TransformFieldAccess;
+import javassist.convert.TransformNew;
+import javassist.convert.TransformNewClass;
+import javassist.convert.TransformReadField;
+import javassist.convert.TransformWriteField;
+import javassist.convert.Transformer;
 
 /**
  * Simple translator of method bodies
@@ -666,6 +679,7 @@ public class CodeConverter {
         * Returns "arrayReadByteOrBoolean" as the name of the static method with the signature
         * (Ljava/lang/Object;I)B to replace reading from a byte[].
         */
+        @Override
        public String byteOrBooleanRead()
        {
           return "arrayReadByteOrBoolean";
@@ -675,6 +689,7 @@ public class CodeConverter {
         * Returns "arrayWriteByteOrBoolean" as the name of the static method with the signature
         * (Ljava/lang/Object;IB)V  to replace writing to a byte[].
         */
+        @Override
        public String byteOrBooleanWrite()
        {
           return "arrayWriteByteOrBoolean";
@@ -684,6 +699,7 @@ public class CodeConverter {
         * Returns "arrayReadChar" as the name of the static method with the signature
         * (Ljava/lang/Object;I)C  to replace reading from a char[].
         */
+        @Override
        public String charRead()
        {
           return "arrayReadChar";
@@ -693,6 +709,7 @@ public class CodeConverter {
         * Returns "arrayWriteChar" as the name of the static method with the signature
         * (Ljava/lang/Object;IC)V to replace writing to a byte[].
         */
+        @Override
        public String charWrite()
        {
           return "arrayWriteChar";
@@ -702,6 +719,7 @@ public class CodeConverter {
         * Returns "arrayReadDouble" as the name of the static method with the signature
         * (Ljava/lang/Object;I)D to replace reading from a double[].
         */
+        @Override
        public String doubleRead()
        {
           return "arrayReadDouble";
@@ -711,6 +729,7 @@ public class CodeConverter {
         * Returns "arrayWriteDouble" as the name of the static method with the signature
         * (Ljava/lang/Object;ID)V to replace writing to a double[].
         */
+        @Override
        public String doubleWrite()
        {
           return "arrayWriteDouble";
@@ -720,6 +739,7 @@ public class CodeConverter {
         * Returns "arrayReadFloat" as the name of the static method with the signature
         * (Ljava/lang/Object;I)F  to replace reading from a float[].
         */
+        @Override
        public String floatRead()
        {
           return "arrayReadFloat";
@@ -729,6 +749,7 @@ public class CodeConverter {
         * Returns "arrayWriteFloat" as the name of the static method with the signature
         * (Ljava/lang/Object;IF)V  to replace writing to a float[].
         */
+        @Override
        public String floatWrite()
        {
           return "arrayWriteFloat";
@@ -738,6 +759,7 @@ public class CodeConverter {
         * Returns "arrayReadInt" as the name of the static method with the signature
         * (Ljava/lang/Object;I)I to replace reading from a int[].
         */
+        @Override
        public String intRead()
        {
           return "arrayReadInt";
@@ -747,6 +769,7 @@ public class CodeConverter {
         * Returns "arrayWriteInt" as the name of the static method with the signature
         * (Ljava/lang/Object;II)V to replace writing to a int[].
         */
+        @Override
        public String intWrite()
        {
           return "arrayWriteInt";
@@ -756,6 +779,7 @@ public class CodeConverter {
         * Returns "arrayReadLong" as the name of the static method with the signature
         * (Ljava/lang/Object;I)J to replace reading from a long[].
         */
+        @Override
        public String longRead()
        {
           return "arrayReadLong";
@@ -765,6 +789,7 @@ public class CodeConverter {
         * Returns "arrayWriteLong" as the name of the static method with the signature
         * (Ljava/lang/Object;IJ)V to replace writing to a long[].
         */
+        @Override
        public String longWrite()
        {
           return "arrayWriteLong";
@@ -774,6 +799,7 @@ public class CodeConverter {
         * Returns "arrayReadObject" as the name of the static method with the signature
         * (Ljava/lang/Object;I)Ljava/lang/Object;  to replace reading from a Object[] (or any subclass of object).
         */
+        @Override
        public String objectRead()
        {
           return "arrayReadObject";
@@ -783,6 +809,7 @@ public class CodeConverter {
         * Returns "arrayWriteObject" as the name of the static method with the signature
         * (Ljava/lang/Object;ILjava/lang/Object;)V  to replace writing to a Object[] (or any subclass of object).
         */
+        @Override
        public String objectWrite()
        {
           return "arrayWriteObject";
@@ -792,6 +819,7 @@ public class CodeConverter {
         * Returns "arrayReadShort" as the name of the static method with the signature
         * (Ljava/lang/Object;I)S to replace reading from a short[].
         */
+        @Override
        public String shortRead()
        {
           return "arrayReadShort";
@@ -801,6 +829,7 @@ public class CodeConverter {
         * Returns "arrayWriteShort" as the name of the static method with the signature
         * (Ljava/lang/Object;IS)V to replace writing to a short[].
         */
+        @Override
        public String shortWrite()
        {
           return "arrayWriteShort";