Attachment #116029 for bug #249692

View | Details | Raw Unified | Return to bug 249692
Collapse All | Expand All




		buf.append("}\n");
		assertEqualString(cu.getSource(), buf.toString());
	}
	
	public void testAddImports4() throws Exception {
		getJavaProject("P").setOption(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_SEMICOLON, JavaCore.INSERT);
		
		IPackageFragment pack1= this.sourceFolder.createPackageFragment("pack1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package pack1;\n");
		buf.append("\n");
		buf.append("import java.util.Set; // comment\n");
		buf.append("\n");
		buf.append("public class C {\n");
		buf.append("}\n");
		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);

		String[] order= new String[] { "java", "java.util", "com", "pack" };

		ImportRewrite imports= newImportsRewrite(cu, order, 99, 99, true);
		imports.addImport("java.util.Vector");

		apply(imports);

		buf= new StringBuffer();
		buf.append("package pack1;\n");
		buf.append("\n");
		buf.append("import java.util.Set; // comment\n");
		buf.append("import java.util.Vector ;\n");
		buf.append("\n");
		buf.append("public class C {\n");
		buf.append("}\n");
		assertEqualString(cu.getSource(), buf.toString());
	}

	public void testAddImportsWithGroupsOfUnmatched1() throws Exception {


Lines 104-109 Link Here

(-)dom/org/eclipse/jdt/internal/core/dom/rewrite/ImportRewriteAnalyzer.java (+5 lines)
104	}	104	}
105	return 1;	105	return 1;
106	}	106	}
		107
		108	private boolean insertSpaceBeforeSemicolon() {
		109	return JavaCore.INSERT.equals(this.compilationUnit.getJavaProject().getOption(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_SEMICOLON, true));
		110	}
107		111
108	private void addPreferenceOrderHolders(PackageEntry[] preferenceOrder) {	112	private void addPreferenceOrderHolders(PackageEntry[] preferenceOrder) {
109	if (this.packageEntries.isEmpty()) {	113	if (this.packageEntries.isEmpty()) {
Lines 709-714 Link Here
709	buf.append("static "); //$NON-NLS-1$	713	buf.append("static "); //$NON-NLS-1$
710	}	714	}
711	buf.append(importName);	715	buf.append(importName);
		716	if (insertSpaceBeforeSemicolon()) buf.append(' ');
712	buf.append(';');	717	buf.append(';');
713	buf.append(lineDelim);	718	buf.append(lineDelim);
714		719

Return to bug 249692

Lines 268-273 Link Here

(-)src/org/eclipse/jdt/core/tests/rewrite/describing/ImportRewriteTest.java (+31 lines)
268	buf.append("}\n");	268	buf.append("}\n");
269	assertEqualString(cu.getSource(), buf.toString());	269	assertEqualString(cu.getSource(), buf.toString());
270	}	270	}
		271
		272	public void testAddImports4() throws Exception {
		273	getJavaProject("P").setOption(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_SEMICOLON, JavaCore.INSERT);
		274
		275	IPackageFragment pack1= this.sourceFolder.createPackageFragment("pack1", false, null);
		276	StringBuffer buf= new StringBuffer();
		277	buf.append("package pack1;\n");
		278	buf.append("\n");
		279	buf.append("import java.util.Set; // comment\n");
		280	buf.append("\n");
		281	buf.append("public class C {\n");
		282	buf.append("}\n");
		283	ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
		284
		285	String[] order= new String[] { "java", "java.util", "com", "pack" };
		286
		287	ImportRewrite imports= newImportsRewrite(cu, order, 99, 99, true);
		288	imports.addImport("java.util.Vector");
		289
		290	apply(imports);
		291
		292	buf= new StringBuffer();
		293	buf.append("package pack1;\n");
		294	buf.append("\n");
		295	buf.append("import java.util.Set; // comment\n");
		296	buf.append("import java.util.Vector ;\n");
		297	buf.append("\n");
		298	buf.append("public class C {\n");
		299	buf.append("}\n");
		300	assertEqualString(cu.getSource(), buf.toString());
		301	}
271		302
272	public void testAddImportsWithGroupsOfUnmatched1() throws Exception {	303	public void testAddImportsWithGroupsOfUnmatched1() throws Exception {
273		304