diff --git a/java/debugger/impl/src/com/intellij/debugger/memory/agent/MemoryAgentUtil.java b/java/debugger/impl/src/com/intellij/debugger/memory/agent/MemoryAgentUtil.java index adeee17aff07..1b2ffca5eff5 100644 --- a/java/debugger/impl/src/com/intellij/debugger/memory/agent/MemoryAgentUtil.java +++ b/java/debugger/impl/src/com/intellij/debugger/memory/agent/MemoryAgentUtil.java @@ -25,6 +25,7 @@ import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ExecutionUtil; import com.intellij.execution.ui.ExecutionConsole; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.RunContentManager; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Attachment; import com.intellij.openapi.diagnostic.Logger; @@ -285,7 +286,7 @@ public class MemoryAgentUtil { if (outputLines.length >= 1 && outputLines[0].contains("memory_agent") && !mentions.isEmpty()) { Project project = env.getProject(); String name = env.getRunProfile().getName(); - String windowId = ExecutionManager.getInstance(project).getContentManager().getToolWindowIdByEnvironment(env); + String windowId = RunContentManager.getInstance(project).getToolWindowIdByEnvironment(env); Attachment[] mentionsInOutput = StreamEx.of(mentions).map(x -> new Attachment("agent_mention.txt", x)) .toArray(Attachment.EMPTY_ARRAY); diff --git a/java/execution/impl/src/com/intellij/execution/jshell/JShellHandler.java b/java/execution/impl/src/com/intellij/execution/jshell/JShellHandler.java index b2bbab2a0b5d..345177e2e65e 100644 --- a/java/execution/impl/src/com/intellij/execution/jshell/JShellHandler.java +++ b/java/execution/impl/src/com/intellij/execution/jshell/JShellHandler.java @@ -1,7 +1,6 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.execution.jshell; -import com.intellij.execution.ExecutionManager; import com.intellij.execution.Executor; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.execution.executors.DefaultRunExecutor; @@ -13,6 +12,7 @@ import com.intellij.execution.jshell.protocol.*; import com.intellij.execution.process.*; import com.intellij.execution.ui.ConsoleViewContentType; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.RunContentManager; import com.intellij.execution.ui.actions.CloseAction; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.ActionToolbar; @@ -188,7 +188,7 @@ public class JShellHandler { processHandler.startNotify(); - ExecutionManager.getInstance(project).getContentManager().showRunContent(EXECUTOR, descriptor); + RunContentManager.getInstance(project).showRunContent(EXECUTOR, descriptor); return jshellHandler; } @@ -289,11 +289,11 @@ public class JShellHandler { public void stop() { myProcess.destroyProcess(); // use force - ExecutionManager.getInstance(myProject).getContentManager().removeRunContent(EXECUTOR, myRunContent); + RunContentManager.getInstance(myProject).removeRunContent(EXECUTOR, myRunContent); } public void toFront() { - ExecutionManager.getInstance(myProject).getContentManager().toFrontRunContent(EXECUTOR, myRunContent); + RunContentManager.getInstance(myProject).toFrontRunContent(EXECUTOR, myRunContent); } @Nullable diff --git a/platform/lang-api/src/com/intellij/execution/ExecutionManager.java b/platform/lang-api/src/com/intellij/execution/ExecutionManager.java index 42f5ac2167dd..0269cb464b5d 100644 --- a/platform/lang-api/src/com/intellij/execution/ExecutionManager.java +++ b/platform/lang-api/src/com/intellij/execution/ExecutionManager.java @@ -5,7 +5,6 @@ import com.intellij.execution.configurations.RunProfileState; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.ui.RunContentManager; -import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.util.messages.Topic; import org.jetbrains.annotations.ApiStatus; @@ -20,15 +19,14 @@ public abstract class ExecutionManager { Topic.create("configuration executed", ExecutionListener.class, Topic.BroadcastDirection.TO_PARENT); public static ExecutionManager getInstance(@NotNull Project project) { - return ServiceManager.getService(project, ExecutionManager.class); + return project.getService(ExecutionManager.class); } /** - * Returns the manager of running process tabs in Run and Debug toolwindows. - * - * @return the run content manager instance. + * @deprecated Use {@link RunContentManager#getInstance(Project)} */ @NotNull + @Deprecated public abstract RunContentManager getContentManager(); /** diff --git a/platform/lang-api/src/com/intellij/execution/runners/ExecutionUtil.java b/platform/lang-api/src/com/intellij/execution/runners/ExecutionUtil.java index e64d169100e0..f625a6cf52ad 100644 --- a/platform/lang-api/src/com/intellij/execution/runners/ExecutionUtil.java +++ b/platform/lang-api/src/com/intellij/execution/runners/ExecutionUtil.java @@ -54,7 +54,7 @@ public final class ExecutionUtil { public static void handleExecutionError(@NotNull ExecutionEnvironment environment, @NotNull ExecutionException e) { handleExecutionError(environment.getProject(), - ExecutionManager.getInstance(environment.getProject()).getContentManager().getToolWindowIdByEnvironment(environment), + RunContentManager.getInstance(environment.getProject()).getToolWindowIdByEnvironment(environment), environment.getRunProfile().getName(), e); } @@ -227,7 +227,7 @@ public final class ExecutionUtil { catch (ExecutionException e) { RunConfiguration configuration = settings.getConfiguration(); Project project = configuration.getProject(); - RunContentManager manager = ExecutionManager.getInstance(project).getContentManager(); + RunContentManager manager = RunContentManager.getInstance(project); String toolWindowId = manager.getContentDescriptorToolWindowId(configuration); if (toolWindowId == null) { toolWindowId = executor.getToolWindowId(); diff --git a/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.kt b/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.kt index b85216d5442c..336bc1705ca0 100644 --- a/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.kt +++ b/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.kt @@ -7,6 +7,7 @@ import com.intellij.execution.RunProfileStarter import com.intellij.execution.configurations.RunProfileState import com.intellij.execution.configurations.RunnerSettings import com.intellij.execution.ui.RunContentDescriptor +import com.intellij.execution.ui.RunContentManager import com.intellij.openapi.project.Project import org.jetbrains.annotations.ApiStatus import org.jetbrains.concurrency.Promise @@ -67,7 +68,7 @@ fun startRunProfile(environment: ExecutionEnvironment, callback: ProgramRunner.C if (descriptor != null) { descriptor.executionId = environment.executionId - val toolWindowId = ExecutionManager.getInstance(environment.project).contentManager.getContentDescriptorToolWindowId(environment) + val toolWindowId = RunContentManager.getInstance(environment.project).getContentDescriptorToolWindowId(environment) if (toolWindowId != null) { descriptor.contentToolWindowId = toolWindowId } diff --git a/platform/lang-api/src/com/intellij/execution/ui/RunContentManager.java b/platform/lang-api/src/com/intellij/execution/ui/RunContentManager.java index 4fa0f0105e3d..7e0bfa7e7aab 100644 --- a/platform/lang-api/src/com/intellij/execution/ui/RunContentManager.java +++ b/platform/lang-api/src/com/intellij/execution/ui/RunContentManager.java @@ -17,8 +17,6 @@ import java.util.List; /** * The manager of tabs in the Run/Debug toolwindows. - * - * @see com.intellij.execution.ExecutionManager#getContentManager() */ public interface RunContentManager { Topic TOPIC = Topic.create("Run Content", RunContentWithExecutorListener.class); diff --git a/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java b/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java index 7ced98680017..93191f07a85c 100644 --- a/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java +++ b/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java @@ -1,24 +1,10 @@ -/* - * Copyright 2000-2019 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.execution.ui.actions; import com.intellij.execution.ExecutionBundle; -import com.intellij.execution.ExecutionManager; import com.intellij.execution.Executor; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.RunContentManager; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -56,7 +42,7 @@ public class CloseAction extends AnAction implements DumbAware { if (contentDescriptor == null) { return; } - final boolean removedOk = ExecutionManager.getInstance(myProject).getContentManager().removeRunContent(getExecutor(), contentDescriptor); + final boolean removedOk = RunContentManager.getInstance(myProject).removeRunContent(getExecutor(), contentDescriptor); if (removedOk) { myContentDescriptor = null; myExecutor = null; diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java b/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java index 28da7c188770..5ef82d558924 100644 --- a/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java +++ b/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java @@ -237,7 +237,7 @@ public class ExecutionHelper { final Ref> ref = new Ref<>(); final Runnable computeDescriptors = () -> { - RunContentManager contentManager = ExecutionManager.getInstance(project).getContentManager(); + RunContentManager contentManager = RunContentManager.getInstance(project); final RunContentDescriptor selectedContent = contentManager.getSelectedContent(); if (selectedContent != null) { final ToolWindow toolWindow = contentManager.getToolWindowByDescriptor(selectedContent); @@ -309,7 +309,7 @@ public class ExecutionHelper { private static void descriptorToFront(@NotNull final Project project, @NotNull final RunContentDescriptor descriptor) { ApplicationManager.getApplication().invokeLater(() -> { - RunContentManager manager = ExecutionManager.getInstance(project).getContentManager(); + RunContentManager manager = RunContentManager.getInstance(project); ToolWindow toolWindow = manager.getToolWindowByDescriptor(descriptor); if (toolWindow != null) { toolWindow.show(null); diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java index 26a8698cbf87..e9717750a996 100644 --- a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java @@ -12,6 +12,7 @@ import com.intellij.execution.runners.ExecutionEnvironmentBuilder; import com.intellij.execution.runners.ExecutionUtil; import com.intellij.execution.runners.ProgramRunner; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.RunContentManager; import com.intellij.icons.AllIcons; import com.intellij.ide.macro.MacroManager; import com.intellij.openapi.actionSystem.*; @@ -254,8 +255,7 @@ public final class ExecutorRegistryImpl extends ExecutorRegistry { List runningDescriptors = executionManager.getRunningDescriptors(s -> s != null && s.getConfiguration() == selectedConfiguration.getConfiguration()); runningDescriptors = ContainerUtil.filter(runningDescriptors, descriptor -> { - RunContentDescriptor contentDescriptor = - executionManager.getContentManager().findContentDescriptor(myExecutor, descriptor.getProcessHandler()); + RunContentDescriptor contentDescriptor = RunContentManager.getInstance(project).findContentDescriptor(myExecutor, descriptor.getProcessHandler()); return contentDescriptor != null && executionManager.getExecutors(contentDescriptor).contains(myExecutor); }); diff --git a/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java b/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java index 61cc506a71cc..daf9efcf3924 100644 --- a/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java +++ b/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java @@ -10,6 +10,7 @@ import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ExecutionEnvironmentBuilder; import com.intellij.execution.runners.ExecutionUtil; import com.intellij.execution.runners.ProgramRunner; +import com.intellij.execution.ui.RunContentManager; import com.intellij.icons.AllIcons; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.options.ex.SingleConfigurableEditor; @@ -114,7 +115,7 @@ public final class ProgramRunnerUtil { Throwable e, RunProfile configuration) { String name = configuration != null ? configuration.getName() : environment.getRunProfile().getName(); - String windowId = ExecutionManager.getInstance(project).getContentManager().getToolWindowIdByEnvironment(environment); + String windowId = RunContentManager.getInstance(project).getToolWindowIdByEnvironment(environment); if (configuration instanceof ConfigurationWithCommandLineShortener && ExecutionUtil.isProcessNotCreated(e)) { handleProcessNotStartedError((ConfigurationWithCommandLineShortener)configuration, (ProcessNotCreatedException)e, name, windowId); } diff --git a/platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java b/platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java index 59199cb129b1..066f6f28e58d 100644 --- a/platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java +++ b/platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java @@ -10,6 +10,7 @@ import com.intellij.execution.process.ProcessEvent; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.ui.ConsoleView; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.RunContentManager; import com.intellij.execution.ui.actions.CloseAction; import com.intellij.icons.AllIcons; import com.intellij.openapi.Disposable; @@ -108,17 +109,17 @@ public class RunContentExecutor implements Disposable { Disposer.register(descriptor, this); Disposer.register(descriptor, console); - + actions.add(new RerunAction(consolePanel)); actions.add(new StopAction()); actions.add(new CloseAction(executor, descriptor, myProject)); - ExecutionManager.getInstance(myProject).getContentManager().showRunContent(executor, descriptor); + RunContentManager.getInstance(myProject).showRunContent(executor, descriptor); if (myActivateToolWindow) { activateToolWindow(); } - + return console; } diff --git a/platform/lang-impl/src/com/intellij/execution/actions/ShowRunningListAction.java b/platform/lang-impl/src/com/intellij/execution/actions/ShowRunningListAction.java index b53ee5362b30..c6a61f6f369d 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/ShowRunningListAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/ShowRunningListAction.java @@ -7,6 +7,7 @@ import com.intellij.execution.KillableProcess; import com.intellij.execution.impl.ExecutionManagerImpl; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.RunContentManager; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -15,7 +16,10 @@ import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.ui.popup.Balloon; import com.intellij.openapi.ui.popup.BalloonBuilder; import com.intellij.openapi.ui.popup.JBPopupFactory; -import com.intellij.openapi.util.*; +import com.intellij.openapi.util.Conditions; +import com.intellij.openapi.util.Pair; +import com.intellij.openapi.util.Ref; +import com.intellij.openapi.util.Trinity; import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.openapi.wm.IdeFrame; import com.intellij.openapi.wm.WindowManager; @@ -38,7 +42,7 @@ import java.util.Arrays; import java.util.List; import java.util.Set; -public class ShowRunningListAction extends AnAction { +public final class ShowRunningListAction extends AnAction { public ShowRunningListAction() { super(ExecutionBundle.message("show.running.list.action.name"), ExecutionBundle.message("show.running.list.action.description"), null); } @@ -96,7 +100,7 @@ public class ShowRunningListAction extends AnAction { if (aFrame != null && !aFrame.isActive()) { IdeFocusManager.getGlobalInstance().doWhenFocusSettlesDown(() -> IdeFocusManager.getGlobalInstance().requestFocus(aFrame, true)); } - ExecutionManagerImpl.getInstance(aProject).getContentManager(). + RunContentManager.getInstance(aProject). toFrontRunContent((Executor)((Trinity)value).second, (RunContentDescriptor)((Trinity)value).third); } } diff --git a/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java b/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java index 52ba9fbdf9d1..fa60c584234f 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java @@ -1,13 +1,13 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.execution.actions; import com.intellij.execution.ExecutionBundle; -import com.intellij.execution.ExecutionManager; import com.intellij.execution.KillableProcess; import com.intellij.execution.configurations.RunProfile; import com.intellij.execution.impl.ExecutionManagerImpl; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.RunContentManager; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; @@ -235,7 +235,7 @@ public class StopAction extends DumbAwareAction implements AnAction.TransparentU else { // main menu toolbar final Project project = CommonDataKeys.PROJECT.getData(dataContext); - return project == null ? null : ExecutionManager.getInstance(project).getContentManager().getSelectedContent(); + return project == null ? null : RunContentManager.getInstance(project).getSelectedContent(); } } diff --git a/platform/lang-impl/src/com/intellij/execution/console/RunIdeConsoleAction.java b/platform/lang-impl/src/com/intellij/execution/console/RunIdeConsoleAction.java index 246e65c175b4..d5a513d7fdb2 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/RunIdeConsoleAction.java +++ b/platform/lang-impl/src/com/intellij/execution/console/RunIdeConsoleAction.java @@ -1,7 +1,6 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.execution.console; -import com.intellij.execution.ExecutionManager; import com.intellij.execution.Executor; import com.intellij.execution.executors.DefaultRunExecutor; import com.intellij.execution.filters.TextConsoleBuilderFactory; @@ -9,6 +8,7 @@ import com.intellij.execution.impl.ConsoleViewImpl; import com.intellij.execution.ui.ConsoleView; import com.intellij.execution.ui.ConsoleViewContentType; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.RunContentManager; import com.intellij.execution.ui.actions.CloseAction; import com.intellij.ide.scratch.ScratchFileService; import com.intellij.ide.script.IdeConsoleScriptBindings; @@ -61,7 +61,7 @@ import java.util.List; /** * @author gregsh */ -public class RunIdeConsoleAction extends DumbAwareAction { +public final class RunIdeConsoleAction extends DumbAwareAction { private static final Logger LOG = Logger.getInstance(RunIdeConsoleAction.class); private static final String DEFAULT_FILE_NAME = "ide-scripting"; @@ -242,14 +242,14 @@ public class RunIdeConsoleAction extends DumbAwareAction { private static void selectContent(RunContentDescriptor descriptor) { Executor executor = DefaultRunExecutor.getRunExecutorInstance(); ConsoleViewImpl consoleView = ObjectUtils.assertNotNull((ConsoleViewImpl)descriptor.getExecutionConsole()); - ExecutionManager.getInstance(consoleView.getProject()).getContentManager().toFrontRunContent(executor, descriptor); + RunContentManager.getInstance(consoleView.getProject()).toFrontRunContent(executor, descriptor); } @NotNull private static RunContentDescriptor getConsoleView(@NotNull Project project, @NotNull VirtualFile file, @NotNull IdeScriptEngineManager.EngineInfo engineInfo) { - for (RunContentDescriptor existing : ExecutionManager.getInstance(project).getContentManager().getAllDescriptors()) { + for (RunContentDescriptor existing : RunContentManager.getInstance(project).getAllDescriptors()) { Content content = existing.getAttachedContent(); if (content == null) continue; Trinity data = content.getUserData(SCRIPT_ENGINE_KEY); @@ -277,7 +277,7 @@ public class RunIdeConsoleAction extends DumbAwareAction { Executor executor = DefaultRunExecutor.getRunExecutorInstance(); toolbarActions.addAll(consoleView.createConsoleActions()); toolbarActions.add(new CloseAction(executor, descriptor, project)); - ExecutionManager.getInstance(project).getContentManager().showRunContent(executor, descriptor); + RunContentManager.getInstance(project).showRunContent(executor, descriptor); return descriptor; } 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 8158d998c444..09b2c4c6a84b 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardManagerImpl.java @@ -15,6 +15,7 @@ import com.intellij.execution.services.ServiceEventListener; import com.intellij.execution.services.ServiceViewManager; import com.intellij.execution.services.ServiceViewManagerImpl; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.RunContentManager; import com.intellij.execution.ui.RunContentManagerImpl; import com.intellij.execution.ui.RunnerLayoutUi; import com.intellij.execution.ui.layout.impl.RunnerLayoutUiImpl; @@ -232,8 +233,7 @@ public final class RunDashboardManagerImpl implements RunDashboardManager, Persi } private void moveRemovedContent(Condition condition) { - ExecutionManagerImpl executionManager = (ExecutionManagerImpl)ExecutionManager.getInstance(myProject); - RunContentManagerImpl runContentManager = (RunContentManagerImpl)executionManager.getContentManager(); + RunContentManagerImpl runContentManager = (RunContentManagerImpl)RunContentManager.getInstance(myProject); for (RunDashboardService service : getRunConfigurations()) { Content content = service.getContent(); if (content == null || !condition.value(service.getSettings())) continue; @@ -251,9 +251,8 @@ public final class RunDashboardManagerImpl implements RunDashboardManager, Persi } private void moveAddedContent(Condition condition) { - ExecutionManagerImpl executionManager = (ExecutionManagerImpl)ExecutionManager.getInstance(myProject); - RunContentManagerImpl runContentManager = (RunContentManagerImpl)executionManager.getContentManager(); - List descriptors = executionManager.getRunningDescriptors(condition); + RunContentManagerImpl runContentManager = (RunContentManagerImpl)RunContentManager.getInstance(myProject); + List descriptors = ((ExecutionManagerImpl)ExecutionManager.getInstance(myProject)).getRunningDescriptors(condition); for (RunContentDescriptor descriptor : descriptors) { Content content = descriptor.getAttachedContent(); if (content == null) continue; diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/ClearContentAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/ClearContentAction.java index 872e5641aad0..6d57648f0393 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/ClearContentAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/ClearContentAction.java @@ -1,10 +1,10 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.execution.dashboard.actions; -import com.intellij.execution.ExecutionManager; import com.intellij.execution.Executor; import com.intellij.execution.dashboard.RunDashboardRunConfigurationNode; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.RunContentManager; import com.intellij.execution.ui.RunContentManagerImpl; import com.intellij.openapi.actionSystem.ActionPlaces; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -40,6 +40,6 @@ public class ClearContentAction extends DumbAwareAction { Executor executor = RunContentManagerImpl.getExecutorByContent(content); if (executor == null) return; - ExecutionManager.getInstance(project).getContentManager().removeRunContent(executor, descriptor); + RunContentManager.getInstance(project).removeRunContent(executor, descriptor); } } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.kt b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.kt index 6da455cd15c5..3046784bf618 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.kt +++ b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.kt @@ -134,7 +134,7 @@ class ExecutionManagerImpl(private val project: Project) : ExecutionManager(), D RunManager.getInstance(environment.project).refreshUsagesList(environment.runProfile) val project = environment.project - val reuseContent = contentManager.getReuseContent(environment) + val reuseContent = RunContentManager.getInstance(project).getReuseContent(environment) if (reuseContent != null) { reuseContent.executionId = environment.executionId environment.contentToReuse = reuseContent @@ -172,7 +172,7 @@ class ExecutionManagerImpl(private val project: Project) : ExecutionManager(), D runningConfigurations.add(entry) Disposer.register(descriptor, Disposable { runningConfigurations.remove(entry) }) if (!descriptor.isHiddenContent) { - contentManager.showRunContent(executor, descriptor, environment.contentToReuse) + RunContentManager.getInstance(project).showRunContent(executor, descriptor, environment.contentToReuse) } activity?.stageStarted("ui.shown") diff --git a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java index 0e65d0c9f17a..fe9d07ae6073 100644 --- a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java +++ b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java @@ -2,7 +2,6 @@ package com.intellij.execution.runners; import com.intellij.execution.ExecutionException; -import com.intellij.execution.ExecutionManager; import com.intellij.execution.Executor; import com.intellij.execution.console.ConsoleExecuteAction; import com.intellij.execution.console.LanguageConsoleView; @@ -10,6 +9,7 @@ import com.intellij.execution.console.ProcessBackedConsoleExecuteActionHandler; import com.intellij.execution.executors.DefaultRunExecutor; import com.intellij.execution.process.*; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.RunContentManager; import com.intellij.execution.ui.actions.CloseAction; import com.intellij.ide.CommonActionsManager; import com.intellij.openapi.actionSystem.*; @@ -138,7 +138,7 @@ public abstract class AbstractConsoleRunnerWithHistory { if (myRunContentDescriptor != null) { - RunContentManager manager = ExecutionManager.getInstance(myProject).getContentManager(); + RunContentManager manager = RunContentManager.getInstance(myProject); ToolWindow toolWindow = manager.getToolWindowByDescriptor(myRunContentDescriptor); Content content = myRunContentDescriptor.getAttachedContent(); if (toolWindow == null || content == null) return; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java index eaea9b90bae7..f98f3f86f601 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java @@ -2,7 +2,6 @@ package com.intellij.xdebugger.impl.ui; import com.intellij.debugger.ui.DebuggerContentInfo; -import com.intellij.execution.ExecutionManager; import com.intellij.execution.Executor; import com.intellij.execution.executors.DefaultDebugExecutor; import com.intellij.execution.runners.ExecutionEnvironment; @@ -385,7 +384,7 @@ public class XDebugSessionTab extends DebuggerSessionTabBase { ApplicationManager.getApplication().invokeLater(() -> { if (myRunContentDescriptor != null) { - RunContentManager manager = ExecutionManager.getInstance(myProject).getContentManager(); + RunContentManager manager = RunContentManager.getInstance(myProject); ToolWindow toolWindow = manager.getToolWindowByDescriptor(myRunContentDescriptor); if (toolWindow != null) { if (!toolWindow.isVisible()) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/BuildAndRestartConsoleAction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/BuildAndRestartConsoleAction.java index 232a0e910748..b121bbdfdbd3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/BuildAndRestartConsoleAction.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/BuildAndRestartConsoleAction.java @@ -1,10 +1,10 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.plugins.groovy.console; -import com.intellij.execution.ExecutionManager; import com.intellij.execution.Executor; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.RunContentManager; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -53,7 +53,7 @@ public class BuildAndRestartConsoleAction extends AnAction { @Override public void actionPerformed(@NotNull AnActionEvent e) { - if (ExecutionManager.getInstance(myProject).getContentManager().removeRunContent(myExecutor, myContentDescriptor)) { + if (RunContentManager.getInstance(myProject).removeRunContent(myExecutor, myContentDescriptor)) { CompilerManager.getInstance(myProject).compile(myModule, new CompileStatusNotification() { @Override public void finished(boolean aborted, int errors, int warnings, @NotNull CompileContext compileContext) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyConsole.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyConsole.java index dc106bb9f46a..411238596626 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyConsole.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyConsole.java @@ -2,7 +2,6 @@ package org.jetbrains.plugins.groovy.console; import com.intellij.execution.ExecutionException; -import com.intellij.execution.ExecutionManager; import com.intellij.execution.Executor; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.execution.configurations.JavaParameters; @@ -12,6 +11,7 @@ import com.intellij.execution.process.*; import com.intellij.execution.ui.ConsoleView; import com.intellij.execution.ui.ConsoleViewContentType; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.RunContentManager; import com.intellij.execution.ui.actions.CloseAction; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.ActionToolbar; @@ -74,8 +74,10 @@ public final class GroovyConsole { } public void execute(@NotNull String command) { - if (!StringUtil.isEmptyOrSpaces(command)) doExecute(command); - ExecutionManager.getInstance(myProject).getContentManager().toFrontRunContent(defaultExecutor, myContentDescriptor); + if (!StringUtil.isEmptyOrSpaces(command)) { + doExecute(command); + } + RunContentManager.getInstance(myProject).toFrontRunContent(defaultExecutor, myContentDescriptor); } public void stop() { @@ -185,7 +187,7 @@ public final class GroovyConsole { consoleView.attachToProcess(processHandler); processHandler.startNotify(); - ExecutionManager.getInstance(project).getContentManager().showRunContent(defaultExecutor, descriptor); + RunContentManager.getInstance(project).showRunContent(defaultExecutor, descriptor); return console; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/ide/scripting.kt b/plugins/groovy/src/org/jetbrains/plugins/groovy/ide/scripting.kt index f102258bb995..ef95652583f2 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/ide/scripting.kt +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/ide/scripting.kt @@ -1,11 +1,11 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.plugins.groovy.ide -import com.intellij.execution.ExecutionManager import com.intellij.execution.console.* import com.intellij.execution.executors.DefaultRunExecutor import com.intellij.execution.ui.ConsoleViewContentType import com.intellij.execution.ui.RunContentDescriptor +import com.intellij.execution.ui.RunContentManager import com.intellij.execution.ui.actions.CloseAction import com.intellij.openapi.actionSystem.ActionManager import com.intellij.openapi.actionSystem.AnAction @@ -29,8 +29,7 @@ import java.text.SimpleDateFormat import java.util.* import javax.swing.JPanel -class GroovyScriptingShellAction : AnAction() { - +internal class GroovyScriptingShellAction : AnAction() { override fun actionPerformed(e: AnActionEvent) { val project = e.project ?: return initConsole(project) @@ -82,7 +81,7 @@ private fun initConsole(project: Project) { toolbarActions.addAll(*console.createConsoleActions()) val executor = DefaultRunExecutor.getRunExecutorInstance() toolbarActions.add(CloseAction(executor, descriptor, project)) - ExecutionManager.getInstance(project).contentManager.showRunContent(executor, descriptor) + RunContentManager.getInstance(project).showRunContent(executor, descriptor) val appInfo = ApplicationInfo.getInstance() val namesInfo = ApplicationNamesInfo.getInstance() diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/buildtool/BuildViewMavenConsole.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/buildtool/BuildViewMavenConsole.java index 9428c1f88146..7947a975b9ad 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/buildtool/BuildViewMavenConsole.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/buildtool/BuildViewMavenConsole.java @@ -2,17 +2,13 @@ package org.jetbrains.idea.maven.buildtool; import com.intellij.build.*; -import com.intellij.execution.ExecutionManager; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.executors.DefaultRunExecutor; import com.intellij.execution.process.AnsiEscapeDecoder; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ExecutionEnvironmentBuilder; -import com.intellij.execution.ui.ConsoleView; -import com.intellij.execution.ui.ExecutionConsole; -import com.intellij.execution.ui.RunContentDescriptor; -import com.intellij.execution.ui.RunContentManagerImpl; +import com.intellij.execution.ui.*; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.ActionToolbar; @@ -54,7 +50,7 @@ import static icons.OpenapiIcons.RepositoryLibraryLogo; * used only in MavenExternalExecutor * To be removed in IDEA-216278 */ -public class BuildViewMavenConsole extends MavenConsole { +public final class BuildViewMavenConsole extends MavenConsole { private final MavenBuildEventProcessor myEventParser; @NotNull private final Project myProject; @@ -108,17 +104,17 @@ public class BuildViewMavenConsole extends MavenConsole { new RunContentDescriptor(myBuildView, processHandler, consolePanel, myTitle, RepositoryLibraryLogo); descriptor.setExecutionId(myExecutionId); RunnerAndConfigurationSettings configuration = processHandler.getUserData(RunContentManagerImpl.TEMPORARY_CONFIGURATION_KEY); + RunContentManager runContentManager = RunContentManager.getInstance(myProject); if (configuration != null) { ExecutionEnvironment environment = ExecutionEnvironmentBuilder.create(DefaultRunExecutor.getRunExecutorInstance(), configuration.getConfiguration()).build(); - String toolWindowId = - ExecutionManager.getInstance(myProject).getContentManager().getContentDescriptorToolWindowId(environment); + String toolWindowId = runContentManager.getContentDescriptorToolWindowId(environment); if (toolWindowId != null) { descriptor.setContentToolWindowId(toolWindowId); } } Disposer.register(descriptor, myBuildView); - ExecutionManager.getInstance(myProject).getContentManager().showRunContent(DefaultRunExecutor.getRunExecutorInstance(), descriptor); + runContentManager.showRunContent(DefaultRunExecutor.getRunExecutorInstance(), descriptor); }); } } diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java index 7ff1b8075a6c..0981f2b05e20 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java @@ -1,10 +1,11 @@ +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.plugins.terminal; -import com.intellij.execution.ExecutionManager; import com.intellij.execution.Executor; import com.intellij.execution.executors.DefaultRunExecutor; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.RunContentManager; import com.intellij.execution.ui.actions.CloseAction; import com.intellij.ide.actions.ShowLogAction; import com.intellij.openapi.Disposable; @@ -177,7 +178,7 @@ public abstract class AbstractTerminalRunner { protected void showConsole(Executor defaultExecutor, @NotNull RunContentDescriptor myDescriptor, final Component toFocus) { // Show in run toolwindow - ExecutionManager.getInstance(myProject).getContentManager().showRunContent(defaultExecutor, myDescriptor); + RunContentManager.getInstance(myProject).showRunContent(defaultExecutor, myDescriptor); // Request focus ToolWindow toolWindow = ToolWindowManager.getInstance(myProject).getToolWindow(defaultExecutor.getId()); diff --git a/python/src/com/jetbrains/python/console/PydevConsoleRunnerImpl.java b/python/src/com/jetbrains/python/console/PydevConsoleRunnerImpl.java index 965fd7b7bdcd..bf0528541627 100644 --- a/python/src/com/jetbrains/python/console/PydevConsoleRunnerImpl.java +++ b/python/src/com/jetbrains/python/console/PydevConsoleRunnerImpl.java @@ -4,7 +4,6 @@ package com.jetbrains.python.console; import com.google.common.collect.Lists; import com.intellij.execution.ExecutionException; import com.intellij.execution.ExecutionHelper; -import com.intellij.execution.ExecutionManager; import com.intellij.execution.Executor; import com.intellij.execution.configurations.EncodingEnvironmentUtil; import com.intellij.execution.configurations.GeneralCommandLine; @@ -20,6 +19,7 @@ import com.intellij.execution.process.ProcessOutputTypes; import com.intellij.execution.process.ProcessTerminatedListener; import com.intellij.execution.runners.ConsoleTitleGen; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.execution.ui.RunContentManager; import com.intellij.icons.AllIcons; import com.intellij.ide.errorTreeView.NewErrorTreeViewPanel; import com.intellij.idea.ActionsBundle; @@ -317,8 +317,7 @@ public class PydevConsoleRunnerImpl implements PydevConsoleRunner { PythonConsoleToolWindow.getInstance(myProject).init(toolwindow, contentDescriptor); } else { - ExecutionManager - .getInstance(myProject).getContentManager().showRunContent(getExecutor(), contentDescriptor); + RunContentManager.getInstance(myProject).showRunContent(getExecutor(), contentDescriptor); } }