From 12f2b8f8d57806cbbfbfdcc496e1931fa433a97e Mon Sep 17 00:00:00 2001 From: John Cortell Date: Wed, 15 Feb 2012 10:51:14 -0600 Subject: [PATCH] Bug 368987 - Project Name should not be reset when selecting existing code path --- .../ui/wizards/NewMakeProjFromExistingPage.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java index c9b59182216..fa5d314ee15 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java @@ -143,7 +143,11 @@ public class NewMakeProjFromExistingPage extends WizardPage { File file= new File(location.getText()); if (file.isDirectory()) { setErrorMessage(null); - projectName.setText(file.getName()); + // Set the project name to the directory name but not if a + // name has already been specified (bugzilla 368987) + if (projectName.getText().isEmpty()) { + projectName.setText(file.getName()); + } } else setErrorMessage(Messages.NewMakeProjFromExistingPage_8); }