replace Type.instance()

[org.ibex.classgen.git] / src / org / ibex / classgen / FieldGen.java

diff --git a/src/org/ibex/classgen/FieldGen.java b/src/org/ibex/classgen/FieldGen.java
index b657342..1e7373d 100644 (file)
--- a/src/org/ibex/classgen/FieldGen.java
+++ b/src/org/ibex/classgen/FieldGen.java
@@ -23,15 +23,15 @@ public class FieldGen implements CGConst {
     
     FieldGen(DataInput in, ConstantPool cp) throws IOException {
         flags = in.readShort();
-        if((flags & ~(PUBLIC|PRIVATE|PROTECTED|VOLATILE|TRANSIENT|STATIC|FINAL)) != 0)
+        if((flags & ~VALID_FIELD_FLAGS) != 0)
             throw new ClassFile.ClassReadExn("invalid flags");        
         name = cp.getUtf8KeyByIndex(in.readShort());
-        type = Type.instance(cp.getUtf8KeyByIndex(in.readShort()));
+        type = Type.fromDescriptor(cp.getUtf8KeyByIndex(in.readShort()));
         attrs = new ClassFile.AttrGen(in,cp);
     }
 
     FieldGen(ClassFile owner, String name, Type type, int flags) {
-        if((flags & ~(PUBLIC|PRIVATE|PROTECTED|VOLATILE|TRANSIENT|STATIC|FINAL)) != 0)
+        if((flags & ~VALID_FIELD_FLAGS) != 0)
             throw new IllegalArgumentException("invalid flags");
         this.name = name;
         this.type = type;