Attachment #58078 for bug #49412

Lines 36-43 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileVersioner.java (-4 / +16 lines)
36	private static final int VERSION_8= 8; // fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=89739	36	private static final int VERSION_8= 8; // fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=89739
37	private static final int VERSION_9= 9; // after storing project profile names in preferences	37	private static final int VERSION_9= 9; // after storing project profile names in preferences
38	private static final int VERSION_10= 10; // splitting options for annotation types	38	private static final int VERSION_10= 10; // splitting options for annotation types
		39	private static final int VERSION_11= 11; // https://bugs.eclipse.org/bugs/show_bug.cgi?id=49412
39		40
40	private static final int CURRENT_VERSION= VERSION_10;	41	private static final int CURRENT_VERSION= VERSION_11;
41		42
42	public int getFirstVersion() {	43	public int getFirstVersion() {
43	return VERSION_1;	44	return VERSION_1;
Lines 88-93 Link Here
88	case VERSION_8:	89	case VERSION_8:
89	case VERSION_9:	90	case VERSION_9:
90	version9to10(oldSettings);	91	version9to10(oldSettings);
		92
		93	case VERSION_10 :
		94	version10to11(oldSettings);
91		95
92	default:	96	default:
93	for (final Iterator iter= oldSettings.keySet().iterator(); iter.hasNext(); ) {	97	for (final Iterator iter= oldSettings.keySet().iterator(); iter.hasNext(); ) {
Lines 555-561 Link Here
555	}	559	}
556		560
557	private static void version6to7(Map oldSettings) {	561	private static void version6to7(Map oldSettings) {
558	checkAndReplace(oldSettings, FORMATTER_COMMENT_FORMAT, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT);	562	checkAndReplace(oldSettings, FORMATTER_COMMENT_FORMAT, FORMATTER_COMMENT_FORMAT2);
559	checkAndReplace(oldSettings, FORMATTER_COMMENT_FORMATHEADER, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_HEADER);	563	checkAndReplace(oldSettings, FORMATTER_COMMENT_FORMATHEADER, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_HEADER);
560	checkAndReplace(oldSettings, FORMATTER_COMMENT_FORMATSOURCE, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_SOURCE);	564	checkAndReplace(oldSettings, FORMATTER_COMMENT_FORMATSOURCE, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_SOURCE);
561	checkAndReplace(oldSettings, FORMATTER_COMMENT_INDENTPARAMETERDESCRIPTION, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INDENT_PARAMETER_DESCRIPTION);	565	checkAndReplace(oldSettings, FORMATTER_COMMENT_INDENTPARAMETERDESCRIPTION, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INDENT_PARAMETER_DESCRIPTION);
Lines 567-573 Link Here
567	checkAndReplaceBooleanWithINSERT(oldSettings, FORMATTER_COMMENT_NEWLINEFORPARAMETER, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_NEW_LINE_FOR_PARAMETER);	571	checkAndReplaceBooleanWithINSERT(oldSettings, FORMATTER_COMMENT_NEWLINEFORPARAMETER, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_NEW_LINE_FOR_PARAMETER);
568	checkAndReplaceBooleanWithINSERT(oldSettings, FORMATTER_COMMENT_SEPARATEROOTTAGS, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_EMPTY_LINE_BEFORE_ROOT_TAGS);	572	checkAndReplaceBooleanWithINSERT(oldSettings, FORMATTER_COMMENT_SEPARATEROOTTAGS, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_EMPTY_LINE_BEFORE_ROOT_TAGS);
569	}	573	}
570
571		574
572	private static void version9to10(Map oldSettings) {	575	private static void version9to10(Map oldSettings) {
573	duplicate(oldSettings,	576	duplicate(oldSettings,
Lines 578-584 Link Here
578	DefaultCodeFormatterConstants.FORMATTER_INDENT_BODY_DECLARATIONS_COMPARE_TO_ANNOTATION_DECLARATION_HEADER);	581	DefaultCodeFormatterConstants.FORMATTER_INDENT_BODY_DECLARATIONS_COMPARE_TO_ANNOTATION_DECLARATION_HEADER);
579	}	582	}
580		583
581		584	private static void version10to11(Map oldSettings) {
		585	checkAndReplace(oldSettings,
		586	FORMATTER_COMMENT_FORMAT2,
		587	new String[] {
		588	DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_BLOCK_COMMENT,
		589	DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_JAVADOC_COMMENT,
		590	DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT
		591	});
		592	}
582		593
583	/* old format constant values */	594	/* old format constant values */
584		595
Lines 655-660 Link Here
655	private static final String FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_CONSTRUCTOR_THROWS = JavaCore.PLUGIN_ID + ".formatter.insert_space_after_comma_in_constructor_throws"; //$NON-NLS-1$	666	private static final String FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_CONSTRUCTOR_THROWS = JavaCore.PLUGIN_ID + ".formatter.insert_space_after_comma_in_constructor_throws"; //$NON-NLS-1$
656	private static final String FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_CONSTRUCTOR_THROWS = JavaCore.PLUGIN_ID + ".formatter.insert_space_before_comma_in_constructor_throws"; //$NON-NLS-1$	667	private static final String FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_CONSTRUCTOR_THROWS = JavaCore.PLUGIN_ID + ".formatter.insert_space_before_comma_in_constructor_throws"; //$NON-NLS-1$
657	private static final String FORMATTER_NO_ALIGNMENT = "0";//$NON-NLS-1$	668	private static final String FORMATTER_NO_ALIGNMENT = "0";//$NON-NLS-1$
		669	private static final String FORMATTER_COMMENT_FORMAT2= JavaCore.PLUGIN_ID + ".formatter.comment.format_comments"; //$NON-NLS-1$
658		670
659	// Old comment formatter constants	671	// Old comment formatter constants
660	private static final String FORMATTER_COMMENT_FORMATSOURCE= "comment_format_source_code"; //$NON-NLS-1$	672	private static final String FORMATTER_COMMENT_FORMATSOURCE= "comment_format_source_code"; //$NON-NLS-1$




    };
	
	
	private final static class AndController implements Observer {
		
		private final Collection fMasters;
		private final Collection fSlaves;
		
		public AndController(Collection masters, Collection slaves) {
			fMasters= masters;
			fSlaves= slaves;
			for (final Iterator iter= fMasters.iterator(); iter.hasNext();) {

		}
	}
	
	private final static class OrController implements Observer {
		
		private final Collection fMasters;
		private final Collection fSlaves;
		
		public OrController(Collection masters, Collection slaves) {
			fMasters= masters;
			fSlaves= slaves;
			for (final Iterator iter= fMasters.iterator(); iter.hasNext();) {
			    ((CheckboxPreference)iter.next()).addObserver(this);
			}
			update(null, null);
		}

		public void update(Observable o, Object arg) {
		    boolean enabled= false; 

		    for (final Iterator iter= fMasters.iterator(); iter.hasNext();) {
		        enabled |= ((CheckboxPreference)iter.next()).getChecked();
		    }

			for (final Iterator iter = fSlaves.iterator(); iter.hasNext();) {
			    final Object obj= iter.next();
			    if (obj instanceof Preference) {
			        ((Preference)obj).setEnabled(enabled);
			    } else if (obj instanceof Control) {
			        ((Group)obj).setEnabled(enabled);
			    }
			}
		}
	}
	
	private final String PREVIEW=
		createPreviewHeader("An example for comment formatting. This example is meant to illustrate the various possibilities offered by <i>Eclipse</i> in order to format comments.") +	//$NON-NLS-1$

		" * These possibilities include:\n" + //$NON-NLS-1$
		" * <ul><li>Formatting of header comments.</li><li>Formatting of Javadoc tags</li></ul>\n" + //$NON-NLS-1$
		" */\n" + //$NON-NLS-1$
		" int bar();\n" + //$NON-NLS-1$
		" /*\n" + //$NON-NLS-1$
		" *\n" + //$NON-NLS-1$
		" * These possibilities include:\n" + //$NON-NLS-1$
		" * <ul><li>Formatting of header comments.</li><li>Formatting of Javadoc tags</li></ul>\n" + //$NON-NLS-1$
		" */\n" + //$NON-NLS-1$
		" int bar2();" + //$NON-NLS-1$
		" // This is a long comment that should be split in multiple line comments in case the line comment formatting is enabled\n" + //$NON-NLS-1$
		" int foo2();" + //$NON-NLS-1$
		" /**\n" + //$NON-NLS-1$
		" * The following is some sample code which illustrates source formatting within javadoc comments:\n" + //$NON-NLS-1$
		" * <pre>public class Example {final int a= 1;final boolean b= true;}</pre>\n" + //$NON-NLS-1$ 

	    
		// global group
		final Group globalGroup= createGroup(numColumns, composite, FormatterMessages.CommentsTabPage_group1_title); 
		final CheckboxPreference javadoc= createPrefTrueFalse(globalGroup, numColumns, FormatterMessages.commentsTabPage_enable_javadoc_comment_formatting, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_JAVADOC_COMMENT); 
		final CheckboxPreference blockComment= createPrefTrueFalse(globalGroup, numColumns, FormatterMessages.CommentsTabPage_enable_block_comment_formatting, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_BLOCK_COMMENT); 
		createPrefTrueFalse(globalGroup, numColumns, FormatterMessages.CommentsTabPage_enable_line_comment_formatting, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT); 
		final CheckboxPreference code= createPrefTrueFalse(globalGroup, numColumns, FormatterMessages.CommentsTabPage_format_code_snippets, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_SOURCE); 

		// javadoc comment formatting settings
		final Group settingsGroup= createGroup(numColumns, composite, FormatterMessages.CommentsTabPage_group2_title); 
		final CheckboxPreference header= createPrefTrueFalse(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_format_header, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_HEADER); 
		final CheckboxPreference html= createPrefTrueFalse(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_format_html, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_HTML); 
		final CheckboxPreference code= createPrefTrueFalse(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_format_code_snippets, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_SOURCE); 
		final CheckboxPreference blankJavadoc= createPrefInsert(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_blank_line_before_javadoc_tags, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_EMPTY_LINE_BEFORE_ROOT_TAGS); 
		final CheckboxPreference indentJavadoc= createPrefTrueFalse(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_indent_javadoc_tags, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INDENT_ROOT_TAGS); 
		
		// javadoc and block comment settings
		final Group javadocAndBlockSettingsGroup= createGroup(numColumns, composite, FormatterMessages.CommentsTabPage_group4_title); 
		final CheckboxPreference blankLines= createPrefTrueFalse(javadocAndBlockSettingsGroup, numColumns, FormatterMessages.CommentsTabPage_clear_blank_lines, DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES); 

		final CheckboxPreference indentDesc= createCheckboxPref(settingsGroup, numColumns , FormatterMessages.CommentsTabPage_indent_description_after_param, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INDENT_PARAMETER_DESCRIPTION, FALSE_TRUE); 
		((GridData)indentDesc.getControl().getLayoutData()).horizontalIndent= fPixelConverter.convertWidthInCharsToPixels(4);
		final CheckboxPreference nlParam= createPrefInsert(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_new_line_after_param_tags, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_NEW_LINE_FOR_PARAMETER); 

		Collection masters, slaves;

		masters= new ArrayList();
		masters.add(javadoc);
		
		slaves= new ArrayList();
		slaves.add(settingsGroup);
		slaves.add(header);
		slaves.add(html);
		slaves.add(code);
		slaves.add(blankComments);
		slaves.add(blankJavadoc);
		slaves.add(indentJavadoc);
		slaves.add(nlParam);
		slaves.add(lineWidth);
		
		new AndController(masters, slaves);
		
		masters= new ArrayList();
		masters.add(javadoc);
		masters.add(indentJavadoc);
		
		slaves= new ArrayList();
		slaves.add(indentDesc);
		
		new AndController(masters, slaves);

		masters= new ArrayList();
		masters.add(javadoc);
		masters.add(blockComment);
		
		slaves= new ArrayList();
		slaves.add(blankLines);
		
		new OrController(masters, slaves);
	}
	
	protected void initializePage() {

Lines 106-113 Link Here

(-)ui/org/eclipse/jdt/internal/ui/fix/CommentFormatFix.java (-2 / +6 lines)
106	private static List format(IDocument document, boolean singleLine, boolean multiLine, boolean javaDoc, HashMap preferences) {	106	private static List format(IDocument document, boolean singleLine, boolean multiLine, boolean javaDoc, HashMap preferences) {
107	final List edits= new ArrayList();	107	final List edits= new ArrayList();
108		108
109	if (DefaultCodeFormatterConstants.FALSE.equals(preferences.get(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT)))	109	if (DefaultCodeFormatterConstants.FALSE.equals(preferences.get(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_BLOCK_COMMENT)))
110	preferences.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT, DefaultCodeFormatterConstants.TRUE);	110	preferences.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_BLOCK_COMMENT, DefaultCodeFormatterConstants.TRUE);
		111	if (DefaultCodeFormatterConstants.FALSE.equals(preferences.get(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_JAVADOC_COMMENT)))
		112	preferences.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_JAVADOC_COMMENT, DefaultCodeFormatterConstants.TRUE);
		113	if (DefaultCodeFormatterConstants.FALSE.equals(preferences.get(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT)))
		114	preferences.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT, DefaultCodeFormatterConstants.TRUE);
