Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarin Swanson2003-04-24 16:44:30 +0000
committerDarin Swanson2003-04-24 16:44:30 +0000
commit1aa5947f92d6e51cd7dd28e2c65c5cd8b94d2923 (patch)
tree2b733642741e2f5fd453c645e5ab9d5aa903215d /org.eclipse.ui.externaltools/Program Tools Support
parentc853fa05071fbbe845cf3f22fa67e47c68d46e3d (diff)
downloadeclipse.platform.debug-1aa5947f92d6e51cd7dd28e2c65c5cd8b94d2923.tar.gz
eclipse.platform.debug-1aa5947f92d6e51cd7dd28e2c65c5cd8b94d2923.tar.xz
eclipse.platform.debug-1aa5947f92d6e51cd7dd28e2c65c5cd8b94d2923.zip
Bug 36581 - External tool closed when Eclipse exits
Diffstat (limited to 'org.eclipse.ui.externaltools/Program Tools Support')
-rw-r--r--org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.properties2
-rw-r--r--org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java16
2 files changed, 6 insertions, 12 deletions
diff --git a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.properties b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.properties
index 24984e1a3..98ba99c7f 100644
--- a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.properties
+++ b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.properties
@@ -11,4 +11,4 @@
ProgramMainTab.Select=&Select a program:
ProgramLaunchDelegate.Workbench_Closing_1=Workbench Closing
-ProgramLaunchDelegate.The_workbench_is_exiting_and_a_program_launched_from_an_external_tool_appears_to_still_be_running._These_programs_will_be_terminated_when_the_workbench_exits._It_is_recommended_that_you_exit_any_external_programs_launched_from_the_workbench_before_you_proceed._n_nClick_OK_to_continue_exiting_the_workbench._2=The workbench is exiting and a program launched from an external tool appears to still be running. These programs will be terminated when the workbench exits. It is recommended that you exit any external programs launched from the workbench before you proceed.\n\nClick OK to continue exiting the workbench.
+ProgramLaunchDelegate.The_workbench_is_exiting=The workbench is exiting and a program launched from an external tool appears to still be running. These programs will be terminated when the workbench exits. It is recommended that you exit any external programs launched from the workbench before you proceed.\n\nClick OK to continue exiting the workbench.
diff --git a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java
index a92bf5203..79cd68c21 100644
--- a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java
+++ b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java
@@ -75,7 +75,7 @@ public class ProgramLaunchDelegate implements ILaunchConfigurationDelegate {
}
if (configType.equals(programType)) {
if (!launches[i].isTerminated()) {
- MessageDialog.openWarning(window.getShell(), ExternalToolsProgramMessages.getString("ProgramLaunchDelegate.Workbench_Closing_1"), ExternalToolsProgramMessages.getString("ProgramLaunchDelegate.The_workbench_is_exiting_and_a_program_launched_from_an_external_tool_appears_to_still_be_running._These_programs_will_be_terminated_when_the_workbench_exits._It_is_recommended_that_you_exit_any_external_programs_launched_from_the_workbench_before_you_proceed._n_nClick_OK_to_continue_exiting_the_workbench._2")); //$NON-NLS-1$ //$NON-NLS-2$
+ MessageDialog.openWarning(window.getShell(), ExternalToolsProgramMessages.getString("ProgramLaunchDelegate.Workbench_Closing_1"), ExternalToolsProgramMessages.getString("ProgramLaunchDelegate.The_workbench_is_exiting")); //$NON-NLS-1$ //$NON-NLS-2$
break;
}
}
@@ -84,13 +84,6 @@ public class ProgramLaunchDelegate implements ILaunchConfigurationDelegate {
public void windowOpened(IWorkbenchWindow window) {
}
}
-
- /**
- * Constructor for ProgramLaunchDelegate.
- */
- public ProgramLaunchDelegate() {
- super();
- }
/**
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
@@ -168,7 +161,7 @@ public class ProgramLaunchDelegate implements ILaunchConfigurationDelegate {
if (p != null) {
process = DebugPlugin.newProcess(launch, p, location.toOSString(), processAttributes);
}
- process.setAttribute(IProcess.ATTR_CMDLINE, renderCommandLine(cmdLine));
+ process.setAttribute(IProcess.ATTR_CMDLINE, generateCommandLine(cmdLine));
if (ExternalToolsUtil.isBackground(configuration)) {
// refresh resources after process finishes
@@ -194,9 +187,10 @@ public class ProgramLaunchDelegate implements ILaunchConfigurationDelegate {
}
}
- protected static String renderCommandLine(String[] commandLine) {
- if (commandLine.length < 1)
+ private String generateCommandLine(String[] commandLine) {
+ if (commandLine.length < 1) {
return ""; //$NON-NLS-1$
+ }
StringBuffer buf= new StringBuffer(commandLine[0]);
for (int i= 1; i < commandLine.length; i++) {
buf.append(' ');

Back to the top