From ad89dbd07ead54c8241bb11ec3482986a3188bb5 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Wed, 30 Jun 2010 16:20:09 +0400 Subject: [PATCH] ExecutionUtil: problem with balloons fixed --- .../debugger/engine/DebugProcessImpl.java | 3 ++- .../intellij/execution/runners/ExecutionUtil.java | 15 +++++++-------- .../execution/runners/GenericProgramRunner.java | 2 +- .../com/intellij/execution/ProgramRunnerUtil.java | 2 +- .../jetbrains/plugins/groovy/gant/GantRunner.java | 3 ++- .../plugins/groovy/gradle/GradleScriptType.java | 7 ++----- .../groovy/runner/DefaultGroovyScriptRunner.java | 7 +++---- .../runner/GroovyScriptRunConfiguration.java | 2 +- .../plugins/groovy/runner/GroovyScriptRunner.java | 3 ++- 9 files changed, 21 insertions(+), 23 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java index 97eb5afd45a1..d933dca6b60b 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java @@ -69,6 +69,7 @@ import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Ref; +import com.intellij.openapi.wm.ToolWindowId; import com.intellij.openapi.wm.WindowManager; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; @@ -1743,7 +1744,7 @@ public abstract class DebugProcessImpl implements DebugProcess { if (runProfile != null) { SwingUtilities.invokeLater(new Runnable() { public void run() { - ExecutionUtil.handleExecutionError(myProject, runProfile, e); + ExecutionUtil.handleExecutionError(myProject, ToolWindowId.DEBUG, runProfile, e); } }); } 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 40fb95662d9d..5d61ef91a0b8 100644 --- a/platform/lang-api/src/com/intellij/execution/runners/ExecutionUtil.java +++ b/platform/lang-api/src/com/intellij/execution/runners/ExecutionUtil.java @@ -39,18 +39,17 @@ public class ExecutionUtil { private ExecutionUtil() { } - public static void handleExecutionError(Project project, @NotNull String taskName, ExecutionException e) { - handleExecutionError(project, ToolWindowId.MESSAGES_WINDOW, taskName, e); - } - - public static void handleExecutionError(final Project project, @NotNull final RunProfile runProfile, final ExecutionException e) { - handleExecutionError(project, runProfile.getName(), e); + public static void handleExecutionError(@NotNull Project project, + @NotNull String toolWindowId, + @NotNull RunProfile runProfile, + @NotNull ExecutionException e) { + handleExecutionError(project, toolWindowId, runProfile.getName(), e); } public static void handleExecutionError(@NotNull final Project project, @NotNull String toolWindowId, @NotNull String taskName, - @NotNull final ExecutionException e) { + @NotNull ExecutionException e) { if (e instanceof RunCanceledByUserException) return; String error = e.getMessage(); @@ -65,7 +64,7 @@ public class ExecutionUtil { listener = new HyperlinkListener() { @Override - public void hyperlinkUpdate(HyperlinkEvent e) { + public void hyperlinkUpdate(HyperlinkEvent event) { PropertiesComponent.getInstance(project).setValue("dynamic.classpath", "true"); } }; diff --git a/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java b/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java index f48ef63d9326..cfde4926a0b9 100644 --- a/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java +++ b/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java @@ -98,7 +98,7 @@ public abstract class GenericProgramRunner } } catch (ExecutionException e) { - ExecutionUtil.handleExecutionError(project, profile, e); + ExecutionUtil.handleExecutionError(project, executor.getToolWindowId(), profile, e); } } }; diff --git a/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java b/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java index 2b534f422c37..1e40a8720fe1 100644 --- a/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java +++ b/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java @@ -77,7 +77,7 @@ public class ProgramRunnerUtil { runner.execute(executor, new ExecutionEnvironment(runner, configuration, project)); } catch (ExecutionException e) { - ExecutionUtil.handleExecutionError(project, configuration.getConfiguration(), e); + ExecutionUtil.handleExecutionError(project, executor.getToolWindowId(), configuration.getConfiguration(), e); } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantRunner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantRunner.java index 95cea058623b..f22c60635918 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantRunner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantRunner.java @@ -16,6 +16,7 @@ package org.jetbrains.plugins.groovy.gant; import com.intellij.execution.CantRunException; +import com.intellij.execution.Executor; import com.intellij.execution.configurations.JavaParameters; import com.intellij.execution.configurations.RunProfile; import com.intellij.openapi.module.Module; @@ -46,7 +47,7 @@ public class GantRunner extends GroovyScriptRunner { } @Override - public boolean ensureRunnerConfigured(@Nullable Module module, RunProfile profile, final Project project) { + public boolean ensureRunnerConfigured(@Nullable Module module, RunProfile profile, Executor executor, final Project project) { if (!(GantUtils.getSDKInstallPath(module, project).length() > 0)) { int result = Messages .showOkCancelDialog("Gant is not configured. Do you want to configure it?", "Configure Gant SDK", diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleScriptType.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleScriptType.java index ed3c848094a7..f552b8ae27f4 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleScriptType.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleScriptType.java @@ -16,10 +16,7 @@ package org.jetbrains.plugins.groovy.gradle; import com.intellij.compiler.options.CompileStepBeforeRun; -import com.intellij.execution.CantRunException; -import com.intellij.execution.ExecutionException; -import com.intellij.execution.Location; -import com.intellij.execution.RunManagerEx; +import com.intellij.execution.*; import com.intellij.execution.configurations.JavaParameters; import com.intellij.execution.configurations.RunProfile; import com.intellij.openapi.module.Module; @@ -147,7 +144,7 @@ public class GradleScriptType extends GroovyScriptType { } @Override - public boolean ensureRunnerConfigured(@Nullable Module module, RunProfile profile, final Project project) throws ExecutionException { + public boolean ensureRunnerConfigured(@Nullable Module module, RunProfile profile, Executor executor, final Project project) throws ExecutionException { if (GradleLibraryManager.getSdkHome(module, project) == null) { int result = Messages .showOkCancelDialog("Gradle is not configured. Do you want to configure it?", "Configure Gradle SDK", diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/DefaultGroovyScriptRunner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/DefaultGroovyScriptRunner.java index 305b0863d0bf..87a01b45e129 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/DefaultGroovyScriptRunner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/DefaultGroovyScriptRunner.java @@ -17,8 +17,8 @@ package org.jetbrains.plugins.groovy.runner; import com.intellij.execution.CantRunException; -import com.intellij.execution.ExecutionBundle; import com.intellij.execution.ExecutionException; +import com.intellij.execution.Executor; import com.intellij.execution.configurations.JavaParameters; import com.intellij.execution.configurations.RunProfile; import com.intellij.execution.runners.ExecutionUtil; @@ -29,7 +29,6 @@ import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.encoding.EncodingManager; import com.intellij.openapi.vfs.encoding.EncodingProjectManager; -import com.intellij.openapi.ui.Messages; import com.intellij.openapi.roots.ui.configuration.ModulesConfigurator; import com.intellij.openapi.roots.ui.configuration.ClasspathEditor; import com.intellij.openapi.project.Project; @@ -48,13 +47,13 @@ public class DefaultGroovyScriptRunner extends GroovyScriptRunner { } @Override - public boolean ensureRunnerConfigured(@Nullable Module module, RunProfile profile, final Project project) throws ExecutionException { + public boolean ensureRunnerConfigured(@Nullable Module module, RunProfile profile, Executor executor, final Project project) throws ExecutionException { if (module == null) { throw new ExecutionException("Module is not specified"); } if (LibrariesUtil.getGroovyHomePath(module) == null) { - ExecutionUtil.handleExecutionError(project, profile, new ExecutionException("Groovy is not configured")); + ExecutionUtil.handleExecutionError(project, executor.getToolWindowId(), profile, new ExecutionException("Groovy is not configured")); ModulesConfigurator.showDialog(module.getProject(), module.getName(), ClasspathEditor.NAME, false); return false; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java index e45a3acd39d6..610f7774f188 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java @@ -164,7 +164,7 @@ public class GroovyScriptRunConfiguration extends ModuleBasedConfiguration