From cb60fb2b287678ba70aa8ac5835f4e8faa7711ae Mon Sep 17 00:00:00 2001
From: jochen <jochen@379699f6-c40d-0410-875b-85095c16579e>
Date: Sun, 22 Nov 1998 11:16:08 +0000
Subject: [PATCH] GnuIfy

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@126 379699f6-c40d-0410-875b-85095c16579e
---
 jode/jode/decompiler/ClassAnalyzer.java | 9 ++++-----
 jode/jode/decompiler/FieldAnalyzer.java | 7 ++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jode/jode/decompiler/ClassAnalyzer.java b/jode/jode/decompiler/ClassAnalyzer.java
index f92bdb4..20e9991 100644
--- a/jode/jode/decompiler/ClassAnalyzer.java
+++ b/jode/jode/decompiler/ClassAnalyzer.java
@@ -72,12 +72,11 @@ public class ClassAnalyzer implements Analyzer {
         int numFields = 0;
         int i = 0;
         
-        Field[] fields = clazz.getDeclaredFields(); 
-
-        analyzers = new Analyzer[fields.length + 
+        analyzers = new Analyzer[classType.getFieldCount() + 
                                 classType.getMethodCount()];
-        for (int j=0; j< fields.length; j++) {
-            analyzers[i] = new FieldAnalyzer(this, fields[j], env);
+        for (gnu.bytecode.Field field = classType.getFields();
+             field != null; field = field.getNext()) {
+            analyzers[i] = new FieldAnalyzer(this, field, env);
             analyzers[i++].analyze();
         }
 
diff --git a/jode/jode/decompiler/FieldAnalyzer.java b/jode/jode/decompiler/FieldAnalyzer.java
index 930ded2..f537a01 100644
--- a/jode/jode/decompiler/FieldAnalyzer.java
+++ b/jode/jode/decompiler/FieldAnalyzer.java
@@ -31,13 +31,14 @@ public class FieldAnalyzer implements Analyzer {
     String fieldName;
     Expression constant;
     
-    public FieldAnalyzer(ClassAnalyzer cla, Field fd, JodeEnvironment e)
+    public FieldAnalyzer(ClassAnalyzer cla, gnu.bytecode.Field fd, 
+                         JodeEnvironment e)
     {
         clazz = cla;
         env  = e;
 
-        modifiers = fd.getModifiers();
-        type = Type.tType(fd.getType());
+        modifiers = Spy.getModifiers(fd);
+        type = Type.tType(fd.getSignature());
         fieldName = fd.getName();
         constant = null;