From e60c28c0733fd149b0cef0caff5f289efff78ef4 Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Sat, 17 Feb 2018 00:48:49 +0300
Subject: [PATCH] rename and cleanup

---
 ...ction.java => ShowDiscoveredTestsAction.java} | 16 ++++++++--------
 resources/src/META-INF/IdeaPlugin.xml            |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename java/execution/impl/src/com/intellij/execution/testDiscovery/{FindTestsInTestDiscoveryServerAction.java => ShowDiscoveredTestsAction.java} (96%)

diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/FindTestsInTestDiscoveryServerAction.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/ShowDiscoveredTestsAction.java
similarity index 96%
rename from java/execution/impl/src/com/intellij/execution/testDiscovery/FindTestsInTestDiscoveryServerAction.java
rename to java/execution/impl/src/com/intellij/execution/testDiscovery/ShowDiscoveredTestsAction.java
index 8c518c68452a..4502a0d22613 100644
--- a/java/execution/impl/src/com/intellij/execution/testDiscovery/FindTestsInTestDiscoveryServerAction.java
+++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/ShowDiscoveredTestsAction.java
@@ -45,7 +45,7 @@ import java.util.stream.Collectors;
 import static com.intellij.openapi.actionSystem.CommonDataKeys.EDITOR;
 import static com.intellij.openapi.actionSystem.CommonDataKeys.PSI_FILE;
 
-public class FindTestsInTestDiscoveryServerAction extends AnAction {
+public class ShowDiscoveredTestsAction extends AnAction {
   @Override
   public void update(AnActionEvent e) {
     Editor editor = e.getData(EDITOR);
@@ -103,9 +103,9 @@ public class FindTestsInTestDiscoveryServerAction extends AnAction {
                            .findFirst()
                            .ifPresent(configuration -> {
                              ExecutionUtil.runConfiguration(configuration.getConfigurationSettings(), executor);
-                             JBPopup pinPopup = ref.get();
-                             if (pinPopup != null) {
-                               pinPopup.cancel();
+                             JBPopup popup = ref.get();
+                             if (popup != null) {
+                               popup.cancel();
                              }
                            });
     });
@@ -115,9 +115,9 @@ public class FindTestsInTestDiscoveryServerAction extends AnAction {
       __ -> {
         PsiElement[] elements = model.getItems().toArray(PsiElement.EMPTY_ARRAY);
         FindUtil.showInUsageView(null, elements, initTitle, project);
-        JBPopup pinPopup = ref.get();
-        if (pinPopup != null) {
-          pinPopup.cancel();
+        JBPopup popup = ref.get();
+        if (popup != null) {
+          popup.cancel();
         }
       });
 
@@ -176,7 +176,7 @@ public class FindTestsInTestDiscoveryServerAction extends AnAction {
       });
     });
   }
-  
+
   private static List<TestDiscoveryConfigurationProducer> getProducers(Project project) {
     return RunConfigurationProducer.getProducers(project)
                                    .stream()
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 94a0a91909d0..b72064f2ad43 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -399,7 +399,7 @@
       <add-to-group group-id="Internal" anchor="last"/>
     </action>
 
-    <action class="com.intellij.execution.testDiscovery.FindTestsInTestDiscoveryServerAction" internal="true" id="FindTestsInTestDiscoveryServer" text="Test Discovery">
+    <action class="com.intellij.execution.testDiscovery.ShowDiscoveredTestsAction" internal="true" id="ShowDiscoveredTests" text="Show Discovered Tests">
       <add-to-group group-id="Internal" anchor="last"/>
     </action>