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

Collapse All | Expand All

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/MemberTypeBinding.java (-20 lines)
Lines 36-61 Link Here
36
36
37
	return constantPoolName = CharOperation.concat(enclosingType().constantPoolName(), sourceName, '$');
37
	return constantPoolName = CharOperation.concat(enclosingType().constantPoolName(), sourceName, '$');
38
}
38
}
39
public void initializeDeprecatedAnnotationTagBits() {
40
	if ((this.tagBits & (TagBits.AnnotationResolved|TagBits.AnnotationDeprecated)) == 0) {
41
		ReferenceBinding enclosing = this.enclosingType();
42
		enclosing.initializeDeprecatedAnnotationTagBits();
43
		TypeDeclaration typeDecl = this.scope.referenceContext;
44
		boolean old = typeDecl.staticInitializerScope.insideTypeAnnotation;
45
		try {
46
			typeDecl.staticInitializerScope.insideTypeAnnotation = true;
47
			ASTNode.resolveDeprecatedAnnotations(typeDecl.staticInitializerScope, typeDecl.annotations, this);
48
		} finally {
49
			typeDecl.staticInitializerScope.insideTypeAnnotation = old;
50
		}
51
		if ((this.tagBits & TagBits.AnnotationDeprecated) != 0) {
52
			this.modifiers |= ClassFileConstants.AccDeprecated;
53
		} else if ((enclosing.modifiers & (ClassFileConstants.AccDeprecated |
54
						ExtraCompilerModifiers.AccDeprecatedImplicitly)) != 0) {
55
			this.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
56
		}
57
	}
58
}
59
public String toString() {
39
public String toString() {
60
	return "Member type : " + new String(sourceName()) + " " + super.toString(); //$NON-NLS-2$ //$NON-NLS-1$
40
	return "Member type : " + new String(sourceName()) + " " + super.toString(); //$NON-NLS-2$ //$NON-NLS-1$
61
}
41
}
(-)compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java (+2 lines)
Lines 358-363 Link Here
358
				else
358
				else
359
					modifiers |= ClassFileConstants.AccStatic;
359
					modifiers |= ClassFileConstants.AccStatic;
360
			}
360
			}
361
			if (enclosingType.isViewedAsDeprecated() && !sourceType.isDeprecated())
362
				modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
361
		} else if (sourceType.isLocalType()) {
363
		} else if (sourceType.isLocalType()) {
362
			if (sourceType.isEnum()) {
364
			if (sourceType.isEnum()) {
363
				problemReporter().illegalLocalTypeDeclaration(referenceContext);
365
				problemReporter().illegalLocalTypeDeclaration(referenceContext);

Return to bug 161214