From a34ed43a8fb7d6f3f10d52bb9bfbb2aec9b8b8c1 Mon Sep 17 00:00:00 2001 From: Konstantin Aleev Date: Wed, 6 Sep 2017 13:49:07 +0300 Subject: [PATCH] RunDashboard: rename dashboard interfaces - Add 'RunDashboard' prefix to all Run Dashboard interfaces for compliance --- .../dashboard/RunDashboardAnimator.java | 4 +-- .../dashboard/RunDashboardContributor.java | 8 +++--- ...boardGroup.java => RunDashboardGroup.java} | 2 +- ...ule.java => RunDashboardGroupingRule.java} | 8 +++--- ...istener.java => RunDashboardListener.java} | 2 +- .../dashboard/RunDashboardManager.java | 4 +-- ...shboardNode.java => RunDashboardNode.java} | 2 +- ... => RunDashboardRunConfigurationNode.java} | 2 +- ...> RunDashboardRunConfigurationStatus.java} | 12 ++++----- ...ction.java => RunDashboardTreeAction.java} | 4 +-- .../dashboard/RunDashboardContent.java | 26 +++++++++---------- .../dashboard/RunDashboardManagerImpl.java | 14 +++++----- .../actions/CopyConfigurationAction.java | 6 ++--- .../actions/EditConfigurationAction.java | 6 ++--- .../dashboard/actions/ExecutorAction.java | 16 ++++++------ .../actions/GroupConfigurationsAction.java | 6 ++--- .../actions/RemoveConfigurationAction.java | 8 +++--- .../actions/RunConfigurationTreeAction.java | 8 +++--- ...n.java => RunDashboardTreeActionImpl.java} | 8 +++--- .../actions/RunDashboardTreeLeafAction.java | 4 +-- .../dashboard/actions/StopAction.java | 12 ++++----- .../actions/UngroupConfigurationsActions.java | 2 +- ...onfigurationTypeDashboardGroupingRule.java | 16 ++++++------ .../tree/FolderDashboardGroupingRule.java | 16 ++++++------ .../dashboard/tree/GroupingNode.java | 10 +++---- ...RunConfigurationDashboardGroupingRule.java | 18 ++++++------- .../dashboard/tree/RunConfigurationNode.java | 12 ++++----- .../tree/RunDashboardAnimatorImpl.java | 12 ++++----- ...upImpl.java => RunDashboardGroupImpl.java} | 10 +++---- ...dGrouper.java => RunDashboardGrouper.java} | 10 +++---- .../tree/RunDashboardTreeCellRenderer.java | 6 ++--- .../dashboard/tree/RunDashboardTreeModel.java | 14 +++++----- .../tree/RunDashboardTreeStructure.java | 18 ++++++------- .../tree/StatusDashboardGroupingRule.java | 14 +++++----- .../src/META-INF/LangExtensionPoints.xml | 2 +- .../ui/tree/actions/ServersTreeAction.java | 4 +-- 36 files changed, 163 insertions(+), 163 deletions(-) rename platform/lang-api/src/com/intellij/execution/dashboard/{DashboardGroup.java => RunDashboardGroup.java} (95%) rename platform/lang-api/src/com/intellij/execution/dashboard/{DashboardGroupingRule.java => RunDashboardGroupingRule.java} (86%) rename platform/lang-api/src/com/intellij/execution/dashboard/{DashboardListener.java => RunDashboardListener.java} (94%) rename platform/lang-api/src/com/intellij/execution/dashboard/{DashboardNode.java => RunDashboardNode.java} (96%) rename platform/lang-api/src/com/intellij/execution/dashboard/{DashboardRunConfigurationNode.java => RunDashboardRunConfigurationNode.java} (91%) rename platform/lang-api/src/com/intellij/execution/dashboard/{DashboardRunConfigurationStatus.java => RunDashboardRunConfigurationStatus.java} (78%) rename platform/lang-api/src/com/intellij/execution/dashboard/{DashboardTreeAction.java => RunDashboardTreeAction.java} (96%) rename platform/lang-impl/src/com/intellij/execution/dashboard/actions/{RunDashboardTreeAction.java => RunDashboardTreeActionImpl.java} (77%) rename platform/lang-impl/src/com/intellij/execution/dashboard/tree/{DashboardGroupImpl.java => RunDashboardGroupImpl.java} (78%) rename platform/lang-impl/src/com/intellij/execution/dashboard/tree/{DashboardGrouper.java => RunDashboardGrouper.java} (77%) diff --git a/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardAnimator.java b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardAnimator.java index bcd380ab1c20..070506957c21 100644 --- a/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardAnimator.java +++ b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardAnimator.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; * @author Konstantin Aleev */ public interface RunDashboardAnimator { - void addNode(@NotNull DashboardNode node); + void addNode(@NotNull RunDashboardNode node); - void removeNode(@NotNull DashboardNode node); + void removeNode(@NotNull RunDashboardNode node); } diff --git a/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardContributor.java b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardContributor.java index eb0216066c58..3533b5f29d51 100644 --- a/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardContributor.java +++ b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardContributor.java @@ -50,11 +50,11 @@ public abstract class RunDashboardContributor { return myType; } - public void updatePresentation(@NotNull PresentationData presentation, @NotNull DashboardNode node) { + public void updatePresentation(@NotNull PresentationData presentation, @NotNull RunDashboardNode node) { } public boolean customizeCellRenderer(@NotNull ColoredTreeCellRenderer cellRenderer, @NotNull JLabel nodeLabel, - @NotNull DashboardNode node, + @NotNull RunDashboardNode node, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { return false; } @@ -66,8 +66,8 @@ public abstract class RunDashboardContributor { * @return node's status. Returned status is used for grouping nodes by status. */ @NotNull - public DashboardRunConfigurationStatus getStatus(@NotNull DashboardRunConfigurationNode node) { - return DashboardRunConfigurationStatus.getStatus(node); + public RunDashboardRunConfigurationStatus getStatus(@NotNull RunDashboardRunConfigurationNode node) { + return RunDashboardRunConfigurationStatus.getStatus(node); } public boolean isShowInDashboard(@NotNull RunConfiguration runConfiguration) { diff --git a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardGroup.java b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardGroup.java similarity index 95% rename from platform/lang-api/src/com/intellij/execution/dashboard/DashboardGroup.java rename to platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardGroup.java index dfc91cd81a4d..ecc9286b11f7 100644 --- a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardGroup.java +++ b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardGroup.java @@ -20,7 +20,7 @@ import javax.swing.*; /** * @author konstantin.aleev */ -public interface DashboardGroup { +public interface RunDashboardGroup { String getName(); Icon getIcon(); diff --git a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardGroupingRule.java b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardGroupingRule.java similarity index 86% rename from platform/lang-api/src/com/intellij/execution/dashboard/DashboardGroupingRule.java rename to platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardGroupingRule.java index a74f2403c245..6c1726ff8406 100644 --- a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardGroupingRule.java +++ b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardGroupingRule.java @@ -27,10 +27,10 @@ import java.util.Comparator; * * @author konstantin.aleev */ -public interface DashboardGroupingRule extends TreeAction { - ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.runDashboardGroupingRule"); +public interface RunDashboardGroupingRule extends TreeAction { + ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.runDashboardGroupingRule"); - Comparator PRIORITY_COMPARATOR = (o1, o2) -> { + Comparator PRIORITY_COMPARATOR = (o1, o2) -> { final int res = o2.getPriority() - o1.getPriority(); return res != 0 ? res : (o1.getName().compareTo(o2.getName())); }; @@ -58,7 +58,7 @@ public interface DashboardGroupingRule extends TreeAction { * @return a group which node belongs to or {@code null} if node could not be grouped by this rule. */ @Nullable - DashboardGroup getGroup(AbstractTreeNode node); + RunDashboardGroup getGroup(AbstractTreeNode node); interface Priorities { int BY_RUN_CONFIG = 200; diff --git a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardListener.java b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardListener.java similarity index 94% rename from platform/lang-api/src/com/intellij/execution/dashboard/DashboardListener.java rename to platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardListener.java index c59d3b795a4c..7c7c7ff3d8e4 100644 --- a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardListener.java +++ b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardListener.java @@ -18,6 +18,6 @@ package com.intellij.execution.dashboard; /** * @author konstantin.aleev */ -public interface DashboardListener { +public interface RunDashboardListener { void contentChanged(boolean withStructure); } diff --git a/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardManager.java b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardManager.java index 9d1de893755b..32720ecf559d 100644 --- a/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardManager.java +++ b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardManager.java @@ -38,8 +38,8 @@ import java.util.Set; */ @ApiStatus.Experimental public interface RunDashboardManager { - Topic DASHBOARD_TOPIC = - Topic.create("run dashboard", DashboardListener.class, Topic.BroadcastDirection.TO_PARENT); + Topic DASHBOARD_TOPIC = + Topic.create("run dashboard", RunDashboardListener.class, Topic.BroadcastDirection.TO_PARENT); static RunDashboardManager getInstance(Project project) { return ServiceManager.getService(project, RunDashboardManager.class); diff --git a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardNode.java b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardNode.java similarity index 96% rename from platform/lang-api/src/com/intellij/execution/dashboard/DashboardNode.java rename to platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardNode.java index decb517d89e7..e0ce517d14d7 100644 --- a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardNode.java +++ b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardNode.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.Nullable; /** * @author konstantin.aleev */ -public interface DashboardNode { +public interface RunDashboardNode { @Nullable default RunContentDescriptor getDescriptor() { return null; diff --git a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardRunConfigurationNode.java b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardRunConfigurationNode.java similarity index 91% rename from platform/lang-api/src/com/intellij/execution/dashboard/DashboardRunConfigurationNode.java rename to platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardRunConfigurationNode.java index b460d2d7b2b6..7f9b3f17ab1c 100644 --- a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardRunConfigurationNode.java +++ b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardRunConfigurationNode.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.Nullable; /** * @author konstantin.aleev */ -public interface DashboardRunConfigurationNode extends DashboardNode, UserDataHolder { +public interface RunDashboardRunConfigurationNode extends RunDashboardNode, UserDataHolder { @NotNull RunnerAndConfigurationSettings getConfigurationSettings(); diff --git a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardRunConfigurationStatus.java b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardRunConfigurationStatus.java similarity index 78% rename from platform/lang-api/src/com/intellij/execution/dashboard/DashboardRunConfigurationStatus.java rename to platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardRunConfigurationStatus.java index a44303f151a4..a50212887828 100644 --- a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardRunConfigurationStatus.java +++ b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardRunConfigurationStatus.java @@ -25,18 +25,18 @@ import javax.swing.*; /** * @author konstantin.aleev */ -public class DashboardRunConfigurationStatus { - public static final DashboardRunConfigurationStatus STARTED = new DashboardRunConfigurationStatus( +public class RunDashboardRunConfigurationStatus { + public static final RunDashboardRunConfigurationStatus STARTED = new RunDashboardRunConfigurationStatus( ExecutionBundle.message("run.dashboard.started.group.name"), AllIcons.Toolwindows.ToolWindowRun); - public static final DashboardRunConfigurationStatus STOPPED = new DashboardRunConfigurationStatus( + public static final RunDashboardRunConfigurationStatus STOPPED = new RunDashboardRunConfigurationStatus( ExecutionBundle.message("run.dashboard.stopped.group.name"), AllIcons.Actions.Suspend); - public static final DashboardRunConfigurationStatus FAILED = new DashboardRunConfigurationStatus( + public static final RunDashboardRunConfigurationStatus FAILED = new RunDashboardRunConfigurationStatus( ExecutionBundle.message("run.dashboard.failed.group.name"), AllIcons.General.Error); private final String myName; private final Icon myIcon; - public DashboardRunConfigurationStatus(String name, Icon icon) { + public RunDashboardRunConfigurationStatus(String name, Icon icon) { myName = name; myIcon = icon; } @@ -49,7 +49,7 @@ public class DashboardRunConfigurationStatus { return myIcon; } - public static DashboardRunConfigurationStatus getStatus(DashboardRunConfigurationNode node) { + public static RunDashboardRunConfigurationStatus getStatus(RunDashboardRunConfigurationNode node) { RunContentDescriptor descriptor = node.getDescriptor(); if (descriptor == null) { return STOPPED; diff --git a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardTreeAction.java b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardTreeAction.java similarity index 96% rename from platform/lang-api/src/com/intellij/execution/dashboard/DashboardTreeAction.java rename to platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardTreeAction.java index 0c74a0fdbc7f..3d8614aa1ae6 100644 --- a/platform/lang-api/src/com/intellij/execution/dashboard/DashboardTreeAction.java +++ b/platform/lang-api/src/com/intellij/execution/dashboard/RunDashboardTreeAction.java @@ -33,8 +33,8 @@ import java.util.stream.Collectors; /** * @author konstantin.aleev */ -public abstract class DashboardTreeAction extends AnAction { - protected DashboardTreeAction(String text, String description, Icon icon) { +public abstract class RunDashboardTreeAction extends AnAction { + protected RunDashboardTreeAction(String text, String description, Icon icon) { super(text, description, icon); } 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 1b1528f0d758..6bff31a660e2 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardContent.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardContent.java @@ -85,7 +85,7 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab private RunDashboardAnimator myAnimator; private AbstractTreeNode myLastSelection; private final Set myCollapsedTreeNodeValues = new HashSet<>(); - private final List myGroupers; + private final List myGroupers; @NotNull private final ContentManager myContentManager; @NotNull private final ContentManagerListener myContentManagerListener; @@ -96,7 +96,7 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab private final DefaultActionGroup myDashboardContentActions = new DefaultActionGroup(); private final Map> myContentActions = new WeakHashMap<>(); - public RunDashboardContent(@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; @@ -164,9 +164,9 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab return; } contentAdded(event); - myBuilder.queueUpdate().doWhenDone(() -> myBuilder.accept(DashboardNode.class, new TreeVisitor() { + myBuilder.queueUpdate().doWhenDone(() -> myBuilder.accept(RunDashboardNode.class, new TreeVisitor() { @Override - public boolean visit(@NotNull DashboardNode node) { + public boolean visit(@NotNull RunDashboardNode node) { if (node.getContent() == event.getContent()) { myBuilder.select(node); } @@ -231,8 +231,8 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab new DoubleClickListener() { @Override protected boolean onDoubleClick(MouseEvent event) { - if (myLastSelection instanceof DashboardRunConfigurationNode && myLastSelection.getChildren().isEmpty()) { - DashboardRunConfigurationNode node = (DashboardRunConfigurationNode)myLastSelection; + if (myLastSelection instanceof RunDashboardRunConfigurationNode && myLastSelection.getChildren().isEmpty()) { + RunDashboardRunConfigurationNode node = (RunDashboardRunConfigurationNode)myLastSelection; RunDashboardContributor contributor = node.getContributor(); if (contributor != null) { return contributor.handleDoubleClick(node.getConfigurationSettings().getConfiguration()); @@ -292,8 +292,8 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab } myLastSelection = node; - if (node instanceof DashboardNode) { - Content content = ((DashboardNode)node).getContent(); + if (node instanceof RunDashboardNode) { + Content content = ((RunDashboardNode)node).getContent(); if (content != null && content.getManager() != myContentManager) { content = null; } @@ -307,7 +307,7 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab showContentPanel(); return; } - if (node instanceof DashboardRunConfigurationNode) { + if (node instanceof RunDashboardRunConfigurationNode) { showMessagePanel(ExecutionBundle.message("run.dashboard.not.started.configuration.message")); return; } @@ -433,9 +433,9 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab } private class GroupAction extends ToggleAction implements DumbAware { - private final DashboardGrouper myGrouper; + private final RunDashboardGrouper myGrouper; - GroupAction(DashboardGrouper grouper) { + GroupAction(RunDashboardGrouper grouper) { super(); myGrouper = grouper; } @@ -475,8 +475,8 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab super.update(e); boolean enabled = true; if (isSelected(e)) { - if (myLastSelection instanceof DashboardNode) { - Content content = ((DashboardNode)myLastSelection).getContent(); + if (myLastSelection instanceof RunDashboardNode) { + Content content = ((RunDashboardNode)myLastSelection).getContent(); enabled = content != null && content.getManager() == myContentManager; } else { diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardManagerImpl.java index 68d2b06d14c3..55bab910678a 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardManagerImpl.java @@ -18,7 +18,7 @@ package com.intellij.execution.dashboard; import com.intellij.execution.*; import com.intellij.execution.configurations.ConfigurationType; import com.intellij.execution.configurations.RunConfiguration; -import com.intellij.execution.dashboard.tree.DashboardGrouper; +import com.intellij.execution.dashboard.tree.RunDashboardGrouper; import com.intellij.execution.impl.ExecutionManagerImpl; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.runners.ExecutionEnvironment; @@ -64,7 +64,7 @@ public class RunDashboardManagerImpl implements RunDashboardManager, PersistentS @NotNull private final Project myProject; @NotNull private final ContentManager myContentManager; @NotNull private final Set myTypes = ContainerUtil.newHashSet(); - @NotNull private final List myGroupers; + @NotNull private final List myGroupers; private boolean myShowConfigurations = true; private float myContentProportion = DEFAULT_CONTENT_PROPORTION; @@ -78,9 +78,9 @@ public class RunDashboardManagerImpl implements RunDashboardManager, PersistentS ContentUI contentUI = new PanelContentUI(); myContentManager = contentFactory.createContentManager(contentUI, false, project); - myGroupers = Arrays.stream(DashboardGroupingRule.EP_NAME.getExtensions()) - .sorted(DashboardGroupingRule.PRIORITY_COMPARATOR) - .map(DashboardGrouper::new) + myGroupers = Arrays.stream(RunDashboardGroupingRule.EP_NAME.getExtensions()) + .sorted(RunDashboardGroupingRule.PRIORITY_COMPARATOR) + .map(RunDashboardGrouper::new) .collect(Collectors.toList()); } @@ -131,7 +131,7 @@ public class RunDashboardManagerImpl implements RunDashboardManager, PersistentS updateDashboardIfNeeded(env.getRunnerAndConfigurationSettings()); } }); - connection.subscribe(RunDashboardManager.DASHBOARD_TOPIC, new DashboardListener() { + connection.subscribe(RunDashboardManager.DASHBOARD_TOPIC, new RunDashboardListener() { @Override public void contentChanged(boolean withStructure) { updateDashboard(withStructure); @@ -405,7 +405,7 @@ public class RunDashboardManagerImpl implements RunDashboardManager, PersistentS myTypes.clear(); myTypes.addAll(state.configurationTypes); state.ruleStates.forEach(ruleState -> { - for (DashboardGrouper grouper : myGroupers) { + for (RunDashboardGrouper grouper : myGroupers) { if (grouper.getRule().getName().equals(ruleState.name) && !grouper.getRule().isAlwaysEnabled()) { grouper.setEnabled(ruleState.enabled); return; 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 03c7042bd7a2..a12c7ae5fda0 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 @@ -20,7 +20,7 @@ import com.intellij.execution.RunManager; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.configuration.ConfigurationFactoryEx; import com.intellij.execution.configurations.ConfigurationFactory; -import com.intellij.execution.dashboard.DashboardRunConfigurationNode; +import com.intellij.execution.dashboard.RunDashboardRunConfigurationNode; import com.intellij.execution.impl.RunDialog; import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.openapi.actionSystem.ActionPlaces; @@ -47,13 +47,13 @@ public class CopyConfigurationAction extends RunConfigurationTreeAction { } @Override - protected boolean isEnabled4(DashboardRunConfigurationNode node) { + protected boolean isEnabled4(RunDashboardRunConfigurationNode node) { return RunManager.getInstance(node.getProject()).hasSettings(node.getConfigurationSettings()); } @Override @SuppressWarnings("unchecked") - protected void doActionPerformed(DashboardRunConfigurationNode node) { + protected void doActionPerformed(RunDashboardRunConfigurationNode node) { RunManager runManager = RunManager.getInstance(node.getProject()); RunnerAndConfigurationSettings settings = node.getConfigurationSettings(); 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 680652cb74bf..c423a093bb73 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 @@ -17,7 +17,7 @@ package com.intellij.execution.dashboard.actions; import com.intellij.execution.ExecutionBundle; import com.intellij.execution.RunManager; -import com.intellij.execution.dashboard.DashboardRunConfigurationNode; +import com.intellij.execution.dashboard.RunDashboardRunConfigurationNode; import com.intellij.execution.impl.RunDialog; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionPlaces; @@ -40,12 +40,12 @@ public class EditConfigurationAction extends RunConfigurationTreeAction { } @Override - protected boolean isEnabled4(DashboardRunConfigurationNode node) { + protected boolean isEnabled4(RunDashboardRunConfigurationNode node) { return RunManager.getInstance(node.getProject()).hasSettings(node.getConfigurationSettings()); } @Override - protected void doActionPerformed(DashboardRunConfigurationNode node) { + protected void doActionPerformed(RunDashboardRunConfigurationNode node) { RunDialog.editConfiguration(node.getProject(), node.getConfigurationSettings(), 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 2ee61eefa669..92b5546706a8 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 @@ -21,7 +21,7 @@ import com.intellij.execution.Executor; import com.intellij.execution.ProgramRunnerUtil; import com.intellij.execution.configurations.RuntimeConfigurationError; import com.intellij.execution.configurations.RuntimeConfigurationException; -import com.intellij.execution.dashboard.DashboardRunConfigurationNode; +import com.intellij.execution.dashboard.RunDashboardRunConfigurationNode; import com.intellij.execution.dashboard.RunDashboardManager; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ProgramRunner; @@ -41,13 +41,13 @@ import java.util.List; /** * @author konstantin.aleev */ -public abstract class ExecutorAction extends RunDashboardTreeLeafAction { +public abstract class ExecutorAction extends RunDashboardTreeLeafAction { protected ExecutorAction(String text, String description, Icon icon) { super(text, description, icon); } @Override - protected boolean isEnabled4(DashboardRunConfigurationNode node) { + protected boolean isEnabled4(RunDashboardRunConfigurationNode node) { String executorId = getExecutor().getId(); ProgramRunner runner = ProgramRunnerUtil.getRunner(executorId, node.getConfigurationSettings()); return runner != null && runner.canRun(executorId, node.getConfigurationSettings().getConfiguration()); @@ -61,7 +61,7 @@ public abstract class ExecutorAction extends RunDashboardTreeLeafAction targetNodes = getTargetNodes(e); + List targetNodes = getTargetNodes(e); if (RunDashboardManager.getInstance(project).isShowConfigurations()) { boolean running = targetNodes.stream().anyMatch(node -> { Content content = node.getContent(); @@ -77,7 +77,7 @@ public abstract class ExecutorAction extends RunDashboardTreeLeafAction getTargetNodeClass() { - return DashboardRunConfigurationNode.class; + protected Class getTargetNodeClass() { + return RunDashboardRunConfigurationNode.class; } protected abstract Executor getExecutor(); diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/GroupConfigurationsAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/GroupConfigurationsAction.java index 59e4731832f5..bfb3991e769d 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/GroupConfigurationsAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/GroupConfigurationsAction.java @@ -16,7 +16,7 @@ package com.intellij.execution.dashboard.actions; import com.intellij.execution.ExecutionBundle; -import com.intellij.execution.dashboard.DashboardRunConfigurationNode; +import com.intellij.execution.dashboard.RunDashboardRunConfigurationNode; import com.intellij.execution.dashboard.RunDashboardContent; import com.intellij.execution.impl.RunManagerImpl; import com.intellij.icons.AllIcons; @@ -42,11 +42,11 @@ public class GroupConfigurationsAction extends RunConfigurationTreeAction { } @Override - protected void doActionPerformed(@NotNull RunDashboardContent content, AnActionEvent e, List nodes) { + protected void doActionPerformed(@NotNull RunDashboardContent content, AnActionEvent e, List nodes) { Project project = e.getProject(); if (project == null) return; - DashboardRunConfigurationNode firstNode = ContainerUtil.getFirstItem(nodes); + RunDashboardRunConfigurationNode firstNode = ContainerUtil.getFirstItem(nodes); String initialValue = firstNode != null ? firstNode.getConfigurationSettings().getFolderName() : null; String value = Messages.showInputDialog(project, ExecutionBundle.message("run.dashboard.group.configurations.label"), ExecutionBundle.message("run.dashboard.group.configurations.title"), null, initialValue, null); 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 f240f3a2b13d..2c11426b73da 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 @@ -17,7 +17,7 @@ package com.intellij.execution.dashboard.actions; import com.intellij.execution.ExecutionBundle; import com.intellij.execution.RunManager; -import com.intellij.execution.dashboard.DashboardRunConfigurationNode; +import com.intellij.execution.dashboard.RunDashboardRunConfigurationNode; import com.intellij.execution.dashboard.RunDashboardContent; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -38,7 +38,7 @@ public class RemoveConfigurationAction extends RunConfigurationTreeAction { } @Override - protected boolean isEnabled4(DashboardRunConfigurationNode node) { + protected boolean isEnabled4(RunDashboardRunConfigurationNode node) { return RunManager.getInstance(node.getProject()).hasSettings(node.getConfigurationSettings()); } @@ -48,7 +48,7 @@ public class RemoveConfigurationAction extends RunConfigurationTreeAction { } @Override - protected void doActionPerformed(@NotNull RunDashboardContent content, AnActionEvent e, List nodes) { + protected void doActionPerformed(@NotNull RunDashboardContent content, AnActionEvent e, List nodes) { if (Messages.showYesNoDialog((Project)null, ExecutionBundle.message("run.dashboard.remove.configuration.dialog.message"), ExecutionBundle.message("run.dashboard.remove.configuration.dialog.title"), @@ -60,7 +60,7 @@ public class RemoveConfigurationAction extends RunConfigurationTreeAction { } @Override - protected void doActionPerformed(DashboardRunConfigurationNode node) { + protected void doActionPerformed(RunDashboardRunConfigurationNode node) { RunManager.getInstance(node.getProject()).removeConfiguration(node.getConfigurationSettings()); } } 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 a80d4c0afe80..68db3daca16b 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 @@ -15,7 +15,7 @@ */ package com.intellij.execution.dashboard.actions; -import com.intellij.execution.dashboard.DashboardRunConfigurationNode; +import com.intellij.execution.dashboard.RunDashboardRunConfigurationNode; import com.intellij.openapi.actionSystem.AnActionEvent; import org.jetbrains.annotations.NotNull; @@ -24,14 +24,14 @@ import javax.swing.*; /** * @author konstantin.aleev */ -public abstract class RunConfigurationTreeAction extends RunDashboardTreeAction { +public abstract class RunConfigurationTreeAction extends RunDashboardTreeActionImpl { protected RunConfigurationTreeAction(String text, String description, Icon icon) { super(text, description, icon); } @Override - protected Class getTargetNodeClass() { - return DashboardRunConfigurationNode.class; + protected Class getTargetNodeClass() { + return RunDashboardRunConfigurationNode.class; } @Override diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeActionImpl.java similarity index 77% rename from platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeAction.java rename to platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeActionImpl.java index 65dca40da8ce..494fea823329 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeActionImpl.java @@ -15,8 +15,8 @@ */ package com.intellij.execution.dashboard.actions; -import com.intellij.execution.dashboard.DashboardNode; -import com.intellij.execution.dashboard.DashboardTreeAction; +import com.intellij.execution.dashboard.RunDashboardNode; +import com.intellij.execution.dashboard.RunDashboardTreeAction; import com.intellij.execution.dashboard.RunDashboardContent; import com.intellij.openapi.actionSystem.AnActionEvent; import org.jetbrains.annotations.NotNull; @@ -26,8 +26,8 @@ import javax.swing.*; /** * @author konstantin.aleev */ -public abstract class RunDashboardTreeAction extends DashboardTreeAction { - protected RunDashboardTreeAction(String text, String description, Icon icon) { +public abstract class RunDashboardTreeActionImpl extends RunDashboardTreeAction { + protected RunDashboardTreeActionImpl(String text, String description, Icon icon) { super(text, description, icon); } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeLeafAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeLeafAction.java index c4d51ee0660b..c5501ecf9978 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeLeafAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunDashboardTreeLeafAction.java @@ -15,7 +15,7 @@ */ package com.intellij.execution.dashboard.actions; -import com.intellij.execution.dashboard.DashboardNode; +import com.intellij.execution.dashboard.RunDashboardNode; import com.intellij.execution.dashboard.tree.GroupingNode; import com.intellij.ide.util.treeView.AbstractTreeBuilder; import com.intellij.ide.util.treeView.AbstractTreeNode; @@ -27,7 +27,7 @@ import java.util.*; /** * @author konstantin.aleev */ -public abstract class RunDashboardTreeLeafAction extends RunDashboardTreeAction { +public abstract class RunDashboardTreeLeafAction extends RunDashboardTreeActionImpl { 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 4e2b9fb45dee..f9ace25db350 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 @@ -16,7 +16,7 @@ package com.intellij.execution.dashboard.actions; import com.intellij.execution.ExecutionBundle; -import com.intellij.execution.dashboard.DashboardRunConfigurationNode; +import com.intellij.execution.dashboard.RunDashboardRunConfigurationNode; import com.intellij.execution.dashboard.RunDashboardManager; import com.intellij.execution.impl.ExecutionManagerImpl; import com.intellij.execution.ui.RunContentManagerImpl; @@ -31,7 +31,7 @@ import java.util.List; /** * @author konstantin.aleev */ -public class StopAction extends RunDashboardTreeLeafAction { +public class StopAction extends RunDashboardTreeLeafAction { public StopAction() { super(ExecutionBundle.message("run.dashboard.stop.action.name"), ExecutionBundle.message("run.dashboard.stop.action.description"), @@ -42,7 +42,7 @@ public class StopAction extends RunDashboardTreeLeafAction targetNodes = getTargetNodes(e); + List targetNodes = getTargetNodes(e); e.getPresentation().setEnabled(targetNodes.stream().anyMatch(node -> { Content content = node.getContent(); return content != null && !RunContentManagerImpl.isTerminated(content); @@ -69,12 +69,12 @@ public class StopAction extends RunDashboardTreeLeafAction getTargetNodeClass() { - return DashboardRunConfigurationNode.class; + protected Class getTargetNodeClass() { + return RunDashboardRunConfigurationNode.class; } } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/UngroupConfigurationsActions.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/UngroupConfigurationsActions.java index cd5d23631f73..a160e575fa63 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/UngroupConfigurationsActions.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/UngroupConfigurationsActions.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull; /** * @author Konstantin Aleev */ -public class UngroupConfigurationsActions extends RunDashboardTreeAction { +public class UngroupConfigurationsActions extends RunDashboardTreeActionImpl { protected UngroupConfigurationsActions() { super(ExecutionBundle.message("run.dashboard.ungroup.configurations.action.name"), null, AllIcons.General.Remove); } 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 1ad5fb28ce68..bdd300485f46 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 @@ -18,9 +18,9 @@ package com.intellij.execution.dashboard.tree; import com.intellij.execution.ExecutionBundle; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.configurations.ConfigurationType; -import com.intellij.execution.dashboard.DashboardGroup; -import com.intellij.execution.dashboard.DashboardGroupingRule; -import com.intellij.execution.dashboard.DashboardRunConfigurationNode; +import com.intellij.execution.dashboard.RunDashboardGroup; +import com.intellij.execution.dashboard.RunDashboardGroupingRule; +import com.intellij.execution.dashboard.RunDashboardRunConfigurationNode; import com.intellij.icons.AllIcons; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.ide.util.treeView.smartTree.ActionPresentation; @@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable; /** * @author konstantin.aleev */ -public class ConfigurationTypeDashboardGroupingRule implements DashboardGroupingRule { +public class ConfigurationTypeDashboardGroupingRule implements RunDashboardGroupingRule { @NonNls private static final String NAME = "ConfigurationTypeDashboardGroupingRule"; @Override @@ -66,11 +66,11 @@ public class ConfigurationTypeDashboardGroupingRule implements DashboardGrouping @Nullable @Override - public DashboardGroup getGroup(AbstractTreeNode node) { - if (node instanceof DashboardRunConfigurationNode) { - RunnerAndConfigurationSettings configurationSettings = ((DashboardRunConfigurationNode)node).getConfigurationSettings(); + public RunDashboardGroup getGroup(AbstractTreeNode node) { + if (node instanceof RunDashboardRunConfigurationNode) { + RunnerAndConfigurationSettings configurationSettings = ((RunDashboardRunConfigurationNode)node).getConfigurationSettings(); ConfigurationType type = configurationSettings.getType(); - return new DashboardGroupImpl<>(type, type.getDisplayName(), type.getIcon()); + return new RunDashboardGroupImpl<>(type, type.getDisplayName(), type.getIcon()); } return null; } 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 06669ffdf733..5eed4268fe30 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 @@ -17,9 +17,9 @@ package com.intellij.execution.dashboard.tree; import com.intellij.execution.ExecutionBundle; import com.intellij.execution.RunnerAndConfigurationSettings; -import com.intellij.execution.dashboard.DashboardGroup; -import com.intellij.execution.dashboard.DashboardGroupingRule; -import com.intellij.execution.dashboard.DashboardRunConfigurationNode; +import com.intellij.execution.dashboard.RunDashboardGroup; +import com.intellij.execution.dashboard.RunDashboardGroupingRule; +import com.intellij.execution.dashboard.RunDashboardRunConfigurationNode; import com.intellij.icons.AllIcons; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.ide.util.treeView.smartTree.ActionPresentation; @@ -33,7 +33,7 @@ import javax.swing.*; /** * @author konstantin.aleev */ -public class FolderDashboardGroupingRule implements DashboardGroupingRule { +public class FolderDashboardGroupingRule implements RunDashboardGroupingRule { @NonNls private static final String NAME = "FolderDashboardGroupingRule"; @Override @@ -67,9 +67,9 @@ public class FolderDashboardGroupingRule implements DashboardGroupingRule { @Nullable @Override - public DashboardGroup getGroup(AbstractTreeNode node) { - if (node instanceof DashboardRunConfigurationNode) { - RunnerAndConfigurationSettings configurationSettings = ((DashboardRunConfigurationNode)node).getConfigurationSettings(); + public RunDashboardGroup getGroup(AbstractTreeNode node) { + if (node instanceof RunDashboardRunConfigurationNode) { + RunnerAndConfigurationSettings configurationSettings = ((RunDashboardRunConfigurationNode)node).getConfigurationSettings(); String folderName = configurationSettings.getFolderName(); if (folderName != null) { return new FolderDashboardGroup(folderName, folderName, AllIcons.Nodes.Folder); @@ -78,7 +78,7 @@ public class FolderDashboardGroupingRule implements DashboardGroupingRule { return null; } - public static class FolderDashboardGroup extends DashboardGroupImpl { + public static class FolderDashboardGroup extends RunDashboardGroupImpl { public FolderDashboardGroup(String value, String name, Icon icon) { super(value, name, icon); } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/GroupingNode.java b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/GroupingNode.java index b9ec6ed7ad35..53b2843c03af 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/GroupingNode.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/GroupingNode.java @@ -15,8 +15,8 @@ */ package com.intellij.execution.dashboard.tree; -import com.intellij.execution.dashboard.DashboardGroup; -import com.intellij.execution.dashboard.DashboardNode; +import com.intellij.execution.dashboard.RunDashboardGroup; +import com.intellij.execution.dashboard.RunDashboardNode; import com.intellij.ide.projectView.PresentationData; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.project.Project; @@ -30,14 +30,14 @@ import java.util.List; /** * @author konstantin.aleev */ -public class GroupingNode extends AbstractTreeNode> implements DashboardNode { +public class GroupingNode extends AbstractTreeNode> implements RunDashboardNode { private final List myChildren = new ArrayList<>(); - public GroupingNode(Project project, Object parent, DashboardGroup group) { + public GroupingNode(Project project, Object parent, RunDashboardGroup group) { super(project, Pair.create(parent, group)); } - public DashboardGroup getGroup() { + public RunDashboardGroup getGroup() { //noinspection ConstantConditions ??? return getValue().getSecond(); } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunConfigurationDashboardGroupingRule.java b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunConfigurationDashboardGroupingRule.java index cb3f5d602e3e..10d2f5bcecdf 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunConfigurationDashboardGroupingRule.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunConfigurationDashboardGroupingRule.java @@ -16,9 +16,9 @@ package com.intellij.execution.dashboard.tree; import com.intellij.execution.RunnerAndConfigurationSettings; -import com.intellij.execution.dashboard.DashboardGroup; -import com.intellij.execution.dashboard.DashboardGroupingRule; -import com.intellij.execution.dashboard.DashboardRunConfigurationNode; +import com.intellij.execution.dashboard.RunDashboardGroup; +import com.intellij.execution.dashboard.RunDashboardGroupingRule; +import com.intellij.execution.dashboard.RunDashboardRunConfigurationNode; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.ide.util.treeView.smartTree.ActionPresentation; import com.intellij.ide.util.treeView.smartTree.ActionPresentationData; @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; /** * @author konstantin.aleev */ -public class RunConfigurationDashboardGroupingRule implements DashboardGroupingRule { +public class RunConfigurationDashboardGroupingRule implements RunDashboardGroupingRule { @NotNull @Override public ActionPresentation getPresentation() { @@ -58,11 +58,11 @@ public class RunConfigurationDashboardGroupingRule implements DashboardGroupingR @Nullable @Override - public DashboardGroup getGroup(AbstractTreeNode node) { - if (node instanceof DashboardRunConfigurationNode) { - RunnerAndConfigurationSettings configurationSettings = ((DashboardRunConfigurationNode)node).getConfigurationSettings(); - return new DashboardGroupImpl<>(configurationSettings, configurationSettings.getName(), - configurationSettings.getConfiguration().getIcon()); + public RunDashboardGroup getGroup(AbstractTreeNode node) { + if (node instanceof RunDashboardRunConfigurationNode) { + RunnerAndConfigurationSettings configurationSettings = ((RunDashboardRunConfigurationNode)node).getConfigurationSettings(); + return new RunDashboardGroupImpl<>(configurationSettings, configurationSettings.getName(), + configurationSettings.getConfiguration().getIcon()); } return null; } 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 034d206bdb4f..a58464492279 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 @@ -19,8 +19,8 @@ import com.intellij.execution.Executor; import com.intellij.execution.RunManager; 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.RunDashboardRunConfigurationNode; +import com.intellij.execution.dashboard.RunDashboardRunConfigurationStatus; import com.intellij.execution.dashboard.RunDashboardContributor; import com.intellij.execution.ui.RunContentDescriptor; import com.intellij.execution.ui.RunContentManagerImpl; @@ -41,7 +41,7 @@ import java.util.Collections; * @author konstantin.aleev */ class RunConfigurationNode extends AbstractTreeNode> - implements DashboardRunConfigurationNode { + implements RunDashboardRunConfigurationNode { @Nullable private final RunDashboardContributor myContributor; private final UserDataHolder myUserDataHolder = new UserDataHolderBase(); @@ -84,11 +84,11 @@ class RunConfigurationNode extends AbstractTreeNode myNodes = new HashSet<>(); + private Set myNodes = new HashSet<>(); private AbstractTreeBuilder myTreeBuilder; public RunDashboardAnimatorImpl(AbstractTreeBuilder builder) { @@ -98,14 +98,14 @@ public class RunDashboardAnimatorImpl implements RunDashboardAnimator, Runnable, } @Override - public void addNode(@NotNull DashboardNode node) { + public void addNode(@NotNull RunDashboardNode node) { if (myNodes.add(node) && myNodes.size() == 1) { scheduleRepaint(); } } @Override - public void removeNode(@NotNull DashboardNode node) { + public void removeNode(@NotNull RunDashboardNode node) { if (myNodes.remove(node) && myNodes.isEmpty()) { repaintSubTree(); if (myAlarm != null) { @@ -127,8 +127,8 @@ public class RunDashboardAnimatorImpl implements RunDashboardAnimator, Runnable, private void repaintSubTree() { if (myTreeBuilder == null || myTreeBuilder.isDisposed()) return; - List toRemove = ContainerUtil.newSmartList(); - for (DashboardNode node : myNodes) { + List toRemove = ContainerUtil.newSmartList(); + for (RunDashboardNode node : myNodes) { DefaultMutableTreeNode treeNode = myTreeBuilder.getUi().getNodeForElement(node, false); if (treeNode != null) { myTreeBuilder.queueUpdateFrom(node, false, false); diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/DashboardGroupImpl.java b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardGroupImpl.java similarity index 78% rename from platform/lang-impl/src/com/intellij/execution/dashboard/tree/DashboardGroupImpl.java rename to platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardGroupImpl.java index debd9c30972c..b3e2c8eff4c1 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/DashboardGroupImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardGroupImpl.java @@ -15,19 +15,19 @@ */ package com.intellij.execution.dashboard.tree; -import com.intellij.execution.dashboard.DashboardGroup; +import com.intellij.execution.dashboard.RunDashboardGroup; import javax.swing.*; /** * @author konstantin.aleev */ -public class DashboardGroupImpl implements DashboardGroup { +public class RunDashboardGroupImpl implements RunDashboardGroup { private final T myValue; private final String myName; private final Icon myIcon; - public DashboardGroupImpl(T value, String name, Icon icon) { + public RunDashboardGroupImpl(T value, String name, Icon icon) { myValue = value; myName = name; myIcon = icon; @@ -50,8 +50,8 @@ public class DashboardGroupImpl implements DashboardGroup { @Override public final boolean equals(Object obj) { - if (obj instanceof DashboardGroupImpl) { - return myValue.equals(((DashboardGroupImpl)obj).myValue); + if (obj instanceof RunDashboardGroupImpl) { + return myValue.equals(((RunDashboardGroupImpl)obj).myValue); } return false; } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/DashboardGrouper.java b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardGrouper.java similarity index 77% rename from platform/lang-impl/src/com/intellij/execution/dashboard/tree/DashboardGrouper.java rename to platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardGrouper.java index 0728bef2833a..9e5321a0619c 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/DashboardGrouper.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardGrouper.java @@ -15,22 +15,22 @@ */ package com.intellij.execution.dashboard.tree; -import com.intellij.execution.dashboard.DashboardGroupingRule; +import com.intellij.execution.dashboard.RunDashboardGroupingRule; import org.jetbrains.annotations.NotNull; /** * @author konstantin.aleev */ -public class DashboardGrouper { - @NotNull private final DashboardGroupingRule myRule; +public class RunDashboardGrouper { + @NotNull private final RunDashboardGroupingRule myRule; private boolean myEnabled = true; - public DashboardGrouper(@NotNull DashboardGroupingRule rule) { + public RunDashboardGrouper(@NotNull RunDashboardGroupingRule rule) { myRule = rule; } @NotNull - public DashboardGroupingRule getRule() { + public RunDashboardGroupingRule getRule() { return myRule; } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeCellRenderer.java b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeCellRenderer.java index 73d6623480c6..54e3dc44eb43 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeCellRenderer.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeCellRenderer.java @@ -15,7 +15,7 @@ */ package com.intellij.execution.dashboard.tree; -import com.intellij.execution.dashboard.DashboardRunConfigurationNode; +import com.intellij.execution.dashboard.RunDashboardRunConfigurationNode; import com.intellij.execution.dashboard.RunDashboardContributor; import com.intellij.ide.util.treeView.NodeRenderer; import com.intellij.ui.ColoredTreeCellRenderer; @@ -50,8 +50,8 @@ public class RunDashboardTreeCellRenderer extends JPanel implements TreeCellRend boolean hasFocus) { myNodeRender.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus); Object userObject = TreeUtil.getUserObject(value); - if (userObject instanceof DashboardRunConfigurationNode) { - DashboardRunConfigurationNode node = (DashboardRunConfigurationNode)userObject; + if (userObject instanceof RunDashboardRunConfigurationNode) { + RunDashboardRunConfigurationNode node = (RunDashboardRunConfigurationNode)userObject; RunDashboardContributor contributor = node.getContributor(); if (contributor != null) { if (contributor.customizeCellRenderer(myNodeRender, myLabel, node, selected, expanded, leaf, row, hasFocus)) { diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeModel.java b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeModel.java index cccb8e6e7b16..2b0db419e965 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeModel.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeModel.java @@ -16,7 +16,7 @@ package com.intellij.execution.dashboard.tree; import com.intellij.execution.RunnerAndConfigurationSettings; -import com.intellij.execution.dashboard.DashboardRunConfigurationNode; +import com.intellij.execution.dashboard.RunDashboardRunConfigurationNode; import com.intellij.execution.impl.RunManagerImpl; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; @@ -69,7 +69,7 @@ public class RunDashboardTreeModel extends DefaultTreeModel implements EditableM if (myProject.isDisposed() || DumbService.getInstance(myProject).isDumb()) return false; - DashboardRunConfigurationNode oldNode = getRunConfigurationNode(oldIndex); + RunDashboardRunConfigurationNode oldNode = getRunConfigurationNode(oldIndex); if (oldNode == null) return false; GroupingNode newNode = getGroupingNode(newIndex); @@ -80,7 +80,7 @@ public class RunDashboardTreeModel extends DefaultTreeModel implements EditableM public boolean canDrop(int oldIndex, int newIndex, @NotNull Position position) { if (myProject.isDisposed() || DumbService.getInstance(myProject).isDumb()) return false; - DashboardRunConfigurationNode oldNode = getRunConfigurationNode(oldIndex); + RunDashboardRunConfigurationNode oldNode = getRunConfigurationNode(oldIndex); if (oldNode == null) return false; if (position == Position.INTO) { @@ -95,7 +95,7 @@ public class RunDashboardTreeModel extends DefaultTreeModel implements EditableM public void drop(int oldIndex, int newIndex, @NotNull Position position) { if (myProject.isDisposed() || DumbService.getInstance(myProject).isDumb()) return; - DashboardRunConfigurationNode oldNode = getRunConfigurationNode(oldIndex); + RunDashboardRunConfigurationNode oldNode = getRunConfigurationNode(oldIndex); if (oldNode == null) return; final RunManagerImpl runManager = RunManagerImpl.getInstanceImpl(myProject); @@ -109,7 +109,7 @@ public class RunDashboardTreeModel extends DefaultTreeModel implements EditableM return; } - DashboardRunConfigurationNode newNode = getRunConfigurationNode(newIndex); + RunDashboardRunConfigurationNode newNode = getRunConfigurationNode(newIndex); if (newNode == null) return; oldNode.getConfigurationSettings().setFolderName(newNode.getConfigurationSettings().getFolderName()); @@ -141,8 +141,8 @@ public class RunDashboardTreeModel extends DefaultTreeModel implements EditableM } @Nullable - private DashboardRunConfigurationNode getRunConfigurationNode(int index) { - return getDashboardNode(index, DashboardRunConfigurationNode.class); + private RunDashboardRunConfigurationNode getRunConfigurationNode(int index) { + return getDashboardNode(index, RunDashboardRunConfigurationNode.class); } @Nullable diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeStructure.java b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeStructure.java index 82bb1fe4406b..1f9cf5267ef2 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeStructure.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeStructure.java @@ -15,8 +15,8 @@ */ package com.intellij.execution.dashboard.tree; -import com.intellij.execution.dashboard.DashboardGroup; -import com.intellij.execution.dashboard.DashboardGroupingRule; +import com.intellij.execution.dashboard.RunDashboardGroup; +import com.intellij.execution.dashboard.RunDashboardGroupingRule; import com.intellij.execution.dashboard.RunDashboardManager; import com.intellij.ide.projectView.PresentationData; import com.intellij.ide.projectView.TreeStructureProvider; @@ -34,10 +34,10 @@ import java.util.stream.Collectors; */ public class RunDashboardTreeStructure extends AbstractTreeStructureBase { private final Project myProject; - private final List myGroupers; + private final List myGroupers; private final RunConfigurationsTreeRootNode myRootElement; - public RunDashboardTreeStructure(@NotNull Project project, @NotNull List groupers) { + public RunDashboardTreeStructure(@NotNull Project project, @NotNull List groupers) { super(project); myProject = project; myGroupers = groupers; @@ -79,7 +79,7 @@ public class RunDashboardTreeStructure extends AbstractTreeStructureBase { return group(myProject, this, - myGroupers.stream().filter(DashboardGrouper::isEnabled).map(DashboardGrouper::getRule).collect(Collectors.toList()), + myGroupers.stream().filter(RunDashboardGrouper::isEnabled).map(RunDashboardGrouper::getRule).collect(Collectors.toList()), nodes); } @@ -89,13 +89,13 @@ public class RunDashboardTreeStructure extends AbstractTreeStructureBase { } private static Collection group(final Project project, final AbstractTreeNode parent, - List rules, List nodes) { + List rules, List nodes) { if (rules.isEmpty()) { return nodes; } - final List remaining = new ArrayList<>(rules); - DashboardGroupingRule rule = remaining.remove(0); - Map, List> groups = nodes.stream().collect( + final List remaining = new ArrayList<>(rules); + RunDashboardGroupingRule rule = remaining.remove(0); + Map, List> groups = nodes.stream().collect( Collectors.groupingBy(node -> Optional.ofNullable(rule.getGroup(node)))); final List result = new ArrayList<>(); final List ungroupedNodes = new ArrayList<>(); 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 eea7e3845acf..3b7c8d737eaa 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 @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; /** * @author konstantin.aleev */ -public class StatusDashboardGroupingRule implements DashboardGroupingRule { +public class StatusDashboardGroupingRule implements RunDashboardGroupingRule { @NonNls private static final String NAME = "StatusDashboardGroupingRule"; @Override @@ -62,13 +62,13 @@ public class StatusDashboardGroupingRule implements DashboardGroupingRule { @Nullable @Override - public DashboardGroup getGroup(AbstractTreeNode node) { - if (node instanceof DashboardRunConfigurationNode) { - DashboardRunConfigurationNode runConfigurationNode = (DashboardRunConfigurationNode)node; + public RunDashboardGroup getGroup(AbstractTreeNode node) { + if (node instanceof RunDashboardRunConfigurationNode) { + RunDashboardRunConfigurationNode runConfigurationNode = (RunDashboardRunConfigurationNode)node; RunDashboardContributor contributor = runConfigurationNode.getContributor(); - DashboardRunConfigurationStatus status = contributor != null ? contributor.getStatus(runConfigurationNode) : - DashboardRunConfigurationStatus.getStatus(runConfigurationNode); - return new DashboardGroupImpl<>(status, status.getName(), status.getIcon()); + RunDashboardRunConfigurationStatus status = contributor != null ? contributor.getStatus(runConfigurationNode) : + RunDashboardRunConfigurationStatus.getStatus(runConfigurationNode); + return new RunDashboardGroupImpl<>(status, status.getName(), status.getIcon()); } return null; } diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml index a2c41b8f2f7b..508f781afff0 100644 --- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml +++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml @@ -462,7 +462,7 @@ + interface="com.intellij.execution.dashboard.RunDashboardGroupingRule"/> diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeAction.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeAction.java index 583c20adc793..cb894c92f8ee 100644 --- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeAction.java +++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/ServersTreeAction.java @@ -1,6 +1,6 @@ package com.intellij.remoteServer.impl.runtime.ui.tree.actions; -import com.intellij.execution.dashboard.DashboardTreeAction; +import com.intellij.execution.dashboard.RunDashboardTreeAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.project.DumbAware; @@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.util.List; -public abstract class ServersTreeAction extends DashboardTreeAction +public abstract class ServersTreeAction extends RunDashboardTreeAction implements DumbAware { protected ServersTreeAction(String text, String description, Icon icon) { super(text, description, icon);