Attachment #27721 for bug #111139

Lines 448-454 Link Here

(-)FormatterMessages.java (-1 / +3 lines)
448	public static String JavaPreview_formatter_exception;	448	public static String JavaPreview_formatter_exception;
449	public static String WhiteSpaceTabPage_sort_by_java_element;	449	public static String WhiteSpaceTabPage_sort_by_java_element;
450	public static String WhiteSpaceTabPage_sort_by_syntax_element;	450	public static String WhiteSpaceTabPage_sort_by_syntax_element;
451		451	public static String WhiteSpaceTabPage_return;
		452	public static String WhiteSpaceTabPage_befor_none_mandatory_expressions;
		453
452	static {	454	static {
453	NLS.initializeMessages(BUNDLE_NAME, FormatterMessages.class);	455	NLS.initializeMessages(BUNDLE_NAME, FormatterMessages.class);
454	}	456	}

Lines 98-103 Link Here

(-)FormatterMessages.properties (+2 lines)
98	WhiteSpaceTabPage_declarations=Declarations	98	WhiteSpaceTabPage_declarations=Declarations
99	WhiteSpaceTabPage_expressions=Expressions	99	WhiteSpaceTabPage_expressions=Expressions
100	WhiteSpaceTabPage_arrays=Arrays	100	WhiteSpaceTabPage_arrays=Arrays
		101	WhiteSpaceTabPage_return='return'
101	WhiteSpaceTabPage_parameterized_types=Parameterized types	102	WhiteSpaceTabPage_parameterized_types=Parameterized types
102		103
103	WhiteSpaceTabPage_after_opening_brace=after opening brace	104	WhiteSpaceTabPage_after_opening_brace=after opening brace
Lines 145-150 Link Here
145	WhiteSpaceTabPage_after_closing_angle_bracket=after closing angle bracket	146	WhiteSpaceTabPage_after_closing_angle_bracket=after closing angle bracket
146	WhiteSpaceTabPage_before_opening_angle_bracket=before opening angle bracket	147	WhiteSpaceTabPage_before_opening_angle_bracket=before opening angle bracket
147	WhiteSpaceTabPage_before_closing_angle_bracket=before closing angle bracket	148	WhiteSpaceTabPage_before_closing_angle_bracket=before closing angle bracket
		149	WhiteSpaceTabPage_befor_none_mandatory_expressions=before string, parenthesis, prefixes
148		150
149	WhiteSpaceTabPage_before_and_list=before '&' in type bounds	151	WhiteSpaceTabPage_before_and_list=before '&' in type bounds
150	WhiteSpaceTabPage_after_and_list=after '&' in type bounds	152	WhiteSpaceTabPage_after_and_list=after '&' in type bounds

Lines 262-267 Link Here

(-)WhiteSpaceOptions.java (+15 lines)
262	"assert condition : reportError();" //$NON-NLS-1$	262	"assert condition : reportError();" //$NON-NLS-1$
263	);	263	);
264		264
		265	private final static PreviewSnippet RETURN_PREVIEW= new PreviewSnippet(
		266	CodeFormatter.K_STATEMENTS,
		267	"return (String)o;" + //$NON-NLS-1$
		268	"return (o);" + //$NON-NLS-1$
		269	"return \"\";" + //$NON-NLS-1$
		270	"return -1;" //$NON-NLS-1$
		271	);
		272
265	private final static PreviewSnippet ANNOTATION_DECL_PREVIEW= new PreviewSnippet(	273	private final static PreviewSnippet ANNOTATION_DECL_PREVIEW= new PreviewSnippet(
266	CodeFormatter.K_CLASS_BODY_DECLARATIONS,	274	CodeFormatter.K_CLASS_BODY_DECLARATIONS,
267	"@interface MyAnnotation { String value(); }\n@interface OtherAnnotation { }\n" //$NON-NLS-1$	275	"@interface MyAnnotation { String value(); }\n@interface OtherAnnotation { }\n" //$NON-NLS-1$
Lines 528-533 Link Here
528	createSynchronizedTree(workingValues, statements);	536	createSynchronizedTree(workingValues, statements);
529	createTryStatementTree(workingValues, statements);	537	createTryStatementTree(workingValues, statements);
530	createAssertTree(workingValues, statements);	538	createAssertTree(workingValues, statements);
		539	createReturnTree(workingValues, statements);
531		540
532	final InnerNode expressions= new InnerNode(null, workingValues, FormatterMessages.WhiteSpaceTabPage_expressions);	541	final InnerNode expressions= new InnerNode(null, workingValues, FormatterMessages.WhiteSpaceTabPage_expressions);
533	createFunctionCallTree(workingValues, expressions);	542	createFunctionCallTree(workingValues, expressions);
Lines 1095-1100 Link Here
1095	return root;	1104	return root;
1096	}	1105	}
1097		1106
		1107	private static InnerNode createReturnTree(Map workingValues, InnerNode parent) {
		1108	final InnerNode root= new InnerNode(parent, workingValues, FormatterMessages.WhiteSpaceTabPage_return);
		1109	createOption(root, workingValues, FormatterMessages.WhiteSpaceTabPage_befor_none_mandatory_expressions, DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_EXPRESSION_IN_RETURN, RETURN_PREVIEW);
		1110	return root;
		1111	}
		1112
1098	private static InnerNode createLabelTree(Map workingValues, InnerNode parent) {	1113	private static InnerNode createLabelTree(Map workingValues, InnerNode parent) {
1099	final InnerNode root= new InnerNode(parent, workingValues, FormatterMessages.WhiteSpaceTabPage_labels);	1114	final InnerNode root= new InnerNode(parent, workingValues, FormatterMessages.WhiteSpaceTabPage_labels);
1100	createOption(root, workingValues, FormatterMessages.WhiteSpaceTabPage_before_colon, DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COLON_IN_LABELED_STATEMENT, LABEL_PREVIEW);	1115	createOption(root, workingValues, FormatterMessages.WhiteSpaceTabPage_before_colon, DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COLON_IN_LABELED_STATEMENT, LABEL_PREVIEW);

Return to bug 111139