Index: FormatterMessages.java
===================================================================
RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java,v
retrieving revision 1.7
diff -u -r1.7 FormatterMessages.java
--- FormatterMessages.java	13 Sep 2005 12:58:28 -0000	1.7
+++ FormatterMessages.java	3 Oct 2005 07:11:47 -0000
@@ -448,7 +448,9 @@
 	public static String JavaPreview_formatter_exception;
 	public static String WhiteSpaceTabPage_sort_by_java_element;
 	public static String WhiteSpaceTabPage_sort_by_syntax_element;
-
+	public static String WhiteSpaceTabPage_return;
+	public static String WhiteSpaceTabPage_befor_none_mandatory_expressions;
+	
 	static {
 		NLS.initializeMessages(BUNDLE_NAME, FormatterMessages.class);
 	}
Index: FormatterMessages.properties
===================================================================
RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties,v
retrieving revision 1.48
diff -u -r1.48 FormatterMessages.properties
--- FormatterMessages.properties	13 Sep 2005 12:58:28 -0000	1.48
+++ FormatterMessages.properties	3 Oct 2005 07:11:48 -0000
@@ -98,6 +98,7 @@
 WhiteSpaceTabPage_declarations=Declarations
 WhiteSpaceTabPage_expressions=Expressions
 WhiteSpaceTabPage_arrays=Arrays
+WhiteSpaceTabPage_return='return'
 WhiteSpaceTabPage_parameterized_types=Parameterized types
 
 WhiteSpaceTabPage_after_opening_brace=after opening brace
@@ -145,6 +146,7 @@
 WhiteSpaceTabPage_after_closing_angle_bracket=after closing angle bracket
 WhiteSpaceTabPage_before_opening_angle_bracket=before opening angle bracket
 WhiteSpaceTabPage_before_closing_angle_bracket=before closing angle bracket
+WhiteSpaceTabPage_befor_none_mandatory_expressions=before casts, parenthesis, string literals, prefix expressions
 
 WhiteSpaceTabPage_before_and_list=before '&' in type bounds
 WhiteSpaceTabPage_after_and_list=after '&' in type bounds
Index: WhiteSpaceOptions.java
===================================================================
RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/WhiteSpaceOptions.java,v
retrieving revision 1.19
diff -u -r1.19 WhiteSpaceOptions.java
--- WhiteSpaceOptions.java	18 Apr 2005 10:07:34 -0000	1.19
+++ WhiteSpaceOptions.java	3 Oct 2005 07:11:50 -0000
@@ -262,6 +262,14 @@
         "assert condition : reportError();" //$NON-NLS-1$
     );
     
+    private final static PreviewSnippet RETURN_PREVIEW= new PreviewSnippet(
+            CodeFormatter.K_STATEMENTS,
+            "return (String)o;" + //$NON-NLS-1$
+            "return (o);" + //$NON-NLS-1$
+            "return \"\";" + //$NON-NLS-1$
+            "return ++d;" //$NON-NLS-1$
+        );
+    
     private final static PreviewSnippet ANNOTATION_DECL_PREVIEW= new PreviewSnippet(
         CodeFormatter.K_CLASS_BODY_DECLARATIONS,
         "@interface MyAnnotation { String value(); }\n@interface OtherAnnotation { }\n" //$NON-NLS-1$
@@ -528,6 +536,7 @@
         createSynchronizedTree(workingValues, statements);
         createTryStatementTree(workingValues, statements);
         createAssertTree(workingValues, statements);
+        createReturnTree(workingValues, statements);
         
         final InnerNode expressions= new InnerNode(null, workingValues, FormatterMessages.WhiteSpaceTabPage_expressions); 
         createFunctionCallTree(workingValues, expressions);
@@ -1095,6 +1104,12 @@
     	return root;
     }
     
+    private static InnerNode createReturnTree(Map workingValues, InnerNode parent) {
+    	final InnerNode root= new InnerNode(parent, workingValues, FormatterMessages.WhiteSpaceTabPage_return); 
+    	createOption(root, workingValues, FormatterMessages.WhiteSpaceTabPage_befor_none_mandatory_expressions, DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_EXPRESSION_IN_RETURN, RETURN_PREVIEW); 
+    	return root;
+    }
+    
     private static InnerNode createLabelTree(Map workingValues, InnerNode parent) {
         final InnerNode root= new InnerNode(parent, workingValues, FormatterMessages.WhiteSpaceTabPage_labels); 
         createOption(root, workingValues, FormatterMessages.WhiteSpaceTabPage_before_colon, DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COLON_IN_LABELED_STATEMENT, LABEL_PREVIEW);