### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.doc.user
Index: reference/preferences/java/compiler/ref-preferences-javadoc.htm
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.doc.user/reference/preferences/java/compiler/ref-preferences-javadoc.htm,v
retrieving revision 1.5
diff -u -r1.5 ref-preferences-javadoc.htm
--- reference/preferences/java/compiler/ref-preferences-javadoc.htm	6 Apr 2009 14:09:24 -0000	1.5
+++ reference/preferences/java/compiler/ref-preferences-javadoc.htm	5 Oct 2010 15:46:43 -0000
@@ -55,7 +55,7 @@
 			<p>Only consider members as visible as</p>
 			</td>
 			<td valign="top">
-			<p>The compiler does only check members with the specified or a broader visibility.</p>
+			<p>The compiler only checks members with the specified or a broader visibility.</p>
 			</td>
 			<td valign="top">
 			<p>Public</p>
@@ -122,7 +122,7 @@
 			<p>Only consider members as visible as</p>
 			</td>
 			<td valign="top">
-			<p>The compiler does only check members with the specified or a broader visibility.</p>
+			<p>The compiler only checks members with the specified or a broader visibility.</p>
 			</td>
 			<td valign="top">
 			<p>Public</p>
@@ -130,13 +130,24 @@
 		</tr>
 		<tr>
 			<td valign="top" style="padding-left: 1em;">
-			<p>Check overriding and implementing methods</p>
+			<p>Ignore in overriding and implementing methods</p>
 			</td>
 			<td valign="top">
-			<p>When enabled, also overriding and implementing methods are checked for missing Javadoc tags.</p>
+			<p>When enabled, methods that override or implement another method are not checked for missing Javadoc tags.</p>
 			</td>
 			<td valign="top">
-			<p>Off</p>
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" style="padding-left: 1em;">
+			<p>Ignore method type parameters</p>
+			</td>
+			<td valign="top">
+			<p>When enabled, missing Javadoc tags are not reported for method type parameters.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
 			</td>
 		</tr>
 		<tr>
@@ -155,7 +166,7 @@
 			<p>Only consider members as visible as</p>
 			</td>
 			<td valign="top">
-			<p>The compiler does only check members with the specified or a broader visibility.</p>
+			<p>The compiler only checks members with the specified or a broader visibility.</p>
 			</td>
 			<td valign="top">
 			<p>Public</p>
@@ -163,13 +174,13 @@
 		</tr>
 		<tr>
 			<td valign="top" style="padding-left: 1em;">
-			<p>Check overriding and implementing methods</p>
+			<p>Ignore in overriding and implementing methods</p>
 			</td>
 			<td valign="top">
-			<p>When enabled, also overriding and implementing methods are checked for missing Javadoc comments.</p>
+			<p>When enabled, methods that override or implement another method are not checked for missing Javadoc comments.</p>
 			</td>
 			<td valign="top">
-			<p>Off</p>
+			<p>On</p>
 			</td>
 		</tr>
 	</tbody>
#P org.eclipse.jdt.ui
Index: ui/org/eclipse/jdt/internal/ui/preferences/JavadocProblemsConfigurationBlock.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocProblemsConfigurationBlock.java,v
retrieving revision 1.18
diff -u -r1.18 JavadocProblemsConfigurationBlock.java
--- ui/org/eclipse/jdt/internal/ui/preferences/JavadocProblemsConfigurationBlock.java	18 Jan 2010 13:31:16 -0000	1.18
+++ ui/org/eclipse/jdt/internal/ui/preferences/JavadocProblemsConfigurationBlock.java	5 Oct 2010 15:46:44 -0000
@@ -48,6 +48,7 @@
 	private static final Key PREF_PB_MISSING_JAVADOC_TAGS= getJDTCoreKey(JavaCore.COMPILER_PB_MISSING_JAVADOC_TAGS);
 	private static final Key PREF_PB_MISSING_JAVADOC_TAGS_VISIBILITY= getJDTCoreKey(JavaCore.COMPILER_PB_MISSING_JAVADOC_TAGS_VISIBILITY);
 	private static final Key PREF_PB_MISSING_JAVADOC_TAGS_OVERRIDING= getJDTCoreKey(JavaCore.COMPILER_PB_MISSING_JAVADOC_TAGS_OVERRIDING);
