Attachment 52221 Details for Bug 161214 – Fix for item #1 - do not apply as is

[patch] Fix for item #1 - do not apply as is

org.eclipse.jdt.core_01.txt (text/plain), 2.72 KB, created by Maxime Daniel

on 2006-10-18 09:22:54 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Maxime Daniel

Created: 2006-10-18 09:22:54 EDT

Size: 2.72 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/internal/compiler/lookup/MemberTypeBinding.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MemberTypeBinding.java,v
>retrieving revision 1.21
>diff -u -r1.21 MemberTypeBinding.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/MemberTypeBinding.java	16 Oct 2006 08:07:14 -0000	1.21
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/MemberTypeBinding.java	18 Oct 2006 13:04:59 -0000
>@@ -36,26 +36,6 @@
> 
> 	return constantPoolName = CharOperation.concat(enclosingType().constantPoolName(), sourceName, '$');
> }
>-public void initializeDeprecatedAnnotationTagBits() {
>-	if ((this.tagBits & (TagBits.AnnotationResolved|TagBits.AnnotationDeprecated)) == 0) {
>-		ReferenceBinding enclosing = this.enclosingType();
>-		enclosing.initializeDeprecatedAnnotationTagBits();
>-		TypeDeclaration typeDecl = this.scope.referenceContext;
>-		boolean old = typeDecl.staticInitializerScope.insideTypeAnnotation;
>-		try {
>-			typeDecl.staticInitializerScope.insideTypeAnnotation = true;
>-			ASTNode.resolveDeprecatedAnnotations(typeDecl.staticInitializerScope, typeDecl.annotations, this);
>-		} finally {
>-			typeDecl.staticInitializerScope.insideTypeAnnotation = old;
>-		}
>-		if ((this.tagBits & TagBits.AnnotationDeprecated) != 0) {
>-			this.modifiers |= ClassFileConstants.AccDeprecated;
>-		} else if ((enclosing.modifiers & (ClassFileConstants.AccDeprecated |
>-						ExtraCompilerModifiers.AccDeprecatedImplicitly)) != 0) {
>-			this.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
>-		}
>-	}
>-}
> public String toString() {
> 	return "Member type : " + new String(sourceName()) + " " + super.toString(); //$NON-NLS-2$ //$NON-NLS-1$
> }
>Index: compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java,v
>retrieving revision 1.140
>diff -u -r1.140 ClassScope.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java	8 Sep 2006 13:36:02 -0000	1.140
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java	18 Oct 2006 13:04:59 -0000
>@@ -358,6 +358,8 @@
> 				else
> 					modifiers |= ClassFileConstants.AccStatic;
> 			}
>+			if (enclosingType.isViewedAsDeprecated() && !sourceType.isDeprecated())
>+				modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
> 		} else if (sourceType.isLocalType()) {
> 			if (sourceType.isEnum()) {
> 				problemReporter().illegalLocalTypeDeclaration(referenceContext);

Actions: View | Diff

Attachments on bug 161214: 52221 | 52301 | 52391