Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarin Wright2001-06-06 17:15:43 +0000
committerDarin Wright2001-06-06 17:15:43 +0000
commit05aba987ccb5a5da893918035b86f519230a9580 (patch)
tree5050baa7b95a1f4adffd20696cb9876ba4991010
parentb6a9dee138230bf8b9eb7c6e3004454ddfb75e35 (diff)
downloadeclipse.platform.debug-05aba987ccb5a5da893918035b86f519230a9580.tar.gz
eclipse.platform.debug-05aba987ccb5a5da893918035b86f519230a9580.tar.xz
eclipse.platform.debug-05aba987ccb5a5da893918035b86f519230a9580.zip
1GEWSJF & 1GESV5Fv0_120
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchSelectionAction.java2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizard.java3
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizardSelectionPage.java22
3 files changed, 17 insertions, 10 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchSelectionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchSelectionAction.java
index 524c02d0a..d8d884321 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchSelectionAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchSelectionAction.java
@@ -41,7 +41,7 @@ public class LaunchSelectionAction extends Action {
public void run() {
BusyIndicator.showWhile(Display.getCurrent(), new Runnable() {
public void run() {
- if (fElement != null) {
+ if (fElement != null || !DebugUIPlugin.getDefault().hasWizard(fLauncher)) {
fLauncher.launch(new Object[] {fElement}, fMode);
} else {
Shell shell= DebugUIPlugin.getActiveWorkbenchWindow().getShell();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizard.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizard.java
index 97b2d36fd..a527b6404 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizard.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizard.java
@@ -190,6 +190,9 @@ public class LaunchWizard extends Wizard {
*/
public void setProjectSelection(IStructuredSelection selection) {
fSelection= selection;
+ if (fPage != null) {
+ fPage.updateDefaultProject();
+ }
}
/**
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizardSelectionPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizardSelectionPage.java
index 78bc15917..d76950e34 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizardSelectionPage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchWizardSelectionPage.java
@@ -144,14 +144,7 @@ public class LaunchWizardSelectionPage extends WizardSelectionPage {
});
fLaunchersList.setInput(fLaunchersList);
fSetAsDefaultLauncher= new Button(root, SWT.CHECK);
- IProject project= ((LaunchWizard)getWizard()).getProject();
- String projectName= "";
- if (project != null) {
- projectName= project.getName();
- } else {
- projectName= DebugUIUtils.getResourceString(UNKNOWN);
- }
- fSetAsDefaultLauncher.setText(MessageFormat.format(DebugUIUtils.getResourceString(DEFAULT_LAUNCHER), new String[] {projectName}));
+ updateDefaultProject();
}
/**
@@ -239,6 +232,17 @@ public class LaunchWizardSelectionPage extends WizardSelectionPage {
*/
protected IWizardContainer getContainer() {
return super.getContainer();
- }
+ }
+
+ protected void updateDefaultProject() {
+ IProject project= ((LaunchWizard)getWizard()).getProject();
+ String projectName= "";
+ if (project != null) {
+ projectName= project.getName();
+ } else {
+ projectName= DebugUIUtils.getResourceString(UNKNOWN);
+ }
+ fSetAsDefaultLauncher.setText(MessageFormat.format(DebugUIUtils.getResourceString(DEFAULT_LAUNCHER), new String[] {projectName}));
+ }
}

Back to the top