### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v retrieving revision 1.355 diff -u -r1.355 Main.java --- batch/org/eclipse/jdt/internal/compiler/batch/Main.java 29 Sep 2010 16:43:28 -0000 1.355 +++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 18 Oct 2010 11:23:44 -0000 @@ -3461,6 +3461,9 @@ } else if (token.equals("super")) { //$NON-NLS-1$ setSeverity(CompilerOptions.OPTION_ReportOverridingMethodWithoutSuperInvocation, severity, isEnabling); return; + } else if (token.equals("static-method")) { //$NON-NLS-1$ + setSeverity(CompilerOptions.OPTION_ReportMethodCanBeStatic, severity, isEnabling); + return; } break; case 't' : Index: batch/org/eclipse/jdt/internal/compiler/batch/messages.properties =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties,v retrieving revision 1.933 diff -u -r1.933 messages.properties --- batch/org/eclipse/jdt/internal/compiler/batch/messages.properties 6 Oct 2010 13:57:36 -0000 1.933 +++ batch/org/eclipse/jdt/internal/compiler/batch/messages.properties 18 Oct 2010 11:23:49 -0000 @@ -309,6 +309,7 @@ \ semicolon unnecessary semicolon, empty statement\n\ \ serial + missing serialVersionUID\n\ \ specialParamHiding constructor or setter parameter hiding a field\n\ +\ static-method method can be declared as static\n\ \ static-access macro for indirectStatic and staticReceiver\n\ \ staticReceiver + non-static reference to static member\n\ \ super overriding a method without making a super invocation\n\ 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.222 diff -u -r1.222 IProblem.java --- compiler/org/eclipse/jdt/core/compiler/IProblem.java 7 Sep 2010 13:39:18 -0000 1.222 +++ compiler/org/eclipse/jdt/core/compiler/IProblem.java 18 Oct 2010 11:23:49 -0000 @@ -401,6 +401,8 @@ int IndirectAccessToStaticMethod = Internal + MethodRelated + 119; /** @since 3.4 */ int MissingTypeInMethod = MethodRelated + 120; + /** @since 3.7 */ + int MethodCanBeStatic = Internal + MethodRelated + 121; // constructors /** @since 3.4 */ Index: compiler/org/eclipse/jdt/internal/compiler/ast/ASTNode.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ASTNode.java,v retrieving revision 1.103 diff -u -r1.103 ASTNode.java --- compiler/org/eclipse/jdt/internal/compiler/ast/ASTNode.java 10 May 2010 20:47:58 -0000 1.103 +++ compiler/org/eclipse/jdt/internal/compiler/ast/ASTNode.java 18 Oct 2010 11:23:49 -0000 @@ -146,6 +146,7 @@ // for type, method and field declarations public static final int HasLocalType = Bit2; // cannot conflict with AddAssertionMASK public static final int HasBeenResolved = Bit5; // field decl only (to handle forward references) + public static final int CanBeStatic = Bit9; // for expression public static final int ParenthesizedSHIFT = 21; // Bit22 -> Bit29 Index: compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java,v retrieving revision 1.129 diff -u -r1.129 FieldReference.java --- compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java 21 Feb 2010 03:31:46 -0000 1.129 +++ compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java 18 Oct 2010 11:23:49 -0000 @@ -107,6 +107,17 @@ currentScope.problemReporter().cannotAssignToFinalField(this.binding, this); } } + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=318682 + if (!this.binding.isStatic()) { + if (this.receiver.isThis()) { + currentScope.resetEnclosingMethodStaticFlag(); + } + } else if (this.receiver.isThis()) { + if ((this.receiver.bits & ASTNode.IsImplicitThis) == 0) { + // explicit this, not allowed in static context + currentScope.resetEnclosingMethodStaticFlag(); + } + } return flowInfo; } @@ -119,6 +130,16 @@ this.receiver.analyseCode(currentScope, flowContext, flowInfo, nonStatic); if (nonStatic) { this.receiver.checkNPE(currentScope, flowContext, flowInfo); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=318682 + if (this.receiver.isThis()) { + currentScope.resetEnclosingMethodStaticFlag(); + } + } else if (this.receiver.isThis()) { + if ((this.receiver.bits & ASTNode.IsImplicitThis) == 0) { + // explicit this receiver, not allowed in static context + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=318682 + currentScope.resetEnclosingMethodStaticFlag(); + } } if (valueRequired || currentScope.compilerOptions().complianceLevel >= ClassFileConstants.JDK1_4) { Index: compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java,v retrieving revision 1.148 diff -u -r1.148 MessageSend.java --- compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java 12 Aug 2010 16:58:28 -0000 1.148 +++ compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java 18 Oct 2010 11:23:53 -0000 @@ -61,6 +61,16 @@ flowInfo = this.receiver.analyseCode(currentScope, flowContext, flowInfo, nonStatic).unconditionalInits(); if (nonStatic) { this.receiver.checkNPE(currentScope, flowContext, flowInfo); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=318682 + if (this.receiver.isThis()) { + // accessing non-static method without an object + currentScope.resetEnclosingMethodStaticFlag(); + } + } else if (this.receiver.isThis()) { + if ((this.receiver.bits & ASTNode.IsImplicitThis) == 0) { + // explicit this receiver, not allowed in static context + currentScope.resetEnclosingMethodStaticFlag(); + } } if (this.arguments != null) { Index: compiler/org/eclipse/jdt/internal/compiler/ast/MethodDeclaration.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MethodDeclaration.java,v retrieving revision 1.76 diff -u -r1.76 MethodDeclaration.java --- compiler/org/eclipse/jdt/internal/compiler/ast/MethodDeclaration.java 3 Nov 2009 15:37:46 -0000 1.76 +++ compiler/org/eclipse/jdt/internal/compiler/ast/MethodDeclaration.java 18 Oct 2010 11:23:53 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2010 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 @@ -105,6 +105,11 @@ methodContext.complainIfUnusedExceptionHandlers(this); // check unused parameters this.scope.checkUnusedParameters(this.binding); + // check if the method could have been static + if (!this.binding.isStatic() && (this.bits & ASTNode.CanBeStatic) != 0) { + if(!this.binding.isOverriding() && !this.binding.isImplementing()) + this.scope.problemReporter().methodCanBeDeclaredStatic(this); + } } catch (AbortMethod e) { this.ignoreFurtherInvestigation = true; } @@ -207,6 +212,8 @@ // the method HAS a body --> abstract native modifiers are forbiden if (((this.modifiers & ClassFileConstants.AccNative) != 0) || ((this.modifiers & ClassFileConstants.AccAbstract) != 0)) this.scope.problemReporter().methodNeedingNoBody(this); + else + this.bits |= ASTNode.CanBeStatic; } } super.resolveStatements(); Index: compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java,v retrieving revision 1.147 diff -u -r1.147 QualifiedNameReference.java --- compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java 21 Sep 2010 14:02:57 -0000 1.147 +++ compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java 18 Oct 2010 11:23:53 -0000 @@ -80,6 +80,9 @@ currentScope.problemReporter().uninitializedBlankFinalField(lastFieldBinding, this); } } + if (!lastFieldBinding.isStatic()) { + currentScope.resetEnclosingMethodStaticFlag(); + } break; case Binding.LOCAL : // first binding is a local variable @@ -175,8 +178,8 @@ if (needValue || complyTo14) { manageSyntheticAccessIfNecessary(currentScope, (FieldBinding) this.binding, 0, flowInfo); } + FieldBinding fieldBinding = (FieldBinding) this.binding; if (this.indexOfFirstFieldBinding == 1) { // was an implicit reference to the first field binding - FieldBinding fieldBinding = (FieldBinding) this.binding; // check if reading a final blank field if (fieldBinding.isBlankFinal() && currentScope.needBlankFinalFieldInitializationCheck(fieldBinding)) { @@ -186,6 +189,9 @@ } } } + if (!fieldBinding.isStatic()) { + currentScope.resetEnclosingMethodStaticFlag(); + } break; case Binding.LOCAL : // reading a local variable LocalVariableBinding localBinding; Index: compiler/org/eclipse/jdt/internal/compiler/ast/SingleNameReference.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SingleNameReference.java,v retrieving revision 1.124 diff -u -r1.124 SingleNameReference.java --- compiler/org/eclipse/jdt/internal/compiler/ast/SingleNameReference.java 23 Sep 2010 12:03:42 -0000 1.124 +++ compiler/org/eclipse/jdt/internal/compiler/ast/SingleNameReference.java 18 Oct 2010 11:23:53 -0000 @@ -61,14 +61,18 @@ if (isCompound) { // check the variable part is initialized if blank final switch (this.bits & ASTNode.RestrictiveFlagMASK) { case Binding.FIELD : // reading a field - FieldBinding fieldBinding; - if ((fieldBinding = (FieldBinding) this.binding).isBlankFinal() + FieldBinding fieldBinding = (FieldBinding) this.binding; + if (fieldBinding.isBlankFinal() && currentScope.needBlankFinalFieldInitializationCheck(fieldBinding)) { FlowInfo fieldInits = flowContext.getInitsForFinalBlankInitializationCheck(fieldBinding.declaringClass.original(), flowInfo); if (!fieldInits.isDefinitelyAssigned(fieldBinding)) { currentScope.problemReporter().uninitializedBlankFinalField(fieldBinding, this); } } + if (!fieldBinding.isStatic()) { + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=318682 + currentScope.resetEnclosingMethodStaticFlag(); + } manageSyntheticAccessIfNecessary(currentScope, flowInfo, true /*read-access*/); break; case Binding.LOCAL : // reading a local variable @@ -107,6 +111,10 @@ currentScope.problemReporter().cannotAssignToFinalField(fieldBinding, this); } } + if (!fieldBinding.isStatic()) { + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=318682 + currentScope.resetEnclosingMethodStaticFlag(); + } break; case Binding.LOCAL : // assigning to a local variable LocalVariableBinding localBinding = (LocalVariableBinding) this.binding; @@ -156,6 +164,10 @@ currentScope.problemReporter().uninitializedBlankFinalField(fieldBinding, this); } } + if (!fieldBinding.isStatic()) { + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=318682 + currentScope.resetEnclosingMethodStaticFlag(); + } break; case Binding.LOCAL : // reading a local variable LocalVariableBinding localBinding; 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.234 diff -u -r1.234 CompilerOptions.java --- compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java 6 Oct 2010 13:57:36 -0000 1.234 +++ compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java 18 Oct 2010 11:23:57 -0000 @@ -133,6 +133,7 @@ public static final String OPTION_ReportTasks = "org.eclipse.jdt.core.compiler.problem.tasks"; //$NON-NLS-1$ public static final String OPTION_ReportUnusedObjectAllocation = "org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation"; //$NON-NLS-1$ 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$ // Backward compatibility public static final String OPTION_ReportInvalidAnnotation = "org.eclipse.jdt.core.compiler.problem.invalidAnnotation"; //$NON-NLS-1$ public static final String OPTION_ReportMissingAnnotation = "org.eclipse.jdt.core.compiler.problem.missingAnnotation"; //$NON-NLS-1$ @@ -238,6 +239,7 @@ public static final int DeadCode = IrritantSet.GROUP2 | ASTNode.Bit2; public static final int Tasks = IrritantSet.GROUP2 | ASTNode.Bit3; public static final int UnusedObjectAllocation = IrritantSet.GROUP2 | ASTNode.Bit4; + public static final int MethodCanBeStatic = IrritantSet.GROUP2 | ASTNode.Bit5; // Severity level for handlers /** @@ -375,6 +377,7 @@ "rawtypes", //$NON-NLS-1$ "serial", //$NON-NLS-1$ "static-access", //$NON-NLS-1$ + "static-method", //$NON-NLS-1$ "super", //$NON-NLS-1$ "synthetic-access", //$NON-NLS-1$ "unchecked", //$NON-NLS-1$ @@ -539,6 +542,8 @@ return OPTION_ReportDeadCode; case UnusedObjectAllocation: return OPTION_ReportUnusedObjectAllocation; + case MethodCanBeStatic : + return OPTION_ReportMethodCanBeStatic; } return null; } @@ -638,6 +643,7 @@ OPTION_ReportInvalidJavadoc, OPTION_ReportLocalVariableHiding, OPTION_ReportMethodWithConstructorName, + OPTION_ReportMethodCanBeStatic, OPTION_ReportMissingDeprecatedAnnotation, OPTION_ReportMissingJavadocComments, OPTION_ReportMissingJavadocTagDescription, @@ -739,6 +745,8 @@ return "fallthrough"; //$NON-NLS-1$ case OverridingMethodWithoutSuperInvocation : return "super"; //$NON-NLS-1$ + case MethodCanBeStatic : + return "static-method"; //$NON-NLS-1$ } return null; } @@ -796,6 +804,8 @@ return IrritantSet.SERIAL; if ("static-access".equals(warningToken)) //$NON-NLS-1$ return IrritantSet.STATIC_ACCESS; + if ("static-method".equals(warningToken)) //$NON-NLS-1$ + return IrritantSet.STATIC_METHOD; if ("synthetic-access".equals(warningToken)) //$NON-NLS-1$ return IrritantSet.SYNTHETIC_ACCESS; if ("super".equals(warningToken)) { //$NON-NLS-1$ @@ -921,6 +931,7 @@ optionsMap.put(OPTION_ReportTasks, getSeverityString(Tasks)); optionsMap.put(OPTION_ReportUnusedObjectAllocation, getSeverityString(UnusedObjectAllocation)); optionsMap.put(OPTION_IncludeNullInfoFromAsserts, this.includeNullInfoFromAsserts ? ENABLED : DISABLED); + optionsMap.put(OPTION_ReportMethodCanBeStatic, getSeverityString(MethodCanBeStatic)); return optionsMap; } @@ -1339,6 +1350,7 @@ if ((optionValue = optionsMap.get(OPTION_ReportDeadCode)) != null) updateSeverity(DeadCode, optionValue); if ((optionValue = optionsMap.get(OPTION_ReportTasks)) != null) updateSeverity(Tasks, optionValue); if ((optionValue = optionsMap.get(OPTION_ReportUnusedObjectAllocation)) != null) updateSeverity(UnusedObjectAllocation, optionValue); + if ((optionValue = optionsMap.get(OPTION_ReportMethodCanBeStatic)) != null) updateSeverity(MethodCanBeStatic, optionValue); // Javadoc options if ((optionValue = optionsMap.get(OPTION_DocCommentSupport)) != null) { @@ -1551,6 +1563,7 @@ buf.append("\n\t- dead code in trivial if statement: ").append(this.reportDeadCodeInTrivialIfStatement ? ENABLED : DISABLED); //$NON-NLS-1$ buf.append("\n\t- tasks severity: ").append(getSeverityString(Tasks)); //$NON-NLS-1$ 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$ 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.10 diff -u -r1.10 IrritantSet.java --- compiler/org/eclipse/jdt/internal/compiler/impl/IrritantSet.java 18 May 2010 18:12:12 -0000 1.10 +++ compiler/org/eclipse/jdt/internal/compiler/impl/IrritantSet.java 18 Oct 2010 11:23:57 -0000 @@ -51,6 +51,7 @@ public static final IrritantSet RESTRICTION = new IrritantSet(CompilerOptions.ForbiddenReference); public static final IrritantSet SERIAL = new IrritantSet(CompilerOptions.MissingSerialVersion); public static final IrritantSet STATIC_ACCESS = new IrritantSet(CompilerOptions.IndirectStaticAccess); + public static final IrritantSet STATIC_METHOD = new IrritantSet(CompilerOptions.MethodCanBeStatic); public static final IrritantSet SYNTHETIC_ACCESS = new IrritantSet(CompilerOptions.AccessEmulation); public static final IrritantSet SUPER = new IrritantSet(CompilerOptions.OverridingMethodWithoutSuperInvocation); public static final IrritantSet UNUSED = new IrritantSet(CompilerOptions.UnusedLocalVariable); @@ -118,7 +119,10 @@ .set(CompilerOptions.UnusedTypeArguments) .set(CompilerOptions.RedundantSuperinterface) .set(CompilerOptions.DeadCode) - .set(CompilerOptions.UnusedObjectAllocation); + .set(CompilerOptions.UnusedObjectAllocation) + .set(CompilerOptions.MethodCanBeStatic); + STATIC_METHOD + .set(CompilerOptions.MethodCanBeStatic); String suppressRawWhenUnchecked = System.getProperty("suppressRawWhenUnchecked"); //$NON-NLS-1$ if (suppressRawWhenUnchecked != null && "true".equalsIgnoreCase(suppressRawWhenUnchecked)) { //$NON-NLS-1$ UNCHECKED.set(CompilerOptions.RawTypeReference); Index: compiler/org/eclipse/jdt/internal/compiler/lookup/BlockScope.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BlockScope.java,v retrieving revision 1.119 diff -u -r1.119 BlockScope.java --- compiler/org/eclipse/jdt/internal/compiler/lookup/BlockScope.java 13 Sep 2010 13:26:20 -0000 1.119 +++ compiler/org/eclipse/jdt/internal/compiler/lookup/BlockScope.java 18 Oct 2010 11:23:57 -0000 @@ -940,4 +940,12 @@ s += ((BlockScope) this.subscopes[i]).toString(tab + 1) + "\n"; //$NON-NLS-1$ return s; } +// https://bugs.eclipse.org/bugs/show_bug.cgi?id=318682 +public void resetEnclosingMethodStaticFlag() { + MethodScope methodScope = methodScope(); + if (methodScope != null && methodScope.referenceContext instanceof MethodDeclaration) { + MethodDeclaration methodDeclaration= (MethodDeclaration) methodScope.referenceContext; + methodDeclaration.bits &= ~ASTNode.CanBeStatic; + } +} } Index: compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java,v retrieving revision 1.422 diff -u -r1.422 ProblemReporter.java --- compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java 21 Sep 2010 14:02:58 -0000 1.422 +++ compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java 18 Oct 2010 11:24:00 -0000 @@ -418,6 +418,9 @@ case IProblem.UnusedObjectAllocation: return CompilerOptions.UnusedObjectAllocation; + + case IProblem.MethodCanBeStatic: + return CompilerOptions.MethodCanBeStatic; } return 0; } @@ -448,6 +451,7 @@ case CompilerOptions.MissingOverrideAnnotation : case CompilerOptions.MissingDeprecatedAnnotation : case CompilerOptions.ParameterAssignment : + case CompilerOptions.MethodCanBeStatic: return CategorizedProblem.CAT_CODE_STYLE; case CompilerOptions.MaskedCatchBlock : @@ -5019,6 +5023,27 @@ methodDecl.sourceEnd); } +public void methodCanBeDeclaredStatic(MethodDeclaration methodDecl) { + int severity = computeSeverity(IProblem.MethodCanBeStatic); + if (severity == ProblemSeverities.Ignore) return; + MethodBinding method = methodDecl.binding; + this.handle( + IProblem.MethodCanBeStatic, + new String[] { + new String(method.declaringClass.readableName()), + new String(method.selector), + typesAsString(method.isVarargs(), method.parameters, false) + }, + new String[] { + new String(method.declaringClass.shortReadableName()), + new String(method.selector), + typesAsString(method.isVarargs(), method.parameters, true) + }, + severity, + methodDecl.sourceStart, + methodDecl.sourceEnd); +} + public void missingDeprecatedAnnotationForField(FieldDeclaration field) { int severity = computeSeverity(IProblem.FieldMissingDeprecatedAnnotation); if (severity == ProblemSeverities.Ignore) return; Index: compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties,v retrieving revision 1.258 diff -u -r1.258 messages.properties --- compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties 7 Sep 2010 13:39:18 -0000 1.258 +++ compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties 18 Oct 2010 11:24:00 -0000 @@ -102,6 +102,7 @@ 118 = The method {1}({2}) from the type {0} is never used locally 119 = The static method {1}({2}) from the type {0} should be accessed directly 120 = The method {1}({2}) from the type {0} refers to the missing type {3} +121 = The method {1}({2}) from the type {0} can be declared as static 129 = The constructor {0}({1}) refers to the missing type {2} 130 = The constructor {0}({1}) is undefined Index: formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatter.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatter.java,v retrieving revision 1.80 diff -u -r1.80 DefaultCodeFormatter.java --- formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatter.java 22 Feb 2010 11:01:46 -0000 1.80 +++ formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatter.java 18 Oct 2010 11:24:03 -0000 @@ -338,6 +338,7 @@ optionsMap.put(CompilerOptions.OPTION_ReportSpecialParameterHidingField, CompilerOptions.DISABLED); optionsMap.put(CompilerOptions.OPTION_MaxProblemPerUnit, String.valueOf(100)); optionsMap.put(CompilerOptions.OPTION_InlineJsr, CompilerOptions.DISABLED); + optionsMap.put(CompilerOptions.OPTION_ReportMethodCanBeStatic, CompilerOptions.IGNORE); this.defaultCompilerOptions = optionsMap; } Object sourceOption = this.options.get(CompilerOptions.OPTION_Source); Index: model/org/eclipse/jdt/core/JavaCore.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java,v retrieving revision 1.655 diff -u -r1.655 JavaCore.java --- model/org/eclipse/jdt/core/JavaCore.java 6 Oct 2010 13:57:36 -0000 1.655 +++ model/org/eclipse/jdt/core/JavaCore.java 18 Oct 2010 11:24:05 -0000 @@ -1314,6 +1314,19 @@ */ public static final String COMPILER_PB_PARAMETER_ASSIGNMENT = PLUGIN_ID + ".compiler.problem.parameterAssignment"; //$NON-NLS-1$ /** + * Compiler option ID: Reporting potentially static method not declared static. + *

