perf301 - Merge R3_0_maintenance changesv_454a_perf_301perf_301

77 files changed, 242 insertions, 78 deletions

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterJavadocTest.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterJavadocTest.java
index 02c54c3fad..84c8b7f970 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterJavadocTest.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterJavadocTest.java
@@ -2133,4 +2133,12 @@ public class ASTConverterJavadocTest extends ConverterTestSetup {
 	public void testBug68726() throws JavaModelException {
 		verifyComments("testBug68726");
 	}
+
+	/**
+	 * Test fix for bug 73348: [Javadoc] Missing description for return tag is not always warned
+	 * @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73348">73348</a>
+	 */
+	public void testBug73348() throws JavaModelException {
+		verifyComments("testBug73348");
+	}
 }
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java
index 53c9bbd6a1..c1a3bc0a1e 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java
@@ -832,9 +832,7 @@ public abstract class AbstractJavaModelTests extends SuiteOfTestCases {
 				// resource in the workspace
 				root = project.getPackageFragmentRoot(resource);
 			}
-			if (root.exists()) {
-				return root;
-			}
+			return root;
 		} else {
 			IPackageFragmentRoot[] roots = project.getPackageFragmentRoots();
 			if (roots == null || roots.length == 0) {
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AttachSourceTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AttachSourceTests.java
index e9079f085c..d49d65de89 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AttachSourceTests.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AttachSourceTests.java
@@ -670,4 +670,24 @@ public void testRootPath11() throws JavaModelException {
 	root.close();
 }
 
+/**
+ * Attach a jar with a source attachement that is itself. The jar contains 2 root paths for the same class file.
+ * (regression test for bug 74014 prefix path for source attachements - automatic detection does not seem to work)
+ */
+public void testRootPath12() throws JavaModelException {
+	IJavaProject project = this.getJavaProject("/AttachSourceTests");
+	IPackageFragmentRoot root = project.getPackageFragmentRoot(this.getFile("/AttachSourceTests/test5.jar"));
+	attachSource(root, "/AttachSourceTests/test5.jar", null);
+	
+	IClassFile cf = root.getPackageFragment("p1.p2").getClassFile("X.class");
+	assertSourceEquals(
+		"Unexpected source for class file",
+		"package p1.p2;\n" +
+		"public class X {\n" +
+		"}\n",
+		cf.getSource());
+	attachSource(root, null, null); // detach source
+	root.close();
+}
+
 }
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchJavadocTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchJavadocTests.java
index 91dc0da18a..1751f29326 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchJavadocTests.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchJavadocTests.java
@@ -88,6 +88,8 @@ public class JavaSearchJavadocTests extends JavaSearchTests {
 		System.err.println("WARNING: only subset of tests will be executed!!!");
 		suite.addTest(new JavaSearchJavadocTests("testBug54962"));
 		suite.addTest(new JavaSearchJavadocTests("testBug54962qualified"));
+		suite.addTest(new JavaSearchJavadocTests("testBug71267"));
+		suite.addTest(new JavaSearchJavadocTests("testBug71267qualified"));
 		return suite;
 	}
 
@@ -153,6 +155,8 @@ public class JavaSearchJavadocTests extends JavaSearchTests {
 		suite.addTest(new JavaSearchJavadocTests("testBug49994constructor", support));
 		suite.addTest(new JavaSearchJavadocTests("testBug54962", support));
 		suite.addTest(new JavaSearchJavadocTests("testBug54962qualified", support));
+		suite.addTest(new JavaSearchJavadocTests("testBug71267", support));
+		suite.addTest(new JavaSearchJavadocTests("testBug71267qualified", support));
 	}
 
 	/* (non-Javadoc)
@@ -1005,10 +1009,10 @@ public class JavaSearchJavadocTests extends JavaSearchTests {
 		IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "j6", "Bug54962.java").getPackageDeclaration("j6");
 		search(packDecl, REFERENCES, getJavaSearchScope(),  result);
 		assertSearchResults(
-			"src/j6/Bug54962.java [j6] EXACT_MATCH INSIDE_JAVADOC\n" + 
-				"src/j6/Bug54962.java j6.Bug54962 [j6] POTENTIAL_MATCH INSIDE_JAVADOC\n" + 
-				"src/j6/Bug54962.java j6.Bug54962 [j6] EXACT_MATCH INSIDE_JAVADOC\n" + 
-				"src/j7/qua/li/fied/Bug54962a.java [j6] EXACT_MATCH OUTSIDE_JAVADOC",
+			"src/j6/Bug54962.java j6.Bug54962 [j6] EXACT_MATCH INSIDE_JAVADOC\n" + 
+			"src/j6/Bug54962.java j6.Bug54962 [j6] POTENTIAL_MATCH INSIDE_JAVADOC\n" + 
+			"src/j6/Bug54962.java j6.Bug54962 [j6] EXACT_MATCH INSIDE_JAVADOC\n" + 
+			"src/j7/qua/li/fied/Bug54962a.java [j6] EXACT_MATCH OUTSIDE_JAVADOC",
 			result);
 	}
 	public void testBug54962qualified() throws CoreException {
@@ -1019,9 +1023,44 @@ public class JavaSearchJavadocTests extends JavaSearchTests {
 		IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "j7.qua.li.fied", "Bug54962a.java").getPackageDeclaration("j7.qua.li.fied");
 		search(packDecl, REFERENCES, getJavaSearchScope(),  result);
 		assertSearchResults(
-			"src/j7/qua/li/fied/Bug54962a.java [j7.qua.li.fied] EXACT_MATCH INSIDE_JAVADOC\n" + 
-				"src/j7/qua/li/fied/Bug54962a.java j7.qua.li.fied.Bug54962a [j7.qua.li.fied] POTENTIAL_MATCH INSIDE_JAVADOC\n" + 
-				"src/j7/qua/li/fied/Bug54962a.java j7.qua.li.fied.Bug54962a [j7.qua.li.fied] EXACT_MATCH INSIDE_JAVADOC",
+			"src/j7/qua/li/fied/Bug54962a.java j7.qua.li.fied.Bug54962a [j7.qua.li.fied] EXACT_MATCH INSIDE_JAVADOC\n" + 
+			"src/j7/qua/li/fied/Bug54962a.java j7.qua.li.fied.Bug54962a [j7.qua.li.fied] POTENTIAL_MATCH INSIDE_JAVADOC\n" + 
+			"src/j7/qua/li/fied/Bug54962a.java j7.qua.li.fied.Bug54962a [j7.qua.li.fied] EXACT_MATCH INSIDE_JAVADOC",
+			result);
+	}
+
+	/**
+	 * Test fix for bug 71267: [Search][Javadoc] SearchMatch in class javadoc reported with element of type IImportDeclaration
+	 * @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=71267">71267</a>
+	 * @throws CoreException
+	 */
+	public void testBug71267() throws CoreException {
+		setJavadocOptions();
+		JavaSearchResultCollector result = new JavaSearchResultCollector();
+		result.showAccuracy = true;
+		result.showInsideDoc = true;
+		IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "p71267", "Test.java").getPackageDeclaration("p71267");
+		search(packDecl, REFERENCES, getJavaSearchScope(),  result);
+		assertSearchResults(
+			"src/p71267/Test.java p71267.Test [p71267] EXACT_MATCH INSIDE_JAVADOC\n" + 
+			"src/p71267/Test.java p71267.Test [p71267] EXACT_MATCH INSIDE_JAVADOC\n" + 
+			"src/p71267/q71267/Test.java p71267.q71267.Test [p71267] EXACT_MATCH INSIDE_JAVADOC",
+			result);
+	}
+	public void testBug71267qualified() throws CoreException {
+		setJavadocOptions();
+		JavaSearchResultCollector result = new JavaSearchResultCollector();
+		result.showAccuracy = true;
+		result.showInsideDoc = true;
+		IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "p71267.q71267", "Test.java").getPackageDeclaration("p71267.q71267");
+		search(packDecl, REFERENCES, getJavaSearchScope(),  result);
+		assertSearchResults(
+			"src/p71267/q71267/Test.java p71267.q71267.Test [p71267.q71267] EXACT_MATCH INSIDE_JAVADOC\n" + 
+			"src/p71267/q71267/Test.java p71267.q71267.Test [p71267.q71267] EXACT_MATCH INSIDE_JAVADOC\n" + 
+			"src/p71267/q71267/Test.java p71267.q71267.Test.field [p71267.q71267] EXACT_MATCH INSIDE_JAVADOC\n" + 
+			"src/p71267/q71267/Test.java p71267.q71267.Test.field [p71267.q71267] EXACT_MATCH INSIDE_JAVADOC\n" + 
+			"src/p71267/q71267/Test.java void p71267.q71267.Test.method() [p71267.q71267] EXACT_MATCH INSIDE_JAVADOC\n" + 
+			"src/p71267/q71267/Test.java void p71267.q71267.Test.method() [p71267.q71267] EXACT_MATCH INSIDE_JAVADOC",
 			result);
 	}
 }
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchTests.java
index bddb113f7d..032ce2b503 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchTests.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchTests.java
@@ -302,6 +302,7 @@ public static Test suite() {
 	suite.addTest(new JavaSearchTests("testSimplePackageDeclaration"));
 	suite.addTest(new JavaSearchTests("testVariousPackageDeclarations"));
 	suite.addTest(new JavaSearchTests("testPackageDeclaration"));
+	suite.addTest(new JavaSearchTests("testPackageDeclarationBug73551"));
 	
 	// package reference
 	suite.addTest(new JavaSearchTests("testSimplePackageReference"));
@@ -435,6 +436,8 @@ public static Test suite() {
 	suite.addTest(new JavaSearchTests("testFieldReference5"));
 	suite.addTest(new JavaSearchTests("testFieldReference6"));
 	suite.addTest(new JavaSearchTests("testFieldReference7"));
+	suite.addTest(new JavaSearchTests("testFieldReferenceBug73112a"));
+	suite.addTest(new JavaSearchTests("testFieldReferenceBug73112b"));
 	suite.addTest(new JavaSearchTests("testFieldReferenceInInnerClass"));
 	suite.addTest(new JavaSearchTests("testFieldReferenceInAnonymousClass"));
 	suite.addTest(new JavaSearchTests("testFieldReferenceThroughSubclass"));
@@ -1186,6 +1189,47 @@ public void testFieldReference7() throws CoreException {
 		resultCollector);
 }
 /**
+ * Field reference test.
+ * (regression test for bug 73112: [Search] SearchEngine doesn't find all fields multiple field declarations
+ */
+public void testFieldReferenceBug73112a() throws CoreException {
+	JavaSearchResultCollector resultCollector = new JavaSearchResultCollector();
+	search(
+		"fieldA73112*",
+		FIELD,
+		ALL_OCCURRENCES,
+		getJavaSearchScope(), 
+		resultCollector);
+	assertSearchResults(
+		"src/bug73112/A.java bug73112.A.fieldA73112a [fieldA73112a]\n" + 
+		"src/bug73112/A.java bug73112.A.fieldA73112b [fieldA73112b]\n" + 
+		"src/bug73112/A.java bug73112.A.fieldA73112c [fieldA73112c]\n" + 
+		"src/bug73112/A.java bug73112.A.fieldA73112c [fieldA73112a]\n" + 
+		"src/bug73112/A.java bug73112.A.fieldA73112c [fieldA73112b]\n" + 
+		"src/bug73112/A.java bug73112.A.fieldA73112d [fieldA73112d]",
+		resultCollector);
+}
+public void testFieldReferenceBug73112b() throws CoreException {
+	JavaSearchResultCollector resultCollector = new JavaSearchResultCollector();
+	search(
+		"fieldB73112*",
+		FIELD,
+		ALL_OCCURRENCES,
+		getJavaSearchScope(), 
+		resultCollector);
+	assertSearchResults(
+		"src/bug73112/B.java bug73112.B.fieldB73112a [fieldB73112a]\n" + 
+		"src/bug73112/B.java bug73112.B.fieldB73112b [fieldB73112b]\n" + 
+		"src/bug73112/B.java bug73112.B.fieldB73112c [fieldB73112c]\n" + 
+		"src/bug73112/B.java bug73112.B.fieldB73112c [fieldB73112a]\n" + 
+		"src/bug73112/B.java bug73112.B.fieldB73112c [fieldB73112b]\n" + 
+		"src/bug73112/B.java bug73112.B.fieldB73112d [fieldB73112d]\n" + 
+		"src/bug73112/B.java bug73112.B.fieldB73112d [fieldB73112c]\n" + 
+		"src/bug73112/B.java bug73112.B.fieldB73112d [fieldB73112a]\n" + 
+		"src/bug73112/B.java bug73112.B.fieldB73112e [fieldB73112e]",
+		resultCollector);
+}
+/**
  * Field reference in anonymous class test.
  * (regression test for PR 1GL12XE: ITPJCORE:WIN2000 - search: missing field references in inner class)
  */
@@ -2121,6 +2165,21 @@ public void testPackageDeclaration() throws CoreException {
 		getExternalJCLPath() + " java.lang",
 		resultCollector);
 }
