Use gnu.bytecode directly

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@99 379699f6-c40d-0410-875b-85095c16579e

jode/jode/decompiler/ClassAnalyzer.java

@@ -18,19 +18,21 @@
  */
 
 package jode;
-import java.lang.reflect.*;
+import java.lang.reflect.Modifier;
-import gnu.bytecode.ClassType;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Constructor;
 import gnu.bytecode.ConstantPool;
 import gnu.bytecode.CpoolEntry;
-import gnu.bytecode.CpoolString;
 import gnu.bytecode.CpoolValue1;
 import gnu.bytecode.CpoolValue2;
+import gnu.bytecode.CpoolString;
 
 public class ClassAnalyzer implements Analyzer {
     JodeEnvironment env;
     Analyzer[] analyzers;
     Class clazz;
-    ClassType classType;
+    gnu.bytecode.ClassType classType;
     ClassAnalyzer parent;
     
     public ClassAnalyzer(ClassAnalyzer parent, Class clazz, 
@@ -52,25 +54,21 @@ public class ClassAnalyzer implements Analyzer {
         int i = 0;
         
         Field[] fields = clazz.getDeclaredFields(); 
-        Method[] methods = clazz.getDeclaredMethods();
-        Constructor[] constrs = clazz.getDeclaredConstructors();
 
-        analyzers = new Analyzer[fields.length + methods.length 
+        analyzers = new Analyzer[fields.length + 
-                                + constrs.length];
+                                classType.getMethodCount()];
 
         for (int j=0; j< fields.length; j++) {
             analyzers[i] = new FieldAnalyzer(this, fields[j], env);
             analyzers[i++].analyze();
         }
     
-        for (int j=0; j< constrs.length; j++) {
+        for (gnu.bytecode.Method method = classType.getMethods();
-            analyzers[i] = new MethodAnalyzer(this, constrs[j], env);
+             method != null; method = method.getNext()) {
-            analyzers[i++].analyze();
+            analyzers[i] = new MethodAnalyzer(this, method, env);
-        }
-        for (int j=0; j< methods.length; j++) {
-            analyzers[i] = new MethodAnalyzer(this, methods[j], env);
             analyzers[i++].analyze();
         }
+
 	env.useClass(clazz);
         if (clazz.getSuperclass() != null)
             env.useClass(clazz.getSuperclass());
@@ -88,7 +86,9 @@ public class ClassAnalyzer implements Analyzer {
                                          & ~Modifier.SYNCHRONIZED);
         if (modif.length() > 0)
             writer.print(modif + " ");
-        writer.print(clazz.isInterface() ? "interface " : "class ");
+        writer.print(clazz.isInterface() 
+                     ? ""/*interface is in modif*/ 
+                     : "class ");
 	writer.println(env.classString(clazz));
 	writer.tab();
         Class superClazz = clazz.getSuperclass();
@@ -115,11 +115,6 @@ public class ClassAnalyzer implements Analyzer {
 	writer.println("}");
     }
 
-
-    public ConstantPool getConstantPool() {
-        return classType.getConstants();
-    }
-
     public CpoolEntry getConstant(int i) {
         return classType.getConstant(i);
     }