Skip to content

Commit 7b2a763

Browse files
iloveeclipseiloveeclipse
committed
Remove dead code for problems never reported for Java < 1.8
See eclipse-jdt/eclipse.jdt.core#3883 and especially eclipse-jdt/eclipse.jdt.core@af83290
1 parent f2884fa commit 7b2a763

File tree

4 files changed

+2
-75
lines changed

4 files changed

+2
-75
lines changed

‎org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/LocalCorrectionsSubProcessor.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,13 +1274,6 @@ public static void getTryWithResourceProposals(IInvocationContext context, IProb
12741274
}
12751275
}
12761276

1277-
public static void getConvertLambdaToAnonymousClassCreationsProposals(IInvocationContext context, IProblemLocation problem, Collection<ICommandAccess> proposals) {
1278-
ASTNode coveringNode= problem.getCoveringNode(context.getASTRoot());
1279-
if (coveringNode != null) {
1280-
QuickAssistProcessor.getConvertLambdaToAnonymousClassCreationsProposals(context, coveringNode, proposals);
1281-
}
1282-
}
1283-
12841277
public static void addOverrideDefaultMethodProposal(IInvocationContext context, IProblemLocation problem, Collection<ICommandAccess> proposals) {
12851278
new LocalCorrectionsSubProcessor().getOverrideDefaultMethodProposal(context, problem, proposals);
12861279
}

