Attachment 209200 Details for Bug 365437 – proposed fix v2.0 + regression tests

[patch] proposed fix v2.0 + regression tests

master--Fixed-bug-365437-Private-methods-tagged-with.patch (text/plain), 26.92 KB, created by Ayushman Jain

on 2012-01-09 06:50:31 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ayushman Jain

Created: 2012-01-09 06:50:31 EST

Size: 26.92 KB

patch

obsolete

>diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java
>index bbe0ba5..1a39df5 100644
>--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java
>+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -47,7 +47,7 @@
> 	// Static initializer to specify tests subset using TESTS_* static variables
> 	// All specified tests which do not belong to the class are skipped...
> 	static {
>-//		TESTS_NAMES = new String[] { "test293" };
>+//		TESTS_NAMES = new String[] { "testBug365437b" };
> //		TESTS_NUMBERS = new int[] { 297 };
> //		TESTS_RANGE = new int[] { 294, -1 };
> 	}
>@@ -10148,4 +10148,149 @@
> 		"Bla cannot be resolved to a type\n" +
> 		"----------\n");
> }
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=365437
>+public void testBug365437a() {
>+	Map customOptions = getCompilerOptions();
>+	customOptions.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.ERROR);
>+	String testFiles [] = new String[] {
>+			"p/A.java",
>+			"package p;\n" +
>+			"import p1.*;\n" +
>+			"public class A {\n" +
>+			"	@p1.PreDestroy\n" +
>+			"	private void foo1(){}\n" +
>+			"	@PreDestroy\n" +
>+			"	private void foo2(){}\n" +
>+			"	@SuppressWarnings(\"null\")\n" +
>+			"	@PostConstruct\n" +
>+			"	private void foo1a(){}\n" +
>+			"	@PostConstruct\n" +
>+			"	private void foo2a(){}\n" +
>+			"	@Deprecated" +
>+			"	private void foo3(){}" +
>+			"}\n",
>+			"p1/PreDestroy.java",
>+			"package p1;\n" +
>+			"public @interface PreDestroy{}",
>+			"p1/PostConstruct.java",
>+			"package p1;\n" +
>+			"public @interface PostConstruct{}"
>+			};
>+	String expectedErrorString = 
>+			"----------\n" + 
>+			"1. WARNING in p\\A.java (at line 8)\n" + 
>+			"	@SuppressWarnings(\"null\")\n" + 
>+			"	                  ^^^^^^\n" + 
>+			"Unnecessary @SuppressWarnings(\"null\")\n" + 
>+			"----------\n" + 
>+			"2. ERROR in p\\A.java (at line 13)\n" + 
>+			"	@Deprecated	private void foo3(){}}\n" + 
>+			"	           	             ^^^^^^\n" + 
>+			"The method foo3() from the type A is never used locally\n" + 
>+			"----------\n";
>+	runNegativeTest(
>+			true,
>+			testFiles,
>+			null, 
>+			customOptions,
>+			expectedErrorString,
>+			JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=365437
>+public void testBug365437b() {
>+	Map customOptions = getCompilerOptions();
>+	customOptions.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.ERROR);
>+	customOptions.put(CompilerOptions.OPTION_AnnotationBasedNullAnalysis, CompilerOptions.ENABLED);
>+	customOptions.put(CompilerOptions.OPTION_NonNullAnnotationName, "p.NonNull");
>+	String testFiles [] = new String[] {
>+			"A.java",
>+			"import javax.annotation.*;\n" +
>+			"public class A {\n" +
>+			"	@javax.annotation.PreDestroy\n" +
>+			"	private void foo1(){}\n" +
>+			"	@PreDestroy\n" +
>+			"	private void foo2(){}\n" +
>+			"	@javax.annotation.Resource\n" +
>+			"	private void foo1a(){}\n" +
>+			"	@Resource\n" +
>+			"	@p.NonNull\n" +
>+			"	private Object foo2a(){ return new Object();}\n" +
>+			"	@javax.annotation.PostConstruct\n" +
>+			"	@Deprecated\n" +
>+			"	private void foo3(){}\n" +
>+			"	@p.NonNull\n" +
>+			"	private Object foo3a(){ return new Object();}\n" +
>+			"}\n",
>+			"p/NonNull.java",
>+			"package p;\n" +
>+			"import static java.lang.annotation.ElementType.*;\n" +
>+			"import java.lang.annotation.*;\n" +
>+			"@Target({TYPE, METHOD,PARAMETER,LOCAL_VARIABLE})\n" +
>+			"public @interface NonNull {\n" +
>+			"}"
>+			};
>+	String expectedErrorString = 
>+			"----------\n" + 
>+			"1. ERROR in A.java (at line 16)\n" + 
>+			"	private Object foo3a(){ return new Object();}\n" + 
>+			"	               ^^^^^^^\n" + 
>+			"The method foo3a() from the type A is never used locally\n" + 
>+			"----------\n";
>+	runNegativeTest(
>+			true,
>+			testFiles,
>+			null, 
>+			customOptions,
>+			expectedErrorString,
>+			JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=365437
>+public void testBug365437c() {
>+	if (this.complianceLevel < ClassFileConstants.JDK1_7) return;
>+	Map customOptions = getCompilerOptions();
>+	customOptions.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.ERROR);
>+	String testFiles [] = new String[] {
>+			"p/A.java",
>+			"package p;\n" +
>+			"import p1.*;\n" +
>+			"public class A {\n" +
>+			"	@p1.PreDestroy\n" +
>+			"	private void foo1(){}\n" +
>+			"	@PreDestroy\n" +
>+			"	private void foo2(){}\n" +
>+			"	@SuppressWarnings(\"null\")\n" +
>+			"	@PostConstruct\n" +
>+			"	private void foo1a(){}\n" +
>+			"	@PostConstruct\n" +
>+			"	private void foo2a(){}\n" +
>+			"	@SafeVarargs" +
>+			"	private final void foo3(Object... o){}" +
>+			"}\n",
>+			"p1/PreDestroy.java",
>+			"package p1;\n" +
>+			"public @interface PreDestroy{}",
>+			"p1/PostConstruct.java",
>+			"package p1;\n" +
>+			"public @interface PostConstruct{}"
>+			};
>+	String expectedErrorString = 
>+			"----------\n" + 
>+			"1. WARNING in p\\A.java (at line 8)\n" + 
>+			"	@SuppressWarnings(\"null\")\n" + 
>+			"	                  ^^^^^^\n" + 
>+			"Unnecessary @SuppressWarnings(\"null\")\n" + 
>+			"----------\n" + 
>+			"2. ERROR in p\\A.java (at line 13)\n" + 
>+			"	@SafeVarargs	private final void foo3(Object... o){}}\n" + 
>+			"	            	                   ^^^^^^^^^^^^^^^^^\n" + 
>+			"The method foo3(Object...) from the type A is never used locally\n" + 
>+			"----------\n";
>+	runNegativeTest(
>+			true,
>+			testFiles,
>+			null, 
>+			customOptions,
>+			expectedErrorString,
>+			JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
>+}
> }
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
>index bc76ad7..68ed9eb 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -167,12 +167,6 @@
> 				break;
> 			case TypeIds.T_JavaLangInvokeMethodHandlePolymorphicSignature :
> 				tagBits |= TagBits.AnnotationPolymorphicSignature;
>-				break;
>-			case TypeIds.T_JavaxAnnotationPostConstruct :
>-				tagBits |= TagBits.AnnotationPostConstruct;
>-				break;
>-			case TypeIds.T_JavaxAnnotationPreDestroy :
>-				tagBits |= TagBits.AnnotationPreDestroy;
> 				break;
> 			case TypeIds.T_ConfiguredAnnotationNullable :
> 				tagBits |= TagBits.AnnotationNullable;
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/AnnotationInfo.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/AnnotationInfo.java
>index 3357d7d..d81ec1c 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/AnnotationInfo.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/AnnotationInfo.java
>@@ -303,10 +303,6 @@
> 					currentOffset += 2;
> 					return readTargetValue(currentOffset);
> 				}
>-				if (CharOperation.equals(typeName, ConstantPool.JAVAX_ANNOTATION_PREDESTROY)) {
>-					this.standardAnnotationTagBits |= TagBits.AnnotationPreDestroy;
>-					return currentOffset;
>-				}
> 				break;
> 			case 32:
> 				if (CharOperation.equals(typeName, ConstantPool.JAVA_LANG_ANNOTATION_RETENTION)) {
>@@ -315,10 +311,6 @@
> 				}
> 				if (CharOperation.equals(typeName, ConstantPool.JAVA_LANG_ANNOTATION_INHERITED)) {
> 					this.standardAnnotationTagBits |= TagBits.AnnotationInherited;
>-					return currentOffset;
>-				}
>-				if (CharOperation.equals(typeName, ConstantPool.JAVAX_ANNOTATION_POSTCONSTRUCT)) {
>-					this.standardAnnotationTagBits |= TagBits.AnnotationPostConstruct;
> 					return currentOffset;
> 				}
> 				break;
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ConstantPool.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ConstantPool.java
>index c875c9b..c449385 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ConstantPool.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ConstantPool.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -248,8 +248,6 @@
> 	public static final char[] JAVA_LANG_SAFEVARARGS = "Ljava/lang/SafeVarargs;".toCharArray(); //$NON-NLS-1$
> 	// java 7 java.lang.invoke.MethodHandle.invokeExact(..)/invokeGeneric(..)
> 	public static final char[] JAVA_LANG_INVOKE_METHODHANDLE_POLYMORPHICSIGNATURE = "Ljava/lang/invoke/MethodHandle$PolymorphicSignature;".toCharArray(); //$NON-NLS-1$
>-	public static final char[] JAVAX_ANNOTATION_POSTCONSTRUCT = "Ljavax/annotation/PostConstruct;".toCharArray(); //$NON-NLS-1$
>-	public static final char[] JAVAX_ANNOTATION_PREDESTROY = "Ljavax/annotation/PreDestroy;".toCharArray(); //$NON-NLS-1$
> 
> 	public static final char[] HashCode = "hashCode".toCharArray(); //$NON-NLS-1$
> 	public static final char[] HashCodeSignature = "()I".toCharArray(); //$NON-NLS-1$; 
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/AnnotationBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/AnnotationBinding.java
>index c88c4a1..038c5ad 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/AnnotationBinding.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/AnnotationBinding.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -54,11 +54,10 @@
> 		count++;
> 	if ((annotationTagBits & TagBits.AnnotationSafeVarargs) != 0)
> 		count++;
>-	if ((annotationTagBits & TagBits.AnnotationPostConstruct) != 0)
>-		count++;
>-	if ((annotationTagBits & TagBits.AnnotationPreDestroy) != 0)
>-		count++;
>-	// count must be different from 0
>+	if (count == 0) {
>+		// this is possible if bits were set for null annotations
>+		return recordedAnnotations;
>+	}
> 
> 	int index = recordedAnnotations.length;
> 	AnnotationBinding[] result = new AnnotationBinding[index + count];
>@@ -81,10 +80,6 @@
> 		result[index++] = buildMarkerAnnotationForMemberType(TypeConstants.JAVA_LANG_INVOKE_METHODHANDLE_$_POLYMORPHICSIGNATURE, env);
> 	if ((annotationTagBits & TagBits.AnnotationSafeVarargs) != 0)
> 		result[index++] = buildMarkerAnnotation(TypeConstants.JAVA_LANG_SAFEVARARGS, env);
>-	if ((annotationTagBits & TagBits.AnnotationPostConstruct) != 0)
>-		result[index++] = buildMarkerAnnotation(TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT, env);
>-	if ((annotationTagBits & TagBits.AnnotationPreDestroy) != 0)
>-		result[index++] = buildMarkerAnnotation(TypeConstants.JAVAX_ANNOTATION_PREDESTROY, env);
> 	return result;
> }
> 
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java
>index 75de854..8e57afb 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -380,8 +380,7 @@
> 	switch (this.compoundName.length) {
> 
> 		case 3 :
>-			if (!CharOperation.equals(TypeConstants.JAVA, this.compoundName[0])
>-					&& !CharOperation.equals(TypeConstants.JAVAX, this.compoundName[0]))
>+			if (!CharOperation.equals(TypeConstants.JAVA, this.compoundName[0]))
> 				return;
> 			
> 			char[] packageName = this.compoundName[1];
>@@ -389,19 +388,6 @@
> 			char[] typeName = this.compoundName[2];
> 			if (typeName.length == 0) return; // just to be safe
> 			// remaining types MUST be in java.*.*
>-			if (CharOperation.equals(TypeConstants.JAVAX, this.compoundName[0])) {
>-				if (CharOperation.equals(TypeConstants.ANNOTATION, this.compoundName[1])) {
>-					switch (typeName[0]) {
>-						case 'P' :
>-							if (CharOperation.equals(typeName, TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT[2]))
>-								this.id = TypeIds.T_JavaxAnnotationPostConstruct;
>-							if (CharOperation.equals(typeName, TypeConstants.JAVAX_ANNOTATION_PREDESTROY[2]))
>-								this.id = TypeIds.T_JavaxAnnotationPreDestroy;
>-							return;
>-					}
>-				}
>-				return;
>-			}
> 			if (!CharOperation.equals(TypeConstants.LANG, this.compoundName[1])) {
> 				switch (packageName[0]) {
> 					case 'i' :
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TagBits.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TagBits.java
>index 9ba6da0..21b1c11 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TagBits.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TagBits.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -129,10 +129,6 @@
> 	long AnnotationSafeVarargs = ASTNode.Bit52L;
> 	/** @since 3.7 - java 7 MethodHandle.invokeExact(..)/invokeGeneric(..)*/
> 	long AnnotationPolymorphicSignature = ASTNode.Bit53L;
>-	/** @since 3.8 */
>-	long AnnotationPreDestroy = ASTNode.Bit54L;
>-	/** @since 3.8 */
>-	long AnnotationPostConstruct = ASTNode.Bit55L;
> 	/** @since 3.8 null annotation for MethodBinding or LocalVariableBinding (argument): */
> 	long AnnotationNullable = ASTNode.Bit56L;
> 	/** @since 3.8 null annotation for MethodBinding or LocalVariableBinding (argument): */
>@@ -152,8 +148,6 @@
> 				| AnnotationSuppressWarnings
> 				| AnnotationSafeVarargs
> 				| AnnotationPolymorphicSignature
>-				| AnnotationPostConstruct
>-				| AnnotationPreDestroy
> 				| AnnotationNullable
> 				| AnnotationNonNull
> 				| AnnotationNonNullByDefault
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeConstants.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeConstants.java
>index 0bbef47..7098d37 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeConstants.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeConstants.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -177,18 +177,6 @@
> 	char[] SYNTHETIC_ACCESS_METHOD_PREFIX =  "access$".toCharArray(); //$NON-NLS-1$
> 	char[] SYNTHETIC_ENUM_CONSTANT_INITIALIZATION_METHOD_PREFIX =  " enum constant initialization$".toCharArray(); //$NON-NLS-1$
> 	char[] SYNTHETIC_STATIC_FACTORY =  "<factory>".toCharArray(); //$NON-NLS-1$
>-	char[][] JAVAX_ANNOTATION_POSTCONSTRUCT =
>-			new char[][] {
>-				JAVAX,
>-				ANNOTATION,
>-				"PostConstruct".toCharArray() //$NON-NLS-1$
>-			};
>-	char[][] JAVAX_ANNOTATION_PREDESTROY =
>-			new char[][] {
>-				JAVAX,
>-				ANNOTATION,
>-				"PreDestroy".toCharArray() //$NON-NLS-1$
>-			};
> 
> 	// synthetic package-info name
> 	public static final char[] PACKAGE_INFO_NAME = "package-info".toCharArray(); //$NON-NLS-1$
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeIds.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeIds.java
>index 7fff434..5156a44 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeIds.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeIds.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -100,11 +100,6 @@
> 
> 	// java 7 java.lang.AutoCloseable
> 	final int T_JavaLangAutoCloseable = 62;
>-
>-	// new in 3.8
>-	final int T_JavaxAnnotationPostConstruct = 63;
>-
>-	final int T_JavaxAnnotationPreDestroy = 64;
> 	
> 	// new in 3.8 for null annotations:
> 	final int T_ConfiguredAnnotationNullable = 65;
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
>index 9b83933..3f365d4 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -7691,9 +7691,26 @@
> 			&& CharOperation.equals(method.selector, TypeConstants.WRITEREPLACE)) {
> 		return;
> 	}
>-	if ((method.tagBits & (TagBits.AnnotationPostConstruct | TagBits.AnnotationPreDestroy)) != 0) {
>-		// PostConstruct and PreDestroy method are ignored
>-		return;
>+	Annotation[] annotations = methodDecl.annotations;
>+	int annotationsLen = 0;
>+	if (annotations != null) {
>+		annotationsLen = annotations.length;
>+	}
>+	for (int i = 0; i < annotationsLen; i++) {
>+		if (annotations[i].resolvedType != null) {
>+			switch (annotations[i].resolvedType.id) {
>+				case TypeIds.T_JavaLangSuppressWarnings:
>+				case TypeIds.T_JavaLangDeprecated:
>+				case TypeIds.T_JavaLangSafeVarargs:
>+				case TypeIds.T_ConfiguredAnnotationNonNull:
>+				case TypeIds.T_ConfiguredAnnotationNullable:
>+				case TypeIds.T_ConfiguredAnnotationNonNullByDefault:
>+					break;
>+				default:
>+					// non-standard annotation found, don't warn
>+					return;
>+			}
>+		}
> 	}
> 	this.handle(
> 			IProblem.UnusedPrivateMethod,
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMember.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMember.java
>index 94e6db1..3f6d742 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMember.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMember.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -86,12 +86,6 @@
> 	}
> 	if ((tagBits & TagBits.AnnotationSafeVarargs) != 0) {
> 		annotations.add(getAnnotation(TypeConstants.JAVA_LANG_SAFEVARARGS));
>-	}
>-	if ((tagBits & TagBits.AnnotationPostConstruct) != 0) {
>-		annotations.add(getAnnotation(TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT));
>-	}
>-	if ((tagBits & TagBits.AnnotationPreDestroy) != 0) {
>-		annotations.add(getAnnotation(TypeConstants.JAVAX_ANNOTATION_PREDESTROY));
> 	}
> 	// note that JAVA_LANG_SUPPRESSWARNINGS and JAVA_LANG_OVERRIDE cannot appear in binaries
> 	return (IAnnotation[]) annotations.toArray(new IAnnotation[annotations.size()]);
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileInfo.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileInfo.java
>index bcf7ceb..e1714a0 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileInfo.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileInfo.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -107,12 +107,6 @@
> 	}
> 	if ((tagBits & TagBits.AnnotationSafeVarargs) != 0) {
> 		generateStandardAnnotation(javaElement, TypeConstants.JAVA_LANG_SAFEVARARGS, Annotation.NO_MEMBER_VALUE_PAIRS, newElements);
>-	}
>-	if ((tagBits & TagBits.AnnotationPostConstruct) != 0) {
>-		generateStandardAnnotation(javaElement, TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT, Annotation.NO_MEMBER_VALUE_PAIRS, newElements);
>-	}
>-	if ((tagBits & TagBits.AnnotationPreDestroy) != 0) {
>-		generateStandardAnnotation(javaElement, TypeConstants.JAVAX_ANNOTATION_PREDESTROY, Annotation.NO_MEMBER_VALUE_PAIRS, newElements);
> 	}
> 	// note that JAVA_LANG_SUPPRESSWARNINGS and JAVA_LANG_OVERRIDE cannot appear in binaries
> }
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java
>index c242fb5..f752c34 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -46,6 +46,9 @@
> 		super(document);
> 	}
> 	private void addBinaryStandardAnnotations(long annotationTagBits) {
>+		if ((annotationTagBits & TagBits.AllStandardAnnotationsMask) == 0) {
>+			return;
>+		}
> 		if ((annotationTagBits & TagBits.AnnotationTargetMASK) != 0) {
> 			char[][] compoundName = TypeConstants.JAVA_LANG_ANNOTATION_TARGET;
> 			addAnnotationTypeReference(compoundName[compoundName.length-1]);
>@@ -83,14 +86,6 @@
> 		if ((annotationTagBits & TagBits.AnnotationPolymorphicSignature) != 0) {
> 			char[][] compoundName =
> 					TypeConstants.JAVA_LANG_INVOKE_METHODHANDLE_$_POLYMORPHICSIGNATURE;
>-			addAnnotationTypeReference(compoundName[compoundName.length-1]);
>-		}
>-		if ((annotationTagBits & TagBits.AnnotationPostConstruct) != 0) {
>-			char[][] compoundName = TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT;
>-			addAnnotationTypeReference(compoundName[compoundName.length-1]);
>-		}
>-		if ((annotationTagBits & TagBits.AnnotationPreDestroy) != 0) {
>-			char[][] compoundName = TypeConstants.JAVAX_ANNOTATION_PREDESTROY;
> 			addAnnotationTypeReference(compoundName[compoundName.length-1]);
> 		}
> 	}
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ClassFileMatchLocator.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ClassFileMatchLocator.java
>index 37608aa..1c86721 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ClassFileMatchLocator.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ClassFileMatchLocator.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -90,6 +90,9 @@
> 	return true;
> }
> private boolean checkStandardAnnotations(long annotationTagBits, TypeReferencePattern pattern) {
>+	if ((annotationTagBits & TagBits.AllStandardAnnotationsMask) == 0) {
>+		return false;
>+	}
> 	if ((annotationTagBits & TagBits.AnnotationTargetMASK) != 0) {
> 		char[][] compoundName = TypeConstants.JAVA_LANG_ANNOTATION_TARGET;
> 		if (checkAnnotationTypeReference(CharOperation.concatWith(compoundName, '.'), pattern) ||
>@@ -142,18 +145,6 @@
> 	}
> 	if ((annotationTagBits & TagBits.AnnotationPolymorphicSignature) != 0) {
> 		char[][] compoundName = TypeConstants.JAVA_LANG_INVOKE_METHODHANDLE_$_POLYMORPHICSIGNATURE;
>-		if (checkAnnotationTypeReference(CharOperation.concatWith(compoundName, '.'), pattern)) {
>-			return true;
>-		}
>-	}
>-	if ((annotationTagBits & TagBits.AnnotationPostConstruct) != 0) {
>-		char[][] compoundName = TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT;
>-		if (checkAnnotationTypeReference(CharOperation.concatWith(compoundName, '.'), pattern)) {
>-			return true;
>-		}
>-	}
>-	if ((annotationTagBits & TagBits.AnnotationPreDestroy) != 0) {
>-		char[][] compoundName = TypeConstants.JAVAX_ANNOTATION_PREDESTROY;
> 		if (checkAnnotationTypeReference(CharOperation.concatWith(compoundName, '.'), pattern)) {
> 			return true;
> 		}

Actions: View | Diff

Attachments on bug 365437: 207974 | 209012 | 209200 | 209250