diff options
| -rw-r--r-- | Readme.html | 2 | ||||
| -rw-r--r-- | build.xml | 7 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | src/main/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | src/main/javassist/CtClass.java | 2 | ||||
| -rw-r--r-- | src/main/javassist/bytecode/Descriptor.java | 2 | ||||
| -rw-r--r-- | src/main/javassist/bytecode/annotation/AnnotationImpl.java | 6 |
7 files changed, 12 insertions, 11 deletions
diff --git a/Readme.html b/Readme.html index df7b5f20..a1255c4c 100644 --- a/Readme.html +++ b/Readme.html @@ -281,7 +281,7 @@ see javassist.Dump. <h2>Changes</h2> -<p>-version 3.8 +<p>-version 3.8.0 on June 13, 2008 <ul> <li>javassist.bytecode.analysis was implemented. <li>JASSIST-45, 47, 51, 54-57, 60, 62 were fixed. @@ -6,7 +6,7 @@ <project name="javassist" default="jar" basedir="."> - <property name="dist-version" value="javassist-3.7.1"/> + <property name="dist-version" value="javassist-3.8.0"/> <property environment="env"/> <property name="target.jar" value="javassist.jar"/> @@ -182,9 +182,10 @@ Copyright (C) 1999-2008 Shigeru Chiba. All Rights Reserved.</i>]]></bottom> <zipfileset dir="${basedir}" prefix="${dist-version}"> <include name="**"/> <exclude name=".*"/> - <exclude name=".*/**"/> + <exclude name=".*/**"/> <exclude name="build/**"/> - <exclude name="local/**"/> + <exclude name="local/**"/> + <exclude name="eclipse-output/**"/> <exclude name="${dist-version}.zip"/> <exclude name="${target-src.jar}"/> </zipfileset> @@ -13,7 +13,7 @@ <description>Javassist (JAVA programming ASSISTant) makes Java bytecode manipulation simple. It is a class library for editing bytecodes in Java. </description> - <version>3.7.1.GA</version> + <version>3.8.0.GA</version> <name>Javassist</name> <url>http://www.javassist.org/</url> <build> diff --git a/src/main/META-INF/MANIFEST.MF b/src/main/META-INF/MANIFEST.MF index ed798ac1..36b360df 100644 --- a/src/main/META-INF/MANIFEST.MF +++ b/src/main/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.1 Specification-Title: Javassist Created-By: Shigeru Chiba, Tokyo Institute of Technology Specification-Vendor: Shigeru Chiba, Tokyo Institute of Technology -Specification-Version: 3.7.1 +Specification-Version: 3.8.0.GA Main-Class: javassist.CtClass Name: javassist/ diff --git a/src/main/javassist/CtClass.java b/src/main/javassist/CtClass.java index 313a7618..9d6d7756 100644 --- a/src/main/javassist/CtClass.java +++ b/src/main/javassist/CtClass.java @@ -52,7 +52,7 @@ public abstract class CtClass { /** * The version number of this release. */ - public static final String version = "3.7.1.GA"; + public static final String version = "3.8.0.GA"; /** * Prints the version number and the copyright notice. diff --git a/src/main/javassist/bytecode/Descriptor.java b/src/main/javassist/bytecode/Descriptor.java index d9db92ba..e2163ad1 100644 --- a/src/main/javassist/bytecode/Descriptor.java +++ b/src/main/javassist/bytecode/Descriptor.java @@ -358,7 +358,7 @@ public class Descriptor { * the last parameter. * * @param type the type of the appended parameter. - * @param desc descriptor + * @param descriptor the original descriptor. */ public static String appendParameter(CtClass type, String descriptor) { int i = descriptor.indexOf(')'); diff --git a/src/main/javassist/bytecode/annotation/AnnotationImpl.java b/src/main/javassist/bytecode/annotation/AnnotationImpl.java index e912cf06..dfd23bb0 100644 --- a/src/main/javassist/bytecode/annotation/AnnotationImpl.java +++ b/src/main/javassist/bytecode/annotation/AnnotationImpl.java @@ -48,7 +48,7 @@ public class AnnotationImpl implements InvocationHandler { // Try to resolve the JDK annotation type method try { Class clazz = Class.forName(JDK_ANNOTATION_CLASS_NAME); - JDK_ANNOTATION_TYPE_METHOD = clazz.getMethod("annotationType", null); + JDK_ANNOTATION_TYPE_METHOD = clazz.getMethod("annotationType", (Class[])null); } catch (Exception ignored) { // Probably not JDK5+ @@ -243,7 +243,7 @@ public class AnnotationImpl implements InvocationHandler { } } - Class otherAnnotationType = (Class) JDK_ANNOTATION_TYPE_METHOD.invoke(obj, null); + Class otherAnnotationType = (Class) JDK_ANNOTATION_TYPE_METHOD.invoke(obj, (Object[])null); if (getAnnotationType().equals(otherAnnotationType) == false) return false; @@ -260,7 +260,7 @@ public class AnnotationImpl implements InvocationHandler { value = mv.getValue(classLoader, pool, methods[i]); if (value == null) value = getDefault(name, methods[i]); - otherValue = methods[i].invoke(obj, null); + otherValue = methods[i].invoke(obj, (Object[])null); } catch (RuntimeException e) { throw e; |