From e8e335d811284d4e442d59f1d909ce3cd00ad1b5 Mon Sep 17 00:00:00 2001 From: chiba Date: Sun, 1 Mar 2009 01:56:58 +0000 Subject: [PATCH] for preparing 3.10 release git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@466 30ef5769-5b8d-40dd-aea6-55b5d6557bb3 --- License.html | 2 +- Readme.html | 8 ++++---- build.xml | 4 ++-- pom.xml | 2 +- src/main/META-INF/MANIFEST.MF | 2 +- src/main/javassist/CtClass.java | 4 ++-- src/main/javassist/CtConstructor.java | 8 ++++++-- src/main/javassist/CtMethod.java | 3 +++ src/main/javassist/CtNewMethod.java | 4 +++- .../javassist/bytecode/analysis/FramePrinter.java | 13 ++++++++++++- 10 files changed, 35 insertions(+), 15 deletions(-) diff --git a/License.html b/License.html index 65d6611e..39d7716b 100644 --- a/License.html +++ b/License.html @@ -353,7 +353,7 @@ MISCELLANEOUS.

The Original Code is Javassist.

The Initial Developer of the Original Code is Shigeru Chiba. Portions created by the Initial Developer are
  - Copyright (C) 1999-2008 Shigeru Chiba. All Rights Reserved. + Copyright (C) 1999-2009 Shigeru Chiba. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms of diff --git a/Readme.html b/Readme.html index 69f91454..f1b09604 100644 --- a/Readme.html +++ b/Readme.html @@ -7,7 +7,7 @@

Javassist version 3

-

Copyright (C) 1999-2008 by Shigeru Chiba, All rights reserved.

+

Copyright (C) 1999-2009 by Shigeru Chiba, All rights reserved.


@@ -284,7 +284,7 @@ see javassist.Dump.

-version 3.10

-version 3.9 on October 9, 2008 @@ -704,7 +704,7 @@ and @@ -721,7 +721,7 @@ See the License for the specific language governing rights and

The Initial Developer of the Original Code is Shigeru Chiba. Portions created by the Initial Developer are
  -Copyright (C) 1999-2006 Shigeru Chiba. All Rights Reserved. +Copyright (C) 1999-2009 Shigeru Chiba. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this software may be used under the diff --git a/build.xml b/build.xml index a67e9246..1ec16cc6 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ - + @@ -185,7 +185,7 @@ to ${build.classes.dir}. windowtitle="Javassist API"> Javassist]]> Javassist, a Java-bytecode translator toolkit.
-Copyright (C) 1999-2008 Shigeru Chiba. All Rights Reserved.]]> +Copyright (C) 1999-2009 Shigeru Chiba. All Rights Reserved.]]> diff --git a/pom.xml b/pom.xml index d68b79b5..0571986f 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ Javassist (JAVA programming ASSISTant) makes Java bytecode manipulation simple. It is a class library for editing bytecodes in Java. - 3.9.0.GA + 3.10.0.GA Javassist http://www.javassist.org/ diff --git a/src/main/META-INF/MANIFEST.MF b/src/main/META-INF/MANIFEST.MF index 1dea24d3..aa2c3ea9 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.9.0.GA +Specification-Version: 3.10.0.GA Main-Class: javassist.CtClass Name: javassist/ diff --git a/src/main/javassist/CtClass.java b/src/main/javassist/CtClass.java index 21d5ab0e..97f7b426 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.9.0.GA"; + public static final String version = "3.10.0.GA"; /** * Prints the version number and the copyright notice. @@ -63,7 +63,7 @@ public abstract class CtClass { */ public static void main(String[] args) { System.out.println("Javassist version " + CtClass.version); - System.out.println("Copyright (C) 1999-2008 Shigeru Chiba." + System.out.println("Copyright (C) 1999-2009 Shigeru Chiba." + " All Rights Reserved."); } diff --git a/src/main/javassist/CtConstructor.java b/src/main/javassist/CtConstructor.java index e457eb2e..831aef48 100644 --- a/src/main/javassist/CtConstructor.java +++ b/src/main/javassist/CtConstructor.java @@ -318,7 +318,7 @@ public final class CtConstructor extends CtBehavior { /** * Makes a copy of this constructor and converts it into a method. - * The signature of the mehtod is the same as the that of this constructor. + * The signature of the method is the same as the that of this constructor. * The return type is void. The resulting method must be * appended to the class specified by declaring. * If this constructor is a static initializer, the resulting method takes @@ -329,12 +329,16 @@ public final class CtConstructor extends CtBehavior { * eliminated from the resulting method. * *