111		115
112	JavaPlugin.getDefault().getJavaTextTools().setupJavaDocumentPartitioner(document, IJavaPartitions.JAVA_PARTITIONING);	116	JavaPlugin.getDefault().getJavaTextTools().setupJavaDocumentPartitioner(document, IJavaPartitions.JAVA_PARTITIONING);
113		117

Lines 27-33 Link Here

(-)ui/org/eclipse/jdt/internal/ui/text/comment/CommentFormattingContext.java (-1 / +3 lines)
27	*/	27	*/
28	public String[] getPreferenceKeys() {	28	public String[] getPreferenceKeys() {
29	return new String[] {	29	return new String[] {
30	DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT,	30	DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_BLOCK_COMMENT,
		31	DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_JAVADOC_COMMENT,
		32	DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT,
31	DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_HEADER,	33	DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_HEADER,
32	DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_SOURCE,	34	DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_SOURCE,
33	DefaultCodeFormatterConstants.FORMATTER_COMMENT_INDENT_PARAMETER_DESCRIPTION,	35	DefaultCodeFormatterConstants.FORMATTER_COMMENT_INDENT_PARAMETER_DESCRIPTION,

Return to bug 49412

Lines 343-349 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java (-1 / +4 lines)
343	public static String CodingStyleConfigurationBlock_preview_title;	343	public static String CodingStyleConfigurationBlock_preview_title;
344		344
345	public static String CommentsTabPage_group1_title;	345	public static String CommentsTabPage_group1_title;
346	public static String CommentsTabPage_enable_comment_formatting;	346	public static String commentsTabPage_enable_javadoc_comment_formatting;
		347	public static String CommentsTabPage_enable_line_comment_formatting;
		348	public static String CommentsTabPage_enable_block_comment_formatting;
347	public static String CommentsTabPage_format_header;	349	public static String CommentsTabPage_format_header;
348	public static String CommentsTabPage_format_html;	350	public static String CommentsTabPage_format_html;
349	public static String CommentsTabPage_format_code_snippets;	351	public static String CommentsTabPage_format_code_snippets;
Lines 354-359 Link Here
354	public static String CommentsTabPage_indent_description_after_param;	356	public static String CommentsTabPage_indent_description_after_param;
355	public static String CommentsTabPage_new_line_after_param_tags;	357	public static String CommentsTabPage_new_line_after_param_tags;
356	public static String CommentsTabPage_group3_title;	358	public static String CommentsTabPage_group3_title;
		359	public static String CommentsTabPage_group4_title;
357	public static String CommentsTabPage_line_width;	360	public static String CommentsTabPage_line_width;
358	public static String ControlStatementsTabPage_preview_header;	361	public static String ControlStatementsTabPage_preview_header;
359	public static String ControlStatementsTabPage_general_group_title;	362	public static String ControlStatementsTabPage_general_group_title;

Lines 48-59 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/formatter/CommentsTabPage.java (-14 / +66 lines)
48	};	48	};
49		49
50		50
51	private final static class Controller implements Observer {	51	private final static class AndController implements Observer {
52		52
53	private final Collection fMasters;	53	private final Collection fMasters;
54	private final Collection fSlaves;	54	private final Collection fSlaves;
55		55
56	public Controller(Collection masters, Collection slaves) {	56	public AndController(Collection masters, Collection slaves) {
57	fMasters= masters;	57	fMasters= masters;
58	fSlaves= slaves;	58	fSlaves= slaves;
59	for (final Iterator iter= fMasters.iterator(); iter.hasNext();) {	59	for (final Iterator iter= fMasters.iterator(); iter.hasNext();) {
Lines 80-85 Link Here
80	}	80	}
81	}	81	}
82		82
		83	private final static class OrController implements Observer {
		84
		85	private final Collection fMasters;
		86	private final Collection fSlaves;
		87
		88	public OrController(Collection masters, Collection slaves) {
		89	fMasters= masters;
		90	fSlaves= slaves;
		91	for (final Iterator iter= fMasters.iterator(); iter.hasNext();) {
		92	((CheckboxPreference)iter.next()).addObserver(this);
		93	}
		94	update(null, null);
		95	}
		96
		97	public void update(Observable o, Object arg) {
		98	boolean enabled= false;
		99
		100	for (final Iterator iter= fMasters.iterator(); iter.hasNext();) {
		101	enabled \|= ((CheckboxPreference)iter.next()).getChecked();
		102	}
		103
		104	for (final Iterator iter = fSlaves.iterator(); iter.hasNext();) {
		105	final Object obj= iter.next();
		106	if (obj instanceof Preference) {
		107	((Preference)obj).setEnabled(enabled);
		108	} else if (obj instanceof Control) {
		109	((Group)obj).setEnabled(enabled);
		110	}
		111	}
		112	}
		113	}
83		114
84	private final String PREVIEW=	115	private final String PREVIEW=
85	createPreviewHeader("An example for comment formatting. This example is meant to illustrate the various possibilities offered by <i>Eclipse</i> in order to format comments.") + //$NON-NLS-1$	116	createPreviewHeader("An example for comment formatting. This example is meant to illustrate the various possibilities offered by <i>Eclipse</i> in order to format comments.") + //$NON-NLS-1$
Lines 93-99 Link Here
93	" * These possibilities include:\n" + //$NON-NLS-1$	124	" * These possibilities include:\n" + //$NON-NLS-1$
94	" * <ul><li>Formatting of header comments.</li><li>Formatting of Javadoc tags</li></ul>\n" + //$NON-NLS-1$	125	" * <ul><li>Formatting of header comments.</li><li>Formatting of Javadoc tags</li></ul>\n" + //$NON-NLS-1$
95	" */\n" + //$NON-NLS-1$	126	" */\n" + //$NON-NLS-1$
96	" int bar();" + //$NON-NLS-1$	127	" int bar();\n" + //$NON-NLS-1$
		128	" /*\n" + //$NON-NLS-1$
		129	" *\n" + //$NON-NLS-1$
		130	" * These possibilities include:\n" + //$NON-NLS-1$
		131	" * <ul><li>Formatting of header comments.</li><li>Formatting of Javadoc tags</li></ul>\n" + //$NON-NLS-1$
		132	" */\n" + //$NON-NLS-1$
		133	" int bar2();" + //$NON-NLS-1$
		134	" // This is a long comment that should be split in multiple line comments in case the line comment formatting is enabled\n" + //$NON-NLS-1$
		135	" int foo2();" + //$NON-NLS-1$
97	" /**\n" + //$NON-NLS-1$	136	" /**\n" + //$NON-NLS-1$
98	" * The following is some sample code which illustrates source formatting within javadoc comments:\n" + //$NON-NLS-1$	137	" * The following is some sample code which illustrates source formatting within javadoc comments:\n" + //$NON-NLS-1$
99	" * <pre>public class Example {final int a= 1;final boolean b= true;}</pre>\n" + //$NON-NLS-1$	138	" * <pre>public class Example {final int a= 1;final boolean b= true;}</pre>\n" + //$NON-NLS-1$
Lines 116-132 Link Here
116		155
117	// global group	156	// global group
118	final Group globalGroup= createGroup(numColumns, composite, FormatterMessages.CommentsTabPage_group1_title);	157	final Group globalGroup= createGroup(numColumns, composite, FormatterMessages.CommentsTabPage_group1_title);
119	final CheckboxPreference global= createPrefTrueFalse(globalGroup, numColumns, FormatterMessages.CommentsTabPage_enable_comment_formatting, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT);	158	final CheckboxPreference javadoc= createPrefTrueFalse(globalGroup, numColumns, FormatterMessages.commentsTabPage_enable_javadoc_comment_formatting, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_JAVADOC_COMMENT);
120	final CheckboxPreference header= createPrefTrueFalse(globalGroup, numColumns, FormatterMessages.CommentsTabPage_format_header, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_HEADER);	159	final CheckboxPreference blockComment= createPrefTrueFalse(globalGroup, numColumns, FormatterMessages.CommentsTabPage_enable_block_comment_formatting, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_BLOCK_COMMENT);
121	final CheckboxPreference html= createPrefTrueFalse(globalGroup, numColumns, FormatterMessages.CommentsTabPage_format_html, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_HTML);	160	createPrefTrueFalse(globalGroup, numColumns, FormatterMessages.CommentsTabPage_enable_line_comment_formatting, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT);
122	final CheckboxPreference code= createPrefTrueFalse(globalGroup, numColumns, FormatterMessages.CommentsTabPage_format_code_snippets, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_SOURCE);
123		161
124	// blank lines group	162	// javadoc comment formatting settings
125	final Group settingsGroup= createGroup(numColumns, composite, FormatterMessages.CommentsTabPage_group2_title);	163	final Group settingsGroup= createGroup(numColumns, composite, FormatterMessages.CommentsTabPage_group2_title);
126	final CheckboxPreference blankComments= createPrefTrueFalse(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_clear_blank_lines, DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES);	164	final CheckboxPreference header= createPrefTrueFalse(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_format_header, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_HEADER);
		165	final CheckboxPreference html= createPrefTrueFalse(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_format_html, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_HTML);
		166	final CheckboxPreference code= createPrefTrueFalse(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_format_code_snippets, DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_SOURCE);
127	final CheckboxPreference blankJavadoc= createPrefInsert(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_blank_line_before_javadoc_tags, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_EMPTY_LINE_BEFORE_ROOT_TAGS);	167	final CheckboxPreference blankJavadoc= createPrefInsert(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_blank_line_before_javadoc_tags, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_EMPTY_LINE_BEFORE_ROOT_TAGS);
128	final CheckboxPreference indentJavadoc= createPrefTrueFalse(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_indent_javadoc_tags, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INDENT_ROOT_TAGS);	168	final CheckboxPreference indentJavadoc= createPrefTrueFalse(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_indent_javadoc_tags, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INDENT_ROOT_TAGS);
129		169
		170	// javadoc and block comment settings
		171	final Group javadocAndBlockSettingsGroup= createGroup(numColumns, composite, FormatterMessages.CommentsTabPage_group4_title);
		172	final CheckboxPreference blankLines= createPrefTrueFalse(javadocAndBlockSettingsGroup, numColumns, FormatterMessages.CommentsTabPage_clear_blank_lines, DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES);
		173
130	final CheckboxPreference indentDesc= createCheckboxPref(settingsGroup, numColumns , FormatterMessages.CommentsTabPage_indent_description_after_param, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INDENT_PARAMETER_DESCRIPTION, FALSE_TRUE);	174	final CheckboxPreference indentDesc= createCheckboxPref(settingsGroup, numColumns , FormatterMessages.CommentsTabPage_indent_description_after_param, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INDENT_PARAMETER_DESCRIPTION, FALSE_TRUE);
131	((GridData)indentDesc.getControl().getLayoutData()).horizontalIndent= fPixelConverter.convertWidthInCharsToPixels(4);	175	((GridData)indentDesc.getControl().getLayoutData()).horizontalIndent= fPixelConverter.convertWidthInCharsToPixels(4);
132	final CheckboxPreference nlParam= createPrefInsert(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_new_line_after_param_tags, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_NEW_LINE_FOR_PARAMETER);	176	final CheckboxPreference nlParam= createPrefInsert(settingsGroup, numColumns, FormatterMessages.CommentsTabPage_new_line_after_param_tags, DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_NEW_LINE_FOR_PARAMETER);
Lines 137-165 Link Here
137	Collection masters, slaves;	181	Collection masters, slaves;
138		182
139	masters= new ArrayList();	183	masters= new ArrayList();
140	masters.add(global);	184	masters.add(javadoc);
141		185
142	slaves= new ArrayList();	186	slaves= new ArrayList();
143	slaves.add(settingsGroup);	187	slaves.add(settingsGroup);
144	slaves.add(header);	188	slaves.add(header);
145	slaves.add(html);	189	slaves.add(html);
146	slaves.add(code);	190	slaves.add(code);
147	slaves.add(blankComments);
148	slaves.add(blankJavadoc);	191	slaves.add(blankJavadoc);
149	slaves.add(indentJavadoc);	192	slaves.add(indentJavadoc);
150	slaves.add(nlParam);	193	slaves.add(nlParam);
151	slaves.add(lineWidth);	194	slaves.add(lineWidth);
152		195
153	new Controller(masters, slaves);	196	new AndController(masters, slaves);
154		197
155	masters= new ArrayList();	198	masters= new ArrayList();
156	masters.add(global);	199	masters.add(javadoc);
157	masters.add(indentJavadoc);	200	masters.add(indentJavadoc);
158		201
159	slaves= new ArrayList();	202	slaves= new ArrayList();
160	slaves.add(indentDesc);	203	slaves.add(indentDesc);
161		204
162	new Controller(masters, slaves);	205	new AndController(masters, slaves);
		206
		207	masters= new ArrayList();
		208	masters.add(javadoc);
		209	masters.add(blockComment);
		210
		211	slaves= new ArrayList();
		212	slaves.add(blankLines);
		213
		214	new OrController(masters, slaves);
163	}	215	}
164		216
165	protected void initializePage() {	217	protected void initializePage() {

Lines 386-392 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties (-1 / +4 lines)
386	CodingStyleConfigurationBlock_preview_title=A sample source file for the code formatter preview	386	CodingStyleConfigurationBlock_preview_title=A sample source file for the code formatter preview
387		387
388	CommentsTabPage_group1_title=General settings	388	CommentsTabPage_group1_title=General settings
389	CommentsTabPage_enable_comment_formatting=Enable &comment formatting	389	commentsTabPage_enable_javadoc_comment_formatting=Enable &javadoc comment formatting
		390	CommentsTabPage_enable_line_comment_formatting=Enable &line comment formatting
		391	CommentsTabPage_enable_block_comment_formatting=Enable &block comment formatting
390	CommentsTabPage_format_header=Format &header comment	392	CommentsTabPage_format_header=Format &header comment
391	CommentsTabPage_format_html=Format HTML ta&gs	393	CommentsTabPage_format_html=Format HTML ta&gs
392	CommentsTabPage_format_code_snippets=Format &Java code snippets	394	CommentsTabPage_format_code_snippets=Format &Java code snippets
Lines 400-405 Link Here
400	CommentsTabPage_group3_title=Line width	402	CommentsTabPage_group3_title=Line width
401	CommentsTabPage_line_width=Ma&ximum line width for comments:	403	CommentsTabPage_line_width=Ma&ximum line width for comments:
402		404
		405	CommentsTabPage_group4_title=Javadoc and block comment settings
403		406
404	ControlStatementsTabPage_preview_header=If...else	407	ControlStatementsTabPage_preview_header=If...else
405	ControlStatementsTabPage_general_group_title=General	408	ControlStatementsTabPage_general_group_title=General