Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJared Burns2003-09-02 21:52:14 +0000
committerJared Burns2003-09-02 21:52:14 +0000
commit6fb69f0f8b3fb867dc21d3ea43cf8beffe129794 (patch)
tree2edef5346815b09068c07c617be0cb392ddb27ea
parenta00d41fa869de92b016075b9cd17a47167183e2e (diff)
downloadeclipse.platform.debug-6fb69f0f8b3fb867dc21d3ea43cf8beffe129794.tar.gz
eclipse.platform.debug-6fb69f0f8b3fb867dc21d3ea43cf8beffe129794.tar.xz
eclipse.platform.debug-6fb69f0f8b3fb867dc21d3ea43cf8beffe129794.zip
42020 - Move "Run in background" to builders only
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java26
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugUITools.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java2
-rw-r--r--org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java26
-rw-r--r--org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolMigration.java8
-rw-r--r--org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java2
7 files changed, 36 insertions, 36 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
index d6d9e5056..1c59a1de8 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
@@ -1123,7 +1123,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
* @return one of CANCEL or OK
*/
private int doLaunch(ILaunchConfiguration config) throws CoreException {
- if (CommonTab.isRunInBackground(config)) {
+ if (CommonTab.isLaunchInBackground(config)) {
// Background launching
DebugUITools.launchInBackground(config, getMode());
return OK;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java
index 941504727..662eacb36 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java
@@ -79,7 +79,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab {
private Text fSharedLocationText;
private Button fSharedLocationButton;
- protected Button fRunInBackgroundButton;
+ protected Button fLaunchInBackgroundButton;
/**
* Check box list for specifying favorites
@@ -213,13 +213,13 @@ public class CommonTab extends AbstractLaunchConfigurationTab {
* @param parent the composite to create the controls in
*/
protected void createRunInBackgroundComponent(Composite parent) {
- fRunInBackgroundButton = new Button(parent, SWT.CHECK);
- fRunInBackgroundButton.setText(LaunchConfigurationsMessages.getString("CommonTab.10")); //$NON-NLS-1$
+ fLaunchInBackgroundButton = new Button(parent, SWT.CHECK);
+ fLaunchInBackgroundButton.setText(LaunchConfigurationsMessages.getString("CommonTab.10")); //$NON-NLS-1$
GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
data.horizontalSpan = 2;
- fRunInBackgroundButton.setLayoutData(data);
- fRunInBackgroundButton.setFont(parent.getFont());
- fRunInBackgroundButton.addSelectionListener(new SelectionAdapter() {
+ fLaunchInBackgroundButton.setLayoutData(data);
+ fLaunchInBackgroundButton.setFont(parent.getFont());
+ fLaunchInBackgroundButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
updateLaunchConfigurationDialog();
}
@@ -329,7 +329,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab {
}
protected void updateRunInBackground(ILaunchConfiguration configuration) {
- fRunInBackgroundButton.setSelection(isRunInBackground(configuration));
+ fLaunchInBackgroundButton.setSelection(isLaunchInBackground(configuration));
}
/**
@@ -338,14 +338,14 @@ public class CommonTab extends AbstractLaunchConfigurationTab {
* @param configuration the configuration
* @return whether the configuration is configured to run in the background
*/
- public static boolean isRunInBackground(ILaunchConfiguration configuration) {
- boolean runInBackground= true;
+ public static boolean isLaunchInBackground(ILaunchConfiguration configuration) {
+ boolean launchInBackground= true;
try {
- runInBackground= configuration.getAttribute(IDebugUIConstants.ATTR_RUN_IN_BACKGROUND, true);
+ launchInBackground= configuration.getAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, true);
} catch (CoreException ce) {
DebugUIPlugin.log(ce);
}
- return runInBackground;
+ return launchInBackground;
}
private void updateLocalSharedFromConfig(ILaunchConfiguration config) {
@@ -499,7 +499,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab {
*/
public void setDefaults(ILaunchConfigurationWorkingCopy config) {
config.setContainer(null);
- config.setAttribute(IDebugUIConstants.ATTR_RUN_IN_BACKGROUND, true);
+ config.setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, true);
}
/**
@@ -508,7 +508,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab {
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
updateConfigFromLocalShared(configuration);
updateConfigFromFavorites(configuration);
- setAttribute(IDebugUIConstants.ATTR_RUN_IN_BACKGROUND, configuration, fRunInBackgroundButton.getSelection(), true);
+ setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, configuration, fLaunchInBackgroundButton.getSelection(), true);
}
/**
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugUITools.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugUITools.java
index 500ff8b58..bc3f926e9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugUITools.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/DebugUITools.java
@@ -498,13 +498,13 @@ public class DebugUITools {
*/
public static void launch(final ILaunchConfiguration configuration, final String mode) {
if (DebugUIPlugin.preLaunchSave()) {
- boolean runInBackground= true;
+ boolean launchInBackground= true;
try {
- runInBackground= configuration.getAttribute(IDebugUIConstants.ATTR_RUN_IN_BACKGROUND, true);
+ launchInBackground= configuration.getAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, true);
} catch (CoreException e) {
DebugUIPlugin.log(e);
}
- if (runInBackground) {
+ if (launchInBackground) {
launchInBackground(configuration, mode);
} else {
launchInForeground(configuration, mode);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java
index fdece8155..a558ede29 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java
@@ -733,7 +733,7 @@ public interface IDebugUIConstants {
*
* @since 3.0
*/
- public static final String ATTR_RUN_IN_BACKGROUND = PLUGIN_ID + ".ATTR_RUN_IN_BACKGROUND"; //$NON-NLS-1$
+ public static final String ATTR_LAUNCH_IN_BACKGROUND = PLUGIN_ID + ".ATTR_LAUNCH_IN_BACKGROUND"; //$NON-NLS-1$
// Extension points
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java
index f2c3d1343..9252eaa3a 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java
@@ -47,7 +47,7 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab impl
private Button incrementalBuildButton;
private Button workingSetButton;
private IVariableComponent workingSetComponent;
- protected Button fRunInBackgroundButton;
+ protected Button fLaunchInBackgroundButton;
private SelectionListener selectionListener= new SelectionAdapter() {
/**
@@ -85,13 +85,13 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab impl
* @param parent the composite to create the controls in
*/
protected void createRunInBackgroundComponent(Composite parent) {
- fRunInBackgroundButton = new Button(parent, SWT.CHECK);
- fRunInBackgroundButton.setText("Run in bac&kground");
+ fLaunchInBackgroundButton = new Button(parent, SWT.CHECK);
+ fLaunchInBackgroundButton.setText("Run in bac&kground");
GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
data.horizontalSpan = 2;
- fRunInBackgroundButton.setLayoutData(data);
- fRunInBackgroundButton.setFont(parent.getFont());
- fRunInBackgroundButton.addSelectionListener(new SelectionAdapter() {
+ fLaunchInBackgroundButton.setLayoutData(data);
+ fLaunchInBackgroundButton.setFont(parent.getFont());
+ fLaunchInBackgroundButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
updateLaunchConfigurationDialog();
}
@@ -138,7 +138,7 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab impl
buffer.append(IExternalToolConstants.BUILD_TYPE_INCREMENTAL);
buffer.append(',');
configuration.setAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, buffer.toString());
- configuration.setAttribute(IDebugUIConstants.ATTR_RUN_IN_BACKGROUND, false);
+ configuration.setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, false);
}
/**
@@ -191,7 +191,7 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab impl
}
protected void updateRunInBackground(ILaunchConfiguration configuration) {
- fRunInBackgroundButton.setSelection(isRunInBackground(configuration));
+ fLaunchInBackgroundButton.setSelection(isLaunchInBackground(configuration));
}
/**
@@ -200,14 +200,14 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab impl
* @param configuration the configuration
* @return whether the configuration is configured to run in the background
*/
- public static boolean isRunInBackground(ILaunchConfiguration configuration) {
- boolean runInBackground= false;
+ public static boolean isLaunchInBackground(ILaunchConfiguration configuration) {
+ boolean launchInBackground= false;
try {
- runInBackground= configuration.getAttribute(IDebugUIConstants.ATTR_RUN_IN_BACKGROUND, false);
+ launchInBackground= configuration.getAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, false);
} catch (CoreException ce) {
ExternalToolsPlugin.getDefault().log(ce);
}
- return runInBackground;
+ return launchInBackground;
}
/**
@@ -234,7 +234,7 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab impl
} else {
configuration.setAttribute(IExternalToolConstants.ATTR_BUILD_SCOPE, (String)null);
}
- setAttribute(IDebugUIConstants.ATTR_RUN_IN_BACKGROUND, configuration, fRunInBackgroundButton.getSelection(), true);
+ setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, configuration, fLaunchInBackgroundButton.getSelection(), true);
}
/**
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolMigration.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolMigration.java
index 87b7b3406..ecb5f58f6 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolMigration.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolMigration.java
@@ -133,7 +133,7 @@ public final class ExternalToolMigration {
config.setAttribute(IExternalToolConstants.ATTR_WORKING_DIRECTORY, (String) commandArgs.get(TAG_WORK_DIR));
config.setAttribute(IExternalToolConstants.ATTR_CAPTURE_OUTPUT, TRUE.equals(commandArgs.get(TAG_CAPTURE_OUTPUT)));
config.setAttribute(IExternalToolConstants.ATTR_SHOW_CONSOLE, TRUE.equals(commandArgs.get(TAG_SHOW_CONSOLE)));
- config.setAttribute(IDebugUIConstants.ATTR_RUN_IN_BACKGROUND, TRUE.equals(commandArgs.get(TAG_RUN_BKGRND)));
+ config.setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, TRUE.equals(commandArgs.get(TAG_RUN_BKGRND)));
config.setAttribute(IExternalToolConstants.ATTR_PROMPT_FOR_ARGUMENTS, TRUE.equals(commandArgs.get(TAG_PROMPT_ARGS)));
config.setAttribute(LaunchVariableUtil.ATTR_REFRESH_SCOPE, (String) commandArgs.get(TAG_REFRESH_SCOPE));
config.setAttribute(LaunchVariableUtil.ATTR_REFRESH_RECURSIVE, TRUE.equals(commandArgs.get(TAG_REFRESH_RECURSIVE)));
@@ -239,7 +239,7 @@ public final class ExternalToolMigration {
// Collect the rest of the information
config.setAttribute(IExternalToolConstants.ATTR_SHOW_CONSOLE, TRUE.equals(args.get(TAG_TOOL_SHOW_LOG)));
config.setAttribute(IExternalToolConstants.ATTR_CAPTURE_OUTPUT, TRUE.equals(args.get(TAG_TOOL_SHOW_LOG)));
- config.setAttribute(IDebugUIConstants.ATTR_RUN_IN_BACKGROUND, FALSE.equals(args.get(TAG_TOOL_BLOCK)));
+ config.setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, FALSE.equals(args.get(TAG_TOOL_BLOCK)));
config.setAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, (String) args.get(TAG_TOOL_BUILD_TYPES));
config.setAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, arguments);
config.setAttribute(IExternalToolConstants.ATTR_WORKING_DIRECTORY, (String) args.get(TAG_TOOL_DIRECTORY));
@@ -289,7 +289,7 @@ public final class ExternalToolMigration {
String noValueFlag= "NoValue"; //$NON-NLS-1$
String attr= null;
try {
- attr = config.getAttribute(IDebugUIConstants.ATTR_RUN_IN_BACKGROUND, noValueFlag);
+ attr = config.getAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, noValueFlag);
} catch (CoreException e) {
// Exception will occur if the attribute is set because the attribute is actually a boolean.
return config;
@@ -306,7 +306,7 @@ public final class ExternalToolMigration {
ILaunchConfigurationWorkingCopy workingCopy;
try {
workingCopy = config.getWorkingCopy();
- workingCopy.setAttribute(IDebugUIConstants.ATTR_RUN_IN_BACKGROUND, runInBackground);
+ workingCopy.setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, runInBackground);
config= workingCopy.doSave();
} catch (CoreException e) {
ExternalToolsPlugin.getDefault().log(ExternalToolsUIMessages.getString("ExternalToolMigration.38"), e); //$NON-NLS-1$
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 96ab9e9ec..879de763e 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
@@ -168,7 +168,7 @@ public class ProgramLaunchDelegate implements ILaunchConfigurationDelegate {
}
process.setAttribute(IProcess.ATTR_CMDLINE, generateCommandLine(cmdLine));
- if (CommonTab.isRunInBackground(configuration)) {
+ if (CommonTab.isLaunchInBackground(configuration)) {
// refresh resources after process finishes
if (LaunchVariableUtil.getRefreshScope(configuration) != null) {
BackgroundResourceRefresher refresher = new BackgroundResourceRefresher(configuration, process);

Back to the top