mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 14:55:41 +02:00
Code Issues Wiki Activity

Moved catch block for CoreException from page level to Wizard level

Browse source
This commit is contained in:
Judy N. Green 2002-08-14 13:45:57 +00:00
parent 8b52ecdb22
commit 46acfebc85
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java
View file

@ -9,6 +9,7 @@ import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.internal.ui.CPlugin; import org.eclipse.cdt.internal.ui.CPlugin;
import org.eclipse.cdt.ui.wizards.CProjectWizard; import org.eclipse.cdt.ui.wizards.CProjectWizard;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabFolder;
@ -115,9 +116,14 @@ public abstract class ConversionWizard
*/ */
protected void doRun(IProgressMonitor monitor) { protected void doRun(IProgressMonitor monitor) {
doRunPrologue(monitor); doRunPrologue(monitor);
mainPage.doRun(monitor, getProjectID()); try{
doRunEpilogue(monitor); mainPage.doRun(monitor, getProjectID());
monitor.done(); } catch (CoreException ce){
CCorePlugin.log(ce);
} finally{
doRunEpilogue(monitor);
monitor.isCanceled();
}
} }
/** /**
* Return the type of project that it is being converted to * Return the type of project that it is being converted to

13
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java
View file

@ -373,26 +373,19 @@ public abstract class ConvertProjectWizardPage
* *
* @param monitor * @param monitor
* @param projectID * @param projectID
* @exception CoreException
*/ */
public void doRun(IProgressMonitor monitor, String projectID) { public void doRun(IProgressMonitor monitor, String projectID) throws CoreException {
Object[] selection = getCheckedElements(); Object[] selection = getCheckedElements();
int totalSelected = selection.length; int totalSelected = selection.length;
if ((selection != null) && (totalSelected > 0)) { if ((selection != null) && (totalSelected > 0)) {
if (monitor == null) { if (monitor == null) {
monitor = new NullProgressMonitor(); monitor = new NullProgressMonitor();
} }
monitor.beginTask(CPlugin.getResourceString(KEY_TITLE), 1); monitor.beginTask(CPlugin.getResourceString(KEY_TITLE), 1);
convertProjects(selection, monitor, projectID);
try {
convertProjects(selection, monitor, projectID);
}
catch (CoreException ce) {
CPlugin.log(ce);
}
} }
} }