MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

deprecate getContentManager — use RunContentManager.getInstance() directly

Browse Source 
GitOrigin-RevId: da81162abe382947ee2b159774bb2efd9aeeda01
This commit is contained in:
Vladimir Krivosheev
2019-12-19 20:02:35 +00:00
committed by intellij-monorepo-bot
parent 525c976b5c
commit 2422a15654
38 changed files with 104 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/memory/agent/MemoryAgentUtil.java
+2 -1
View File
@@ -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);
java/execution/impl/src/com/intellij/execution/jshell/JShellHandler.java
+4 -4
View File
@@ -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
platform/lang-api/src/com/intellij/execution/ExecutionManager.java
+3 -5
View File
@@ -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();
/**
platform/lang-api/src/com/intellij/execution/runners/ExecutionUtil.java
+2 -2
View File
@@ -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();
platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.kt
+2 -1
View File
@@ -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
}
platform/lang-api/src/com/intellij/execution/ui/RunContentManager.java
-2
View File
@@ -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<RunContentWithExecutorListener> TOPIC = Topic.create("Run Content", RunContentWithExecutorListener.class);
platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java
+3 -17
View File
@@ -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;
platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java
+2 -2
View File
@@ -237,7 +237,7 @@ public class ExecutionHelper {
final Ref<Collection<RunContentDescriptor>> 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);
platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
+2 -2
View File
@@ -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<RunContentDescriptor> 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);
});
platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java
+2 -1
View File
@@ -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);
}
platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java
+4 -3
View File
@@ -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;
}
platform/lang-impl/src/com/intellij/execution/actions/ShowRunningListAction.java
+7 -3
View File
@@ -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);
}
}
platform/lang-impl/src/com/intellij/execution/actions/StopAction.java
+3 -3
View File
@@ -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();
}
}
platform/lang-impl/src/com/intellij/execution/console/RunIdeConsoleAction.java
+5 -5
View File
@@ -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<IdeScriptEngine, IdeScriptEngineManager.EngineInfo, VirtualFile> 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;
}
platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardManagerImpl.java
+4 -5
View File
@@ -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<? super RunnerAndConfigurationSettings> 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<? super RunnerAndConfigurationSettings> condition) {
ExecutionManagerImpl executionManager = (ExecutionManagerImpl)ExecutionManager.getInstance(myProject);
RunContentManagerImpl runContentManager = (RunContentManagerImpl)executionManager.getContentManager();
List<RunContentDescriptor> descriptors = executionManager.getRunningDescriptors(condition);
RunContentManagerImpl runContentManager = (RunContentManagerImpl)RunContentManager.getInstance(myProject);
List<RunContentDescriptor> descriptors = ((ExecutionManagerImpl)ExecutionManager.getInstance(myProject)).getRunningDescriptors(condition);
for (RunContentDescriptor descriptor : descriptors) {
Content content = descriptor.getAttachedContent();
if (content == null) continue;
platform/lang-impl/src/com/intellij/execution/dashboard/actions/ClearContentAction.java
+2 -2
View File
@@ -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);
}
}
platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.kt
+2 -2
View File
@@ -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")
platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
+2 -2
View File
@@ -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<T extends LanguageConsole
protected void showConsole(Executor defaultExecutor, @NotNull RunContentDescriptor contentDescriptor) {
// Show in run toolwindow
ExecutionManager.getInstance(myProject).getContentManager().showRunContent(defaultExecutor, contentDescriptor);
RunContentManager.getInstance(myProject).showRunContent(defaultExecutor, contentDescriptor);
}
protected void finishConsole() {
platform/lang-impl/src/com/intellij/execution/runners/FakeRerunAction.java
+2 -1
View File
@@ -7,6 +7,7 @@ import com.intellij.execution.RunnerAndConfigurationSettings;
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.ide.DataManager;
import com.intellij.ide.macro.MacroManager;
@@ -56,7 +57,7 @@ public class FakeRerunAction extends AnAction {
ExecutionEnvironment environment = event.getData(LangDataKeys.EXECUTION_ENVIRONMENT);
if (environment == null) {
Project project = event.getProject();
RunContentDescriptor contentDescriptor = project == null ? null : ExecutionManager.getInstance(project).getContentManager().getSelectedContent();
RunContentDescriptor contentDescriptor = project == null ? null : RunContentManager.getInstance(project).getSelectedContent();
if (contentDescriptor != null) {
JComponent component = contentDescriptor.getComponent();
if (component != null) {
platform/lang-impl/src/com/intellij/execution/runners/RerunTestsAction.java
+1 -2
View File
@@ -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.runners;
import com.intellij.execution.ExecutionManager;
import com.intellij.execution.ui.RunContentDescriptor;
import com.intellij.execution.ui.RunContentManager;
import com.intellij.openapi.Disposable;
@@ -59,7 +58,7 @@ public class RerunTestsAction extends DumbAwareAction implements AnAction.Transp
else {
Project project = e.getProject();
if (project != null) {
RunContentManager runContentManager = ExecutionManager.getInstance(project).getContentManager();
RunContentManager runContentManager = RunContentManager.getInstance(project);
// check if the descriptor belongs to the current project
if (runContentManager.getToolWindowByDescriptor(descriptor) != null) {
ExecutionUtil.restart(descriptor);
platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java
+1 -2
View File
@@ -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.runners;
import com.intellij.execution.ExecutionManager;
import com.intellij.execution.ExecutionResult;
import com.intellij.execution.Executor;
import com.intellij.execution.configurations.RunConfigurationBase;
@@ -202,7 +201,7 @@ public class RunContentBuilder extends RunTab {
for (ConsoleViewContentType type : types) {
if ((type == ConsoleViewContentType.NORMAL_OUTPUT) && myRunConfigurationBase.isShowConsoleOnStdOut()
|| (type == ConsoleViewContentType.ERROR_OUTPUT) && myRunConfigurationBase.isShowConsoleOnStdErr()) {
ExecutionManager.getInstance(myProject).getContentManager().toFrontRunContent(myExecutor, myRunContentDescriptor);
RunContentManager.getInstance(myProject).toFrontRunContent(myExecutor, myRunContentDescriptor);
myUi.selectAndFocus(myUi.findContent(ExecutionConsole.CONSOLE_CONTENT_ID), false, false);
return;
}
platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutUiFactoryImpl.java
+3 -4
View File
@@ -1,20 +1,19 @@
// 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.layout.impl;
import com.intellij.execution.ExecutionManager;
import com.intellij.execution.ui.RunContentManager;
import com.intellij.execution.ui.RunnerLayoutUi;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
public class RunnerLayoutUiFactoryImpl extends RunnerLayoutUi.Factory {
public final class RunnerLayoutUiFactoryImpl extends RunnerLayoutUi.Factory {
private final Project myProject;
public RunnerLayoutUiFactoryImpl(Project project) {
myProject = project;
// ensure dockFactory is registered
ExecutionManager.getInstance(project).getContentManager();
RunContentManager.getInstance(project);
}
@NotNull
platform/lang-impl/src/com/intellij/ide/actions/runAnything/execution/RunAnythingRunProfileState.java
+4 -6
View File
@@ -1,8 +1,7 @@
// 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.ide.actions.runAnything.execution;
import com.intellij.execution.ExecutionException;
import com.intellij.execution.ExecutionManager;
import com.intellij.execution.configurations.CommandLineState;
import com.intellij.execution.configurations.GeneralCommandLine;
import com.intellij.execution.configurations.RunProfile;
@@ -14,6 +13,7 @@ import com.intellij.execution.runners.ExecutionEnvironment;
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.ide.IdeBundle;
import com.intellij.ide.actions.runAnything.RunAnythingUtil;
import com.intellij.ide.actions.runAnything.handlers.RunAnythingCommandHandler;
@@ -83,10 +83,8 @@ public class RunAnythingRunProfileState extends CommandLineState {
@Nullable
private ConsoleView getConsoleView() {
RunContentDescriptor contentDescriptor =
ExecutionManager.getInstance(getEnvironment().getProject())
.getContentManager()
.findContentDescriptor(getEnvironment().getExecutor(), this);
RunContentDescriptor contentDescriptor = RunContentManager.getInstance(getEnvironment().getProject())
.findContentDescriptor(getEnvironment().getExecutor(), this);
ConsoleView console = null;
if (contentDescriptor != null && contentDescriptor.getExecutionConsole() instanceof ConsoleView) {
platform/lang-impl/src/com/intellij/internal/CompletionQuality.kt
+3 -7
View File
@@ -11,11 +11,11 @@ import com.intellij.codeInsight.completion.CompletionType
import com.intellij.codeInsight.lookup.LookupElement
import com.intellij.codeInsight.lookup.LookupManager
import com.intellij.codeInsight.lookup.impl.LookupImpl
import com.intellij.execution.ExecutionManager
import com.intellij.execution.executors.DefaultRunExecutor
import com.intellij.execution.filters.TextConsoleBuilderFactory
import com.intellij.execution.ui.ConsoleViewContentType
import com.intellij.execution.ui.RunContentDescriptor
import com.intellij.execution.ui.RunContentManager
import com.intellij.ide.util.scopeChooser.ScopeChooserCombo
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.actionSystem.AnActionEvent
@@ -61,10 +61,6 @@ import javax.swing.JComponent
import javax.swing.JLabel
import kotlin.collections.HashMap
/**
* @author traff
*/
private data class CompletionTime(var cnt: Int, var time: Long)
private data class CompletionQualityParameters(
@@ -91,7 +87,7 @@ private val saveResultToFile = "${System.getProperty("user.dir")}/result.json"
private const val doProcessingWords = true
private const val checkAfterDotOnly = true
class CompletionQualityStatsAction : AnAction() {
internal class CompletionQualityStatsAction : AnAction() {
override fun actionPerformed(e: AnActionEvent) {
val editor = e.getData(CommonDataKeys.EDITOR) as? EditorImpl
val project = e.getData(CommonDataKeys.PROJECT) ?: return
@@ -201,7 +197,7 @@ class CompletionQualityStatsAction : AnAction() {
val consoleBuilder = TextConsoleBuilderFactory.getInstance().createBuilder(project)
val console = consoleBuilder.console
val descriptor = RunContentDescriptor(console, null, console.component, "Completion Quality Statistics")
ExecutionManager.getInstance(project).contentManager.showRunContent(DefaultRunExecutor.getRunExecutorInstance(), descriptor)
RunContentManager.getInstance(project).showRunContent(DefaultRunExecutor.getRunExecutorInstance(), descriptor)
console.print(text, ConsoleViewContentType.NORMAL_OUTPUT)
File(saveResultToFile).writeText(text)
}
platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java
+3 -3
View File
@@ -1,8 +1,7 @@
// 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.tools;
import com.intellij.execution.ExecutionException;
import com.intellij.execution.ExecutionManager;
import com.intellij.execution.ExecutionResult;
import com.intellij.execution.Executor;
import com.intellij.execution.configurations.CommandLineState;
@@ -15,6 +14,7 @@ import com.intellij.execution.filters.TextConsoleBuilderFactory;
import com.intellij.execution.process.*;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.runners.ProgramRunner;
import com.intellij.execution.ui.RunContentManager;
import com.intellij.ide.macro.Macro;
import com.intellij.ide.macro.MacroManager;
import com.intellij.openapi.actionSystem.DataContext;
@@ -103,7 +103,7 @@ public class ToolRunProfile implements ModuleRunProfile{
public void onTextAvailable(@NotNull ProcessEvent event, @NotNull Key outputType) {
if ((outputType == ProcessOutputTypes.STDOUT && myTool.isShowConsoleOnStdOut())
|| (outputType == ProcessOutputTypes.STDERR && myTool.isShowConsoleOnStdErr())) {
ExecutionManager.getInstance(project).getContentManager().toFrontRunContent(executor, processHandler);
RunContentManager.getInstance(project).toFrontRunContent(executor, processHandler);
}
}
});
platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceUtil.java
+3 -7
View File
@@ -1,8 +1,7 @@
// 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.unscramble;
import com.intellij.execution.ExecutionManager;
import com.intellij.execution.Executor;
import com.intellij.execution.executors.DefaultRunExecutor;
import com.intellij.execution.filters.Filter;
@@ -10,10 +9,7 @@ import com.intellij.execution.filters.TextConsoleBuilder;
import com.intellij.execution.filters.TextConsoleBuilderFactory;
import com.intellij.execution.impl.ConsoleViewImpl;
import com.intellij.execution.impl.ConsoleViewUtil;
import com.intellij.execution.ui.ConsoleView;
import com.intellij.execution.ui.ConsoleViewContentType;
import com.intellij.execution.ui.ExecutionConsole;
import com.intellij.execution.ui.RunContentDescriptor;
import com.intellij.execution.ui.*;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.ApplicationManager;
@@ -96,7 +92,7 @@ public class AnalyzeStacktraceUtil {
ConsoleViewUtil.enableReplaceActionForConsoleViewEditor(console.getEditor());
console.getEditor().getSettings().setCaretRowShown(true);
toolbarActions.add(new AnnotateStackTraceAction(console.getEditor(), console.getHyperlinks()));
ExecutionManager.getInstance(project).getContentManager().showRunContent(executor, descriptor);
RunContentManager.getInstance(project).showRunContent(executor, descriptor);
consoleView.allowHeavyFilters();
if (consoleFactory == null) {
printStacktrace(consoleView, text);
platform/testRunner/src/com/intellij/execution/testframework/actions/RerunFailedTestsAction.java
+3 -17
View File
@@ -1,23 +1,9 @@
/*
* Copyright 2000-2015 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.testframework.actions;
import com.intellij.execution.ExecutionManager;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.ui.RunContentDescriptor;
import com.intellij.execution.ui.RunContentManager;
import com.intellij.ide.DataManager;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
@@ -44,7 +30,7 @@ class RerunFailedTestsAction extends AnAction {
return false;
}
RunContentDescriptor contentDescriptor = ExecutionManager.getInstance(project).getContentManager().getSelectedContent();
RunContentDescriptor contentDescriptor = RunContentManager.getInstance(project).getSelectedContent();
if (contentDescriptor == null) {
return false;
}
platform/testRunner/src/com/intellij/execution/testframework/autotest/AbstractAutoTestManager.java
+2 -3
View File
@@ -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.testframework.autotest;
import com.intellij.execution.ExecutionManager;
import com.intellij.execution.RunnerAndConfigurationSettings;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.configurations.RunProfile;
@@ -126,7 +125,7 @@ public abstract class AbstractAutoTestManager implements PersistentStateComponen
}
private boolean hasEnabledAutoTests() {
RunContentManager contentManager = ExecutionManager.getInstance(myProject).getContentManager();
RunContentManager contentManager = RunContentManager.getInstance(myProject);
for (RunContentDescriptor descriptor : contentManager.getAllDescriptors()) {
if (isAutoTestEnabledForDescriptor(descriptor)) {
return true;
@@ -149,7 +148,7 @@ public abstract class AbstractAutoTestManager implements PersistentStateComponen
}
protected void restartAllAutoTests(int modificationStamp) {
RunContentManager contentManager = ExecutionManager.getInstance(myProject).getContentManager();
RunContentManager contentManager = RunContentManager.getInstance(myProject);
boolean active = false;
for (RunContentDescriptor descriptor : contentManager.getAllDescriptors()) {
if (isAutoTestEnabledForDescriptor(descriptor)) {
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
+2 -7
View File
@@ -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.xdebugger.impl;
import com.intellij.execution.ExecutionManager;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.configurations.RunProfile;
import com.intellij.execution.executors.DefaultDebugExecutor;
@@ -11,10 +10,7 @@ import com.intellij.execution.process.ProcessAdapter;
import com.intellij.execution.process.ProcessEvent;
import com.intellij.execution.process.ProcessHandler;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.ui.ConsoleView;
import com.intellij.execution.ui.ConsoleViewContentType;
import com.intellij.execution.ui.RunContentDescriptor;
import com.intellij.execution.ui.RunnerLayoutUi;
import com.intellij.execution.ui.*;
import com.intellij.icons.AllIcons;
import com.intellij.ide.DataManager;
import com.intellij.notification.NotificationGroup;
@@ -397,8 +393,7 @@ public class XDebugSessionImpl implements XDebugSession {
public void showSessionTab() {
RunContentDescriptor descriptor = getRunContentDescriptor();
ExecutionManager.getInstance(getProject()).getContentManager()
.showRunContent(DefaultDebugExecutor.getDebugExecutorInstance(), descriptor);
RunContentManager.getInstance(getProject()).showRunContent(DefaultDebugExecutor.getDebugExecutorInstance(), descriptor);
}
@Nullable
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java
+1 -2
View File
@@ -6,7 +6,6 @@ import com.intellij.codeInsight.hint.LineTooltipRenderer;
import com.intellij.codeInsight.hint.TooltipController;
import com.intellij.codeInsight.hint.TooltipGroup;
import com.intellij.execution.ExecutionException;
import com.intellij.execution.ExecutionManager;
import com.intellij.execution.Executor;
import com.intellij.execution.executors.DefaultDebugExecutor;
import com.intellij.execution.process.ProcessHandler;
@@ -261,7 +260,7 @@ public class XDebuggerManagerImpl extends XDebuggerManager implements Persistent
!myProject.isDisposed() &&
!ApplicationManager.getApplication().isUnitTestMode() &&
XDebuggerSettingManagerImpl.getInstanceImpl().getGeneralSettings().isHideDebuggerOnProcessTermination()) {
ExecutionManager.getInstance(myProject).getContentManager().hideRunContent(DefaultDebugExecutor.getDebugExecutorInstance(),
RunContentManager.getInstance(myProject).hideRunContent(DefaultDebugExecutor.getDebugExecutorInstance(),
sessionTab.getRunContentDescriptor());
}
if (myActiveSession.compareAndSet(session, null)) {
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java
+2 -17
View File
@@ -1,22 +1,7 @@
/*
* Copyright 2000-2016 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.xdebugger.impl.ui;
import com.intellij.debugger.ui.DebuggerContentInfo;
import com.intellij.execution.ExecutionManager;
import com.intellij.execution.configurations.RunConfigurationBase;
import com.intellij.execution.configurations.RunProfile;
import com.intellij.execution.executors.DefaultDebugExecutor;
@@ -90,7 +75,7 @@ public abstract class DebuggerSessionTabBase extends RunTab {
UIUtil.invokeLaterIfNeeded(() -> {
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;
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
+1 -2
View File
@@ -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()) {
plugins/groovy/src/org/jetbrains/plugins/groovy/console/BuildAndRestartConsoleAction.java
+2 -2
View File
@@ -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) {
plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyConsole.java
+6 -4
View File
@@ -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;
}
plugins/groovy/src/org/jetbrains/plugins/groovy/ide/scripting.kt
+4 -5
View File
@@ -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()
plugins/maven/src/main/java/org/jetbrains/idea/maven/buildtool/BuildViewMavenConsole.java
+5 -9
View File
@@ -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);
});
}
}
plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java
+3 -2
View File
@@ -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<T extends Process> {
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());
python/src/com/jetbrains/python/console/PydevConsoleRunnerImpl.java
+2 -3
View File
@@ -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);
}
}