mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-03 21:53:39 +02:00
Code Issues Wiki Activity

further fix for 95556

Browse source
This commit is contained in:
David Inglis 2005-06-16 23:56:57 +00:00
parent 2a08c7bbc4
commit a921b87b6f
1 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java
View file

@ -92,8 +92,8 @@ public abstract class NewCProjectWizard extends BasicNewResourceWizard implement
op_error = error; op_error = error;
} }
/** /* (non-Javadoc)
* @see Wizard#createPages * @see org.eclipse.jface.wizard.IWizard#addPages()
*/ */
public void addPages() { public void addPages() {
fMainPage= new NewCProjectWizardPage(CUIPlugin.getResourceString(PREFIX)); fMainPage= new NewCProjectWizardPage(CUIPlugin.getResourceString(PREFIX));
@ -154,8 +154,8 @@ public abstract class NewCProjectWizard extends BasicNewResourceWizard implement
return getNewProject(); return getNewProject();
} }
/** /* (non-Javadoc)
* @see Wizard#performFinish * @see org.eclipse.jface.wizard.IWizard#performFinish()
*/ */
public boolean performFinish() { public boolean performFinish() {
if (!invokeRunnable(getRunnable())) { if (!invokeRunnable(getRunnable())) {
@ -208,7 +208,13 @@ public abstract class NewCProjectWizard extends BasicNewResourceWizard implement
} }
public IRunnableWithProgress getRunnable() { public IRunnableWithProgress getRunnable() {
return new IRunnableWithProgress() { return new WorkspaceModifyDelegatingOperation(new IRunnableWithProgress() {
public void run(IProgressMonitor imonitor) throws InvocationTargetException, InterruptedException {
final Exception except[] = new Exception[1];
// ugly, need to make the wizard page run in a non ui thread so that this can go away!!!
getShell().getDisplay().syncExec(new Runnable() {
public void run() {
IRunnableWithProgress op= new WorkspaceModifyDelegatingOperation(new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
final IProgressMonitor fMonitor; final IProgressMonitor fMonitor;
if (monitor == null) { if (monitor == null) {
@ -217,9 +223,6 @@ public abstract class NewCProjectWizard extends BasicNewResourceWizard implement
fMonitor = monitor; fMonitor = monitor;
} }
fMonitor.beginTask(CUIPlugin.getResourceString(OP_DESC), 3); fMonitor.beginTask(CUIPlugin.getResourceString(OP_DESC), 3);
final CoreException except[] = new CoreException[1];
getShell().getDisplay().syncExec(new Runnable() {
public void run() {
doRunPrologue(new SubProgressMonitor(fMonitor, 1)); doRunPrologue(new SubProgressMonitor(fMonitor, 1));
try { try {
doRun(new SubProgressMonitor(fMonitor, 1)); doRun(new SubProgressMonitor(fMonitor, 1));
@ -228,13 +231,29 @@ public abstract class NewCProjectWizard extends BasicNewResourceWizard implement
except[0] = e; except[0] = e;
} }
doRunEpilogue(new SubProgressMonitor(fMonitor, 1)); doRunEpilogue(new SubProgressMonitor(fMonitor, 1));
fMonitor.done();
}
});
try {
getContainer().run(false, true, op);
} catch (InvocationTargetException e) {
except[0] = e;
} catch (InterruptedException e) {
except[0] = e;
}
} }
}); });
if (except[0] != null) { 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]); throw new InvocationTargetException(except[0]);
} }
fMonitor.done(); } }
}; });
} }
/** /**