Attachment #11594 for bug #65531

Lines 36-42 Link Here

(-)formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatter.java (-2 / +2 lines)
36	private CodeSnippetParsingUtil codeSnippetParsingUtil;	36	private CodeSnippetParsingUtil codeSnippetParsingUtil;
37		37
38	public DefaultCodeFormatter() {	38	public DefaultCodeFormatter() {
39	this(new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getDefaultSettings()), null);	39	this(new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getJavaConventionsSettings()), null);
40	}	40	}
41		41
42	public DefaultCodeFormatter(DefaultCodeFormatterOptions preferences) {	42	public DefaultCodeFormatter(DefaultCodeFormatterOptions preferences) {
Lines 49-55 Link Here
49	this.preferences = new DefaultCodeFormatterOptions(options);	49	this.preferences = new DefaultCodeFormatterOptions(options);
50	} else {	50	} else {
51	this.options = JavaCore.getOptions();	51	this.options = JavaCore.getOptions();
52	this.preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getDefaultSettings());	52	this.preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getJavaConventionsSettings());
53	}	53	}
54	this.defaultCompilerOptions = getDefaultCompilerOptions();	54	this.defaultCompilerOptions = getDefaultCompilerOptions();
55	if (defaultCodeFormatterOptions != null) {	55	if (defaultCodeFormatterOptions != null) {




		this.blank_lines_after_imports = 1;
		this.blank_lines_after_package = 1;
		this.blank_lines_before_field = 1;
		this.blank_lines_before_first_class_body_declaration = 0;
		this.blank_lines_before_imports = 1;
		this.blank_lines_before_member_type = 1;
		this.blank_lines_before_method = 1;

		this.insert_space_between_empty_parens_in_method_declaration = false;
		this.insert_space_between_empty_parens_in_method_invocation = false;
		this.compact_else_if = true;
		this.keep_guardian_clause_on_one_line = false;
		this.keep_else_statement_on_same_line = false;
		this.keep_empty_array_initializer_on_one_line = false;
		this.keep_simple_if_on_one_line = false;
		this.keep_then_statement_on_same_line = false;
		this.number_of_empty_lines_to_preserve = 1;
		this.put_empty_statement_on_new_line = true;

Lines 2393-2399 Link Here

(-)model/org/eclipse/jdt/core/JavaCore.java (-1 / +1 lines)
2393	optionNames.add(CORE_ENCODING);	2393	optionNames.add(CORE_ENCODING);
2394		2394
2395	// Formatter settings	2395	// Formatter settings
2396	Map codeFormatterOptionsMap = DefaultCodeFormatterConstants.getDefaultSettings(); // code formatter defaults	2396	Map codeFormatterOptionsMap = DefaultCodeFormatterConstants.getJavaConventionsSettings(); // code formatter defaults
2397	for (Iterator iter = codeFormatterOptionsMap.entrySet().iterator(); iter.hasNext();) {	2397	for (Iterator iter = codeFormatterOptionsMap.entrySet().iterator(); iter.hasNext();) {
2398	Map.Entry entry = (Map.Entry) iter.next();	2398	Map.Entry entry = (Map.Entry) iter.next();
2399	String optionName = (String) entry.getKey();	2399	String optionName = (String) entry.getKey();

Return to bug 65531

Lines 1523-1529 Link Here

(-)formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java (-3 / +3 lines)
1523	this.blank_lines_after_imports = 1;	1523	this.blank_lines_after_imports = 1;
1524	this.blank_lines_after_package = 1;	1524	this.blank_lines_after_package = 1;
1525	this.blank_lines_before_field = 1;	1525	this.blank_lines_before_field = 1;
1526	this.blank_lines_before_first_class_body_declaration = 1;	1526	this.blank_lines_before_first_class_body_declaration = 0;
1527	this.blank_lines_before_imports = 1;	1527	this.blank_lines_before_imports = 1;
1528	this.blank_lines_before_member_type = 1;	1528	this.blank_lines_before_member_type = 1;
1529	this.blank_lines_before_method = 1;	1529	this.blank_lines_before_method = 1;
Lines 1654-1663 Link Here
1654	this.insert_space_between_empty_parens_in_method_declaration = false;	1654	this.insert_space_between_empty_parens_in_method_declaration = false;
1655	this.insert_space_between_empty_parens_in_method_invocation = false;	1655	this.insert_space_between_empty_parens_in_method_invocation = false;
1656	this.compact_else_if = true;	1656	this.compact_else_if = true;
1657	this.keep_guardian_clause_on_one_line = true;	1657	this.keep_guardian_clause_on_one_line = false;
1658	this.keep_else_statement_on_same_line = false;	1658	this.keep_else_statement_on_same_line = false;
1659	this.keep_empty_array_initializer_on_one_line = false;	1659	this.keep_empty_array_initializer_on_one_line = false;
1660	this.keep_simple_if_on_one_line = true;	1660	this.keep_simple_if_on_one_line = false;
1661	this.keep_then_statement_on_same_line = false;	1661	this.keep_then_statement_on_same_line = false;
1662	this.number_of_empty_lines_to_preserve = 1;	1662	this.number_of_empty_lines_to_preserve = 1;
1663	this.put_empty_statement_on_new_line = true;	1663	this.put_empty_statement_on_new_line = true;