diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java index d7fbbe0d7315..ef6529029da0 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java @@ -30,10 +30,9 @@ import org.jetbrains.annotations.NotNull; import java.util.*; abstract class StaticMembersProcessor implements Processor { - private final MultiMap myDeprecated = new LinkedMultiMap(); - private final MultiMap mySuggestions = new LinkedMultiMap(); + private final MultiMap mySuggestions = new LinkedMultiMap<>(); - private final Map myPossibleClasses = new HashMap(); + private final Map myPossibleClasses = new HashMap<>(); private final PsiElement myPlace; private PsiType myExpectedType; @@ -47,16 +46,12 @@ abstract class StaticMembersProcessor implements Processor< @NotNull public List getMembersToImport(boolean applicableOnly) { - final List list = new ArrayList(); - final List applicableList = new ArrayList(); + final List list = new ArrayList<>(); + final List applicableList = new ArrayList<>(); for (Map.Entry> methodEntry : mySuggestions.entrySet()) { registerMember(methodEntry.getKey(), methodEntry.getValue(), list, applicableList); } - for (Map.Entry> deprecatedMethod : myDeprecated.entrySet()) { - registerMember(deprecatedMethod.getKey(), deprecatedMethod.getValue(), list, applicableList); - } - List result = !applicableOnly && applicableList.isEmpty() ? list : applicableList; for (int i = result.size() - 1; i >= 0; i--) { ProgressManager.checkCanceled(); @@ -140,17 +135,13 @@ abstract class StaticMembersProcessor implements Processor< if (file instanceof PsiJavaFile //do not show methods from default package && !((PsiJavaFile)file).getPackageName().isEmpty()) { - if (JavaCompletionUtil.isEffectivelyDeprecated((PsiDocCommentOwner)member)) { - myDeprecated.putValue(containingClass, member); - return processCondition(); - } mySuggestions.putValue(containingClass, member); } return processCondition(); } private boolean processCondition() { - return mySuggestions.size() + myDeprecated.size() < 50; + return mySuggestions.size() < 50; } private void registerMember(PsiClass containingClass,