reference superclass fields

darcs-hash:20040605101520-24bed-28535ad03edc77eeba7b1f17aadaabe8f3d6b2c4.gz

diff --git a/src/com/brian_web/gcclass/GCClass.java b/src/com/brian_web/gcclass/GCClass.java
index b17c5b5..02d89cb 100644 (file)
--- a/src/com/brian_web/gcclass/GCClass.java
+++ b/src/com/brian_web/gcclass/GCClass.java
@@ -35,6 +35,10 @@ public class GCClass {
         "java.security.*"
     };
     
+    private static final String[] IGNORED_FIELDS = {
+        "java.io.ObjectInputStream.SUBCLASS_IMPLEMENTATION_PERMISSION"
+    };
+    
     private static final String[] NO_OUTPUT = { "java", "javax", "sun", "com.sun", "apple", "com.apple" };
     
     
@@ -128,9 +132,15 @@ public class GCClass {
         for(int i=0;i<m.args.length;i++) referenceClass(m.args[i]);
     }
     
-    private final void referenceField(FieldRef f) {
+    private final void referenceField(FieldRef f) throws ClassNotFoundException  {
+        if(completed.get(f) != null) return;
+        
         Hashtable h = classRefHash(f.c);
         h.put(f,Boolean.TRUE);
+        
+        // process(FieldRef) doesn't create much work so we don't bother queuing it 
+        process(f);
+        
         referenceClass(f.ftype);
     }
     
@@ -268,6 +278,28 @@ public class GCClass {
         }
     }
     
+    private void process(FieldRef fr) throws ClassNotFoundException {
+        if(completed.get(fr) != null) return;
+        completed.put(fr,Boolean.TRUE);
+
+        JavaClass c = repoGet(fr.c.toString());
+        Field f = findField(c,fr);
+        if(f == null) {
+            JavaClass supers[] = c.getSuperClasses();
+            for(int i=0;i<supers.length;i++) {
+                f = findField(supers[i],fr);
+                if(f != null) { referenceField(new FieldRef(supers[i],f)); return; }
+            }
+            String sig = fr.toString();
+            for(int i=0;i<IGNORED_FIELDS.length;i++) {
+                String pat = IGNORED_FIELDS[i];
+                if(pat.endsWith("*") ? sig.startsWith(pat.substring(0,pat.length()-1)) : sig.equals(pat)) return;
+            }
+            throw new ClassNotFoundException("" + fr + " not found (but the class was)");            
+        }
+        /* nothing to do */
+    }
+    
     private static Method findMethod(JavaClass c, MethodRef mr) {
         Method[] ms = c.getMethods();
         for(int i=0;i<ms.length;i++) {
@@ -278,6 +310,16 @@ public class GCClass {
         return null;
     }
     
+    private static Field findField(JavaClass c, FieldRef fr) {
+        Field[] fs = c.getFields();
+        for(int i=0;i<fs.length;i++) {
+            Field f = fs[i];
+            if(f.getName().equals(fr.name) && f.getType().equals(fr.ftype))
+                return f;
+        }
+        return null;
+    }
+    
     public void dump(File outdir) throws IOException, ClassNotFoundException {
         if(!outdir.isDirectory()) throw new IOException("" + outdir + " is not a directory");
         OUTER: for(Enumeration e = references.keys(); e.hasMoreElements(); ) {