+
+/**
+ * Test fix for bug 73551: NPE while searching package declaration
+ * @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=73551">73551</a>
+ * @throws CoreException
+ */
+public void testPackageDeclarationBug73551() throws CoreException {
+	JavaSearchResultCollector result = new JavaSearchResultCollector();
+	result.showAccuracy = true;
+	IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "p71267", "Test.java").getPackageDeclaration("p71267");
+	search(packDecl, DECLARATIONS, getJavaSearchScope(),  result);
+	assertSearchResults(
+		"src/p71267/Test.java [No source] EXACT_MATCH",
+		result);
+}
 /**
  * Package reference test.
  * (regression test for PR 1GK90H4: ITPJCORE:WIN2000 - search: missing package reference)
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/MementoTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/MementoTests.java
index a46f4e45ef..4c9c1db032 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/MementoTests.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/MementoTests.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.jdt.core.tests.model;
 
+import java.io.File;
+
 import org.eclipse.core.resources.*;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.runtime.CoreException;
@@ -258,6 +260,17 @@ public void testExternalJarBinaryTypeMemento() throws JavaModelException {
 		type);	
 }
 /**
+ * Tests that a class file in an external jar at the root of the file system can be persisted and restored using its memento.
+ */
+public void testExternalJarClassFileMemento() throws JavaModelException {
+	char separator = File.separatorChar;
+	String device = separator == '/' ? "" : "C:";
+	IClassFile classFile = getClassFile("P", device + separator + "lib.jar", "p", "X.class");
+	assertMemento(
+		"=P/" + device + "\\/lib.jar<p(X.class",
+		classFile);	
+}
+/**
  * Tests that an import declaration can be persisted and restored using its memento.
  */
 public void testImportContainerMemento() {
@@ -436,6 +449,20 @@ public void testPackageFragmentMemento() {
 		pkg);
 }
 /**
+ * Tests that a package fragment in the default root can be persisted and restored using its memento.
+ */
+public void testPackageFragmentMemento2() throws CoreException {
+	try {
+		createJavaProject("P1", new String[] {""}, "");
+		IPackageFragment pkg = getPackage("/P1/p");
+		assertMemento(
+			"=P1/<p",
+			pkg);		
+	} finally {
+		deleteProject("P1");
+	}
+}
+/**
  * Tests that a source folder package fragment root can be persisted and restored using its memento.
  */
 public void testPackageFragmentRootMemento1() {
diff --git a/org.eclipse.jdt.core.tests.model/workspace/AttachSourceTests/.classpath b/org.eclipse.jdt.core.tests.model/workspace/AttachSourceTests/.classpath
index 9990816db7..643bef8a9c 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/AttachSourceTests/.classpath
+++ b/org.eclipse.jdt.core.tests.model/workspace/AttachSourceTests/.classpath
@@ -7,6 +7,7 @@
     <classpathentry kind="lib" path="full.jar"/>
     <classpathentry kind="lib" path="test2.jar"/>    
     <classpathentry kind="lib" path="test4.jar"/>    
+    <classpathentry kind="lib" path="test5.jar"/>    
     <classpathentry kind="lib" path="lib"/>
     <classpathentry kind="src" path="src" output="src"/>
     <classpathentry kind="var" path="JCL_LIB"/>
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test002/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test002/A_out.java
index 634e8b1788..2ff3210d34 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test002/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test002/A_out.java
@@ -13,4 +13,4 @@ public abstract/* */class A extends java.lang.Object
 			Runnable,
 			Cloneable,
 			Serializable {
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test003/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test003/A_out.java
index d3191965f3..b49d95814a 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test003/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test003/A_out.java
@@ -7,4 +7,4 @@ public abstract class A extends java.lang.Object
 			Runnable,
 			Cloneable,
 			Serializable {
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test004/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test004/A_out.java
index cddea024f5..034116a022 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test004/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test004/A_out.java
@@ -3,4 +3,4 @@ package p1.p2.test;
 import java.io.Serializable;
 import java.io.IOException;
 public abstract class A implements Runnable {
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test007/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test007/A_out.java
index 38350c1eed..fef70e4b4b 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test007/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test007/A_out.java
@@ -13,4 +13,4 @@ public abstract/* */class A extends java.lang.Object
 			Runnable,
 			Cloneable,
 			Serializable {
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test008/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test008/A_out.java
index b4a6bf628b..8d997a585c 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test008/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test008/A_out.java
@@ -12,4 +12,4 @@ public abstract/*  */class A
 			Toto,
 			Titi,
 			Tata {
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test009/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test009/A_out.java
index 13859a336a..8b3a3c37aa 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test009/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test009/A_out.java
@@ -13,4 +13,4 @@ public abstract/*  */class A extends p1.p2.fpfpfpfppffp.A
 	public final static int CONST = 12; // CONST comment 
 	public final int value = CONST; // value comment 
 	protected long s = a; // s comment 
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test010/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test010/A_out.java
index 9d3cc7bd98..d56b0c9869 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test010/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test010/A_out.java
@@ -6,4 +6,4 @@ public abstract class A implements Runnable {
 	int i;
 	int j;
 	double d;
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test011/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test011/A_out.java
index 070b925da0..a6a0f5d482 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test011/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test011/A_out.java
@@ -13,4 +13,4 @@ public abstract/*  */class A extends p1.p2.fpfpfpfppffp.A
 	int CONST;
 	int value;
 	long s;
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test012/A_in.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test012/A_in.java
index d7b4daebcd..014a71ae73 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test012/A_in.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test012/A_in.java
@@ -4,4 +4,4 @@ import java.io.Serializable;
 import java.io.IOException;
 public abstract /*  */ class A extends p1.p2.fpfpfpfppffp.A implements Runnable, Cloneable, Serializable, Toto, Titi, Tata {
 int CONST;int value;transient long s;protected synchronized void foo() throws IOException,Exception{}public A() throws IOException,Exception{}
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test013/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test013/A_out.java
index 90888f3fb8..d459f7bf1b 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test013/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test013/A_out.java
@@ -14,4 +14,4 @@ public abstract/*  */class A implements Serializable, Toto, Titi, Tata {
 		i = 2;
 		;;
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test014/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test014/A_out.java
index 76148f8c79..92511752a5 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test014/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test014/A_out.java
@@ -15,4 +15,4 @@ public abstract/*  */class A implements Serializable, Toto, Titi, Tata {
 	}
 	public int value = 0; // blabla 
 	final X x; // test 
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test015/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test015/A_out.java
index f56dda5b83..847e41ffee 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test015/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test015/A_out.java
@@ -5,4 +5,4 @@ import java.io.IOException;
 public abstract/*  */class A implements Serializable, Toto, Titi, Tata {
 	Object s = null; // test 
 	A a; // test 
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test017/A_in.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test017/A_in.java
index 5dc02073db..1b11056ec7 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test017/A_in.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test017/A_in.java
@@ -4,4 +4,4 @@ String s2;
     Object oooooooooooooooooooooooooooooooo = null, sssssssssssssssssssssssssssssssssssss;        // toto
 int    iiiiiiiiiiiiiiiiiiiii = 1, jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj = 2, kkkkkkkkkkkkk;    // test 
 String s;
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test018/A_in.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test018/A_in.java
index 9a9c0708f4..b0956e5fba 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test018/A_in.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test018/A_in.java
@@ -2,4 +2,4 @@
 public class A {
     int oooooooooooo00000000000000000000000000000000000000000000000oooooooooooooooooooo = "125665332563256522ddddddddddddddd";        // toto
 String s;
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test019/A_1_in.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test019/A_1_in.java
index ebafad0bf1..5a3c08f59f 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test019/A_1_in.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test019/A_1_in.java
@@ -2,4 +2,4 @@
 public class A {
 protected synchronized void foo(final java.lang.String s1, long l) throws IOException,Exception{
 foo("Helloddddddddddddddddddddddddddddddddddddd", 121212121221212121212121);f("Helloddddddddddddddddddddddddddddddddddddd", 121212121221212121212121);fooooooobaaaaaaar("Helloddddddddddddddddddddddddddddddddddddd", 121212121221212121212121);
-}}
+}}
\ No newline at end of file
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test019/A_2_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test019/A_2_out.java
index e283bc3eca..a78ecba7b5 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test019/A_2_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test019/A_2_out.java
@@ -9,4 +9,4 @@ public class A {
         fooooooobaaaaaaar("Helloddddddddddddddddddddddddddddddddddddd",
                 121212121221212121212121);
     }
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test020/A_in.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test020/A_in.java
index 9bd5c1b3b5..0e4f33fc62 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test020/A_in.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test020/A_in.java
@@ -2,4 +2,4 @@
 public class A {
 protected synchronized String foo(final java.lang.String s1) throws IOException,Exception{
 foo(foo(foo(foo(foo(foo("Helloddddddddddddddddddddddddddddddddddddd"))))));
-}}
+}}
\ No newline at end of file
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test021/A_in.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test021/A_in.java
index e3e35658d1..ec1f86d659 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test021/A_in.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test021/A_in.java
@@ -1,4 +1,4 @@
 // test021
 public class A {
 protected synchronized String foo(final java.lang.String s1) throws IOException,Exception{
-}}
+}}
\ No newline at end of file
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test022/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test022/A_out.java
index 2d3ee38059..673005be43 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test022/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test022/A_out.java
@@ -3,4 +3,4 @@ public class A {
 	public int i = 2; // end of line comment
 	public String s = "Hello";
 	private String tab[] = {"Hello", "World"}; // this is an array
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test023/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test023/A_out.java
index 358af18e4f..bd70fc6c33 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test023/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test023/A_out.java
@@ -11,4 +11,4 @@ public class A {
 		return 3;
 	} // end of baz() comment
 	private String tab[] = {"Hello", "World"}; // this is an array
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test024/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test024/A_out.java
index 4e74139e8b..5d37eb6540 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test024/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test024/A_out.java
@@ -8,4 +8,4 @@ public class A {
 			if (should - split - second)
 				if (remainCompact) if (remainCompact) whatever();
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test025/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test025/A_out.java
index 65ae17331c..7d2fe12d69 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test025/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test025/A_out.java
@@ -3,4 +3,4 @@ public class A {
 	public void foo() {
 	}
 	public int field1;
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test026/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test026/A_out.java
index fb27b04443..f27495c32f 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test026/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test026/A_out.java
@@ -14,4 +14,4 @@ public class A {
 								Alignment.M_COMPACT_SPLIT),
 				expressionsLength - 1, this.scribe.scanner.currentPosition);
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test027/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test027/A_out.java
index 7f17342d12..1b7c94bb2b 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test027/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test027/A_out.java
@@ -6,4 +6,4 @@ public class A {
 		int i = 0, k = 3;
 		i = 2;
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test028/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test028/A_out.java
index 1d4c704d47..0361d5abd9 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test028/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test028/A_out.java
@@ -3,4 +3,4 @@ public class A {
 	public void foo(boolean b) {
 		;;
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test029/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test029/A_out.java
index af99edf2e5..c92970dbbb 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test029/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test029/A_out.java
@@ -17,4 +17,4 @@ public class Test {
 	}
 	public long l; // long field
 	public String s = null;
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test030/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test030/A_out.java
index 1c764259e6..e21582bde0 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test030/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test030/A_out.java
@@ -17,4 +17,4 @@ public class Test {
 	}
 	public String s = null;
 	public long l; // long field
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test031/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test031/A_out.java
index 79635134ef..e84f3045e3 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test031/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test031/A_out.java
@@ -18,4 +18,4 @@ public abstract/*  */class A extends p1.p2.fpfpfpfppffp.A
 	}
 	public A() throws IOException, Exception {
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test032/A_in.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test032/A_in.java
index 774c50b1d7..b6e380a62b 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test032/A_in.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test032/A_in.java
@@ -1,3 +1,3 @@
 // test032 
 public class A {
-protected synchronized Object foo() throws IOException,Exception{return new String("this is a very long long long long string") != null ? new Object() : null;}}
\ No newline at end of file
+protected synchronized Object foo() throws IOException,Exception{return new String("this is a very long long long long string") != null ? new Object() : null;}}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test032/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test032/A_out.java
index 0fce2a7a80..04ac651c83 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test032/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test032/A_out.java
@@ -5,4 +5,4 @@ public class A {
 				? new Object()
 				: null;
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test033/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test033/A_out.java
index 892042ce86..17e75cb289 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test033/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test033/A_out.java
@@ -3,4 +3,4 @@ public class A {
 	protected synchronized Object foo() throws IOException, Exception {
 		return new String("") != null ? null : null;
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test034/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test034/A_out.java
index c4be48b20e..6d7023f81b 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test034/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test034/A_out.java
@@ -6,4 +6,4 @@ public class A {
 			doSomething();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test035/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test035/A_out.java
index 5c5835da5a..757fbbc361 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test035/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test035/A_out.java
@@ -5,4 +5,4 @@ public class A {
 			doSomething();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test036/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test036/A_out.java
index 726352657a..ee105e3739 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test036/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test036/A_out.java
@@ -5,4 +5,4 @@ public class A {
 			doSomething();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test037/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test037/A_out.java
index 5159efe7b5..cdfe7f570a 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test037/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test037/A_out.java
@@ -7,4 +7,4 @@ class F {
 			}
 		};
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test038/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test038/A_out.java
index 6cdf3a9b44..b5f391d24a 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test038/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test038/A_out.java
@@ -6,4 +6,4 @@ class F {
 			}
 		};
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test039/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test039/A_out.java
index 3fcf9f987c..de355641aa 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test039/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test039/A_out.java
@@ -6,4 +6,4 @@ class F {
 	}
 	public void bar2() {//todo
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test040/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test040/A_out.java
index 9041253176..73aee4645b 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test040/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test040/A_out.java
@@ -3,4 +3,4 @@ class F {
 		return new Runnable() {
 		};
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test042/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test042/A_out.java
index 9d531aaea6..3813519a8a 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test042/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test042/A_out.java
@@ -11,4 +11,4 @@ class F {
 			--size;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test045/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test045/A_out.java
index 0a9793c55b..de652b3a91 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test045/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test045/A_out.java
@@ -5,4 +5,4 @@ class F {
 				&& ((local.declaration.bits & AstNode.IsLocalDeclarationReachableMASK) != 0)) { // declaration is reachable
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test052/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test052/A_out.java
index d3191965f3..b49d95814a 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test052/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test052/A_out.java
@@ -7,4 +7,4 @@ public abstract class A extends java.lang.Object
 			Runnable,
 			Cloneable,
 			Serializable {
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test053/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test053/A_out.java
index 741327fa1f..5efa7b963a 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test053/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test053/A_out.java
@@ -14,4 +14,4 @@ public abstract class A extends java.lang.Object
 	 * test4
 	 * 004 
 	 */
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test054/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test054/A_out.java
index 741327fa1f..5efa7b963a 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test054/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test054/A_out.java
@@ -14,4 +14,4 @@ public abstract class A extends java.lang.Object
 	 * test4
 	 * 004 
 	 */
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test063/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test063/A_out.java
index 96804bc8bc..b0f85a6012 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test063/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test063/A_out.java
@@ -4,4 +4,4 @@ public class E {
 		goo();
 		System.out.println();
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test064/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test064/A_out.java
index 55997badb9..14136c8c6d 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test064/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test064/A_out.java
@@ -8,4 +8,4 @@ public class E {
 	}
 	public int foo1(int i) {
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test065/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test065/A_out.java
index 916b516bd0..5c0d3f807b 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test065/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test065/A_out.java
@@ -13,4 +13,4 @@ public class E {
 	public int foo1(int i) {
 		return 0;
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test066/A_in.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test066/A_in.java
index db0d0eab64..1c7dd99057 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test066/A_in.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test066/A_in.java
@@ -11,4 +11,4 @@ public class E {
     public int foo1(int i) {
 		return 0;
     }
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test067/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test067/A_out.java
index 7675551bd3..2df95dd8b1 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test067/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test067/A_out.java
@@ -12,4 +12,4 @@ public class E {
 	public int foo1(int i) {
 		return 0;
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test073/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test073/A_out.java
index f8781175f7..a09933d99a 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test073/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test073/A_out.java
@@ -28,4 +28,4 @@ public class FormatterProblem {
 			if (!d.readAndDispatch()) d.sleep();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test113/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test113/A_out.java
index 0ead9425f2..a6cb2320ed 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test113/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test113/A_out.java
@@ -9,4 +9,4 @@ public class A {
 		fooooooobaaaaaaar(	"Helloddddddddddddddddddddddddddddddddddddd",
 							121212121221212121212121);
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test117/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test117/A_out.java
index 3907ec3038..af8170f0ba 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test117/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test117/A_out.java
@@ -5,4 +5,4 @@ public class A {
 			foo();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test118/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test118/A_out.java
index b9d82cf085..254ca03b47 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test118/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test118/A_out.java
@@ -5,4 +5,4 @@ public class A {
 			hoo(11);
 		} while (true);
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test123/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test123/A_out.java
index 3907ec3038..af8170f0ba 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test123/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test123/A_out.java
@@ -5,4 +5,4 @@ public class A {
 			foo();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test126/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test126/A_out.java
index 3907ec3038..af8170f0ba 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test126/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test126/A_out.java
@@ -5,4 +5,4 @@ public class A {
 			foo();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test133/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test133/A_out.java
index b0f21b70fb..8fc5ef2016 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test133/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test133/A_out.java
@@ -141,4 +141,4 @@ public class AssistOptions {
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test140/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test140/A_out.java
index 9e8c3d87e7..a2f1af131d 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test140/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test140/A_out.java
@@ -7,4 +7,4 @@ public class A {
             default :
         }
     }
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test141/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test141/A_out.java
index d8b17d86b2..6ccb9a8aa1 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test141/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test141/A_out.java
@@ -7,4 +7,4 @@ public class A {
         default :
         }
     }
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test153/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test153/A_out.java
index faf948eb22..9dde19ed18 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test153/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test153/A_out.java
@@ -3,4 +3,4 @@ public class Parser {
 	protected int[]						astLengthStack;
 	public CompilationUnitDeclaration	compilationUnit;								/*the result from parse()*/
 	AstNode[]							noAstNodes	= new AstNode[AstStackIncrement];
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test154/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test154/A_out.java
index d99eeb55d6..f07376a52a 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test154/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test154/A_out.java
@@ -16,4 +16,4 @@ public class E {
 	}
 	public int foo1(int i) {
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test159/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test159/A_out.java
index aa40ab8ba4..4fdc43c3cc 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test159/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test159/A_out.java
@@ -41,4 +41,4 @@ public class Example extends Object {
 		}
 		return size;
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test165/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test165/A_out.java
index 71c8ae7c29..14aac98dee 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test165/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test165/A_out.java
@@ -7,4 +7,4 @@ public class A {
 			}
 		};
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test181/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test181/A_out.java
index 56a04fbabb..498e31c662 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test181/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test181/A_out.java
@@ -3,4 +3,4 @@ public class X {
 			str4 = "xxxxxxxxxx", str5 = "xxxxxxxxxx", str6 = "xxxxxxxxxx",
 			str7 = "xxxxxxxxxx", str8 = "xxxxxxxxxx", str9 = "xxxxxxxxxx",
 			str10 = "xxxxxxxxxx";
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test215/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test215/A_out.java
index e604ad54c4..f9c26aea70 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test215/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test215/A_out.java
@@ -11,4 +11,4 @@ public class TestFormatCode {
 		synchronized (this) {
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test216/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test216/A_out.java
index ba0b63a55f..dd79d2019a 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test216/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test216/A_out.java
@@ -18,4 +18,4 @@ public class TestFormatCode
 		{
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test432/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test432/A_out.java
index a97a37a2c6..82c1719ea7 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test432/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test432/A_out.java
@@ -836,4 +836,4 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     void unregisterObject() {
         unregister(this.getObject());
     }
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test446/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test446/A_out.java
index 3f8d2416a0..faa4a09854 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test446/A_out.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test446/A_out.java
@@ -5,4 +5,4 @@ class Foo {
 	public Foo blowup() {
 		return (Foo.KABOOM);
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test448/A_in.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test448/A_in.java
index 3da0cee168..0fedc8fb72 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test448/A_in.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test448/A_in.java
@@ -3,4 +3,4 @@ public class Format {
   public void temp() {
   	int[] tab = new int[3];
   }
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test449/A_in.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test449/A_in.java
index 3da0cee168..0fedc8fb72 100644
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test449/A_in.java
+++ b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test449/A_in.java
@@ -3,4 +3,4 @@ public class Format {
   public void temp() {
   	int[] tab = new int[3];
   }
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.jdt.core.tests.model/workspace/JavaSearch/src/bug73112/A.java b/org.eclipse.jdt.core.tests.model/workspace/JavaSearch/src/bug73112/A.java
new file mode 100644
index 0000000000..9c51f251b0
--- /dev/null
+++ b/org.eclipse.jdt.core.tests.model/workspace/JavaSearch/src/bug73112/A.java
@@ -0,0 +1,6 @@
+public class A {
+    int fieldA73112a = 1, fieldA73112b = new Integer(2).intValue(), fieldA73112c = fieldA73112a + fieldA73112b;
+    int fieldA73112d;
+    
+    public void method(){}
+}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/JavaSearch/src/bug73112/B.java b/org.eclipse.jdt.core.tests.model/workspace/JavaSearch/src/bug73112/B.java
new file mode 100644
index 0000000000..d0751f5566
--- /dev/null
+++ b/org.eclipse.jdt.core.tests.model/workspace/JavaSearch/src/bug73112/B.java
@@ -0,0 +1,6 @@
+public class B {
+    int fieldB73112a, fieldB73112b = 10;
+    int fieldB73112c = fieldB73112a + fieldB73112b, fieldB73112d = fieldB73112c + fieldB73112a, fieldB73112e;
+    
+    public void method(){}
+}