+	private static final Key PREF_PB_MISSING_JAVADOC_TAGS_METHOD_TYPE_PARAMETERS= getJDTCoreKey(JavaCore.COMPILER_PB_MISSING_JAVADOC_TAGS_METHOD_TYPE_PARAMETERS);
 
 	private static final Key PREF_PB_MISSING_JAVADOC_TAG_DESCRIPTION= getJDTCoreKey(JavaCore.COMPILER_PB_MISSING_JAVADOC_TAG_DESCRIPTION);
 
@@ -91,6 +92,7 @@
 				PREF_PB_INVALID_JAVADOC_TAGS_VISIBILITY,
 				PREF_PB_INVALID_JAVADOC_TAGS_NOT_VISIBLE_REF, PREF_PB_INVALID_JAVADOC_TAGS_DEPRECATED_REF,
 				PREF_PB_MISSING_JAVADOC_TAGS, PREF_PB_MISSING_JAVADOC_TAGS_VISIBILITY, PREF_PB_MISSING_JAVADOC_TAGS_OVERRIDING,
+				PREF_PB_MISSING_JAVADOC_TAGS_METHOD_TYPE_PARAMETERS,
 				PREF_PB_MISSING_JAVADOC_COMMENTS, PREF_PB_MISSING_JAVADOC_COMMENTS_VISIBILITY, PREF_PB_MISSING_JAVADOC_COMMENTS_OVERRIDING,
 				PREF_PB_MISSING_JAVADOC_TAG_DESCRIPTION,
 			};
@@ -186,7 +188,10 @@
 		gd.horizontalSpan= nColumns;
 		description.setLayoutData(gd);
 
-		int indent= fPixelConverter.convertWidthInCharsToPixels(2);
+		int indent= fPixelConverter.convertWidthInCharsToPixels(4);
+
+		spacer= new Composite(composite, SWT.NONE);
+		GridDataFactory.fillDefaults().span(nColumns, 1).hint(1, 5).applyTo(spacer);
 
 		label = PreferencesMessages.JavadocProblemsConfigurationBlock_pb_invalid_javadoc_label;
 		addComboBox(composite, label, PREF_PB_INVALID_JAVADOC, errorWarningIgnore, errorWarningIgnoreLabels, 0);
@@ -216,6 +221,10 @@
 		label= PreferencesMessages.JavadocProblemsConfigurationBlock_pb_missing_tag_description;
 		addComboBox(composite, label, PREF_PB_MISSING_JAVADOC_TAG_DESCRIPTION, missingTagValues, missingTagLabels, indent);
 
+
+		spacer= new Composite(composite, SWT.NONE);
+		GridDataFactory.fillDefaults().span(nColumns, 1).hint(1, 5).applyTo(spacer);
+
 		label = PreferencesMessages.JavadocProblemsConfigurationBlock_pb_missing_javadoc_label;
 		addComboBox(composite, label, PREF_PB_MISSING_JAVADOC_TAGS, errorWarningIgnore, errorWarningIgnoreLabels, 0);
 
@@ -225,6 +234,13 @@
 		label= PreferencesMessages.JavadocProblemsConfigurationBlock_pb_missing_javadoc_tags_overriding_label;
 		addCheckBox(composite, label, PREF_PB_MISSING_JAVADOC_TAGS_OVERRIDING, disabledEnabled, indent);
 
