From 290d07653ea5a569d269f5d593f18b1da53e43a4 Mon Sep 17 00:00:00 2001
From: Konstantin Aleev <konstantin.aleev@jetbrains.com>
Date: Mon, 3 Jul 2017 17:58:24 +0300
Subject: [PATCH] RunDashboard: improve actions

- Make Run Dashboard labels consistent
---
 .../dashboard/RunDashboardContent.java        | 17 ++++++-------
 .../src/messages/ExecutionBundle.properties   | 24 +++++++++----------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardContent.java b/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardContent.java
index a0859f690d6b..f3bcfb7f7c1a 100644
--- a/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardContent.java
+++ b/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardContent.java
@@ -351,8 +351,8 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab
     DefaultActionGroup treeGroup = new DefaultActionGroup();
 
     treeGroup.addAction(new ShowConfigurationsAction());
-    treeGroup.addAction(new PreviousOccurrenceAction());
-    treeGroup.addAction(new NextOccurrenceAction());
+    treeGroup.addAction(new PreviousConfigurationAction());
+    treeGroup.addAction(new NextConfigurationAction());
     treeGroup.addSeparator();
 
     TreeExpander treeExpander = new DefaultTreeExpander(myTree);
@@ -461,10 +461,7 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab
       if (isSelected(e)) {
         if (myLastSelection instanceof DashboardNode) {
           Content content = ((DashboardNode)myLastSelection).getContent();
-          if (content != null && content.getManager() != myContentManager) {
-            content = null;
-          }
-          enabled = content != null;
+          enabled = content != null && content.getManager() == myContentManager;
         }
         else {
           enabled = false;
@@ -485,8 +482,8 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab
     }
   }
 
-  private class PreviousOccurrenceAction extends AnAction implements DumbAware {
-    PreviousOccurrenceAction() {
+  private class PreviousConfigurationAction extends AnAction implements DumbAware {
+    PreviousConfigurationAction() {
       super(ExecutionBundle.message("run.dashboard.previous.configuration.action.name"), null, AllIcons.Actions.PreviousOccurence);
     }
 
@@ -501,8 +498,8 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab
     }
   }
 
-  private class NextOccurrenceAction extends AnAction implements DumbAware {
-    NextOccurrenceAction() {
+  private class NextConfigurationAction extends AnAction implements DumbAware {
+    NextConfigurationAction() {
       super(ExecutionBundle.message("run.dashboard.next.configuration.action.name"), null, AllIcons.Actions.NextOccurence);
     }
 
diff --git a/platform/platform-resources-en/src/messages/ExecutionBundle.properties b/platform/platform-resources-en/src/messages/ExecutionBundle.properties
index 251cfe3553e6..caceda316540 100644
--- a/platform/platform-resources-en/src/messages/ExecutionBundle.properties
+++ b/platform/platform-resources-en/src/messages/ExecutionBundle.properties
@@ -377,30 +377,30 @@ sm.test.runner.magnitude.ignored.failed.title=Ignored
 sm.test.runner.magnitude.assertion.failed.title=Assertion failed
 sm.test.runner.magnitude.testerror.title=Error
 
-run.dashboard.empty.selection.message=Select run configuration in tree to view details
-run.dashboard.not.started.configuration.message=Run configuration not started
+run.dashboard.empty.selection.message=Select configuration in tree to view details
+run.dashboard.not.started.configuration.message=Configuration not started
 run.dashboard.group.by.type.action.name=Group by Type
 run.dashboard.group.by.status.action.name=Group by Status
 run.dashboard.group.by.folder.action.name=Group by Folder
 run.dashboard.run.action.name=Run
-run.dashboard.run.action.description=Run selected run configuration(s)
+run.dashboard.run.action.description=Run selected configuration(s)
 run.dashboard.rerun.action.name=Rerun
-run.dashboard.rerun.action.description=Rerun selected run configuration(s)
+run.dashboard.rerun.action.description=Rerun selected configuration(s)
 run.dashboard.debug.action.name=Debug
-run.dashboard.debug.action.description=Debug selected run configuration(s)
+run.dashboard.debug.action.description=Debug selected configuration(s)
 run.dashboard.restart.debugger.action.name=Rerun in Debug Mode
-run.dashboard.restart.debugger.action.description=Rerun selected run configuration(s) in Debug Mode
+run.dashboard.restart.debugger.action.description=Rerun selected configuration(s) in Debug Mode
 run.dashboard.stop.action.name=Stop
-run.dashboard.stop.action.description=Stop selected run configuration(s)
+run.dashboard.stop.action.description=Stop selected configuration(s)
 run.dashboard.edit.configuration.action.name=Edit Configuration
-run.dashboard.edit.configuration.dialog.title=Edit Run Configuration
+run.dashboard.edit.configuration.dialog.title=Edit Configuration
 run.dashboard.remove.configuration.action.name=Remove Configuration
 run.dashboard.remove.configuration.action.description=Remove Configuration(s)
 run.dashboard.show.configurations.action.name=Show Configurations
-run.dashboard.previous.configuration.action.name=Previous Launched Configuration
-run.dashboard.next.configuration.action.name=Next Launched Configuration
-run.dashboard.remove.configuration.dialog.title=Remove Run Configuration
-run.dashboard.remove.configuration.dialog.message=Are you sure to remove selected run configuration(s)?
+run.dashboard.previous.configuration.action.name=Previous Started Configuration
+run.dashboard.next.configuration.action.name=Next Started Configuration
+run.dashboard.remove.configuration.dialog.title=Remove Configuration
+run.dashboard.remove.configuration.dialog.message=Are you sure to remove selected configuration(s)?
 run.dashboard.started.group.name=Started
 run.dashboard.stopped.group.name=Stopped
 run.dashboard.failed.group.name=Failed