Attachment 125407 Details for Bug 263558 – Updated patch and testcase

[patch] Updated patch and testcase

patch.txt (text/plain), 4.17 KB, created by Kent Johnson

on 2009-02-11 11:42:12 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kent Johnson

Created: 2009-02-11 11:42:12 EST

Size: 4.17 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java,v
>retrieving revision 1.195
>diff -u -r1.195 AnnotationTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java	26 Jan 2009 16:29:27 -0000	1.195
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java	11 Feb 2009 16:40:38 -0000
>@@ -8698,7 +8698,9 @@
> 		"");
> }
> // https://bugs.eclipse.org/bugs/show_bug.cgi?id=258906 
>-public void _test265() {
>+public void test265() {
>+	if (new CompilerOptions(getCompilerOptions()).complianceLevel < ClassFileConstants.JDK1_6) return;
>+
> 	INameEnvironment nameEnvironment = new FileSystem(Util.getJavaClassLibs(), new String[] {}, null);
> 	IErrorHandlingPolicy errorHandlingPolicy = new IErrorHandlingPolicy() {
> 		public boolean proceedOnErrors() { return true; }
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java,v
>retrieving revision 1.49
>diff -u -r1.49 PackageBinding.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java	12 Jan 2009 18:37:16 -0000	1.49
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java	11 Feb 2009 16:40:39 -0000
>@@ -204,28 +204,19 @@
> 
> 	return null;
> }
>-
>-/**
>- * Compute the tagbits for standard annotations. For source types, these could require
>- * lazily resolving corresponding annotation nodes, in case of forward references.
>- * @see org.eclipse.jdt.internal.compiler.lookup.Binding#getAnnotationTagBits()
>- * NOTE : when the name environment is based on the JavaModel, the synthetic
>- * package-info type is not stored so the package's annotations will not be available.
>- */
>-public long getAnnotationTagBits() {
>-	if ((this.tagBits & TagBits.AnnotationResolved) != 0)
>-		return this.tagBits;
>-
>-	this.tagBits |= (TagBits.AnnotationResolved | TagBits.DeprecatedAnnotationResolved);
>-	if (this.compoundName == CharOperation.NO_CHAR_CHAR)
>-		return this.tagBits;
>-
>-	ReferenceBinding packageInfo = this.getType(TypeConstants.PACKAGE_INFO_NAME);
>-	if (packageInfo != null)
>-		this.tagBits |= (packageInfo.getAnnotationTagBits() & TagBits.AllStandardAnnotationsMask);
>-	return this.tagBits;
>+public final boolean isViewedAsDeprecated() {
>+	if ((this.tagBits & TagBits.DeprecatedAnnotationResolved) == 0) {
>+		this.tagBits |= TagBits.DeprecatedAnnotationResolved;
>+		if (this.compoundName != CharOperation.NO_CHAR_CHAR) {
>+			ReferenceBinding packageInfo = this.getType(TypeConstants.PACKAGE_INFO_NAME);
>+			if (packageInfo != null) {
>+				packageInfo.initializeDeprecatedAnnotationTagBits();
>+				this.tagBits |= packageInfo.tagBits & TagBits.AllStandardAnnotationsMask;
>+			}
>+		}
>+	}
>+	return (this.tagBits & TagBits.AnnotationDeprecated) != 0;
> }
>-
> /* API
> * Answer the receiver's binding type from Binding.BindingID.
> */
>Index: compiler/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java,v
>retrieving revision 1.129
>diff -u -r1.129 ReferenceBinding.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java	12 Jan 2009 18:37:16 -0000	1.129
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java	11 Feb 2009 16:40:39 -0000
>@@ -1175,7 +1175,7 @@
>  */
> public final boolean isViewedAsDeprecated() {
> 	return (this.modifiers & (ClassFileConstants.AccDeprecated | ExtraCompilerModifiers.AccDeprecatedImplicitly)) != 0
>-			|| (getPackage().getAnnotationTagBits() & TagBits.AnnotationDeprecated) != 0;
>+			|| getPackage().isViewedAsDeprecated();
> }
> 
> public ReferenceBinding[] memberTypes() {

Actions: View | Diff

Attachments on bug 263558: 124616 | 125166 | 125407