From 020d2e48adb243215e7d6d549f5f92e6633db2bb Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 11 Nov 2016 12:44:09 +0100 Subject: [PATCH] simplify PermanentDeleteFix (IDEA-CR-15631) --- .../deadCode/UnusedDeclarationPresentation.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationPresentation.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationPresentation.java index a654116fb20d..8347415b61d4 100644 --- a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationPresentation.java +++ b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationPresentation.java @@ -53,7 +53,6 @@ import com.intellij.util.text.CharArrayUtil; import com.intellij.util.text.DateFormatUtil; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; -import gnu.trove.TObjectHashingStrategy; import org.jdom.Element; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -77,8 +76,8 @@ import java.util.function.Predicate; public class UnusedDeclarationPresentation extends DefaultInspectionToolPresentation { - private final Set myIgnoreElements = ContainerUtil.newConcurrentSet(TObjectHashingStrategy.IDENTITY); - private final Map myFixedElements = ContainerUtil.newConcurrentMap(TObjectHashingStrategy.IDENTITY); + private final Set myIgnoreElements = ContainerUtil.newConcurrentSet(ContainerUtil.identityStrategy()); + private final Map myFixedElements = ContainerUtil.newConcurrentMap(ContainerUtil.identityStrategy()); private WeakUnreferencedFilter myFilter; private DeadHTMLComposer myComposer; @@ -612,8 +611,7 @@ public class UnusedDeclarationPresentation extends DefaultInspectionToolPresenta @Override public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException { if (myElement != null && myElement.isValid()) { - ApplicationManager.getApplication().invokeLater(() -> SafeDeleteHandler - .invoke(myElement.getProject(), new PsiElement[]{PsiTreeUtil.getParentOfType(myElement, PsiModifierListOwner.class)}, false)); + SafeDeleteHandler.invoke(myElement.getProject(), new PsiElement[]{PsiTreeUtil.getParentOfType(myElement, PsiModifierListOwner.class)}, false); } }