1.1 --- a/src/share/classes/com/sun/tools/classfile/AccessFlags.java Tue Jun 16 10:46:37 2009 +0100
1.2 +++ b/src/share/classes/com/sun/tools/classfile/AccessFlags.java Fri Jun 19 11:40:47 2009 -0700
1.3 @@ -58,7 +58,7 @@
1.4 public static final int ACC_ENUM = 0x4000; // class, inner, field
1.5 public static final int ACC_MODULE = 0x8000; // class, inner, field, method
1.6
1.7 - private static enum Type { Class, InnerClass, Field, Method};
1.8 + public static enum Kind { Class, InnerClass, Field, Method};
1.9
1.10 AccessFlags(ClassReader cr) throws IOException {
1.11 this(cr.readUnsignedShort());
1.12 @@ -87,11 +87,11 @@
1.13
1.14 public Set<String> getClassModifiers() {
1.15 int f = ((flags & ACC_INTERFACE) != 0 ? flags & ~ACC_ABSTRACT : flags);
1.16 - return getModifiers(f, classModifiers, Type.Class);
1.17 + return getModifiers(f, classModifiers, Kind.Class);
1.18 }
1.19
1.20 public Set<String> getClassFlags() {
1.21 - return getFlags(classFlags, Type.Class);
1.22 + return getFlags(classFlags, Kind.Class);
1.23 }
1.24
1.25 private static final int[] innerClassModifiers = {
1.26 @@ -106,11 +106,11 @@
1.27
1.28 public Set<String> getInnerClassModifiers() {
1.29 int f = ((flags & ACC_INTERFACE) != 0 ? flags & ~ACC_ABSTRACT : flags);
1.30 - return getModifiers(f, innerClassModifiers, Type.InnerClass);
1.31 + return getModifiers(f, innerClassModifiers, Kind.InnerClass);
1.32 }
1.33
1.34 public Set<String> getInnerClassFlags() {
1.35 - return getFlags(innerClassFlags, Type.InnerClass);
1.36 + return getFlags(innerClassFlags, Kind.InnerClass);
1.37 }
1.38
1.39 private static final int[] fieldModifiers = {
1.40 @@ -124,11 +124,11 @@
1.41 };
1.42
1.43 public Set<String> getFieldModifiers() {
1.44 - return getModifiers(fieldModifiers, Type.Field);
1.45 + return getModifiers(fieldModifiers, Kind.Field);
1.46 }
1.47
1.48 public Set<String> getFieldFlags() {
1.49 - return getFlags(fieldFlags, Type.Field);
1.50 + return getFlags(fieldFlags, Kind.Field);
1.51 }
1.52
1.53 private static final int[] methodModifiers = {
1.54 @@ -143,18 +143,18 @@
1.55 };
1.56
1.57 public Set<String> getMethodModifiers() {
1.58 - return getModifiers(methodModifiers, Type.Method);
1.59 + return getModifiers(methodModifiers, Kind.Method);
1.60 }
1.61
1.62 public Set<String> getMethodFlags() {
1.63 - return getFlags(methodFlags, Type.Method);
1.64 + return getFlags(methodFlags, Kind.Method);
1.65 }
1.66
1.67 - private Set<String> getModifiers(int[] modifierFlags, Type t) {
1.68 + private Set<String> getModifiers(int[] modifierFlags, Kind t) {
1.69 return getModifiers(flags, modifierFlags, t);
1.70 }
1.71
1.72 - private static Set<String> getModifiers(int flags, int[] modifierFlags, Type t) {
1.73 + private static Set<String> getModifiers(int flags, int[] modifierFlags, Kind t) {
1.74 Set<String> s = new LinkedHashSet<String>();
1.75 for (int m: modifierFlags) {
1.76 if ((flags & m) != 0)
1.77 @@ -163,7 +163,7 @@
1.78 return s;
1.79 }
1.80
1.81 - private Set<String> getFlags(int[] expectedFlags, Type t) {
1.82 + private Set<String> getFlags(int[] expectedFlags, Kind t) {
1.83 Set<String> s = new LinkedHashSet<String>();
1.84 int f = flags;
1.85 for (int e: expectedFlags) {
1.86 @@ -180,7 +180,7 @@
1.87 return s;
1.88 }
1.89
1.90 - private static String flagToModifier(int flag, Type t) {
1.91 + private static String flagToModifier(int flag, Kind t) {
1.92 switch (flag) {
1.93 case ACC_PUBLIC:
1.94 return "public";
1.95 @@ -195,7 +195,7 @@
1.96 case ACC_SYNCHRONIZED:
1.97 return "synchronized";
1.98 case 0x80:
1.99 - return (t == Type.Field ? "transient" : null);
1.100 + return (t == Kind.Field ? "transient" : null);
1.101 case ACC_VOLATILE:
1.102 return "volatile";
1.103 case ACC_NATIVE:
1.104 @@ -211,7 +211,7 @@
1.105 }
1.106 }
1.107
1.108 - private static String flagToName(int flag, Type t) {
1.109 + private static String flagToName(int flag, Kind t) {
1.110 switch (flag) {
1.111 case ACC_PUBLIC:
1.112 return "ACC_PUBLIC";
1.113 @@ -224,11 +224,11 @@
1.114 case ACC_FINAL:
1.115 return "ACC_FINAL";
1.116 case 0x20:
1.117 - return (t == Type.Class ? "ACC_SUPER" : "ACC_SYNCHRONIZED");
1.118 + return (t == Kind.Class ? "ACC_SUPER" : "ACC_SYNCHRONIZED");
1.119 case 0x40:
1.120 - return (t == Type.Field ? "ACC_VOLATILE" : "ACC_BRIDGE");
1.121 + return (t == Kind.Field ? "ACC_VOLATILE" : "ACC_BRIDGE");
1.122 case 0x80:
1.123 - return (t == Type.Field ? "ACC_TRANSIENT" : "ACC_VARARGS");
1.124 + return (t == Kind.Field ? "ACC_TRANSIENT" : "ACC_VARARGS");
1.125 case ACC_NATIVE:
1.126 return "ACC_NATIVE";
1.127 case ACC_INTERFACE:
1.128 @@ -250,5 +250,5 @@
1.129 }
1.130 }
1.131
1.132 - final int flags;
1.133 + public final int flags;
1.134 }
