### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core.tests.performance
Index: src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceASTTests.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.performance/src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceASTTests.java,v
retrieving revision 1.26
diff -u -r1.26 FullSourceWorkspaceASTTests.java
--- src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceASTTests.java	7 Mar 2009 02:04:23 -0000	1.26
+++ src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceASTTests.java	8 Oct 2009 09:00:10 -0000
@@ -19,10 +19,15 @@
 
 import junit.framework.*;
 
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.*;
 import org.eclipse.jdt.core.compiler.IProblem;
 import org.eclipse.jdt.core.dom.*;
+import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
 import org.eclipse.jdt.core.tests.model.AbstractJavaModelTests;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.text.edits.MalformedTreeException;
+import org.osgi.service.prefs.BackingStoreException;
 
 /**
  */
@@ -733,4 +738,39 @@
 		tagAsSummary("DOM AST tree for project files (JLS3)", true); // put in fingerprint
 		runAstCreation(getProject("org.eclipse.search"));
 	}
+	
+	private void rewriteImport(ICompilationUnit cu, String[] order,
+			int normalThreshold, int staticThreshold,
+			boolean restoreExistingImports) throws CoreException,
+			BackingStoreException, MalformedTreeException, BadLocationException {
+
+		ImportRewrite rewrite = ImportRewrite
+				.create(cu, restoreExistingImports);
+		rewrite.setImportOrder(order);
+		rewrite.setOnDemandImportThreshold(normalThreshold);
+		rewrite.setStaticOnDemandImportThreshold(staticThreshold);
+		rewrite.rewriteImports(null);
+	}
+
+	public void testPerfImportRewrite() throws MalformedTreeException, CoreException, BackingStoreException, BadLocationException {
+		tagAsSummary("testPerfImportRewrite", false); // do NOT put in fingerprint
+
+		String[] order= new String[] {"org", "javax", "java"};
+		ICompilationUnit unit = getCompilationUnit("org.eclipse.jdt.core", "org.eclipse.jdt.internal.core", "JavaProject.java");
+		
+		int measures = MEASURES_COUNT;
+		int internalLoop = 10;
+		for (int i = 0; i < measures; i++) {
+			runGc();
+			startMeasuring();
+			for (int index = 0; index < internalLoop; index++ ) {
+				rewriteImport(unit, order, 99, 99, false);
+			}
+			stopMeasuring();
+		}
+		commitMeasurements();
+		assertPerformance();		
+	
+	}
+	
 }
#P org.eclipse.jdt.core
Index: dom/org/eclipse/jdt/internal/core/dom/rewrite/ImportRewriteAnalyzer.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ImportRewriteAnalyzer.java,v
retrieving revision 1.15
diff -u -r1.15 ImportRewriteAnalyzer.java
--- dom/org/eclipse/jdt/internal/core/dom/rewrite/ImportRewriteAnalyzer.java	7 Mar 2009 00:59:06 -0000	1.15
+++ dom/org/eclipse/jdt/internal/core/dom/rewrite/ImportRewriteAnalyzer.java	8 Oct 2009 09:00:17 -0000
@@ -21,6 +21,7 @@
 import org.eclipse.jdt.core.IBuffer;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.Signature;
@@ -168,9 +169,30 @@
 		}
 	}
 
-	private static String getQualifier(ImportDeclaration decl) {
+	private String getQualifier(ImportDeclaration decl) {
 		String name= decl.getName().getFullyQualifiedName();
-		return decl.isOnDemand() ? name : Signature.getQualifier(name);
+		if (decl.isOnDemand()) {
+			return name;
+		}
+		return getQualifier(name);
+	}
+
+	private String getQualifier(String name) {
+		try {
+			// If our element is an inner class, we need to back up to the top-level
+			// enclosing type and use the package that it is in as a qualifier.
+			// This fixes bug 194358.
+			do {
+				IType element = this.compilationUnit.getJavaProject().findType(name);
+				name = Signature.getQualifier(name);
+				if (element == null || element.getDeclaringType() == null) {
+					break;
+				}
+			} while (true);
+		} catch (JavaModelException e) {
+			// Should never happen.
+		}
+		return name;
 	}
 
 	private static String getFullName(ImportDeclaration decl) {
@@ -401,7 +423,7 @@
 	}
 
 	public void addImport(String fullTypeName, boolean isStatic) {
-		String typeContainerName= Signature.getQualifier(fullTypeName);
+		String typeContainerName= getQualifier(fullTypeName);
 		ImportDeclEntry decl= new ImportDeclEntry(fullTypeName, isStatic, null);
 		sortIn(typeContainerName, decl, isStatic);
 	}
#P org.eclipse.jdt.core.tests.model
Index: src/org/eclipse/jdt/core/tests/rewrite/describing/ImportRewriteTest.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/rewrite/describing/ImportRewriteTest.java,v
retrieving revision 1.12
diff -u -r1.12 ImportRewriteTest.java
--- src/org/eclipse/jdt/core/tests/rewrite/describing/ImportRewriteTest.java	24 Oct 2008 10:40:41 -0000	1.12
+++ src/org/eclipse/jdt/core/tests/rewrite/describing/ImportRewriteTest.java	8 Oct 2009 09:00:20 -0000
@@ -572,6 +572,50 @@
 		assertEqualString(cu.getSource(), buf.toString());
 	}
 
+	public void testAddImports_bug194358() throws Exception {
+
+		IPackageFragment pack1= this.sourceFolder.createPackageFragment("pack1", false, null);
+		StringBuffer buf= new StringBuffer();
+		buf.append("package pack1;\n");
+		buf.append("\n");
+		buf.append("import pack2.A;\n");
+		buf.append("import pack2.A.Inner;\n");
+		buf.append("import pack2.B;\n");
+		buf.append("\n");
+		buf.append("public class C {\n");
+		buf.append("}\n");
+
+		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
+
+		// We need to actually make some state in the AST for the classes, to test that we can 
+		// disambiguate between packages and inner classes (see the bug for details).
+		IPackageFragment pack2= this.sourceFolder.createPackageFragment("pack2", false, null);
+		ICompilationUnit aUnit= pack2.createCompilationUnit("A.java", "", false, null);
+		ICompilationUnit bUnit= pack2.createCompilationUnit("B.java", "", false, null);
+		bUnit.createType("class B {}", null, false, null);
+		
+		IType aType= aUnit.createType("class A {}", null, false, null);
+		aType.createType("class Inner {}", null, false, null);
+		String[] order= new String[] { "java" };
+
+		ImportRewrite imports= newImportsRewrite(cu, order, 99, 99, false);
+		imports.addImport("pack2.A");
+		imports.addImport("pack2.A.Inner");
+		imports.addImport("pack2.B");
+
+		apply(imports);
+		
+		buf= new StringBuffer();
+		buf.append("package pack1;\n");
+		buf.append("\n");
+		buf.append("import pack2.A;\n");
+		buf.append("import pack2.A.Inner;\n");
+		buf.append("import pack2.B;\n");
+		buf.append("\n");
+		buf.append("public class C {\n");
+		buf.append("}\n");
+		assertEqualString(cu.getSource(), buf.toString());
+	}
 	public void testAddStaticImports1() throws Exception {
 
 		IPackageFragment pack1= this.sourceFolder.createPackageFragment("pack1", false, null);