From 4415f739fb9a558125e1b58a00aaec7bf17aef83 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Tue, 13 Aug 2002 13:17:21 +0000 Subject: [PATCH] handle execeptions in runnable when creating project --- .../cdt/ui/wizards/CCProjectWizard.java | 7 ++-- .../eclipse/cdt/ui/wizards/StdCCWizard.java | 12 +++---- .../eclipse/cdt/ui/wizards/StdCWizard.java | 3 +- .../cdt/ui/wizards/StdMakeProjectWizard.java | 34 ++++++++++--------- 4 files changed, 25 insertions(+), 31 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java index 6502dce329b..7d8b87e441a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java @@ -56,14 +56,11 @@ public abstract class CCProjectWizard extends CProjectWizard { } - protected void doRun(IProgressMonitor monitor) { + protected void doRun(IProgressMonitor monitor) throws CoreException { super.doRun(monitor); // Add C++ Nature. if (newProject != null) { - try { - CCProjectNature.addCCNature(newProject, monitor); - } catch (CoreException e) { - } + CCProjectNature.addCCNature(newProject, monitor); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/StdCCWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/StdCCWizard.java index 503f9afa62d..272c015c775 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/StdCCWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/StdCCWizard.java @@ -5,15 +5,14 @@ package org.eclipse.cdt.ui.wizards; * All Rights Reserved. */ +import org.eclipse.cdt.core.CCProjectNature; +import org.eclipse.cdt.internal.ui.CPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.swt.widgets.TabFolder; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.internal.ui.CPlugin; - /** */ @@ -37,7 +36,7 @@ public class StdCCWizard extends StdMakeProjectWizard { fTabFolderPage.setTitle(CPlugin.getResourceString(SETTINGS_TITLE)); fTabFolderPage.setDescription(CPlugin.getResourceString(SETTINGS_DESC)); } - protected void doRun(IProgressMonitor monitor) { + protected void doRun(IProgressMonitor monitor) throws CoreException { super.doRun(monitor); // Add C++ Nature. if (newProject != null) { @@ -45,10 +44,7 @@ public class StdCCWizard extends StdMakeProjectWizard { monitor = new NullProgressMonitor(); } monitor.beginTask("Standard C++ Make", 1); - try { - CCProjectNature.addCCNature(newProject, new SubProgressMonitor(monitor, 1)); - } catch (CoreException e) { - } + CCProjectNature.addCCNature(newProject, new SubProgressMonitor(monitor, 1)); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/StdCWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/StdCWizard.java index 6b24657d6f1..ae2c86a8cb5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/StdCWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/StdCWizard.java @@ -5,9 +5,8 @@ package org.eclipse.cdt.ui.wizards; * All Rights Reserved. */ -import org.eclipse.swt.widgets.TabFolder; - import org.eclipse.cdt.internal.ui.CPlugin; +import org.eclipse.swt.widgets.TabFolder; /** */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/StdMakeProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/StdMakeProjectWizard.java index aae5169e880..940f3e298bc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/StdMakeProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/StdMakeProjectWizard.java @@ -5,6 +5,9 @@ package org.eclipse.cdt.ui.wizards; * All Rights Reserved. */ +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.CProjectNature; +import org.eclipse.cdt.internal.ui.CPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; @@ -14,9 +17,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; -import org.eclipse.cdt.core.CProjectNature; -import org.eclipse.cdt.internal.ui.CPlugin; - /** */ @@ -70,26 +70,28 @@ public abstract class StdMakeProjectWizard extends CProjectWizard { protected void doRunEpilogue(IProgressMonitor monitor) { } - protected void doRun(IProgressMonitor monitor) { + protected void doRun(IProgressMonitor monitor) throws CoreException { super.doRun(monitor); if (newProject != null) { if (monitor == null) { monitor = new NullProgressMonitor(); } monitor.beginTask("Standard Make", 3); - try { - // Update the referenced project if provided. - if (referenceBlock != null) { - referenceBlock.doRun(newProject, new SubProgressMonitor(monitor, 1)); - } - // Update the settings. - if (settingsBlock != null) { - settingsBlock.doRun(newProject, new SubProgressMonitor(monitor, 1)); - } - // Set the Default C Builder. - CProjectNature.addCBuildSpec(newProject, new SubProgressMonitor(monitor, 1)); - } catch (CoreException e) { + // Update the referenced project if provided. + if (referenceBlock != null) { + referenceBlock.doRun(newProject, new SubProgressMonitor(monitor, 1)); } + // Update the settings. + if (settingsBlock != null) { + settingsBlock.doRun(newProject, new SubProgressMonitor(monitor, 1)); + } + // Set the Default C Builder. + CProjectNature.addCBuildSpec(newProject, new SubProgressMonitor(monitor, 1)); } } + + public String getProjectID() { + return CCorePlugin.getDefault().PLUGIN_ID + ".make"; + } + }