From 40e68a1ff3a82d47038eae12c0b1b8291644e117 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Wed, 13 Nov 2002 16:45:00 +0000 Subject: [PATCH] CProjectWizardPage constructor takes CProjectWizard argument validatePage calls isValidName(). --- .../eclipse/cdt/ui/wizards/CProjectWizardPage.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizardPage.java index 406857169f5..1e99a49a36d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizardPage.java @@ -60,6 +60,7 @@ public class CProjectWizardPage extends WizardPage { protected Text locationPathField; protected Label locationLabel; protected Button browseButton; + protected CProjectWizard wizard; private Listener nameModifyListener = new Listener() { public void handleEvent(Event e) { @@ -271,10 +272,11 @@ public class CProjectWizardPage extends WizardPage { * * @param pageName the name of this page */ - public CProjectWizardPage(String pageName) { + public CProjectWizardPage(CProjectWizard wizard, String pageName) { super(pageName); setPageComplete(false); this.initialLocationFieldValue = Platform.getLocation(); + this.wizard = wizard; } /** @@ -304,6 +306,13 @@ public class CProjectWizardPage extends WizardPage { return false; } + // Give a chance to the wizard to do its own validation + IStatus validName = wizard.isValidName(projectFieldContents); + if (!validName.isOK()) { + setErrorMessage(validName.getMessage()); + return false; + } + IStatus nameStatus = workspace.validateName(projectFieldContents, IResource.PROJECT); if (!nameStatus.isOK()) {