diff --git a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardGroupingRule.java b/platform/lang-api/src/com/intellij/execution/dashboard/DashboardGroupingRule.java index 902d2e23c798..2d01a48ee6a9 100644 --- a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardGroupingRule.java +++ b/platform/lang-api/src/com/intellij/execution/dashboard/DashboardGroupingRule.java @@ -23,12 +23,12 @@ import org.jetbrains.annotations.Nullable; import java.util.Comparator; /** - * Action for grouping items in a runtime dashboard tree. + * Action for grouping items in a run dashboard tree. * * @author konstantin.aleev */ public interface DashboardGroupingRule extends TreeAction { - ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.runtimeDashboardGroupingRule"); + ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.runDashboardGroupingRule"); Comparator PRIORITY_COMPARATOR = (o1, o2) -> { final int res = o2.getPriority() - o1.getPriority(); diff --git a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardRunConfigurationStatus.java b/platform/lang-api/src/com/intellij/execution/dashboard/DashboardRunConfigurationStatus.java index d0783e37506c..41b577ae26af 100644 --- a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardRunConfigurationStatus.java +++ b/platform/lang-api/src/com/intellij/execution/dashboard/DashboardRunConfigurationStatus.java @@ -25,11 +25,11 @@ import javax.swing.*; */ public class DashboardRunConfigurationStatus { public static final DashboardRunConfigurationStatus STARTED = new DashboardRunConfigurationStatus( - ExecutionBundle.message("runtime.dashboard.started.group.name"), AllIcons.Toolwindows.ToolWindowRun); + ExecutionBundle.message("run.dashboard.started.group.name"), AllIcons.Toolwindows.ToolWindowRun); public static final DashboardRunConfigurationStatus STOPPED = new DashboardRunConfigurationStatus( - ExecutionBundle.message("runtime.dashboard.stopped.group.name"), AllIcons.Actions.Suspend); + ExecutionBundle.message("run.dashboard.stopped.group.name"), AllIcons.Actions.Suspend); public static final DashboardRunConfigurationStatus FAILED = new DashboardRunConfigurationStatus( - ExecutionBundle.message("runtime.dashboard.failed.group.name"), AllIcons.General.Error); + ExecutionBundle.message("run.dashboard.failed.group.name"), AllIcons.General.Error); private final String myName; private final Icon myIcon; diff --git a/platform/lang-api/src/com/intellij/execution/dashboard/RuntimeDashboardContributor.java b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardContributor.java similarity index 84% rename from platform/lang-api/src/com/intellij/execution/dashboard/RuntimeDashboardContributor.java rename to platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardContributor.java index d94be223954d..f1b5a98281db 100644 --- a/platform/lang-api/src/com/intellij/execution/dashboard/RuntimeDashboardContributor.java +++ b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardContributor.java @@ -24,18 +24,18 @@ import com.intellij.openapi.util.registry.Registry; import org.jetbrains.annotations.ApiStatus; /** - * In order to show run configurations of the specific configuration type in Runtime Dashboard tool window, + * In order to show run configurations of the specific configuration type in Run Dashboard tool window, * one should register this extension. * * @author konstantin.aleev */ @ApiStatus.Experimental -public abstract class RuntimeDashboardContributor { - public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.runtimeDashboardContributor"); +public abstract class RunDashboardContributor { + public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.runDashboardContributor"); private final ConfigurationType myType; - protected RuntimeDashboardContributor(ConfigurationType type) { + protected RunDashboardContributor(ConfigurationType type) { myType = type; } @@ -74,13 +74,13 @@ public abstract class RuntimeDashboardContributor { return DashboardRunConfigurationStatus.FAILED; } - public static RuntimeDashboardContributor getContributor(ConfigurationType type) { - if (!Registry.is("ide.runtime.dashboard")) { + public static RunDashboardContributor getContributor(ConfigurationType type) { + if (!Registry.is("ide.run.dashboard")) { return null; } if (type != null) { - for (RuntimeDashboardContributor contributor : EP_NAME.getExtensions()) { + for (RunDashboardContributor contributor : EP_NAME.getExtensions()) { if (type.equals(contributor.getType())) { return contributor; } diff --git a/platform/lang-api/src/com/intellij/execution/dashboard/RuntimeDashboardManager.java b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardManager.java similarity index 78% rename from platform/lang-api/src/com/intellij/execution/dashboard/RuntimeDashboardManager.java rename to platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardManager.java index 8f8dcaf311b8..9f0194c372c9 100644 --- a/platform/lang-api/src/com/intellij/execution/dashboard/RuntimeDashboardManager.java +++ b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardManager.java @@ -25,12 +25,12 @@ import javax.swing.*; /** * @author konstantin.aleev */ -public interface RuntimeDashboardManager { +public interface RunDashboardManager { Topic DASHBOARD_TOPIC = - Topic.create("runtime dashboard", DashboardListener.class, Topic.BroadcastDirection.TO_PARENT); + Topic.create("run dashboard", DashboardListener.class, Topic.BroadcastDirection.TO_PARENT); - static RuntimeDashboardManager getInstance(Project project) { - return ServiceManager.getService(project, RuntimeDashboardManager.class); + static RunDashboardManager getInstance(Project project) { + return ServiceManager.getService(project, RunDashboardManager.class); } ContentManager getDashboardContentManager(); diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/RuntimeDashboardContent.java b/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardContent.java similarity index 89% rename from platform/lang-impl/src/com/intellij/execution/dashboard/RuntimeDashboardContent.java rename to platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardContent.java index 5636945ef8e7..a1d66f9cd1b4 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/RuntimeDashboardContent.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardContent.java @@ -17,7 +17,7 @@ package com.intellij.execution.dashboard; import com.intellij.execution.*; import com.intellij.execution.dashboard.tree.DashboardGrouper; -import com.intellij.execution.dashboard.tree.RuntimeDashboardTreeStructure; +import com.intellij.execution.dashboard.tree.RunDashboardTreeStructure; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.ide.CommonActionsManager; @@ -58,11 +58,11 @@ import java.util.Set; /** * @author konstantin.aleev */ -public class RuntimeDashboardContent extends JPanel implements TreeContent, Disposable { - public static final DataKey KEY = DataKey.create("runtimeDashboardContent"); - @NonNls private static final String PLACE_TOOLBAR = "RuntimeDashboardContent#Toolbar"; - @NonNls private static final String RUNTIME_DASHBOARD_TOOLBAR = "RuntimeDashboardToolbar"; - @NonNls private static final String RUNTIME_DASHBOARD_POPUP = "RuntimeDashboardPopup"; +public class RunDashboardContent extends JPanel implements TreeContent, Disposable { + public static final DataKey KEY = DataKey.create("runDashboardContent"); + @NonNls private static final String PLACE_TOOLBAR = "RunDashboardContent#Toolbar"; + @NonNls private static final String RUN_DASHBOARD_TOOLBAR = "RunDashboardToolbar"; + @NonNls private static final String RUN_DASHBOARD_POPUP = "RunDashboardPopup"; private static final String MESSAGE_CARD = "message"; private static final String CONTENT_CARD = "content"; @@ -83,7 +83,7 @@ public class RuntimeDashboardContent extends JPanel implements TreeContent, Disp @NotNull private final Project myProject; - public RuntimeDashboardContent(@NotNull Project project, @NotNull ContentManager contentManager, @NotNull List groupers) { + public RunDashboardContent(@NotNull Project project, @NotNull ContentManager contentManager, @NotNull List groupers) { super(new BorderLayout()); myProject = project; myGroupers = groupers; @@ -102,7 +102,7 @@ public class RuntimeDashboardContent extends JPanel implements TreeContent, Disp splitter.setFirstComponent(ScrollPaneFactory.createScrollPane(myTree, SideBorder.LEFT)); myDetailsPanelLayout = new CardLayout(); myDetailsPanel = new JPanel(myDetailsPanelLayout); - myMessagePanel = new JBPanelWithEmptyText().withEmptyText(ExecutionBundle.message("runtime.dashboard.empty.selection.message")); + myMessagePanel = new JBPanelWithEmptyText().withEmptyText(ExecutionBundle.message("run.dashboard.empty.selection.message")); myDetailsPanel.add(MESSAGE_CARD, myMessagePanel); splitter.setSecondComponent(myDetailsPanel); add(splitter, BorderLayout.CENTER); @@ -163,9 +163,9 @@ public class RuntimeDashboardContent extends JPanel implements TreeContent, Disp }); DefaultActionGroup popupActionGroup = new DefaultActionGroup(); - popupActionGroup.add(ActionManager.getInstance().getAction(RUNTIME_DASHBOARD_TOOLBAR)); - popupActionGroup.add(ActionManager.getInstance().getAction(RUNTIME_DASHBOARD_POPUP)); - PopupHandler.installPopupHandler(myTree, popupActionGroup, ActionPlaces.RUNTIME_DASHBOARD_POPUP, ActionManager.getInstance()); + popupActionGroup.add(ActionManager.getInstance().getAction(RUN_DASHBOARD_TOOLBAR)); + popupActionGroup.add(ActionManager.getInstance().getAction(RUN_DASHBOARD_POPUP)); + PopupHandler.installPopupHandler(myTree, popupActionGroup, ActionPlaces.RUN_DASHBOARD_POPUP, ActionManager.getInstance()); new TreeSpeedSearch(myTree, TreeSpeedSearch.NODE_DESCRIPTOR_TOSTRING, true); } @@ -173,7 +173,7 @@ public class RuntimeDashboardContent extends JPanel implements TreeContent, Disp private void onSelectionChanged() { Set nodes = myBuilder.getSelectedElements(AbstractTreeNode.class); if (nodes.size() != 1) { - showMessagePanel(ExecutionBundle.message("runtime.dashboard.empty.selection.message")); + showMessagePanel(ExecutionBundle.message("run.dashboard.empty.selection.message")); myLastSelection = null; return; } @@ -196,12 +196,12 @@ public class RuntimeDashboardContent extends JPanel implements TreeContent, Disp return; } if (node instanceof DashboardRunConfigurationNode) { - showMessagePanel(ExecutionBundle.message("runtime.dashboard.not.started.configuration.message")); + showMessagePanel(ExecutionBundle.message("run.dashboard.not.started.configuration.message")); return; } } - showMessagePanel(ExecutionBundle.message("runtime.dashboard.empty.selection.message")); + showMessagePanel(ExecutionBundle.message("run.dashboard.empty.selection.message")); } private void showMessagePanel(String text) { @@ -221,7 +221,7 @@ public class RuntimeDashboardContent extends JPanel implements TreeContent, Disp } private void setupBuilder() { - RuntimeDashboardTreeStructure structure = new RuntimeDashboardTreeStructure(myProject, myGroupers); + RunDashboardTreeStructure structure = new RunDashboardTreeStructure(myProject, myGroupers); myBuilder = new AbstractTreeBuilder(myTree, myTreeModel, structure, IndexComparator.INSTANCE) { @Override protected boolean isAutoExpandNode(NodeDescriptor nodeDescriptor) { @@ -262,7 +262,7 @@ public class RuntimeDashboardContent extends JPanel implements TreeContent, Disp updateTreeIfNeeded(env.getRunnerAndConfigurationSettings()); } }); - connection.subscribe(RuntimeDashboardManager.DASHBOARD_TOPIC, new DashboardListener() { + connection.subscribe(RunDashboardManager.DASHBOARD_TOPIC, new DashboardListener() { @Override public void contentChanged(boolean withStructure) { updateTree(withStructure); @@ -281,7 +281,7 @@ public class RuntimeDashboardContent extends JPanel implements TreeContent, Disp } private void updateTreeIfNeeded(@Nullable RunnerAndConfigurationSettings settings) { - if (settings != null && RuntimeDashboardContributor.isShowInDashboard(settings.getType())) { + if (settings != null && RunDashboardContributor.isShowInDashboard(settings.getType())) { updateTree(true); } } @@ -289,7 +289,7 @@ public class RuntimeDashboardContent extends JPanel implements TreeContent, Disp private JComponent createToolbar() { JPanel toolBarPanel = new JPanel(new GridLayout()); DefaultActionGroup leftGroup = new DefaultActionGroup(); - leftGroup.add(ActionManager.getInstance().getAction(RUNTIME_DASHBOARD_TOOLBAR)); + leftGroup.add(ActionManager.getInstance().getAction(RUN_DASHBOARD_TOOLBAR)); // TODO [konstantin.aleev] provide context help ID //leftGroup.add(new Separator()); //leftGroup.add(new ContextHelpAction(HELP_ID)); @@ -301,7 +301,7 @@ public class RuntimeDashboardContent extends JPanel implements TreeContent, Disp @Override public Object getData(@NonNls String dataId) { if (KEY.getName().equals(dataId)) { - return RuntimeDashboardContent.this; + return RunDashboardContent.this; } return null; } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/RuntimeDashboardManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardManagerImpl.java similarity index 90% rename from platform/lang-impl/src/com/intellij/execution/dashboard/RuntimeDashboardManagerImpl.java rename to platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardManagerImpl.java index a4c748786096..c4f80f60bb02 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/RuntimeDashboardManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardManagerImpl.java @@ -46,14 +46,14 @@ import java.util.stream.Collectors; * @author konstantin.aleev */ @State( - name = "RuntimeDashboard", + name = "RunDashboard", storages = @Storage(StoragePathMacros.WORKSPACE_FILE) ) -public class RuntimeDashboardManagerImpl implements RuntimeDashboardManager, PersistentStateComponent { +public class RunDashboardManagerImpl implements RunDashboardManager, PersistentStateComponent { @NotNull private final ContentManager myContentManager; private List myGroupers = new ArrayList<>(); - public RuntimeDashboardManagerImpl(@NotNull final Project project) { + public RunDashboardManagerImpl(@NotNull final Project project) { ContentFactory contentFactory = ContentFactory.SERVICE.getInstance(); ContentUI contentUI = new PanelContentUI(); myContentManager = contentFactory.createContentManager(contentUI, false, project); @@ -68,13 +68,13 @@ public class RuntimeDashboardManagerImpl implements RuntimeDashboardManager, Per .map(DashboardGrouper::new) .collect(Collectors.toList()); - RuntimeDashboardContent dashboardContent = new RuntimeDashboardContent(project, myContentManager, myGroupers); + RunDashboardContent dashboardContent = new RunDashboardContent(project, myContentManager, myGroupers); Content content = contentFactory.createContent(dashboardContent, null, false); Disposer.register(content, dashboardContent); toolWindow.getContentManager().addContent(content); } - if (!Registry.is("ide.runtime.dashboard")) { + if (!Registry.is("ide.run.dashboard")) { toolWindow.setAvailable(false, null); } @@ -88,7 +88,7 @@ public class RuntimeDashboardManagerImpl implements RuntimeDashboardManager, Per @Override public String getToolWindowId() { - return ToolWindowId.RUNTIME_DASHBOARD; + return ToolWindowId.RUN_DASHBOARD; } @Override diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/CopyConfigurationAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/CopyConfigurationAction.java index 05126ed327ae..c977ec3aa7f6 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/CopyConfigurationAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/CopyConfigurationAction.java @@ -69,7 +69,7 @@ public class CopyConfigurationAction extends RunConfigurationTreeAction { } if (RunDialog.editConfiguration(node.getProject(), copiedSettings, - ExecutionBundle.message("runtime.dashboard.edit.configuration.dialog.title"))) { + ExecutionBundle.message("run.dashboard.edit.configuration.dialog.title"))) { runManager.addConfiguration(copiedSettings, runManager.isConfigurationShared(settings), runManager.getBeforeRunTasks(settings.getConfiguration()), false); } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/DebugAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/DebugAction.java index 710302ed97c9..e43781358bd9 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/DebugAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/DebugAction.java @@ -26,8 +26,8 @@ import com.intellij.openapi.wm.ToolWindowId; */ public class DebugAction extends ExecutorAction { public DebugAction() { - super(ExecutionBundle.message("runtime.dashboard.debug.action.name"), - ExecutionBundle.message("runtime.dashboard.debug.action.description"), + super(ExecutionBundle.message("run.dashboard.debug.action.name"), + ExecutionBundle.message("run.dashboard.debug.action.description"), AllIcons.Toolwindows.ToolWindowDebugger); } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/EditConfigurationAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/EditConfigurationAction.java index d8f79c91e7fa..1622456db19a 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/EditConfigurationAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/EditConfigurationAction.java @@ -26,8 +26,8 @@ import org.jetbrains.annotations.NotNull; public class EditConfigurationAction extends RunConfigurationTreeAction { public EditConfigurationAction() { - super(ExecutionBundle.message("runtime.dashboard.edit.configuration.action.name"), - ExecutionBundle.message("runtime.dashboard.edit.configuration.action.name"), + super(ExecutionBundle.message("run.dashboard.edit.configuration.action.name"), + ExecutionBundle.message("run.dashboard.edit.configuration.action.name"), AllIcons.Actions.EditSource); } @@ -35,7 +35,7 @@ public class EditConfigurationAction extends RunConfigurationTreeAction { public void update(@NotNull AnActionEvent e) { super.update(e); if (ActionPlaces.isPopupPlace(e.getPlace())) { - e.getPresentation().setText(ExecutionBundle.message("runtime.dashboard.edit.configuration.action.name") + "..."); + e.getPresentation().setText(ExecutionBundle.message("run.dashboard.edit.configuration.action.name") + "..."); } } @@ -48,6 +48,6 @@ public class EditConfigurationAction extends RunConfigurationTreeAction { @Override protected void doActionPerformed(DashboardRunConfigurationNode node) { RunDialog.editConfiguration(node.getProject(), node.getConfigurationSettings(), - ExecutionBundle.message("runtime.dashboard.edit.configuration.dialog.title")); + ExecutionBundle.message("run.dashboard.edit.configuration.dialog.title")); } } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/ExecutorAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/ExecutorAction.java index 6c50aab07137..21bcf4e23e56 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/ExecutorAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/ExecutorAction.java @@ -28,7 +28,7 @@ import javax.swing.*; /** * @author konstantin.aleev */ -public abstract class ExecutorAction extends RuntimeDashboardTreeLeafAction { +public abstract class ExecutorAction extends RunDashboardTreeLeafAction { protected ExecutorAction(String text, String description, Icon icon) { super(text, description, icon); } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RemoveConfigurationAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RemoveConfigurationAction.java index 8537ac79550c..d83295f0af97 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RemoveConfigurationAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RemoveConfigurationAction.java @@ -19,7 +19,7 @@ import com.intellij.execution.ExecutionBundle; import com.intellij.execution.RunManager; import com.intellij.execution.RunManagerEx; import com.intellij.execution.dashboard.DashboardRunConfigurationNode; -import com.intellij.execution.dashboard.RuntimeDashboardContent; +import com.intellij.execution.dashboard.RunDashboardContent; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.Project; @@ -33,8 +33,8 @@ import java.util.List; */ public class RemoveConfigurationAction extends RunConfigurationTreeAction { public RemoveConfigurationAction() { - super(ExecutionBundle.message("runtime.dashboard.remove.configuration.action.name"), - ExecutionBundle.message("runtime.dashboard.remove.configuration.action.description"), + super(ExecutionBundle.message("run.dashboard.remove.configuration.action.name"), + ExecutionBundle.message("run.dashboard.remove.configuration.action.description"), AllIcons.General.Remove); } @@ -50,10 +50,10 @@ public class RemoveConfigurationAction extends RunConfigurationTreeAction { } @Override - protected void doActionPerformed(@NotNull RuntimeDashboardContent content, AnActionEvent e, List nodes) { + protected void doActionPerformed(@NotNull RunDashboardContent content, AnActionEvent e, List nodes) { if (Messages.showYesNoDialog((Project)null, - ExecutionBundle.message("runtime.dashboard.remove.configuration.dialog.message"), - ExecutionBundle.message("runtime.dashboard.remove.configuration.dialog.title"), + ExecutionBundle.message("run.dashboard.remove.configuration.dialog.message"), + ExecutionBundle.message("run.dashboard.remove.configuration.dialog.title"), Messages.getWarningIcon()) != Messages.YES) { return; diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunAction.java index 062ee8835682..3a6d363a4e92 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunAction.java @@ -25,8 +25,8 @@ import com.intellij.icons.AllIcons; */ public class RunAction extends ExecutorAction { public RunAction() { - super(ExecutionBundle.message("runtime.dashboard.run.action.name"), - ExecutionBundle.message("runtime.dashboard.run.action.description"), + super(ExecutionBundle.message("run.dashboard.run.action.name"), + ExecutionBundle.message("run.dashboard.run.action.description"), AllIcons.Toolwindows.ToolWindowRun); } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunConfigurationTreeAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunConfigurationTreeAction.java index e1aca3e53e07..e7643cc6e034 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunConfigurationTreeAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunConfigurationTreeAction.java @@ -22,7 +22,7 @@ import javax.swing.*; /** * @author konstantin.aleev */ -public abstract class RunConfigurationTreeAction extends RuntimeDashboardTreeAction { +public abstract class RunConfigurationTreeAction extends RunDashboardTreeAction { protected RunConfigurationTreeAction(String text, String description, Icon icon) { super(text, description, icon); } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RuntimeDashboardTreeAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeAction.java similarity index 74% rename from platform/lang-impl/src/com/intellij/execution/dashboard/actions/RuntimeDashboardTreeAction.java rename to platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeAction.java index d04a2d491191..918fd071ed29 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RuntimeDashboardTreeAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeAction.java @@ -24,14 +24,14 @@ import javax.swing.*; /** * @author konstantin.aleev */ -public abstract class RuntimeDashboardTreeAction extends DashboardTreeAction { - protected RuntimeDashboardTreeAction(String text, String description, Icon icon) { +public abstract class RunDashboardTreeAction extends DashboardTreeAction { + protected RunDashboardTreeAction(String text, String description, Icon icon) { super(text, description, icon); } @Override - protected final RuntimeDashboardContent getTreeContent(AnActionEvent e) { - return e.getData(RuntimeDashboardContent.KEY); + protected final RunDashboardContent getTreeContent(AnActionEvent e) { + return e.getData(RunDashboardContent.KEY); } @Override diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RuntimeDashboardTreeLeafAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeLeafAction.java similarity index 91% rename from platform/lang-impl/src/com/intellij/execution/dashboard/actions/RuntimeDashboardTreeLeafAction.java rename to platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeLeafAction.java index 65c5cf7112b4..f333bb315636 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RuntimeDashboardTreeLeafAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeLeafAction.java @@ -27,8 +27,8 @@ import java.util.*; /** * @author konstantin.aleev */ -public abstract class RuntimeDashboardTreeLeafAction extends RuntimeDashboardTreeAction { - protected RuntimeDashboardTreeLeafAction(String text, String description, Icon icon) { +public abstract class RunDashboardTreeLeafAction extends RunDashboardTreeAction { + protected RunDashboardTreeLeafAction(String text, String description, Icon icon) { super(text, description, icon); } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/StopAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/StopAction.java index d2b44aa8d2ca..8eda61cf2bb9 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/StopAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/StopAction.java @@ -29,10 +29,10 @@ import java.util.List; /** * @author konstantin.aleev */ -public class StopAction extends RuntimeDashboardTreeLeafAction { +public class StopAction extends RunDashboardTreeLeafAction { public StopAction() { - super(ExecutionBundle.message("runtime.dashboard.stop.action.name"), - ExecutionBundle.message("runtime.dashboard.stop.action.description"), + super(ExecutionBundle.message("run.dashboard.stop.action.name"), + ExecutionBundle.message("run.dashboard.stop.action.description"), AllIcons.Actions.Suspend); } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/ConfigurationTypeDashboardGroupingRule.java b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/ConfigurationTypeDashboardGroupingRule.java index 857e4fe45397..13a4a87d8453 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/ConfigurationTypeDashboardGroupingRule.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/ConfigurationTypeDashboardGroupingRule.java @@ -44,8 +44,8 @@ public class ConfigurationTypeDashboardGroupingRule implements DashboardGrouping @NotNull @Override public ActionPresentation getPresentation() { - return new ActionPresentationData(ExecutionBundle.message("runtime.dashboard.group.by.type.action.name"), - ExecutionBundle.message("runtime.dashboard.group.by.type.action.name"), + return new ActionPresentationData(ExecutionBundle.message("run.dashboard.group.by.type.action.name"), + ExecutionBundle.message("run.dashboard.group.by.type.action.name"), AllIcons.Actions.GroupByFile); } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/FolderDashboardGroupingRule.java b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/FolderDashboardGroupingRule.java index 00c8b46f27df..6362f280485d 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/FolderDashboardGroupingRule.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/FolderDashboardGroupingRule.java @@ -43,8 +43,8 @@ public class FolderDashboardGroupingRule implements DashboardGroupingRule { @NotNull @Override public ActionPresentation getPresentation() { - return new ActionPresentationData(ExecutionBundle.message("runtime.dashboard.group.by.folder.action.name"), - ExecutionBundle.message("runtime.dashboard.group.by.folder.action.name"), + return new ActionPresentationData(ExecutionBundle.message("run.dashboard.group.by.folder.action.name"), + ExecutionBundle.message("run.dashboard.group.by.folder.action.name"), AllIcons.Actions.GroupByPackage); } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunConfigurationNode.java b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunConfigurationNode.java index 996d702b0751..229b978701f2 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunConfigurationNode.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunConfigurationNode.java @@ -21,7 +21,7 @@ import com.intellij.execution.RunManagerEx; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.dashboard.DashboardRunConfigurationNode; import com.intellij.execution.dashboard.DashboardRunConfigurationStatus; -import com.intellij.execution.dashboard.RuntimeDashboardContributor; +import com.intellij.execution.dashboard.RunDashboardContributor; import com.intellij.execution.ui.RunContentDescriptor; import com.intellij.execution.ui.RunContentManagerImpl; import com.intellij.ide.projectView.PresentationData; @@ -68,7 +68,7 @@ class RunConfigurationNode extends AbstractTreeNode myGroupers; private final RunConfigurationsTreeRootNode myRootElement; - public RuntimeDashboardTreeStructure(@NotNull Project project, @NotNull List groupers) { + public RunDashboardTreeStructure(@NotNull Project project, @NotNull List groupers) { super(project); myProject = project; myGroupers = groupers; @@ -72,7 +72,7 @@ public class RuntimeDashboardTreeStructure extends AbstractTreeStructureBase { public class RunConfigurationsTreeRootNode extends AbstractTreeNode { public RunConfigurationsTreeRootNode() { - super(RuntimeDashboardTreeStructure.this.myProject, new Object()); + super(RunDashboardTreeStructure.this.myProject, new Object()); } @NotNull @@ -81,7 +81,7 @@ public class RuntimeDashboardTreeStructure extends AbstractTreeStructureBase { List nodes = new ArrayList<>(); List configurations = RunManager.getInstance(myProject).getAllSettings().stream() - .filter(runConfiguration -> RuntimeDashboardContributor.isShowInDashboard(runConfiguration.getType())) + .filter(runConfiguration -> RunDashboardContributor.isShowInDashboard(runConfiguration.getType())) .collect(Collectors.toList()); //noinspection ConstantConditions ??? @@ -102,7 +102,7 @@ public class RuntimeDashboardTreeStructure extends AbstractTreeStructureBase { .collect(Collectors.toList()); List notStoredDescriptors = executionManager.getRunningDescriptors(settings -> { RunConfiguration configuration = settings.getConfiguration(); - return RuntimeDashboardContributor.isShowInDashboard(settings.getType()) && !storedConfigurations.contains(configuration); + return RunDashboardContributor.isShowInDashboard(settings.getType()) && !storedConfigurations.contains(configuration); }); notStoredDescriptors.forEach(descriptor -> { Set settings = executionManager.getConfigurations(descriptor); diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/StatusDashboardGroupingRule.java b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/StatusDashboardGroupingRule.java index 17bc4688ad11..3d5894ccdb25 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/StatusDashboardGroupingRule.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/StatusDashboardGroupingRule.java @@ -40,8 +40,8 @@ public class StatusDashboardGroupingRule implements DashboardGroupingRule { @NotNull @Override public ActionPresentation getPresentation() { - return new ActionPresentationData(ExecutionBundle.message("runtime.dashboard.group.by.status.action.name"), - ExecutionBundle.message("runtime.dashboard.group.by.status.action.name"), + return new ActionPresentationData(ExecutionBundle.message("run.dashboard.group.by.status.action.name"), + ExecutionBundle.message("run.dashboard.group.by.status.action.name"), AllIcons.Actions.GroupByPrefix); // TODO [konstantin.aleev] provide new icon } @@ -65,7 +65,7 @@ public class StatusDashboardGroupingRule implements DashboardGroupingRule { public DashboardGroup getGroup(AbstractTreeNode node) { if (node instanceof DashboardRunConfigurationNode) { DashboardRunConfigurationNode runConfigurationNode = (DashboardRunConfigurationNode)node; - RuntimeDashboardContributor contributor = RuntimeDashboardContributor.getContributor( + RunDashboardContributor contributor = RunDashboardContributor.getContributor( runConfigurationNode.getConfigurationSettings().getType()); if (contributor != null) { DashboardRunConfigurationStatus status = contributor.getStatus(runConfigurationNode); diff --git a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java index 34c66596beab..388b0667a45c 100644 --- a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java @@ -17,8 +17,8 @@ package com.intellij.execution.ui; import com.intellij.execution.*; import com.intellij.execution.configurations.ConfigurationType; -import com.intellij.execution.dashboard.RuntimeDashboardContributor; -import com.intellij.execution.dashboard.RuntimeDashboardManager; +import com.intellij.execution.dashboard.RunDashboardContributor; +import com.intellij.execution.dashboard.RunDashboardManager; import com.intellij.execution.process.ProcessAdapter; import com.intellij.execution.process.ProcessEvent; import com.intellij.execution.process.ProcessHandler; @@ -93,7 +93,7 @@ public class RunContentManagerImpl implements RunContentManager, Disposable { registerToolWindow(executor, toolWindowManager); } - RuntimeDashboardManager dashboardManager = RuntimeDashboardManager.getInstance(myProject); + RunDashboardManager dashboardManager = RunDashboardManager.getInstance(myProject); initToolWindow(null, dashboardManager.getToolWindowId(), dashboardManager.getToolWindowIcon(), dashboardManager.getDashboardContentManager()); @@ -569,8 +569,8 @@ public class RunContentManagerImpl implements RunContentManager, Disposable { public String getContentDescriptorToolWindowId(@Nullable RunnerAndConfigurationSettings settings) { if (settings != null) { ConfigurationType type = settings.getType(); - if (RuntimeDashboardContributor.isShowInDashboard(type)) { - return RuntimeDashboardManager.getInstance(myProject).getToolWindowId(); + if (RunDashboardContributor.isShowInDashboard(type)) { + return RunDashboardManager.getInstance(myProject).getToolWindowId(); } } return null; @@ -582,7 +582,7 @@ public class RunContentManagerImpl implements RunContentManager, Disposable { // TODO [konstantin.aleev] Check remaining places where Executor.getToolWindowId() is used // Also there are some places where ToolWindowId.RUN or ToolWindowId.DEBUG are used directly. // For example, HotSwapProgressImpl.NOTIFICATION_GROUP. All notifications for this group is shown in Debug tool window, - // however such notifications should be shown in Runtime Dashboard tool window, if run content is redirected to Runtime Dashboard tool window. + // however such notifications should be shown in Run Dashboard tool window, if run content is redirected to Run Dashboard tool window. String toolWindowId = getContentDescriptorToolWindowId(executionEnvironment.getRunnerAndConfigurationSettings()); return toolWindowId != null ? toolWindowId : executionEnvironment.getExecutor().getToolWindowId(); } @@ -592,7 +592,7 @@ public class RunContentManagerImpl implements RunContentManager, Disposable { List contents = new ArrayList<>(); ContainerUtil.addAll(contents, getContentManagerForRunner(runnerInfo, null).getContents()); ContainerUtil.addAll(contents, - myToolwindowIdToContentManagerMap.get(RuntimeDashboardManager.getInstance(myProject).getToolWindowId()).getContents()); + myToolwindowIdToContentManagerMap.get(RunDashboardManager.getInstance(myProject).getToolWindowId()).getContents()); for (Content content : contents) { RunContentDescriptor runContentDescriptor = getRunContentDescriptorByContent(content); assert runContentDescriptor != null; diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ActionPlaces.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ActionPlaces.java index 84113d734181..d60a4beab0d6 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ActionPlaces.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ActionPlaces.java @@ -131,7 +131,7 @@ public abstract class ActionPlaces { public static final String V8_HEAP_PROFILING_POPUP = "V8_HEAP_PROFILING_POPUP"; public static final String V8_HEAP_DIFF_PROFILING_POPUP = "V8_HEAP_DIFF_PROFILING_POPUP"; - public static final String RUNTIME_DASHBOARD_POPUP = "RuntimeDashboardPopup"; + public static final String RUN_DASHBOARD_POPUP = "RunDashboardPopup"; private static final Set ourToolbarPlaces = ContainerUtil.newHashSet( EDITOR_TOOLBAR, PROJECT_VIEW_TOOLBAR, TESTTREE_VIEW_TOOLBAR, MAIN_TOOLBAR, TOOLBAR, RUNNER_TOOLBAR, @@ -159,7 +159,7 @@ public abstract class ActionPlaces { GUI_DESIGNER_PROPERTY_INSPECTOR_POPUP, CREATE_EJB_POPUP, CHANGES_VIEW_POPUP, REMOTE_HOST_VIEW_POPUP, REMOTE_HOST_DIALOG_POPUP, TFS_TREE_POPUP, ACTION_PLACE_VCS_QUICK_LIST_POPUP_ACTION, PHING_EXPLORER_POPUP, NAVIGATION_BAR_POPUP, JS_BUILD_TOOL_POPUP, - V8_CPU_PROFILING_POPUP, V8_HEAP_PROFILING_POPUP, V8_HEAP_PROFILING_POPUP, RUNTIME_DASHBOARD_POPUP + V8_CPU_PROFILING_POPUP, V8_HEAP_PROFILING_POPUP, V8_HEAP_PROFILING_POPUP, RUN_DASHBOARD_POPUP ); public static boolean isPopupPlace(@NotNull String place) { diff --git a/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowId.java b/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowId.java index 4b18339226e0..25ef9bcfc7fe 100644 --- a/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowId.java +++ b/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowId.java @@ -39,5 +39,5 @@ public interface ToolWindowId { String TASKS = UIBundle.message("tool.window.name.tasks"); String DATABASE_VIEW = UIBundle.message("tool.window.name.database"); String PREVIEW = UIBundle.message("tool.window.name.preview"); - String RUNTIME_DASHBOARD = UIBundle.message("tool.window.name.runtime.dashboard"); + String RUN_DASHBOARD = UIBundle.message("tool.window.name.run.dashboard"); } \ No newline at end of file diff --git a/platform/platform-resources-en/src/messages/ExecutionBundle.properties b/platform/platform-resources-en/src/messages/ExecutionBundle.properties index 01038e10f885..7cfeb2274f00 100644 --- a/platform/platform-resources-en/src/messages/ExecutionBundle.properties +++ b/platform/platform-resources-en/src/messages/ExecutionBundle.properties @@ -375,23 +375,23 @@ sm.test.runner.magnitude.ignored.failed.title=Ignored sm.test.runner.magnitude.assertion.failed.title=Assertion failed sm.test.runner.magnitude.testerror.title=Error -runtime.dashboard.empty.selection.message=Select a run configuration in the tree to view details -runtime.dashboard.not.started.configuration.message=Run configuration is not started -runtime.dashboard.group.by.type.action.name=Group by Type -runtime.dashboard.group.by.status.action.name=Group by Status -runtime.dashboard.group.by.folder.action.name=Group by Folder -runtime.dashboard.run.action.name=(Re)run -runtime.dashboard.run.action.description=(Re)run selected run configuration(s) -runtime.dashboard.debug.action.name=(Re)run in Debug Mode -runtime.dashboard.debug.action.description=(Re)run selected run configuration(s) in Debug Mode -runtime.dashboard.stop.action.name=Stop -runtime.dashboard.stop.action.description=Stop selected run configuration(s) -runtime.dashboard.edit.configuration.action.name=Edit Configuration -runtime.dashboard.edit.configuration.dialog.title=Edit Run Configuration -runtime.dashboard.remove.configuration.action.name=Remove Run Configuration -runtime.dashboard.remove.configuration.action.description=Remove Run Configuration(s) -runtime.dashboard.remove.configuration.dialog.title=Remove Run Configuration -runtime.dashboard.remove.configuration.dialog.message=Are you sure to remove selected run configuration(s)? -runtime.dashboard.started.group.name=Started -runtime.dashboard.stopped.group.name=Stopped -runtime.dashboard.failed.group.name=Failed +run.dashboard.empty.selection.message=Select a run configuration in the tree to view details +run.dashboard.not.started.configuration.message=Run configuration is 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=(Re)run +run.dashboard.run.action.description=(Re)run selected run configuration(s) +run.dashboard.debug.action.name=(Re)run in Debug Mode +run.dashboard.debug.action.description=(Re)run selected run configuration(s) in Debug Mode +run.dashboard.stop.action.name=Stop +run.dashboard.stop.action.description=Stop selected run configuration(s) +run.dashboard.edit.configuration.action.name=Edit Configuration +run.dashboard.edit.configuration.dialog.title=Edit Run Configuration +run.dashboard.remove.configuration.action.name=Remove Run Configuration +run.dashboard.remove.configuration.action.description=Remove Run Configuration(s) +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.started.group.name=Started +run.dashboard.stopped.group.name=Stopped +run.dashboard.failed.group.name=Failed diff --git a/platform/platform-resources-en/src/messages/UIBundle.properties b/platform/platform-resources-en/src/messages/UIBundle.properties index 289bb44d29f0..a3af80fecb9e 100644 --- a/platform/platform-resources-en/src/messages/UIBundle.properties +++ b/platform/platform-resources-en/src/messages/UIBundle.properties @@ -58,7 +58,7 @@ tool.window.name.version.control=Version Control tool.window.name.module.dependencies=Module Dependencies tool.window.name.tasks=Time Tracking tool.window.name.database=Database -tool.window.name.runtime.dashboard=Run Dashboard +tool.window.name.run.dashboard=Run Dashboard tool.window.move.to.action.group.name=Move to tool.window.move.to.top.action.name=Top tool.window.move.to.left.action.name=Left diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml index 9c6fb4b0c70c..c16fc9edb85e 100644 --- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml +++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml @@ -459,9 +459,9 @@ - - + - - - - - + + + + + diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml index 062d26196d96..8257d58e9d98 100644 --- a/platform/platform-resources/src/idea/LangActions.xml +++ b/platform/platform-resources/src/idea/LangActions.xml @@ -1019,15 +1019,15 @@ - - - - + + + + - - - + + + - + diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 4933a84f4031..a2d0d498fbd7 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -915,10 +915,10 @@ dumb.aware.run.configurations.description=Enable executing run configurations in select.run.configuration.from.context=true select.run.configuration.from.context.description=Select run configuration when run from context (gutter icon, popup menu) -ide.runtime.dashboard=false -ide.runtime.dashboard.description=Enable Runtime Dashboard tool window -ide.runtime.dashboard.spring.boot.jmx=true -ide.runtime.dashboard.spring.boot.jmx.description=Enable JMX Remote with disabled security for Spring Boot applications to access runtime information +ide.run.dashboard=false +ide.run.dashboard.description=Enable Run Dashboard tool window +ide.run.dashboard.spring.boot.jmx=true +ide.run.dashboard.spring.boot.jmx.description=Enable JMX Remote with disabled security for Spring Boot applications to access runtime information focus.follows.mouse.workarounds=false focus.follows.mouse.workarounds.description=Enables some workarounds for Focus-follows-mouse issues, like IDEA-112015