From ef61e01b421eeda73762729278932609b83f5526 Mon Sep 17 00:00:00 2001
From: jochen <jochen@379699f6-c40d-0410-875b-85095c16579e>
Date: Wed, 5 May 1999 20:47:54 +0000
Subject: [PATCH] OUTERCLASSES and reflection implemented

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@758 379699f6-c40d-0410-875b-85095c16579e
---
 jode/jode/bytecode/ClassInfo.java | 40 ++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/jode/jode/bytecode/ClassInfo.java b/jode/jode/bytecode/ClassInfo.java
index e02859e..160ceb0 100644
--- a/jode/jode/bytecode/ClassInfo.java
+++ b/jode/jode/bytecode/ClassInfo.java
@@ -454,13 +454,36 @@ public class ClassInfo extends BinaryInfo {
 		    ("Could only get public methods of class "
 		     + name + ".");
 	    }
-	    innerClasses = new InnerClassInfo[is.length];
-	    for (int i = is.length; --i >= 0; ) {
-		String inner = is[i].getName();
-		int dollar = inner.lastIndexOf('$');
-		String name = inner.substring(dollar+1);
-		innerClasses[i] = new InnerClassInfo
-		    (inner, getName(), name, is[i].getModifiers());
+	    if (is.length > 0) {
+		innerClasses = new InnerClassInfo[is.length];
+		for (int i = is.length; --i >= 0; ) {
+		    String inner = is[i].getName();
+		    int dollar = inner.lastIndexOf('$');
+		    String name = inner.substring(dollar+1);
+		    innerClasses[i] = new InnerClassInfo
+			(inner, getName(), name, is[i].getModifiers());
+		}
+	    }
+	}
+	if ((howMuch & INNERCLASSES) != 0 && outerClasses == null) {
+	    int count = 0;
+	    Class declarer = clazz.getDeclaringClass();
+	    while (declarer != null) {
+		count++;
+		declarer = declarer.getDeclaringClass();
+	    }
+	    if (count > 0) {
+		outerClasses = new InnerClassInfo[count];
+		Class current = clazz;
+		for (int i = 0; i < count; i++) {
+		    declarer = current.getDeclaringClass();
+		    String name = current.getName();
+		    int dollar = name.lastIndexOf('$');
+		    outerClasses[i] = new InnerClassInfo
+			(name, declarer.getName(), 
+			 name.substring(dollar+1), current.getModifiers());
+		    current = declarer;
+		}
 	    }
 	}
 	status |= howMuch;
@@ -476,7 +499,8 @@ public class ClassInfo extends BinaryInfo {
 
         } catch (IOException ex) {
 	    String message = ex.getMessage();
-            if ((howMuch & ~(FIELDS|METHODS|HIERARCHY|INNERCLASSES)) != 0) {
+            if ((howMuch & ~(FIELDS|METHODS|HIERARCHY
+			     |INNERCLASSES|OUTERCLASSES)) != 0) {
 		GlobalOptions.err.println
 		    ("Can't read class " + name + ".");
 		ex.printStackTrace(GlobalOptions.err);