Attachment 115176 Details for Bug 250982 – proposed patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] proposed patch

bug_250982_wizard_progress (text/plain), 2.62 KB, created by Vivian Kong

on 2008-10-15 14:41:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Vivian Kong

Created: 2008-10-15 14:41:27 EDT

Size: 2.62 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.ui
>Index: src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java,v
>retrieving revision 1.23
>diff -u -r1.23 CDTCommonProjectWizard.java
>--- src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java	28 Apr 2008 18:35:19 -0000	1.23
>+++ src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java	15 Oct 2008 18:38:48 -0000
>@@ -222,15 +222,47 @@
> 		final boolean defaults = _defaults;
> 		return new IRunnableWithProgress() {
> 			public void run(IProgressMonitor imonitor) throws InvocationTargetException, InterruptedException {
>+				final Exception except[] = new Exception[1];
> 				getShell().getDisplay().syncExec(new Runnable() {
>-					public void run() { 
>+					public void run() {
>+						IRunnableWithProgress op= new WorkspaceModifyDelegatingOperation(new IRunnableWithProgress() {
>+							public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
>+								final IProgressMonitor fMonitor;
>+								if (monitor == null) {
>+									fMonitor= new NullProgressMonitor();
>+								} else {
>+									fMonitor = monitor;
>+								}
>+								fMonitor.beginTask(CUIPlugin.getResourceString("CProjectWizard.op_description"), 100); //$NON-NLS-1$
>+							
>+								try {							
>+									newProject = createIProject(lastProjectName, lastProjectLocation);
>+									fMonitor.worked(50);
>+									if (newProject != null) 
>+										fMainPage.h_selected.createProject(newProject, defaults, onFinish);
>+									fMonitor.worked(50);
>+								} catch (CoreException e) {	CUIPlugin.log(e); }
>+								finally {fMonitor.done();}
>+							}
>+						});
> 						try {
>-							newProject = createIProject(lastProjectName, lastProjectLocation);
>-							if (newProject != null) 
>-								fMainPage.h_selected.createProject(newProject, defaults, onFinish);
>-						} catch (CoreException e) {	CUIPlugin.log(e); }
>+							getContainer().run(false, true, op);
>+						} catch (InvocationTargetException e) {
>+							except[0] = e;
>+						} catch (InterruptedException e) {
>+							except[0] = e;
>+						}
> 					}
> 				});
>+				if (except[0] != null) {
>+					if (except[0] instanceof InvocationTargetException) {
>+						throw (InvocationTargetException)except[0];
>+					}
>+					if (except[0] instanceof InterruptedException) {
>+						throw (InterruptedException)except[0];
>+					}
>+					throw new InvocationTargetException(except[0]);
>+				}					
> 			}
> 		};
> 	}

Actions: View | Diff

Attachments on bug 250982: 115176 | 115211 | 115276 | 115577 | 115815 | 117791