Skip to content

Avoids importing inner classes #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 15, 2016
Merged

Avoids importing inner classes #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions codemodel/src/main/java/com/sun/codemodel/JFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@

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;
Expand Down Expand Up @@ -473,17 +475,26 @@ private boolean supressImport(JClass clazz, JClass c) {
if(packageName.equals("java.lang"))
return true; // no need to explicitly import java.lang classes

if (clazz._package() == c._package()){
if (clazz._package() == c._package()) {
// inner classes require an import stmt.
// All other pkg local classes do not need an
// import stmt for ref.
if(clazz.outer()==null) {
return true; // no need to explicitly import a class into itself
}
// no need to explicitly import a class into itself
return clazz.outer() == null || isInnerClass(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 JPackage javaLang;


Expand Down