The immediate super class of the class declaring this constructor - * must be also a super class of the class declaring the resulting method. + * must be also a super class of the class declaring the resulting method + * (this is obviously true if the second parameter declaring is + * the same as the class declaring this constructor). * If the constructor accesses a field, the class declaring the resulting method * must also declare a field with the same name and type. * * @param name the name of the resulting method. * @param declaring the class declaring the resulting method. + * It is normally the same as the class declaring this + * constructor. * @param map the hash table associating original class names * with substituted names. The original class names will be * replaced while making a copy. diff --git a/src/main/javassist/CtMethod.java b/src/main/javassist/CtMethod.java index 0c85783d..727ff5ba 100644 --- a/src/main/javassist/CtMethod.java +++ b/src/main/javassist/CtMethod.java @@ -30,6 +30,9 @@ import javassist.bytecode.*; public final class CtMethod extends CtBehavior { protected String cachedStringRep; + /** + * @see #make(MethodInfo minfo, CtClass declaring) + */ CtMethod(MethodInfo minfo, CtClass declaring) { super(declaring, minfo); cachedStringRep = null; diff --git a/src/main/javassist/CtNewMethod.java b/src/main/javassist/CtNewMethod.java index 2911484a..60802542 100644 --- a/src/main/javassist/CtNewMethod.java +++ b/src/main/javassist/CtNewMethod.java @@ -94,6 +94,7 @@ public class CtNewMethod { * If it is null, the created method * does nothing except returning zero or null. * @param declaring the class to which the created method is added. + * @see #make(int, CtClass, String, CtClass[], CtClass[], String, CtClass) */ public static CtMethod make(CtClass returnType, String mname, CtClass[] parameters, @@ -106,7 +107,8 @@ public class CtNewMethod { } /** - * Creates a method. + * Creates a method. modifiers can contain + * Modifier.STATIC. * * @param modifiers access modifiers. * @param returnType the type of the returned value. diff --git a/src/main/javassist/bytecode/analysis/FramePrinter.java b/src/main/javassist/bytecode/analysis/FramePrinter.java index 263e5299..fc99cd39 100644 --- a/src/main/javassist/bytecode/analysis/FramePrinter.java +++ b/src/main/javassist/bytecode/analysis/FramePrinter.java @@ -37,14 +37,23 @@ import javassist.bytecode.MethodInfo; public final class FramePrinter { private final PrintStream stream; + /** + * Constructs a bytecode printer. + */ public FramePrinter(PrintStream stream) { this.stream = stream; } + /** + * Prints all the methods declared in the given class. + */ public static void print(CtClass clazz, PrintStream stream) { (new FramePrinter(stream)).print(clazz); } + /** + * Prints all the methods declared in the given class. + */ public void print(CtClass clazz) { CtMethod[] methods = clazz.getDeclaredMethods(); for (int i = 0; i < methods.length; i++) { @@ -62,6 +71,9 @@ public final class FramePrinter { } } + /** + * Prints the instructions and the frame states of the given method. + */ public void print(CtMethod method) { stream.println("\n" + getMethodString(method)); MethodInfo info = method.getMethodInfo2(); @@ -132,5 +144,4 @@ public final class FramePrinter { while (count-- > 0) stream.print(' '); } - } -- 2.39.5