X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fclassgen%2FFieldGen.java;h=0fa60697f74326d4bd21520fb16609f9d2177e94;hb=e364eb71c265255d2843ef8752a30c854f56fefb;hp=39e91c0b04cc9152180f86894ec2283087fba5fb;hpb=bc9112573cba51be5e7d285ccd3e496be4278c63;p=org.ibex.classgen.git

diff --git a/src/org/ibex/classgen/FieldGen.java b/src/org/ibex/classgen/FieldGen.java
index 39e91c0..0fa6069 100644
--- a/src/org/ibex/classgen/FieldGen.java
+++ b/src/org/ibex/classgen/FieldGen.java
@@ -2,31 +2,49 @@ package org.ibex.classgen;
 
 import java.io.*;
 
-public class FieldGen implements CGConst {
-    private final CPGen cp;
-    private final String name;
-    private final Type type;
-    private final int flags;
-    private final AttrGen attrs;
+/** Class representing a field in a generated classfile
+    @see ClassFile#addField */
+public class FieldGen extends Type.Class.Field.Body {
+
+    StringBuffer toString(StringBuffer sb) {
+        sb.append(ClassFile.flagsToString(flags, false));
+        sb.append(getField().getType().toString());
+        sb.append(" ");
+        sb.append(getField().getName());
+        if (attrs.contains("ConstantValue")) sb.append(" = \"").append(attrs.get("ConstantValue")).append("\"");
+        sb.append(";");
+        return sb;
+    }
+    
+    FieldGen(Type.Class c, DataInput in, ConstantPool cp) throws IOException {
+        this(in.readShort(),
+             c.field(cp.getUtf8KeyByIndex(in.readShort()),
+                     Type.fromDescriptor(cp.getUtf8KeyByIndex(in.readShort()))),
+             new ClassFile.AttrGen(in, cp));
+    }
+
+    private FieldGen(int flags, Type.Class.Field field, ClassFile.AttrGen attrs) { this(field, flags, attrs); }
+    FieldGen(Type.Class.Field field, int flags) { this(field, flags, new ClassFile.AttrGen()); }
+    FieldGen(Type.Class.Field field, int flags, ClassFile.AttrGen attrs) { field.super(flags, attrs); }
+    
+    /** Sets the ContantValue attribute for this field. 
+        @param val The value to set this field to. Must be an Integer, Long, Float, Double, or String */
+    public void setConstantValue(Object val) {
+        if (!isStatic()) throw new IllegalStateException("field does not have the STATIC bit set");
+        attrs.put("ConstantValue",val);
+    }
     
-    FieldGen(ClassGen owner, String name,Type type, int flags) {
-        if((flags & ~(ACC_PUBLIC|ACC_PRIVATE|ACC_PROTECTED|ACC_VOLATILE|ACC_TRANSIENT|ACC_STATIC|ACC_FINAL)) != 0)
-            throw new IllegalArgumentException("invalid flags");
-        this.cp = owner.cp;
-        this.name = name;
-        this.type = type;
-        this.flags = flags;
-        this.attrs = new AttrGen(cp);
+    void finish(ConstantPool cp) {
+        cp.addUtf8(getField().getName());
+        cp.addUtf8(getField().getType().getDescriptor());
         
-        cp.addUtf8(name);
-        cp.addUtf8(type.getDescriptor());
+        attrs.finish(cp);
     }
     
-    public void dump(DataOutput o) throws IOException {
-        o.writeShort(flags);
-        o.writeShort(cp.getUtf8Index(name));
-        o.writeShort(cp.getUtf8Index(type.getDescriptor()));
-        o.writeShort(attrs.size());
-        attrs.dump(o);
+    void dump(DataOutput o, ConstantPool cp) throws IOException {
+        o.writeShort(getFlags());
+        o.writeShort(cp.getUtf8Index(getField().getName()));
+        o.writeShort(cp.getUtf8Index(getField().getType().getDescriptor()));
+        attrs.dump(o,cp);
     }
 }