Branch 3.2.1 - Remove fix for 152725
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java
index c5a2a13..8ff9d1c 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java
@@ -54,7 +54,7 @@
private long time;
static {
-// TESTS_NUMBERS = new int[] { 622 } ;
+// TESTS_NUMBERS = new int[] { 620 } ;
}
public static Test suite() {
return buildModelTestSuite(FormatterRegressionTests.class);
@@ -8808,26 +8808,4 @@
JavaCore.setOptions(javaCoreOptions);
}
}
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=152725
- public void test622() {
- Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
- DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
- Hashtable javaCoreOptions = JavaCore.getOptions();
- try {
- Hashtable newJavaCoreOptions = JavaCore.getOptions();
- newJavaCoreOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);
- newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
- newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
- JavaCore.setOptions(newJavaCoreOptions);
-
- Map compilerOptions = new HashMap();
- compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);
- compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
- compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
- DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions);
- runTest(codeFormatter, "test622", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$
- } finally {
- JavaCore.setOptions(javaCoreOptions);
- }
- }
}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test622/A_in.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test622/A_in.java
deleted file mode 100644
index 1a5bbb9..0000000
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test622/A_in.java
+++ /dev/null
@@ -1,4 +0,0 @@
-public enum Enum_16 {
-ONE,TWO,THREE;
-String foo(String str){return"";}
-}
diff --git a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test622/A_out.java b/org.eclipse.jdt.core.tests.model/workspace/Formatter/test622/A_out.java
deleted file mode 100644
index 9dd9296..0000000
--- a/org.eclipse.jdt.core.tests.model/workspace/Formatter/test622/A_out.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public enum Enum_16 {
- ONE, TWO, THREE;
- String foo(String str) {
- return "";
- }
-}
diff --git a/org.eclipse.jdt.core/buildnotes_jdt-core.html b/org.eclipse.jdt.core/buildnotes_jdt-core.html
index 5b0e322..96d759ab 100644
--- a/org.eclipse.jdt.core/buildnotes_jdt-core.html
+++ b/org.eclipse.jdt.core/buildnotes_jdt-core.html
@@ -37,16 +37,6 @@
</td>
</tr>
</table>
-<a name="v_674_R32x"></a>
-<p><hr><h1>
-Eclipse Platform Build Notes<br>
-Java Development Tooling Core</h1>
-Eclipse SDK 3.2.1 - 16th August 2006
-<br>Project org.eclipse.jdt.core v_674_R32x
-(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_674_R32x">cvs</a>).
-<h2>What's new in this drop</h2>
-
-<h3>Problem Reports Fixed</h3>
<a name="v_673_R32x"></a>
<p><hr><h1>