+		label= PreferencesMessages.JavadocProblemsConfigurationBlock_pb_missing_comments_method_type_parameter_label;
+		addCheckBox(composite, label, PREF_PB_MISSING_JAVADOC_TAGS_METHOD_TYPE_PARAMETERS, disabledEnabled, indent);
+		
+
+		spacer= new Composite(composite, SWT.NONE);
+		GridDataFactory.fillDefaults().span(nColumns, 1).hint(1, 5).applyTo(spacer);
+
 		label = PreferencesMessages.JavadocProblemsConfigurationBlock_pb_missing_comments_label;
 		addComboBox(composite, label, PREF_PB_MISSING_JAVADOC_COMMENTS, errorWarningIgnore, errorWarningIgnoreLabels, 0);
 
@@ -279,6 +295,7 @@
 
 			boolean enableMissingTagsErrors= !checkValue(PREF_PB_MISSING_JAVADOC_TAGS, IGNORE);
 			getCheckBox(PREF_PB_MISSING_JAVADOC_TAGS_OVERRIDING).setEnabled(enableMissingTagsErrors);
+			getCheckBox(PREF_PB_MISSING_JAVADOC_TAGS_METHOD_TYPE_PARAMETERS).setEnabled(enableMissingTagsErrors);
 			setComboEnabled(PREF_PB_MISSING_JAVADOC_TAGS_VISIBILITY, enableMissingTagsErrors);
 
 			boolean enableMissingCommentsErrors= !checkValue(PREF_PB_MISSING_JAVADOC_COMMENTS, IGNORE);
Index: ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java,v
retrieving revision 1.132
diff -u -r1.132 PreferencesMessages.java
--- ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java	30 Sep 2010 14:33:32 -0000	1.132
+++ ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java	5 Oct 2010 15:46:44 -0000
@@ -438,6 +438,7 @@
 	public static String JavadocProblemsConfigurationBlock_pb_missing_javadoc_tags_visibility_label;
 	public static String JavadocProblemsConfigurationBlock_pb_missing_javadoc_tags_overriding_label;
 	public static String JavadocProblemsConfigurationBlock_pb_missing_comments_label;
+	public static String JavadocProblemsConfigurationBlock_pb_missing_comments_method_type_parameter_label;
 	public static String JavadocProblemsConfigurationBlock_pb_missing_comments_visibility_label;
 	public static String JavadocProblemsConfigurationBlock_pb_missing_comments_overriding_label;
 	public static String JavadocProblemsConfigurationBlock_pb_missing_tag_description;
Index: ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties,v
retrieving revision 1.515
diff -u -r1.515 PreferencesMessages.properties
--- ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties	30 Sep 2010 14:33:32 -0000	1.515
+++ ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties	5 Oct 2010 15:46:44 -0000
@@ -468,7 +468,7 @@
 JavadocProblemsConfigurationBlock_needsfullbuild_message=The Javadoc settings have changed. A full rebuild is required for changes to take effect. Do the full build now?
 JavadocProblemsConfigurationBlock_needsprojectbuild_message=The Javadoc settings have changed. A rebuild of the project is required for changes to take effect. Build the project now?
 
-JavadocProblemsConfigurationBlock_javadoc_description=Severity level for problems in Javadoc comments:
+JavadocProblemsConfigurationBlock_javadoc_description=Severity levels for problems in Javadoc comments:
 
 JavadocProblemsConfigurationBlock_pb_javadoc_support_label=Proc&ess Javadoc comments
 JavadocProblemsConfigurationBlock_pb_invalid_javadoc_label=Mal&formed Javadoc comments:
@@ -482,6 +482,7 @@
 JavadocProblemsConfigurationBlock_pb_missing_comments_label=Missing &Javadoc comments:
 JavadocProblemsConfigurationBlock_pb_missing_comments_visibility_label=Only &consider members as visible as:
 JavadocProblemsConfigurationBlock_pb_missing_comments_overriding_label=I&gnore in overriding and implementing methods
+JavadocProblemsConfigurationBlock_pb_missing_comments_method_type_parameter_label=Ignore met&hod type parameters
 JavadocProblemsConfigurationBlock_pb_missing_tag_description=&Missing tag descriptions:
 JavadocProblemsConfigurationBlock_returnTag=Validate @return tags