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

[Kabir Khan]

  User: kkhan   
  Date: 06/07/14 06:04:35

  Modified:    src/main/javassist/bytecode/annotation   MemberValue.java
                        ClassMemberValue.java
  Log:
  Move handling of primitive class value from MemberValue to ClassMemberValue
  
  Revision  Changes    Path
  1.10      +0 -36     javassist/src/main/javassist/bytecode/annotation/MemberValue.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MemberValue.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/bytecode/annotation/MemberValue.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- MemberValue.java	13 Jul 2006 19:19:36 -0000	1.9
  +++ MemberValue.java	14 Jul 2006 10:04:35 -0000	1.10
  @@ -48,42 +48,6 @@
       static Class loadClass(ClassLoader cl, String classname)
           throws ClassNotFoundException
       {
  -       if (classname.equals("void"))
  -       {
  -          return void.class;
  -       }
  -       if (classname.equals("int"))
  -       {
  -          return int.class;
  -       }
  -       if (classname.equals("byte"))
  -       {
  -          return byte.class;
  -       }
  -       if (classname.equals("long"))
  -       {
  -          return long.class;
  -       }
  -       if (classname.equals("double"))
  -       {
  -          return double.class;
  -       }
  -       if (classname.equals("float"))
  -       {
  -          return float.class;
  -       }
  -       if (classname.equals("char"))
  -       {
  -          return char.class;
  -       }
  -       if (classname.equals("short"))
  -       {
  -          return short.class;
  -       }
  -       if (classname.equals("boolean"))
  -       {
  -          return boolean.class;
  -       }
          return Class.forName(classname, true, cl);
       }
   
  
  
  
  1.12      +38 -1     javassist/src/main/javassist/bytecode/annotation/ClassMemberValue.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ClassMemberValue.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/bytecode/annotation/ClassMemberValue.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- ClassMemberValue.java	7 Sep 2005 02:09:58 -0000	1.11
  +++ ClassMemberValue.java	14 Jul 2006 10:04:35 -0000	1.12
  @@ -63,7 +63,44 @@
       Object getValue(ClassLoader cl, ClassPool cp, Method m)
           throws ClassNotFoundException
       {
  -        return loadClass(cl, getValue());
  +        final String classname = getValue();
  +        if (classname.equals("void"))
  +        {
  +            return void.class;
  +        }
  +        if (classname.equals("int"))
  +        {
  +            return int.class;
  +        }
  +        if (classname.equals("byte"))
  +        {
  +            return byte.class;
  +        }
  +        if (classname.equals("long"))
  +        {
  +            return long.class;
  +        }
  +        if (classname.equals("double"))
  +        {
  +            return double.class;
  +        }
  +        if (classname.equals("float"))
  +        {
  +            return float.class;
  +        }
  +        if (classname.equals("char"))
  +        {
  +            return char.class;
  +        }
  +        if (classname.equals("short"))
  +        {
  +            return short.class;
  +        }
  +        if (classname.equals("boolean"))
  +        {
  +           return boolean.class;
  +        }
  +        return loadClass(cl, classname);
       }
   
       Class getType(ClassLoader cl) throws ClassNotFoundException {