additional work for #13

Author: UnquietCode

codemodel/src/main/java/com/sun/codemodel/JFormatter.java

@@ -40,8 +40,6 @@
 
 package com.sun.codemodel;
 
-import com.sun.org.apache.xml.internal.security.encryption.ReferenceList;
-
 import java.io.PrintWriter;
 import java.io.Writer;
 import java.util.ArrayList;
@@ -479,20 +477,22 @@ private boolean supressImport(JClass clazz, JClass c) {
             // inner classes require an import stmt.
             // All other pkg local classes do not need an
             // import stmt for ref.
+
             // no need to explicitly import a class into itself
-            return clazz.outer() == null || isInnerClass(clazz, c);
+            return isNestedInSelf(clazz, c);
         }
         return false;
     }
 
-    private boolean isInnerClass(JClass clazz, JClass c){
-        if(clazz.outer() == null){
-            return false;
-        }
-        else if(clazz.outer().equals(c)){
-            return true;
-        }
-        return isInnerClass(clazz.outer(), c);
+    private static boolean isNestedInSelf(JClass clazz, JClass c) {
+		while (clazz != null) {
+			if (clazz.equals(c)) {
+				return true;
+			}
+			clazz = clazz.outer();
+		}
+
+   		return false;
     }
 
     private JPackage javaLang;

codemodel/src/test/java/com/sun/codemodel/tests/InnerClassTest.java

@@ -1,5 +1,7 @@
 package com.sun.codemodel.tests;
 
+import com.sun.codemodel.writer.SingleStreamCodeWriter;
+import org.junit.Assert;
 import org.junit.Test;
 
 import com.sun.codemodel.JClassAlreadyExistsException;
@@ -8,24 +10,27 @@
 import com.sun.codemodel.JMod;
 import com.sun.codemodel.tests.util.CodeModelTestsUtils;
 
+import java.io.IOException;
+
 public class InnerClassTest {
 
 	@Test
-	public void innerClassesAreImported() throws JClassAlreadyExistsException {
+	public void innerClassesAreImported() throws JClassAlreadyExistsException, IOException {
 		JCodeModel codeModel = new JCodeModel();
 		JDefinedClass aClass = codeModel._class("org.test.DaTestClass");
-//		JDefinedClass daInner = aClass._class("Inner");
+		JDefinedClass daInner = aClass._class("Inner");
+		daInner.method(JMod.PUBLIC, aClass, "doSomething");
+
+		Assert.assertEquals("org.test.DaTestClass.Inner", daInner.fullName());
+		Assert.assertEquals("org.test.DaTestClass$Inner", daInner.binaryName());
+		Assert.assertEquals("Inner", daInner.name());
 
-//		Assert.assertEquals("org.test.DaTestClass.Inner", daInner.fullName());
-//		Assert.assertEquals("org.test.DaTestClass$Inner", daInner.binaryName());
-//		Assert.assertEquals("Inner", daInner.name());
+		aClass.method(JMod.PUBLIC, daInner, "getInner");
 
-//		aClass.method(JMod.PUBLIC, daInner, "getInner");
-		final JDefinedClass otherClass = codeModel
-				._class("org.test.OtherClass");
-//		otherClass.method(JMod.PUBLIC, daInner, "getInner");
+		final JDefinedClass otherClass = codeModel._class("org.test.OtherClass");
+		otherClass.method(JMod.PUBLIC, daInner, "getInner");
 		otherClass.method(JMod.PUBLIC, aClass, "getOuter");
-		System.out.println(CodeModelTestsUtils.declare(otherClass));
 
+		codeModel.build(new SingleStreamCodeWriter(System.out));
 	}
 }