Attachment 225665 Details for Bug 397888 – Patch for JDT Core

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch for JDT Core

Fix-for-Bug-397888---Unused-type-parameter-problem-s.patch (text/plain), 5.18 KB, created by Manoj N Palat

on 2013-01-15 19:42:26 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Manoj N Palat

Created: 2013-01-15 19:42:26 EST

Size: 5.18 KB

patch

obsolete

>diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest.java
>index 18f29ba..da26c10 100644
>--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest.java
>+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2012 IBM Corporation and others.
>+ * Copyright (c) 2000, 2013 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
>@@ -2750,4 +2750,70 @@
> 		});
> }
> 
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=397888
>+public void test397888a() {
>+    Map customOptions = getCompilerOptions();
>+	customOptions.put(JavaCore.COMPILER_DOC_COMMENT_SUPPORT, JavaCore.ENABLED);
>+    customOptions.put(CompilerOptions.OPTION_ReportUnusedTypeParameter, CompilerOptions.ERROR);
>+    customOptions.put(CompilerOptions.OPTION_ReportUnusedParameter, CompilerOptions.ERROR);
>+    customOptions.put(CompilerOptions.OPTION_ReportUnusedParameterIncludeDocCommentReference,
>+             CompilerOptions.ENABLED);
>+
>+    this.runConformTest(new String[] {
>+    		"X.java",
>+            "/***\n" +
>+            " * @param T\n" +
>+            " */\n" +
>+            "public class X <T> {\n"+
>+            "/***\n" +
>+            " * @param S\n" +
>+            " */\n" +
>+            "	public <S> void ph() {\n"+
>+            "	}\n"+
>+            "}\n"
>+            },
>+            null /* no expected output string */,
>+            null /* no extra class libraries */,
>+            true /* flush output directory */,
>+            null /* no vm arguments */,
>+            customOptions,
>+            null /* no custom requestor*/,
>+            false /* do not skip javac for this peculiar test */);
>+}
>+
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=397888
>+public void test397888b() {
>+	Map customOptions = getCompilerOptions();
>+	customOptions.put(JavaCore.COMPILER_DOC_COMMENT_SUPPORT, JavaCore.ENABLED);
>+	customOptions.put(CompilerOptions.OPTION_ReportUnusedTypeParameter, CompilerOptions.ERROR);
>+	customOptions.put(CompilerOptions.OPTION_ReportUnusedParameterIncludeDocCommentReference,
>+           CompilerOptions.DISABLED);
>+
>+	this.runNegativeTest(
>+           new String[] {
>+        		   "X.java",
>+                   "/***\n" +
>+                   " * @param T\n" +
>+                   " */\n" +
>+                   "public class X <T> {\n"+
>+                   "/***\n" +
>+                   " * @param S\n" +
>+                   " */\n" +
>+                   "public <S> void ph() {\n"+
>+                   "}\n"+
>+                   "}\n"
>+           },
>+   		"----------\n" + 
>+   		"1. ERROR in X.java (at line 4)\n" + 
>+   		"	public class X <T> {\n" + 
>+   		"	                ^\n" + 
>+   		"Unused type parameter T\n" + 
>+   		"----------\n" + 
>+   		"2. ERROR in X.java (at line 8)\n" + 
>+   		"	public <S> void ph() {\n" + 
>+   		"	        ^\n" + 
>+   		"Unused type parameter S\n" + 
>+   		"----------\n",
>+   		null, true, customOptions);
>+}
> }
>\ No newline at end of file
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java
>index ba88a60..f324b38 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2013 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
>@@ -582,6 +582,20 @@
> 			return;
> 		}
> 
>+		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=397888
>+		boolean considerParamRefAsUsage = scope.compilerOptions().reportUnusedParameterIncludeDocCommentReference;
>+		if (considerParamRefAsUsage) {			
>+			int paramTagsSize = this.paramReferences == null ? 0 : this.paramReferences.length;
>+			for (int i = 0; i < paramTagsSize; i++) {
>+				JavadocSingleNameReference param = this.paramReferences[i];
>+				Binding binding = param.binding != null ? param.binding : scope.getType(param.token);
>+				if (binding != null && binding.isValidBinding() && binding instanceof TypeVariableBinding) {
>+					TypeVariableBinding typeVariableBinding = (TypeVariableBinding) binding;
>+					typeVariableBinding.modifiers |= ExtraCompilerModifiers.AccLocallyUsed;					
>+				}
>+			}
>+		}
>+
> 		// If no param tags then report a problem for each declaration type parameter
> 		if (parameters != null) {
> 			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=324850, avoid secondary errors when <= 1.4

Actions: View | Diff

Attachments on bug 397888: 225460 | 225599 | 225665 | 225788