Attachment 159313 Details for Bug 150741 – Updated patch for JDT/UI projects

[patch] Updated patch for JDT/UI projects

v00-ui.txt (text/plain), 5.35 KB, created by Frederic Fusier

on 2010-02-17 09:55:19 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2010-02-17 09:55:19 EST

Size: 5.35 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>Index: ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java,v
>retrieving revision 1.27
>diff -u -r1.27 FormatterMessages.java
>--- ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java	16 Nov 2009 16:59:57 -0000	1.27
>+++ ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java	17 Feb 2010 14:43:57 -0000
>@@ -420,6 +420,7 @@
> 	public static String NewLinesTabPage_newlines_group_option_empty_method_body;
> 	public static String NewLinesTabPage_newlines_group_option_empty_block;
> 	public static String NewLinesTabPage_newlines_group_option_empty_end_of_file;
>+	public static String NewLinesTabPage_newlines_group_option_empty_label;
> 	public static String NewLinesTabPage_empty_statement_group_title;
> 	public static String NewLinesTabPage_emtpy_statement_group_option_empty_statement_on_new_line;
> 	public static String NewLinesTabPage_arrayInitializer_group_title;
>Index: ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties,v
>retrieving revision 1.80
>diff -u -r1.80 FormatterMessages.properties
>--- ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties	4 Jan 2010 14:25:42 -0000	1.80
>+++ ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties	17 Feb 2010 14:43:57 -0000
>@@ -475,6 +475,7 @@
> NewLinesTabPage_newlines_group_option_empty_method_body=in empt&y method body
> NewLinesTabPage_newlines_group_option_empty_block=in empty bloc&k
> NewLinesTabPage_newlines_group_option_empty_end_of_file=at end of &file
>+NewLinesTabPage_newlines_group_option_empty_label=after labels
> NewLinesTabPage_empty_statement_group_title=Empty statements
> NewLinesTabPage_emtpy_statement_group_option_empty_statement_on_new_line=Put empty &statement on new line
> 
>Index: ui/org/eclipse/jdt/internal/ui/preferences/formatter/NewLinesTabPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/NewLinesTabPage.java,v
>retrieving revision 1.26
>diff -u -r1.26 NewLinesTabPage.java
>--- ui/org/eclipse/jdt/internal/ui/preferences/formatter/NewLinesTabPage.java	11 Sep 2008 11:59:41 -0000	1.26
>+++ ui/org/eclipse/jdt/internal/ui/preferences/formatter/NewLinesTabPage.java	17 Feb 2010 14:43:57 -0000
>@@ -50,6 +50,7 @@
> 	"  public void\nbar\n(@SuppressWarnings(\"unused\")\n int i)\n {\n@SuppressWarnings(\"unused\") int k;\n}\n" + //$NON-NLS-1$
> 	"  void foo() {" + //$NON-NLS-1$
> 	"    ;;" + //$NON-NLS-1$
>+	"    LABEL:" + //$NON-NLS-1$
> 	"    do {} while (false);" + //$NON-NLS-1$
> 	"    for (;;) {}" + //$NON-NLS-1$
> 	"  }" + //$NON-NLS-1$
>@@ -77,6 +78,7 @@
> 		createPref(newlinesGroup, numColumns, FormatterMessages.NewLinesTabPage_newlines_group_option_empty_anonymous_class_body, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ANONYMOUS_TYPE_DECLARATION, DO_NOT_INSERT_INSERT);
> 		createPref(newlinesGroup, numColumns, FormatterMessages.NewLinesTabPage_newlines_group_option_empty_method_body, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_METHOD_BODY, DO_NOT_INSERT_INSERT);
> 		createPref(newlinesGroup, numColumns, FormatterMessages.NewLinesTabPage_newlines_group_option_empty_block, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_BLOCK, DO_NOT_INSERT_INSERT);
>+		createPref(newlinesGroup, numColumns, FormatterMessages.NewLinesTabPage_newlines_group_option_empty_label, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_LABEL, DO_NOT_INSERT_INSERT);
> 		createPref(newlinesGroup, numColumns, FormatterMessages.NewLinesTabPage_newlines_group_option_empty_enum_declaration, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ENUM_DECLARATION, DO_NOT_INSERT_INSERT);
> 		createPref(newlinesGroup, numColumns, FormatterMessages.NewLinesTabPage_newlines_group_option_empty_enum_constant, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ENUM_CONSTANT, DO_NOT_INSERT_INSERT);
> 		createPref(newlinesGroup, numColumns, FormatterMessages.NewLinesTabPage_newlines_group_option_empty_annotation_decl_body, DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ANNOTATION_DECLARATION, DO_NOT_INSERT_INSERT);
>@@ -97,17 +99,17 @@
> 	}
> 
> 	protected void initializePage() {
>-	    fPreview.setPreviewText(PREVIEW);
>+	    this.fPreview.setPreviewText(this.PREVIEW);
> 	}
> 
>     protected JavaPreview doCreateJavaPreview(Composite parent) {
>-        fPreview= new CompilationUnitPreview(fWorkingValues, parent);
>-        return fPreview;
>+        this.fPreview= new CompilationUnitPreview(this.fWorkingValues, parent);
>+        return this.fPreview;
>     }
> 
>     protected void doUpdatePreview() {
>     	super.doUpdatePreview();
>-        fPreview.update();
>+        this.fPreview.update();
>     }
> 
> 	private CheckboxPreference createPref(Composite composite, int numColumns, String message, String key, String[] values) {

Actions: View | Diff

Attachments on bug 150741: 87246 | 110309 | 159312 | 159313 | 159410