From c0121fbe5fe0d0924aecc999724247d2e335ae95 Mon Sep 17 00:00:00 2001 From: Ken Ryall Date: Sat, 5 Sep 2009 20:03:28 +0000 Subject: [PATCH] Bug 286359. Executable not auto-selected --- .../cdt/dsf/gdb/internal/ui/launching/CMainTab.java | 10 ++++++++++ .../src/org/eclipse/cdt/launch/ui/CMainTab.java | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CMainTab.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CMainTab.java index f3d400981da..50a8880ef30 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CMainTab.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CMainTab.java @@ -458,6 +458,7 @@ public class CMainTab extends CLaunchConfigurationTab { * the specified project. */ protected void handleProjectButtonSelected() { + String currentProjectName = fProjText.getText(); ICProject project = chooseCProject(); if (project == null) { return; @@ -465,6 +466,15 @@ public class CMainTab extends CLaunchConfigurationTab { String projectName = project.getElementName(); fProjText.setText(projectName); + if (currentProjectName.length() == 0) + { + // New project selected for the first time, set the program name default too. + IBinary[] bins = getBinaryFiles(project); + if (bins != null && bins.length == 1) { + fProgText.setText(bins[0].getResource().getProjectRelativePath().toOSString()); + } + + } } /** diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java index d494b73810b..47beb50c479 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java @@ -718,6 +718,7 @@ public class CMainTab extends CLaunchConfigurationTab { * the specified project. */ protected void handleProjectButtonSelected() { + String currentProjectName = fProjText.getText(); ICProject project = chooseCProject(); if (project == null) { return; @@ -725,6 +726,15 @@ public class CMainTab extends CLaunchConfigurationTab { String projectName = project.getElementName(); fProjText.setText(projectName); + if (currentProjectName.length() == 0) + { + // New project selected for the first time, set the program name default too. + IBinary[] bins = getBinaryFiles(project); + if (bins != null && bins.length == 1) { + fProgText.setText(bins[0].getResource().getProjectRelativePath().toOSString()); + } + + } } /**