‎org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/ModifierCorrectionSubProcessor.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -428,9 +428,6 @@ public static void addRemoveInvalidModifiersProposal(IInvocationContext context,
428428
excludedModifiers= Modifier.VOLATILE;
429429
label= CorrectionMessages.ModifierCorrectionSubProcessor_removevolatile_description;
430430
break;
431-
case IProblem.IllegalModifierForInterfaceMethod:
432-
excludedModifiers= ~(Modifier.PUBLIC | Modifier.ABSTRACT);
433-
break;
434431
case IProblem.IllegalModifierForInterfaceMethod18:
435432
excludedModifiers= ~(Modifier.PUBLIC | Modifier.ABSTRACT | Modifier.STRICTFP | Modifier.DEFAULT | Modifier.STATIC);
436433
if (Modifier.isAbstract(binding.getModifiers())) {

‎org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickFixProcessor.java‎

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public boolean hasCorrections(ICompilationUnit cu, int problemId) {
116116
case IProblem.EnumConstantMustImplementAbstractMethod:
117117
case IProblem.ShouldImplementHashcode:
118118
case IProblem.BodyForNativeMethod:
119-
case IProblem.OuterLocalMustBeFinal:
119+
case IProblem.OuterLocalMustBeEffectivelyFinal:
120120
case IProblem.UninitializedLocalVariable:
121121
case IProblem.UninitializedLocalVariableHintMissingDefault:
122122
case IProblem.UndefinedConstructorInDefaultConstructor:
@@ -193,7 +193,6 @@ public boolean hasCorrections(ICompilationUnit cu, int problemId) {
193193
case IProblem.DuplicateTypeVariable:
194194
case IProblem.DuplicateNestedType:
195195
case IProblem.IllegalQualifiedEnumConstantLabel:
196-
case IProblem.IllegalModifierForInterfaceMethod:
197196
case IProblem.IllegalModifierForInterfaceMethod18:
198197
case IProblem.IllegalModifierForInterface:
199198
case IProblem.IllegalModifierForClass:
@@ -226,14 +225,6 @@ public boolean hasCorrections(ICompilationUnit cu, int problemId) {
226225
case IProblem.RedefinedArgument:
227226
case IProblem.CodeCannotBeReached:
228227
case IProblem.DeadCode:
229-
case IProblem.InvalidUsageOfTypeParameters:
230-
case IProblem.InvalidUsageOfStaticImports:
231-
case IProblem.InvalidUsageOfForeachStatements:
232-
case IProblem.InvalidUsageOfTypeArguments:
233-
case IProblem.InvalidUsageOfEnumDeclarations:
234-
case IProblem.InvalidUsageOfVarargs:
235-
case IProblem.InvalidUsageOfAnnotations:
236-
case IProblem.InvalidUsageOfAnnotationDeclarations:
237228
case IProblem.FieldMissingDeprecatedAnnotation:
238229
case IProblem.OverridingDeprecatedMethod:
239230
case IProblem.OverridingDeprecatedSinceVersionMethod:
@@ -276,13 +267,6 @@ public boolean hasCorrections(ICompilationUnit cu, int problemId) {
276267
case IProblem.UnusedObjectAllocation:
277268
case IProblem.MethodCanBeStatic:
278269
case IProblem.MethodCanBePotentiallyStatic:
279-
case IProblem.AutoManagedResourceNotBelow17:
280-
case IProblem.MultiCatchNotBelow17:
281-
case IProblem.PolymorphicMethodNotBelow17:
282-
case IProblem.BinaryLiteralNotBelow17:
283-
case IProblem.UnderscoresInLiteralsNotBelow17:
284-
case IProblem.SwitchOnStringsNotBelow17:
285-
case IProblem.DiamondNotBelow17:
286270
case IProblem.PotentialHeapPollutionFromVararg :
287271
case IProblem.UnsafeGenericArrayForVarargs:
288272
case IProblem.SafeVarargsOnFixedArityMethod :
@@ -304,13 +288,6 @@ public boolean hasCorrections(ICompilationUnit cu, int problemId) {
304288
case IProblem.NullableFieldReference:
305289
case IProblem.ConflictingNullAnnotations:
306290
case IProblem.ConflictingInheritedNullAnnotations:
307-
case IProblem.ExplicitThisParameterNotBelow18:
308-
case IProblem.DefaultMethodNotBelow18:
309-
case IProblem.StaticInterfaceMethodNotBelow18:
310-
case IProblem.LambdaExpressionNotBelow18:
311-
case IProblem.MethodReferenceNotBelow18:
312-
case IProblem.ConstructorReferenceNotBelow18:
313-
case IProblem.IntersectionCastNotBelow18:
314291
case IProblem.InvalidUsageOfTypeAnnotations:
315292
case IProblem.MultiConstantCaseLabelsNotSupported:
316293
case IProblem.DuplicateInheritedDefaultMethods:
@@ -550,7 +527,6 @@ private void process(IInvocationContext context, IProblemLocation problem, Colle
550527
ModifierCorrectionSubProcessor.addChangeOverriddenModifierProposal(context, problem, proposals, ModifierCorrectionSubProcessor.TO_NON_STATIC);
551528
break;
552529
case IProblem.CannotHideAnInstanceMethodWithAStaticMethod:
553-
case IProblem.IllegalModifierForInterfaceMethod:
554530
case IProblem.IllegalModifierForInterface:
555531
case IProblem.IllegalModifierForClass:
556532
case IProblem.IllegalModifierForInterfaceField:
@@ -608,7 +584,7 @@ private void process(IInvocationContext context, IProblemLocation problem, Colle
608584
case IProblem.MethodRequiresBody:
609585
ModifierCorrectionSubProcessor.addMethodRequiresBodyProposals(context, problem, proposals);
610586
break;
611-
case IProblem.OuterLocalMustBeFinal:
587+
case IProblem.OuterLocalMustBeEffectivelyFinal:
612588
ModifierCorrectionSubProcessor.addNonFinalLocalProposal(context, problem, proposals);
613589
break;
614590
case IProblem.UninitializedLocalVariable:
@@ -717,36 +693,6 @@ private void process(IInvocationContext context, IProblemLocation problem, Colle
717693
case IProblem.DeadCode:
718694
LocalCorrectionsSubProcessor.getUnreachableCodeProposals(context, problem, proposals);
719695
break;
720-
case IProblem.InvalidUsageOfTypeParameters:
721-
case IProblem.InvalidUsageOfStaticImports:
722-
case IProblem.InvalidUsageOfForeachStatements:
723-
case IProblem.InvalidUsageOfTypeArguments:
724-
case IProblem.InvalidUsageOfEnumDeclarations:
725-
case IProblem.InvalidUsageOfVarargs:
726-
case IProblem.InvalidUsageOfAnnotations:
727-
case IProblem.InvalidUsageOfAnnotationDeclarations:
728-
ReorgCorrectionsSubProcessor.getNeedHigherComplianceProposals(context, problem, proposals, JavaCore.VERSION_1_5);
729-
break;
730-
case IProblem.DiamondNotBelow17:
731-
TypeArgumentMismatchSubProcessor.getInferDiamondArgumentsProposal(context, problem, proposals);
732-
//$FALL-THROUGH$
733-
case IProblem.AutoManagedResourceNotBelow17:
734-
case IProblem.MultiCatchNotBelow17:
735-
case IProblem.PolymorphicMethodNotBelow17:
736-
case IProblem.BinaryLiteralNotBelow17:
737-
case IProblem.UnderscoresInLiteralsNotBelow17:
738-
case IProblem.SwitchOnStringsNotBelow17:
739-
ReorgCorrectionsSubProcessor.getNeedHigherComplianceProposals(context, problem, proposals, JavaCore.VERSION_1_7);
740-
break;
741-
case IProblem.LambdaExpressionNotBelow18:
742-
LocalCorrectionsSubProcessor.getConvertLambdaToAnonymousClassCreationsProposals(context, problem, proposals);
743-
//$FALL-THROUGH$
744-
case IProblem.ExplicitThisParameterNotBelow18:
745-
case IProblem.DefaultMethodNotBelow18:
746-
case IProblem.StaticInterfaceMethodNotBelow18:
747-
case IProblem.MethodReferenceNotBelow18:
748-
case IProblem.ConstructorReferenceNotBelow18:
749-
case IProblem.IntersectionCastNotBelow18:
750696
case IProblem.InvalidUsageOfTypeAnnotations:
751697
ReorgCorrectionsSubProcessor.getNeedHigherComplianceProposals(context, problem, proposals, JavaCore.VERSION_1_8);
752698
break;

‎org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/TypeArgumentMismatchSubProcessor.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,6 @@ public static void removeMismatchedArguments(IInvocationContext context, IProble
7171
}
7272
}
7373

74-
public static void getInferDiamondArgumentsProposal(IInvocationContext context, IProblemLocation problem, Collection<ICommandAccess> proposals) {
75-
ASTNode selectedNode= problem.getCoveredNode(context.getASTRoot());
76-
if (!(selectedNode instanceof SimpleName)) {
77-
return;
78-
}
79-
80-
QuickAssistProcessor.getInferDiamondArgumentsProposal(context, selectedNode, null, proposals);
81-
}
82-
8374
private TypeArgumentMismatchSubProcessor() {
8475
}
8576

0 commit comments

Comments
 (0)