[jboss-cvs] javassist/src/main/javassist/bytecode ...

[Shigeru Chiba]

  User: chiba   
  Date: 07/05/04 23:47:52

  Modified:    src/main/javassist/bytecode   ClassFile.java
                        ClassFileWriter.java
  Log:
  Javassist has been producing an interface with a wrong modifier.  I fixed this.
  
  Revision  Changes    Path
  1.30      +5 -3      javassist/src/main/javassist/bytecode/ClassFile.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ClassFile.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/bytecode/ClassFile.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -b -r1.29 -r1.30
  --- ClassFile.java	8 Mar 2007 13:05:47 -0000	1.29
  +++ ClassFile.java	5 May 2007 03:47:52 -0000	1.30
  @@ -68,8 +68,7 @@
           constPool = new ConstPool(classname);
           thisClass = constPool.getThisClassInfo();
           if (isInterface)
  -            accessFlags = AccessFlag.SUPER | AccessFlag.INTERFACE
  -                    | AccessFlag.ABSTRACT;
  +            accessFlags = AccessFlag.INTERFACE | AccessFlag.ABSTRACT;
           else
               accessFlags = AccessFlag.SUPER;
   
  @@ -237,7 +236,10 @@
        * @see javassist.bytecode.AccessFlag
        */
       public void setAccessFlags(int acc) {
  -        accessFlags = acc | AccessFlag.SUPER;
  +        if ((acc & AccessFlag.INTERFACE) == 0)
  +            acc |= AccessFlag.SUPER;
  +
  +        accessFlags = acc;
       }
   
       /**
  
  
  
  1.13      +2 -1      javassist/src/main/javassist/bytecode/ClassFileWriter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ClassFileWriter.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/bytecode/ClassFileWriter.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- ClassFileWriter.java	9 Feb 2007 18:05:21 -0000	1.12
  +++ ClassFileWriter.java	5 May 2007 03:47:52 -0000	1.13
  @@ -45,7 +45,8 @@
           int mod
               = AccessFlag.toModifier(cf.getAccessFlags()
                                       & ~AccessFlag.SYNCHRONIZED);
  -        out.println("major: " + cf.major + ", minor: " + cf.minor);
  +        out.println("major: " + cf.major + ", minor: " + cf.minor
  +                    + "modifiers: " + Integer.toHexString(cf.getAccessFlags()));
           out.println(Modifier.toString(mod) + " class "
                       + cf.getName() + " extends " + cf.getSuperclass());