Attachment #220780 for bug #388281

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

Lines 787-792 Link Here

(-)a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java (+1 lines)
787	public static String ComplianceConfigurationBlock_src_greater_compliance;	787	public static String ComplianceConfigurationBlock_src_greater_compliance;
788	public static String ComplianceConfigurationBlock_classfile_greater_compliance;	788	public static String ComplianceConfigurationBlock_classfile_greater_compliance;
789	public static String ComplianceConfigurationBlock_classfile_greater_source;	789	public static String ComplianceConfigurationBlock_classfile_greater_source;
		790	public static String ProblemSeveritiesConfigurationBlock_enable_inheritance_of_null_annotations;
790	public static String ProblemSeveritiesConfigurationBlock_pb_parameter_assignment;	791	public static String ProblemSeveritiesConfigurationBlock_pb_parameter_assignment;
791	public static String ProblemSeveritiesConfigurationBlock_pb_null_reference;	792	public static String ProblemSeveritiesConfigurationBlock_pb_null_reference;
792	public static String ProblemSeveritiesConfigurationBlock_pb_null_spec_violation;	793	public static String ProblemSeveritiesConfigurationBlock_pb_null_spec_violation;

Lines 407-412 Link Here

(-)a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties (+1 lines)
407	NullAnnotationsConfigurationDialog_nullable_annotation_error='Nullable' annotation must be a fully-qualified type name	407	NullAnnotationsConfigurationDialog_nullable_annotation_error='Nullable' annotation must be a fully-qualified type name
408	NullAnnotationsConfigurationDialog_nullable_annotation_label='&Nullable' annotation:	408	NullAnnotationsConfigurationDialog_nullable_annotation_label='&Nullable' annotation:
409		409
		410	ProblemSeveritiesConfigurationBlock_enable_inheritance_of_null_annotations=Enable inheritance of null annotations
410	ProblemSeveritiesConfigurationBlock_common_description=&Select the severity level for the following optional problems:	411	ProblemSeveritiesConfigurationBlock_common_description=&Select the severity level for the following optional problems:
411	ProblemSeveritiesConfigurationBlock_pb_unavoidable_generic_type_problems=Ignore unavoidable generic type problems	412	ProblemSeveritiesConfigurationBlock_pb_unavoidable_generic_type_problems=Ignore unavoidable generic type problems
412	ProblemSeveritiesConfigurationBlock_pb_unsafe_type_op_label=Unchecked generic type operation:	413	ProblemSeveritiesConfigurationBlock_pb_unsafe_type_op_label=Unchecked generic type operation:

Lines 272-277 Link Here

(-)a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ProblemSeveritiesConfigurationBlock.java (+7 lines)
272		272
273	private static final Key PREF_ANNOTATION_NULL_ANALYSIS= getJDTCoreKey(JavaCore.COMPILER_ANNOTATION_NULL_ANALYSIS);	273	private static final Key PREF_ANNOTATION_NULL_ANALYSIS= getJDTCoreKey(JavaCore.COMPILER_ANNOTATION_NULL_ANALYSIS);
274		274
		275	private static final Key PREF_INHERIT_NULL_ANNOTATIONS= getJDTCoreKey(JavaCore.COMPILER_INHERIT_NULL_ANNOTATIONS);
		276
275	/**	277	/**
276	* Key for the "Use default annotations for null " setting.	278	* Key for the "Use default annotations for null " setting.
277	* <p>Values are { {@link #ENABLED}, {@link #DISABLED} }.	279	* <p>Values are { {@link #ENABLED}, {@link #DISABLED} }.
Lines 382-387 Link Here
382	PREF_PB_NULL_UNCHECKED_CONVERSION,	384	PREF_PB_NULL_UNCHECKED_CONVERSION,
383	PREF_PB_REDUNDANT_NULL_ANNOTATION,	385	PREF_PB_REDUNDANT_NULL_ANNOTATION,
384	PREF_PB_REDUNDANT_NULL_CHECK, PREF_PB_INCLUDE_ASSERTS_IN_NULL_ANALYSIS,	386	PREF_PB_REDUNDANT_NULL_CHECK, PREF_PB_INCLUDE_ASSERTS_IN_NULL_ANALYSIS,
		387	PREF_INHERIT_NULL_ANNOTATIONS,
385	PREF_PB_UNCLOSED_CLOSEABLE, PREF_PB_POTENTIALLY_UNCLOSED_CLOSEABLE, PREF_PB_EXPLICITLY_CLOSED_AUTOCLOSEABLE,	388	PREF_PB_UNCLOSED_CLOSEABLE, PREF_PB_POTENTIALLY_UNCLOSED_CLOSEABLE, PREF_PB_EXPLICITLY_CLOSED_AUTOCLOSEABLE,
386	PREF_PB_FALLTHROUGH_CASE, PREF_PB_REDUNDANT_SUPERINTERFACE, PREF_PB_UNUSED_WARNING_TOKEN,	389	PREF_PB_FALLTHROUGH_CASE, PREF_PB_REDUNDANT_SUPERINTERFACE, PREF_PB_UNUSED_WARNING_TOKEN,
387	PREF_15_PB_UNCHECKED_TYPE_OPERATION, PREF_15_PB_FINAL_PARAM_BOUND, PREF_15_PB_VARARGS_ARGUMENT_NEED_CAST,	390	PREF_15_PB_UNCHECKED_TYPE_OPERATION, PREF_15_PB_FINAL_PARAM_BOUND, PREF_15_PB_VARARGS_ARGUMENT_NEED_CAST,
Lines 800-805 Link Here
800	}	803	}
801	});	804	});
802		805
		806	label= PreferencesMessages.ProblemSeveritiesConfigurationBlock_enable_inheritance_of_null_annotations;
		807	fFilteredPrefTree.addCheckBox(inner, label, PREF_INHERIT_NULL_ANNOTATIONS, enabledDisabled, extraIndent, node);
		808
803	// --- global	809	// --- global
804		810
805	// add some vertical space before:	811	// add some vertical space before:
Lines 988-993 Link Here
988	setComboEnabled(PREF_PB_NULL_UNCHECKED_CONVERSION, enableAnnotationNullAnalysis);	994	setComboEnabled(PREF_PB_NULL_UNCHECKED_CONVERSION, enableAnnotationNullAnalysis);
989	setComboEnabled(PREF_PB_REDUNDANT_NULL_ANNOTATION, enableAnnotationNullAnalysis);	995	setComboEnabled(PREF_PB_REDUNDANT_NULL_ANNOTATION, enableAnnotationNullAnalysis);
990	setComboEnabled(PREF_MISSING_NONNULL_BY_DEFAULT_ANNOTATION, enableAnnotationNullAnalysis);	996	setComboEnabled(PREF_MISSING_NONNULL_BY_DEFAULT_ANNOTATION, enableAnnotationNullAnalysis);
		997	getCheckBox(PREF_INHERIT_NULL_ANNOTATIONS).setEnabled(enableAnnotationNullAnalysis);
991	}	998	}
992		999
993	private IStatus validateNullnessAnnotation(String value, String errorMessage) {	1000	private IStatus validateNullnessAnnotation(String value, String errorMessage) {

Return to bug 388281