Attachment 40727 Details for Bug 140318 – Better patch

[patch] Better patch

patch_140318.txt (text/plain), 1.67 KB, created by Olivier Thomann

on 2006-05-09 10:24:50 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2006-05-09 10:24:50 EDT

Size: 1.67 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java,v
>retrieving revision 1.53
>diff -u -r1.53 Annotation.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java	2 Feb 2006 21:32:40 -0000	1.53
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java	9 May 2006 14:26:14 -0000
>@@ -224,21 +224,16 @@
> 
> 		if (this.compilerAnnotation != null)
> 			return this.resolvedType;
>-		boolean initializeCompilerAnnotation = true; // scope.compilerOptions().storeAnnotations;
> 		this.constant = Constant.NotAConstant;
> 		
> 		TypeBinding typeBinding = this.type.resolveType(scope);
> 		if (typeBinding == null) {
>-			if (initializeCompilerAnnotation)
>-				this.compilerAnnotation = new AnnotationBinding(this);
> 			return null;
> 		}
> 		this.resolvedType = typeBinding;
> 		// ensure type refers to an annotation type
> 		if (!typeBinding.isAnnotationType()) {
> 			scope.problemReporter().typeMismatchError(typeBinding, scope.getJavaLangAnnotationAnnotation(), this.type);
>-			if (initializeCompilerAnnotation)
>-				this.compilerAnnotation = new AnnotationBinding(this);
> 			return null;
> 		}
> 
>@@ -302,6 +297,7 @@
> 				pairs[i].resolveTypeExpecting(scope, null); // resilient
> 			}
> 		}
>+		boolean initializeCompilerAnnotation = true; // scope.compilerOptions().storeAnnotations;
> 		if (initializeCompilerAnnotation)
> 			this.compilerAnnotation = new AnnotationBinding(this);
> 		// recognize standard annotations ?

Actions: View | Diff

Attachments on bug 140318: 40509 | 40510 | 40727 | 40896