fixed a but in javassist.bytecode.stackmap etc.

git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@372 30ef5769-5b8d-40dd-aea6-55b5d6557bb3

diff --git a/src/main/javassist/ClassPool.java b/src/main/javassist/ClassPool.java
index 1b84ec4b749e23844fb7ef7c385eb248d09b4402..2581ae85c15a9982a47c6544f2c58619e8ee7447 100644 (file)
--- a/src/main/javassist/ClassPool.java
+++ b/src/main/javassist/ClassPool.java
@@ -584,7 +584,8 @@ public class ClassPool {
      * @see javassist.ByteArrayClassPath
      */
     public CtClass makeClass(InputStream classfile)
-        throws IOException, RuntimeException {
+        throws IOException, RuntimeException
+    {
         classfile = new BufferedInputStream(classfile);
         CtClass clazz = new CtClassType(classfile, this);
         clazz.checkModify();

diff --git a/src/main/javassist/bytecode/ClassFileWriter.java b/src/main/javassist/bytecode/ClassFileWriter.java
index b4f8389586cde30719772990ec76063f616b59d7..3b2b7c7e25b2613981ef5113d74bc1eabed04230 100644 (file)
--- a/src/main/javassist/bytecode/ClassFileWriter.java
+++ b/src/main/javassist/bytecode/ClassFileWriter.java
@@ -46,7 +46,7 @@ public class ClassFileWriter {
             = AccessFlag.toModifier(cf.getAccessFlags()
                                     & ~AccessFlag.SYNCHRONIZED);
         out.println("major: " + cf.major + ", minor: " + cf.minor
-                    + "modifiers: " + Integer.toHexString(cf.getAccessFlags()));
+                    + " modifiers: " + Integer.toHexString(cf.getAccessFlags()));
         out.println(Modifier.toString(mod) + " class "
                     + cf.getName() + " extends " + cf.getSuperclass());
 

diff --git a/src/main/javassist/bytecode/stackmap/TypeData.java b/src/main/javassist/bytecode/stackmap/TypeData.java
index 0069f0fa1db1b217c2e483ac63b837813b7a1879..804264a05b9dbb6e0c9d5e15fafcc20bc08a8bcc 100644 (file)
--- a/src/main/javassist/bytecode/stackmap/TypeData.java
+++ b/src/main/javassist/bytecode/stackmap/TypeData.java
@@ -263,7 +263,7 @@ public abstract class TypeData {
                     cache = cp.get(oldName);
     
                 CtClass cache2 = cp.get(typeName);
-                if (cache2.subclassOf(cache)) {
+                if (cache2.subtypeOf(cache)) {
                     cache = cache2;
                     return true;
                 }

diff --git a/tutorial/tutorial.html b/tutorial/tutorial.html
index 8fe123cca890c6786f5fa1ea3a8359e19150154b..097d695a6e80cfbf2b555cbc0dfbfc40e7666b1b 100644 (file)
--- a/tutorial/tutorial.html
+++ b/tutorial/tutorial.html
@@ -1086,6 +1086,6 @@ For more information, see the API documentation of
 
 <hr>
 Java(TM) is a trademark of Sun Microsystems, Inc.<br>
-Copyright (C) 2000-2005 by Shigeru Chiba, All rights reserved.
+Copyright (C) 2000-2007 by Shigeru Chiba, All rights reserved.
 </body>
 </html>

diff --git a/tutorial/tutorial2.html b/tutorial/tutorial2.html
index 484e85ec8370cf19b138c9dcf908165a29c09a1f..833d122742a6e7ee8695de1b182485f7db151bda 100644 (file)
--- a/tutorial/tutorial2.html
+++ b/tutorial/tutorial2.html
@@ -1623,6 +1623,6 @@ write:
 
 <hr>
 Java(TM) is a trademark of Sun Microsystems, Inc.<br>
-Copyright (C) 2000-2005 by Shigeru Chiba, All rights reserved.
+Copyright (C) 2000-2007 by Shigeru Chiba, All rights reserved.
 </body>
 </html>

diff --git a/tutorial/tutorial3.html b/tutorial/tutorial3.html
index 1c4afe7374b70d6bf610bccea883473023ee2d55..418ef7191e721bb8dbcadec203e3d6ee95f02065 100644 (file)
--- a/tutorial/tutorial3.html
+++ b/tutorial/tutorial3.html
@@ -236,7 +236,7 @@ transformation.
 
 <p>The generics of Java is implemented by the erasure technique.
 After compilation, all type parameters are dropped off.  For
-example, suppose that your source code declare a parameterized
+example, suppose that your source code declares a parameterized
 type <code>Vector&lt;String&gt;</code>:
 
 <ul><pre>
@@ -273,7 +273,7 @@ public interface Getter&lt;T&gt; {
 </pre></ul>
 
 <p>Then the interface you really have to add is <code>Getter</code>
-(the type parameters <code>&lt;T&gt;<code> drops off)
+(the type parameters <code>&lt;T&gt;</code> drops off)
 and the method you also have to add to the <code>Wrapper</code>
 class is this simple one:
 
@@ -289,6 +289,6 @@ public Object get() { return value; }
 
 <hr>
 Java(TM) is a trademark of Sun Microsystems, Inc.<br>
-Copyright (C) 2000-2005 by Shigeru Chiba, All rights reserved.
+Copyright (C) 2000-2007 by Shigeru Chiba, All rights reserved.
 </body>
 </html>