From cbca35298247cc81de14cef7f86bf27a395f983e Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Tue, 6 Apr 2021 11:36:38 +0700 Subject: [PATCH] Anonymous classes -> lambdas GitOrigin-RevId: 186aeca8f513bdc8dbc952b29643e7618018ce20 --- .../BaseStructureConfigurable.java | 29 +++++++++---------- .../manage/AbstractModuleDataService.java | 7 +---- .../welcomeScreen/RecentProjectPanel.java | 11 +++---- ...hMissingImplementationsInspectionTest.java | 12 ++------ 4 files changed, 20 insertions(+), 39 deletions(-) diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseStructureConfigurable.java index 0f784b6db5ed..23bfe559b15b 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseStructureConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseStructureConfigurable.java @@ -309,23 +309,20 @@ public abstract class BaseStructureConfigurable extends MasterDetailsComponent i final class MyRemoveAction extends MyDeleteAction { MyRemoveAction() { - super(new Predicate<>() { - @Override - public boolean test(final Object[] objects) { - List nodes = new ArrayList<>(); - for (Object object : objects) { - if (!(object instanceof MyNode)) return false; - nodes.add((MyNode)object); - } - MultiMap map = groupNodes(nodes); - for (Map.Entry> entry : map.entrySet()) { - //noinspection unchecked - if (!entry.getKey().canBeRemoved(getEditableObjects(entry.getValue()))) { - return false; - } - } - return true; + super((Predicate)objects -> { + List nodes = new ArrayList<>(); + for (Object object : objects) { + if (!(object instanceof MyNode)) return false; + nodes.add((MyNode)object); } + MultiMap map = groupNodes(nodes); + for (Map.Entry> entry : map.entrySet()) { + //noinspection unchecked + if (!entry.getKey().canBeRemoved(getEditableObjects(entry.getValue()))) { + return false; + } + } + return true; }); } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java index cb60cf8ff8a5..bb7a4453b3ad 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java @@ -471,12 +471,7 @@ public abstract class AbstractModuleDataService extends Ab } } - noOrderAwareItems.sort(new Comparator<>() { - @Override - public int compare(OrderEntry o1, OrderEntry o2) { - return o1.toString().compareTo(o2.toString()); - } - }); + noOrderAwareItems.sort(Comparator.comparing(Object::toString)); for (int i = 0; i < noOrderAwareItems.size(); i++) { newOrder[i] = noOrderAwareItems.get(i); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java index a43419865235..333edf858fa8 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java @@ -95,13 +95,10 @@ public class RecentProjectPanel extends JPanel { myList.setCellRenderer(createRenderer(myPathShortener)); if (Registry.is("autocheck.availability.welcome.screen.projects")) { - myChecker = new FilePathChecker(new Runnable() { - @Override - public void run() { - if (myList.isShowing()) { - myList.revalidate(); - myList.repaint(); - } + myChecker = new FilePathChecker(() -> { + if (myList.isShowing()) { + myList.revalidate(); + myList.repaint(); } }, pathsToCheck); Disposer.register(parentDisposable, myChecker); diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/inheritance/AbstractMethodWithMissingImplementationsInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/inheritance/AbstractMethodWithMissingImplementationsInspectionTest.java index 57a7118aad05..65a707700748 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/inheritance/AbstractMethodWithMissingImplementationsInspectionTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/inheritance/AbstractMethodWithMissingImplementationsInspectionTest.java @@ -2,14 +2,10 @@ package com.siyeh.ig.inheritance; import com.intellij.codeInspection.InspectionProfileEntry; -import com.intellij.psi.PsiClass; import com.intellij.psi.PsiClassOwner; import com.intellij.psi.search.searches.ClassInheritorsSearch; -import com.intellij.util.Processor; -import com.intellij.util.QueryExecutor; import com.intellij.util.containers.ContainerUtil; import com.siyeh.ig.LightJavaInspectionTestCase; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; public class AbstractMethodWithMissingImplementationsInspectionTest extends LightJavaInspectionTestCase { @@ -23,12 +19,8 @@ public class AbstractMethodWithMissingImplementationsInspectionTest extends Ligh } public void testSearchReturnsUnrelatedClass() { - ClassInheritorsSearch.EP_NAME.getPoint().registerExtension(new QueryExecutor<>() { - @Override - public boolean execute(@NotNull ClassInheritorsSearch.SearchParameters p, @NotNull Processor consumer) { - return ContainerUtil.process(((PsiClassOwner)p.getClassToProcess().getContainingFile()).getClasses(), consumer); - } - }, getTestRootDisposable()); + ClassInheritorsSearch.EP_NAME.getPoint().registerExtension( + (p, consumer) -> ContainerUtil.process(((PsiClassOwner)p.getClassToProcess().getContainingFile()).getClasses(), consumer), getTestRootDisposable()); doTest(); }