When enabled, the compiler will issue an error or a warning if a method has + * not be declared as static, even though it qualifies as one. + *

+ *
Option id:
"org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic"
+ *
Possible values:
{ "error", "warning", "ignore" }
+ *
Default:
"ignore"
+ *
+ * @since 3.7 + * @category CompilerOptionID + */ + public static final String COMPILER_PB_METHOD_CAN_BE_STATIC = PLUGIN_ID + ".compiler.problem.reportMethodCanBeStatic"; //$NON-NLS-1$ + /** * Compiler option ID: Setting Source Compatibility Mode. *

Specify whether which source level compatibility is used. From 1.4 on, 'assert' is a keyword * reserved for assertion support. Also note, than when toggling to 1.4 mode, the target VM #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.215 diff -u -r1.215 BatchCompilerTest.java --- src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java 6 Oct 2010 13:57:31 -0000 1.215 +++ src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java 18 Oct 2010 11:24:31 -0000 @@ -47,7 +47,7 @@ private static final Main MAIN = new Main(null/*outWriter*/, null/*errWriter*/, false/*systemExit*/, null/*options*/, null/*progress*/); static { -// TESTS_NAMES = new String[] { "test292_warn_options" }; +// TESTS_NAMES = new String[] { "test294_warn_options" }; // TESTS_NUMBERS = new int[] { 306 }; // TESTS_RANGE = new int[] { 298, -1 }; } @@ -830,8 +830,8 @@ abstract String expected(); // for use in JUnit comparison framework } static class StringMatcher extends Matcher { - private String expected; - private Normalizer normalizer; + private final String expected; + private final Normalizer normalizer; StringMatcher(String expected, Normalizer normalizer) { this.expected = expected; this.normalizer = normalizer; @@ -850,7 +850,7 @@ } } static class SubstringMatcher extends Matcher { - private String substring; + private final String substring; SubstringMatcher(String substring) { this.substring = substring; } @@ -878,7 +878,7 @@ * here, that is {@link #normalized(String) normalized}. */ private static abstract class Normalizer { - private Normalizer nextInChain; + private final Normalizer nextInChain; Normalizer(Normalizer nextInChain) { this.nextInChain = nextInChain; } @@ -897,9 +897,9 @@ * placeholder. */ private static class StringNormalizer extends Normalizer { - private String match; - private int matchLength; - private String placeholder; + private final String match; + private final int matchLength; + private final String placeholder; StringNormalizer(Normalizer nextInChain, String match, String placeholder) { super(nextInChain); this.match = match; @@ -973,7 +973,8 @@ * This normalizer removes a selected range of lines from a log file. */ private static class LinesRangeNormalizer extends Normalizer { - private int first, number; + private final int first; + private int number; LinesRangeNormalizer() { super(null); @@ -1704,6 +1705,7 @@ " semicolon unnecessary semicolon, empty statement\n" + " serial + missing serialVersionUID\n" + " specialParamHiding constructor or setter parameter hiding a field\n" + + " static-method method can be declared as static\n" + " static-access macro for indirectStatic and staticReceiver\n" + " staticReceiver + non-static reference to static member\n" + " super overriding a method without making a super invocation\n" + @@ -1730,7 +1732,7 @@ " unusedTypeArgs + unused type arguments for method\n" + " uselessTypeCheck unnecessary cast/instanceof operation\n" + " varargsCast + varargs argument need explicit cast\n" + - " warningToken + unsupported or unnecessary @SuppressWarnings\n" + + " warningToken + unsupported or unnecessary @SuppressWarnings\n" + "\n"; String expandedExpectedOutput = MessageFormat.format(expectedOutput, new String[] { @@ -1856,6 +1858,7 @@ "