Attachment 220780 Details for Bug 388281 – Proposed changes for JDT/UI

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Proposed changes for JDT/UI

Bug-388281_UI_v1.patch (text/plain), 4.18 KB, created by Stephan Herrmann

on 2012-09-06 08:05:37 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Stephan Herrmann

Created: 2012-09-06 08:05:37 EDT

Size: 4.18 KB

patch

obsolete

>diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java
>index 574e0b2..e8dbfc4 100644
>--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java
>+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java
>@@ -787,6 +787,7 @@
> 	public static String ComplianceConfigurationBlock_src_greater_compliance;
> 	public static String ComplianceConfigurationBlock_classfile_greater_compliance;
> 	public static String ComplianceConfigurationBlock_classfile_greater_source;
>+	public static String ProblemSeveritiesConfigurationBlock_enable_inheritance_of_null_annotations;
> 	public static String ProblemSeveritiesConfigurationBlock_pb_parameter_assignment;
> 	public static String ProblemSeveritiesConfigurationBlock_pb_null_reference;
> 	public static String ProblemSeveritiesConfigurationBlock_pb_null_spec_violation;
>diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
>index 8a83f0c..8b09498 100644
>--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
>+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
>@@ -407,6 +407,7 @@
> NullAnnotationsConfigurationDialog_nullable_annotation_error='Nullable' annotation must be a fully-qualified type name
> NullAnnotationsConfigurationDialog_nullable_annotation_label='&Nullable' annotation:
> 
>+ProblemSeveritiesConfigurationBlock_enable_inheritance_of_null_annotations=Enable inheritance of null annotations
> ProblemSeveritiesConfigurationBlock_common_description=&Select the severity level for the following optional problems:
> ProblemSeveritiesConfigurationBlock_pb_unavoidable_generic_type_problems=Ignore unavoidable generic type problems
> ProblemSeveritiesConfigurationBlock_pb_unsafe_type_op_label=Unchecked generic type operation:
>diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ProblemSeveritiesConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ProblemSeveritiesConfigurationBlock.java
>index bd0d309..4859303 100644
>--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ProblemSeveritiesConfigurationBlock.java
>+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ProblemSeveritiesConfigurationBlock.java
>@@ -272,6 +272,8 @@
> 	
> 	private static final Key PREF_ANNOTATION_NULL_ANALYSIS= getJDTCoreKey(JavaCore.COMPILER_ANNOTATION_NULL_ANALYSIS);
> 	
>+	private static final Key PREF_INHERIT_NULL_ANNOTATIONS= getJDTCoreKey(JavaCore.COMPILER_INHERIT_NULL_ANNOTATIONS);
>+
> 	/**
> 	 * Key for the "Use default annotations for null " setting.
> 	 * <p>Values are { {@link #ENABLED}, {@link #DISABLED} }.
>@@ -382,6 +384,7 @@
> 				PREF_PB_NULL_UNCHECKED_CONVERSION,
> 				PREF_PB_REDUNDANT_NULL_ANNOTATION,	
> 				PREF_PB_REDUNDANT_NULL_CHECK, PREF_PB_INCLUDE_ASSERTS_IN_NULL_ANALYSIS,
>+				PREF_INHERIT_NULL_ANNOTATIONS,
> 				PREF_PB_UNCLOSED_CLOSEABLE, PREF_PB_POTENTIALLY_UNCLOSED_CLOSEABLE, PREF_PB_EXPLICITLY_CLOSED_AUTOCLOSEABLE,
> 				PREF_PB_FALLTHROUGH_CASE, PREF_PB_REDUNDANT_SUPERINTERFACE, PREF_PB_UNUSED_WARNING_TOKEN,
> 				PREF_15_PB_UNCHECKED_TYPE_OPERATION, PREF_15_PB_FINAL_PARAM_BOUND, PREF_15_PB_VARARGS_ARGUMENT_NEED_CAST,
>@@ -800,6 +803,9 @@
> 					}
> 				});
> 		
>+		label= PreferencesMessages.ProblemSeveritiesConfigurationBlock_enable_inheritance_of_null_annotations;
>+		fFilteredPrefTree.addCheckBox(inner, label, PREF_INHERIT_NULL_ANNOTATIONS, enabledDisabled, extraIndent, node);
>+		
> 		// --- global
> 		
> 		// add some vertical space before:
>@@ -988,6 +994,7 @@
> 		setComboEnabled(PREF_PB_NULL_UNCHECKED_CONVERSION, enableAnnotationNullAnalysis);
> 		setComboEnabled(PREF_PB_REDUNDANT_NULL_ANNOTATION, enableAnnotationNullAnalysis);
> 		setComboEnabled(PREF_MISSING_NONNULL_BY_DEFAULT_ANNOTATION, enableAnnotationNullAnalysis);
>+		getCheckBox(PREF_INHERIT_NULL_ANNOTATIONS).setEnabled(enableAnnotationNullAnalysis);
> 	}
> 
> 	private IStatus validateNullnessAnnotation(String value, String errorMessage) {

Actions: View | Diff

Attachments on bug 388281: 220779 | 220780