From adb8d7657498bf975d7617da65b9a13ddaadbd95 Mon Sep 17 00:00:00 2001
From: David Inglis <dinglis@qnx.com>
Date: Tue, 13 Aug 2002 13:17:10 +0000
Subject: [PATCH] added abstract getProjectID plus handle execeptions in
 runnable when creating project

---
 .../cdt/ui/wizards/CProjectWizard.java        | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java
index f69c3664778..f4d36c60bfd 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java
@@ -39,7 +39,10 @@ import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
 import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
 import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
 
+import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.CProjectNature;
+import org.eclipse.cdt.core.ICProjectDescriptor;
+import org.eclipse.cdt.core.ICProjectOwnerInfo;
 import org.eclipse.cdt.internal.ui.CPlugin;
 import org.eclipse.cdt.internal.ui.CPluginImages;
 import org.eclipse.cdt.utils.ui.swt.IValidation;
@@ -212,7 +215,12 @@ public abstract class CProjectWizard extends BasicNewResourceWizard implements I
 				monitor.beginTask(CPlugin.getResourceString(OP_DESC), 3);
 
 				doRunPrologue(new SubProgressMonitor(monitor, 1));
-				doRun(new SubProgressMonitor(monitor, 1));
+				try {
+					doRun(new SubProgressMonitor(monitor, 1));
+				}
+				catch (CoreException e) {
+					throw new InvocationTargetException(e);
+				}
 				doRunEpilogue(new SubProgressMonitor(monitor, 1));
 
 				monitor.done();
@@ -243,6 +251,11 @@ public abstract class CProjectWizard extends BasicNewResourceWizard implements I
 			}
 			MessageDialog.openError(shell, title, message);
 			CPlugin.log(th);
+			try {
+				getProjectHandle().delete(true, true, null);
+			}
+			catch (CoreException ignore) {
+			}
 			return false;
 		} catch  (InterruptedException e) {
 			return false;
@@ -250,7 +263,7 @@ public abstract class CProjectWizard extends BasicNewResourceWizard implements I
 		return true;
 	}
 
-	protected void doRun(IProgressMonitor monitor) {
+	protected void doRun(IProgressMonitor monitor) throws CoreException {
 		createNewProject(monitor);
 	}	
 
@@ -270,7 +283,7 @@ public abstract class CProjectWizard extends BasicNewResourceWizard implements I
 	 * @return the created project resource, or <code>null</code> if the project
 	 *    was not created
 	 */
-	protected IProject createNewProject(IProgressMonitor monitor) {
+	protected IProject createNewProject(IProgressMonitor monitor) throws CoreException {
 
 		if (newProject != null)
 			return newProject;
@@ -287,13 +300,7 @@ public abstract class CProjectWizard extends BasicNewResourceWizard implements I
 		IProjectDescription description = workspace.newProjectDescription(newProjectHandle.getName());
 		description.setLocation(newPath);
 
-		try {
-			newProject = createProject(description, newProjectHandle, monitor);
-		} catch (CoreException e) {
-			return null;
-		} catch (OperationCanceledException e) {
-			return null;
-		}
+		newProject = createProject(description, newProjectHandle, monitor);
 		return newProject;
 	}
 
@@ -324,10 +331,17 @@ public abstract class CProjectWizard extends BasicNewResourceWizard implements I
 			projectHandle.open(new SubProgressMonitor(monitor, 1));
 			// Add C Nature.
 			CProjectNature.addCNature(projectHandle, new SubProgressMonitor(monitor, 1));
-
+			CCorePlugin.getDefault().mapCProjectOwner(projectHandle, getProjectID());
 		} finally {
 			//monitor.done();
 		}
 		return projectHandle;
 	}
+
+	/**
+	 * Method getID.
+	 * @return String
+	 */
+	public abstract String getProjectID();
+
 }