### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core.tests.model Index: src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java,v retrieving revision 1.192 diff -u -r1.192 FormatterRegressionTests.java --- src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java 8 Jun 2006 13:09:33 -0000 1.192 +++ src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java 26 Jun 2006 20:20:16 -0000 @@ -54,7 +54,7 @@ private long time; static { -// TESTS_NUMBERS = new int[] { 620 } ; +// TESTS_NUMBERS = new int[] { 624 } ; } public static Test suite() { return buildModelTestSuite(FormatterRegressionTests.class); @@ -8808,4 +8808,70 @@ JavaCore.setOptions(javaCoreOptions); } } + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=148370 + 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_5); + newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5); + newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5); + JavaCore.setOptions(newJavaCoreOptions); + + Map compilerOptions = new HashMap(); + compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5); + compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5); + compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5); + 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); + } + } + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=148370 + public void test623() { + 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_5); + newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5); + newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5); + JavaCore.setOptions(newJavaCoreOptions); + + Map compilerOptions = new HashMap(); + compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5); + compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5); + compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5); + DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions); + runTest(codeFormatter, "test623", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$ + } finally { + JavaCore.setOptions(javaCoreOptions); + } + } + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=148370 + public void test624() { + 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_5); + newJavaCoreOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5); + newJavaCoreOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5); + JavaCore.setOptions(newJavaCoreOptions); + + Map compilerOptions = new HashMap(); + compilerOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5); + compilerOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5); + compilerOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5); + DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences, compilerOptions); + runTest(codeFormatter, "test624", "A.java", CodeFormatter.K_COMPILATION_UNIT, false);//$NON-NLS-1$ //$NON-NLS-2$ + } finally { + JavaCore.setOptions(javaCoreOptions); + } + } } Index: workspace/Formatter/test624/A_out.java =================================================================== RCS file: workspace/Formatter/test624/A_out.java diff -N workspace/Formatter/test624/A_out.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ workspace/Formatter/test624/A_out.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,3 @@ +class X { + Object classes = new Class[][0]; +} Index: workspace/Formatter/test623/A_in.java =================================================================== RCS file: workspace/Formatter/test623/A_in.java diff -N workspace/Formatter/test623/A_in.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ workspace/Formatter/test623/A_in.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,5 @@ +class X +{ +Object +classes = new Class[0]; +} Index: workspace/Formatter/test622/A_out.java =================================================================== RCS file: workspace/Formatter/test622/A_out.java diff -N workspace/Formatter/test622/A_out.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ workspace/Formatter/test622/A_out.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,3 @@ +class X { + Object classes = new Class[] {}; +} Index: workspace/Formatter/test624/A_in.java =================================================================== RCS file: workspace/Formatter/test624/A_in.java diff -N workspace/Formatter/test624/A_in.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ workspace/Formatter/test624/A_in.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,5 @@ +class X +{ +Object +classes = new Class[][0]; +} Index: workspace/Formatter/test622/A_in.java =================================================================== RCS file: workspace/Formatter/test622/A_in.java diff -N workspace/Formatter/test622/A_in.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ workspace/Formatter/test622/A_in.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,5 @@ +class X +{ +Object +classes = new Class[] {}; +} Index: workspace/Formatter/test623/A_out.java =================================================================== RCS file: workspace/Formatter/test623/A_out.java diff -N workspace/Formatter/test623/A_out.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ workspace/Formatter/test623/A_out.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,3 @@ +class X { + Object classes = new Class[0]; +}