View | Details | Raw Unified | Return to bug 65531 | Differences between
and this patch

Collapse All | Expand All

(-)formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatter.java (-2 / +2 lines)
Lines 36-42 Link Here
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) {
(-)model/org/eclipse/jdt/core/JavaCore.java (-1 / +1 lines)
Lines 2393-2399 Link Here
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