Index: formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatter.java
===================================================================
RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatter.java,v
retrieving revision 1.41
diff -u -r1.41 DefaultCodeFormatter.java
--- formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatter.java	27 May 2004 14:41:39 -0000	1.41
+++ formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatter.java	4 Jun 2004 14:57:14 -0000
@@ -36,7 +36,7 @@
 	private CodeSnippetParsingUtil codeSnippetParsingUtil;
 	
 	public DefaultCodeFormatter() {
-		this(new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getDefaultSettings()), null);
+		this(new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getJavaConventionsSettings()), null);
 	}
 	
 	public DefaultCodeFormatter(DefaultCodeFormatterOptions preferences) {
@@ -49,7 +49,7 @@
 			this.preferences = new DefaultCodeFormatterOptions(options);
 		} else {
 			this.options = JavaCore.getOptions();
-			this.preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getDefaultSettings());
+			this.preferences = new DefaultCodeFormatterOptions(DefaultCodeFormatterConstants.getJavaConventionsSettings());
 		}
 		this.defaultCompilerOptions = getDefaultCompilerOptions();
 		if (defaultCodeFormatterOptions != null) {
Index: formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java
===================================================================
RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java,v
retrieving revision 1.45
diff -u -r1.45 DefaultCodeFormatterOptions.java
--- formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java	30 Apr 2004 19:43:23 -0000	1.45
+++ formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java	4 Jun 2004 14:57:15 -0000
@@ -1523,7 +1523,7 @@
 		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 = 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;
@@ -1654,10 +1654,10 @@
 		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 = 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 = true;
+		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;
Index: model/org/eclipse/jdt/core/JavaCore.java
===================================================================
RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java,v
retrieving revision 1.412
diff -u -r1.412 JavaCore.java
--- model/org/eclipse/jdt/core/JavaCore.java	27 May 2004 09:44:55 -0000	1.412
+++ model/org/eclipse/jdt/core/JavaCore.java	4 Jun 2004 14:57:18 -0000
@@ -2393,7 +2393,7 @@
 		optionNames.add(CORE_ENCODING);
 		
 		// Formatter settings
-		Map codeFormatterOptionsMap = DefaultCodeFormatterConstants.getDefaultSettings(); // code formatter defaults
+		Map codeFormatterOptionsMap = DefaultCodeFormatterConstants.getJavaConventionsSettings(); // code formatter defaults
 		for (Iterator iter = codeFormatterOptionsMap.entrySet().iterator(); iter.hasNext();) {
 			Map.Entry entry = (Map.Entry) iter.next();
 			String optionName = (String) entry.getKey();