View | Details | Raw Unified | Return to bug 186342 | Differences between
and this patch

Collapse All | Expand All

(-)a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java (-3 lines)
Lines 267-281 Link Here
267
	if (this.environment.nullableAnnotationPackage == this
267
	if (this.environment.nullableAnnotationPackage == this
268
			&& CharOperation.equals(type.compoundName, this.environment.getNullableAnnotationName())) {
268
			&& CharOperation.equals(type.compoundName, this.environment.getNullableAnnotationName())) {
269
		type.id = TypeIds.T_ConfiguredAnnotationNullable;
269
		type.id = TypeIds.T_ConfiguredAnnotationNullable;
270
		this.environment.nullableAnnotationPackage = null; // don't check again
271
	} else if (this.environment.nonnullAnnotationPackage == this
270
	} else if (this.environment.nonnullAnnotationPackage == this
272
			&& CharOperation.equals(type.compoundName, this.environment.getNonNullAnnotationName())) {
271
			&& CharOperation.equals(type.compoundName, this.environment.getNonNullAnnotationName())) {
273
		type.id = TypeIds.T_ConfiguredAnnotationNonNull;
272
		type.id = TypeIds.T_ConfiguredAnnotationNonNull;
274
		this.environment.nonnullAnnotationPackage = null; // don't check again
275
	} else if (this.environment.nonnullByDefaultAnnotationPackage == this
273
	} else if (this.environment.nonnullByDefaultAnnotationPackage == this
276
			&& CharOperation.equals(type.compoundName, this.environment.getNonNullByDefaultAnnotationName())) {
274
			&& CharOperation.equals(type.compoundName, this.environment.getNonNullByDefaultAnnotationName())) {
277
		type.id = TypeIds.T_ConfiguredAnnotationNonNullByDefault;
275
		type.id = TypeIds.T_ConfiguredAnnotationNonNullByDefault;
278
		this.environment.nonnullByDefaultAnnotationPackage = null; // don't check again
279
	}
276
	}
280
}
277
}
281
278

Return to bug 186342