|
Lines 62-68
Link Here
|
| 62 |
Map formatterOptions; |
62 |
Map formatterOptions; |
| 63 |
|
63 |
|
| 64 |
static { |
64 |
static { |
| 65 |
// TESTS_NUMBERS = new int[] { 738 }; |
65 |
// TESTS_NUMBERS = new int[] { 558, 559, 575, 727, 728 }; |
| 66 |
// TESTS_RANGE = new int[] { 734, -1 }; |
66 |
// TESTS_RANGE = new int[] { 734, -1 }; |
| 67 |
} |
67 |
} |
| 68 |
public static Test suite() { |
68 |
public static Test suite() { |
|
Lines 8007-8013
Link Here
|
| 8007 |
public void test558() { |
8007 |
public void test558() { |
| 8008 |
Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings(); |
8008 |
Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings(); |
| 8009 |
|
8009 |
|
| 8010 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_MEMBER, null); |
8010 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD, null); |
|
|
8011 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD, null); |
| 8012 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE, null); |
| 8013 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE, null); |
| 8011 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER, null); |
8014 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER, null); |
| 8012 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE, null); |
8015 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE, null); |
| 8013 |
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=122247: use deprecated option |
8016 |
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=122247: use deprecated option |
|
Lines 8044-8050
Link Here
|
| 8044 |
*/ |
8047 |
*/ |
| 8045 |
public void test559() { |
8048 |
public void test559() { |
| 8046 |
Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings(); |
8049 |
Map options = DefaultCodeFormatterConstants.getJavaConventionsSettings(); |
| 8047 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_MEMBER, null); |
8050 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD, null); |
|
|
8051 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD, null); |
| 8052 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE, null); |
| 8053 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE, null); |
| 8048 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER, null); |
8054 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER, null); |
| 8049 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE, null); |
8055 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE, null); |
| 8050 |
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=122247: use deprecated option |
8056 |
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=122247: use deprecated option |
|
Lines 8345-8351
Link Here
|
| 8345 |
|
8351 |
|
| 8346 |
public void test575() { |
8352 |
public void test575() { |
| 8347 |
Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings(); |
8353 |
Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings(); |
| 8348 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_MEMBER, null); |
8354 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD, null); |
|
|
8355 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD, null); |
| 8356 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE, null); |
| 8357 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE, null); |
| 8349 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER, null); |
8358 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER, null); |
| 8350 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE, null); |
8359 |
options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE, null); |
| 8351 |
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=122247: use deprecated option |
8360 |
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=122247: use deprecated option |
|
Lines 10831-10837
Link Here
|
| 10831 |
this.formatterOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6); |
10840 |
this.formatterOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6); |
| 10832 |
this.formatterOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6); |
10841 |
this.formatterOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6); |
| 10833 |
this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE, DefaultCodeFormatterConstants.TRUE); |
10842 |
this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE, DefaultCodeFormatterConstants.TRUE); |
| 10834 |
this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_MEMBER, DefaultCodeFormatterConstants.FALSE); |
10843 |
this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD, DefaultCodeFormatterConstants.FALSE); |
|
|
10844 |
this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD, DefaultCodeFormatterConstants.FALSE); |
| 10845 |
this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE, DefaultCodeFormatterConstants.FALSE); |
| 10846 |
this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE, DefaultCodeFormatterConstants.FALSE); |
| 10835 |
this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER, DefaultCodeFormatterConstants.FALSE); |
10847 |
this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER, DefaultCodeFormatterConstants.FALSE); |
| 10836 |
String source = |
10848 |
String source = |
| 10837 |
"@Deprecated package pack;\n" + |
10849 |
"@Deprecated package pack;\n" + |
|
Lines 10864-10873
Link Here
|
| 10864 |
*/ |
10876 |
*/ |
| 10865 |
public void test728() { |
10877 |
public void test728() { |
| 10866 |
this.formatterPrefs = null; |
10878 |
this.formatterPrefs = null; |
|
|
10879 |
this.formatterOptions.remove(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD); |
| 10880 |
this.formatterOptions.remove(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD); |
| 10881 |
this.formatterOptions.remove(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE); |
| 10882 |
this.formatterOptions.remove(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE); |
| 10867 |
this.formatterOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6); |
10883 |
this.formatterOptions.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6); |
| 10868 |
this.formatterOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6); |
10884 |
this.formatterOptions.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6); |
| 10869 |
this.formatterOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6); |
10885 |
this.formatterOptions.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6); |
| 10870 |
this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION, DefaultCodeFormatterConstants.FALSE); |
10886 |
this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION, DefaultCodeFormatterConstants.FALSE); |
|
|
10887 |
this.formatterOptions.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_MEMBER, JavaCore.DO_NOT_INSERT); |
| 10871 |
String source = |
10888 |
String source = |
| 10872 |
"@Deprecated package pack;\n" + |
10889 |
"@Deprecated package pack;\n" + |
| 10873 |
"public class Test {\n" + |
10890 |
"public class Test {\n" + |
