Attachment 199547 Details for Bug 340747 – proposed fix v1.2 + regression tests

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

[patch] proposed fix v1.2 + regression tests

patch340747.txt (text/plain), 9.37 KB, created by Ayushman Jain

on 2011-07-13 04:22:03 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ayushman Jain

Created: 2011-07-13 04:22:03 EDT

Size: 9.37 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/core/compiler/IProblem.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/IProblem.java,v
>retrieving revision 1.225.2.23
>diff -u -r1.225.2.23 IProblem.java
>--- compiler/org/eclipse/jdt/core/compiler/IProblem.java	6 Jul 2011 18:46:34 -0000	1.225.2.23
>+++ compiler/org/eclipse/jdt/core/compiler/IProblem.java	13 Jul 2011 08:19:51 -0000
>@@ -1394,6 +1394,8 @@
> 	int UnhandledExceptionOnAutoClose =  TypeRelated + 882;
> 	/** @since 3.7 */
> 	int DiamondNotBelow17 =  TypeRelated + 883;
>+	/** @since 3.7 */
>+	int RedundantSpecificationOfTypeArguments = TypeRelated + 884;
> 	/**
> 	 * External problems -- These are problems defined by other plugins
> 	 */
>Index: compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java,v
>retrieving revision 1.241.2.3
>diff -u -r1.241.2.3 CompilerOptions.java
>--- compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java	14 Feb 2011 14:08:01 -0000	1.241.2.3
>+++ compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java	13 Jul 2011 08:19:54 -0000
>@@ -5,6 +5,10 @@
>  * which accompanies this distribution, and is available at
>  * http://www.eclipse.org/legal/epl-v10.html
>  *
>+ * This is an implementation of an early-draft specification developed under the Java
>+ * Community Process (JCP) and is made available for testing and evaluation purposes
>+ * only. The code is not compatible with any specification of the JCP.
>+ *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  *     Benjamin Muskalla - Contribution for bug 239066
>@@ -136,6 +140,7 @@
> 	public static final String OPTION_IncludeNullInfoFromAsserts = "org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts";  //$NON-NLS-1$
> 	public static final String OPTION_ReportMethodCanBeStatic = "org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic";  //$NON-NLS-1$
> 	public static final String OPTION_ReportMethodCanBePotentiallyStatic = "org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic";  //$NON-NLS-1$
>+	public static final String OPTION_ReportRedundantSpecificationOfTypeArguments =  "org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments"; //$NON-NLS-1$
> 	/**
> 	 * Possible values for configurable options
> 	 */
>@@ -238,6 +243,7 @@
> 	public static final int UnusedObjectAllocation = IrritantSet.GROUP2 | ASTNode.Bit4;
> 	public static final int MethodCanBeStatic = IrritantSet.GROUP2 | ASTNode.Bit5;
> 	public static final int MethodCanBePotentiallyStatic = IrritantSet.GROUP2 | ASTNode.Bit6;
>+	public static final int RedundantSpecificationOfTypeArguments = IrritantSet.GROUP2 | ASTNode.Bit7;
> 
> 	// Severity level for handlers
> 	/** 
>@@ -547,6 +553,8 @@
> 				return OPTION_ReportMethodCanBeStatic;
> 			case MethodCanBePotentiallyStatic :
> 				return OPTION_ReportMethodCanBePotentiallyStatic;
>+			case RedundantSpecificationOfTypeArguments :
>+				return OPTION_ReportRedundantSpecificationOfTypeArguments;
> 		}
> 		return null;
> 	}
>@@ -682,6 +690,7 @@
> 			OPTION_ReportRawTypeReference,
> 			OPTION_ReportRedundantNullCheck,
> 			OPTION_ReportRedundantSuperinterface,
>+			OPTION_ReportRedundantSpecificationOfTypeArguments,
> 			OPTION_ReportSpecialParameterHidingField,
> 			OPTION_ReportSyntheticAccessEmulation,
> 			OPTION_ReportTasks,
>@@ -763,6 +772,7 @@
> 			case UnusedDeclaredThrownException :
> 			case DeadCode :
> 			case UnusedObjectAllocation :
>+			case RedundantSpecificationOfTypeArguments :
> 				return "unused"; //$NON-NLS-1$
> 			case DiscouragedReference :
> 			case ForbiddenReference :
>@@ -973,6 +983,7 @@
> 		optionsMap.put(OPTION_IncludeNullInfoFromAsserts, this.includeNullInfoFromAsserts ? ENABLED : DISABLED);
> 		optionsMap.put(OPTION_ReportMethodCanBeStatic, getSeverityString(MethodCanBeStatic));
> 		optionsMap.put(OPTION_ReportMethodCanBePotentiallyStatic, getSeverityString(MethodCanBePotentiallyStatic));
>+		optionsMap.put(OPTION_ReportRedundantSpecificationOfTypeArguments, getSeverityString(RedundantSpecificationOfTypeArguments));
> 		return optionsMap;
> 	}
> 
>@@ -1402,6 +1413,7 @@
> 		if ((optionValue = optionsMap.get(OPTION_ReportUnusedObjectAllocation)) != null) updateSeverity(UnusedObjectAllocation, optionValue);
> 		if ((optionValue = optionsMap.get(OPTION_ReportMethodCanBeStatic)) != null) updateSeverity(MethodCanBeStatic, optionValue);
> 		if ((optionValue = optionsMap.get(OPTION_ReportMethodCanBePotentiallyStatic)) != null) updateSeverity(MethodCanBePotentiallyStatic, optionValue);
>+		if ((optionValue = optionsMap.get(OPTION_ReportRedundantSpecificationOfTypeArguments)) != null) updateSeverity(RedundantSpecificationOfTypeArguments, optionValue);
> 
> 		// Javadoc options
> 		if ((optionValue = optionsMap.get(OPTION_DocCommentSupport)) != null) {
>@@ -1616,6 +1628,7 @@
> 		buf.append("\n\t- unused object allocation: ").append(getSeverityString(UnusedObjectAllocation)); //$NON-NLS-1$
> 		buf.append("\n\t- method can be static: ").append(getSeverityString(MethodCanBeStatic)); //$NON-NLS-1$
> 		buf.append("\n\t- method can be potentially static: ").append(getSeverityString(MethodCanBePotentiallyStatic)); //$NON-NLS-1$
>+		buf.append("\n\t- redundant specification of type arguments: ").append(getSeverityString(RedundantSpecificationOfTypeArguments)); //$NON-NLS-1$
> 		return buf.toString();
> 	}
> 	
>Index: compiler/org/eclipse/jdt/internal/compiler/impl/IrritantSet.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IrritantSet.java,v
>retrieving revision 1.13.2.1
>diff -u -r1.13.2.1 IrritantSet.java
>--- compiler/org/eclipse/jdt/internal/compiler/impl/IrritantSet.java	11 Feb 2011 15:17:16 -0000	1.13.2.1
>+++ compiler/org/eclipse/jdt/internal/compiler/impl/IrritantSet.java	13 Jul 2011 08:19:54 -0000
>@@ -5,6 +5,10 @@
>  * which accompanies this distribution, and is available at
>  * http://www.eclipse.org/legal/epl-v10.html
>  *
>+ * This is an implementation of an early-draft specification developed under the Java
>+ * Community Process (JCP) and is made available for testing and evaluation purposes
>+ * only. The code is not compatible with any specification of the JCP.
>+ *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  *******************************************************************************/
>@@ -120,7 +124,8 @@
> 			.set(CompilerOptions.UnusedTypeArguments)
> 			.set(CompilerOptions.RedundantSuperinterface)
> 			.set(CompilerOptions.DeadCode)
>-			.set(CompilerOptions.UnusedObjectAllocation);
>+			.set(CompilerOptions.UnusedObjectAllocation)
>+			.set(CompilerOptions.RedundantSpecificationOfTypeArguments);
> 		STATIC_METHOD
> 		    .set(CompilerOptions.MethodCanBePotentiallyStatic);
> 		String suppressRawWhenUnchecked = System.getProperty("suppressRawWhenUnchecked"); //$NON-NLS-1$
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java,v
>retrieving revision 1.224.2.2
>diff -u -r1.224.2.2 BatchCompilerTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java	28 Jun 2011 19:34:33 -0000	1.224.2.2
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java	13 Jul 2011 08:20:14 -0000
>@@ -5,6 +5,10 @@
>  * which accompanies this distribution, and is available at
>  * http://www.eclipse.org/legal/epl-v10.html
>  *
>+ * This is an implementation of an early-draft specification developed under the Java
>+ * Community Process (JCP) and is made available for testing and evaluation purposes
>+ * only. The code is not compatible with any specification of the JCP.
>+ *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  *     Benjamin Muskalla - Contribution for bug 239066
>@@ -1857,8 +1861,9 @@
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.parameterAssignment\" value=\"ignore\"/>\n" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment\" value=\"ignore\"/>\n" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.potentialNullReference\" value=\"ignore\"/>\n" + 
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.rawTypeReference\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.rawTypeReference\" value=\"warning\"/>\n" +
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.redundantNullCheck\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments\" value=\"ignore\"/>\n" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.redundantSuperinterface\" value=\"ignore\"/>\n" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic\" value=\"ignore\"/>\n" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic\" value=\"ignore\"/>\n" +

Actions: View | Diff

Attachments on bug 340747: 199376 | 199377 | 199483 | 199547