[jbosstools-commits] JBoss Tools SVN: r41245 - in trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples: wizard and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: snjeza
Date: 2012-05-22 07:29:37 -0400 (Tue, 22 May 2012)
New Revision: 41245

Modified:
   trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java
   trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ProjectReadyWizard.java
Log:
JBIDE-11929 - Project examples freezes during quickfix dialog

Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java	2012-05-22 11:16:09 UTC (rev 41244)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java	2012-05-22 11:29:37 UTC (rev 41245)
@@ -24,6 +24,7 @@
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.WorkspaceJob;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -222,19 +223,41 @@
 				try {
 					quickFixButton.setSelection(false);
 					openQuickFixWizard(selected);
-					for (ProjectExample project : projects) {
-						if (project.getIncludedProjects() == null) {
-							buildProject(project.getName());
-						} else {
-							List<String> includedProjects = project.getIncludedProjects();
-							for (String projectName:includedProjects) {
-								buildProject(projectName);
+					WorkspaceJob job = new WorkspaceJob("Building workspace") {
+						
+						@Override
+						public IStatus runInWorkspace(IProgressMonitor monitor)
+								throws CoreException {
+							for (ProjectExample project : projects) {
+								if (project.getIncludedProjects() == null) {
+									buildProject(project.getName(), monitor);
+								} else {
+									List<String> includedProjects = project.getIncludedProjects();
+									for (String projectName:includedProjects) {
+										buildProject(projectName, monitor);
+										if (monitor.isCanceled()) {
+											return Status.CANCEL_STATUS;
+										}
+									}
+								}
 							}
+							if (monitor.isCanceled()) {
+								return Status.CANCEL_STATUS;
+							}
+							ProjectExamplesActivator.waitForBuildAndValidation.schedule();
+							try {
+								ProjectExamplesActivator.waitForBuildAndValidation.join();
+							} catch (InterruptedException e) {
+								return Status.CANCEL_STATUS;
+							}
+							if (monitor.isCanceled()) {
+								return Status.CANCEL_STATUS;
+							}
+							return Status.OK_STATUS;
 						}
-					}
-					ProjectExamplesActivator.waitForBuildAndValidation
-							.schedule();
-					ProjectExamplesActivator.waitForBuildAndValidation.join();
+					};
+					job.setUser(true);
+					job.schedule();
 				} catch (Exception e) {
 					ProjectExamplesActivator.log(e);
 				} finally {
@@ -244,14 +267,10 @@
 		}
 	}
 
-	private void buildProject(String projectName) throws CoreException {
-		IProject eclipseProject = ResourcesPlugin
-				.getWorkspace().getRoot().getProject(projectName);
-		if (eclipseProject != null
-				&& eclipseProject.isOpen()) {
-			eclipseProject.build(
-					IncrementalProjectBuilder.FULL_BUILD,
-					null);
+	private void buildProject(String projectName, IProgressMonitor monitor) throws CoreException {
+		IProject eclipseProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+		if (eclipseProject != null && eclipseProject.isOpen()) {
+			eclipseProject.build(IncrementalProjectBuilder.FULL_BUILD, monitor);
 		}
 	}
 
@@ -272,10 +291,7 @@
 
 		IRunnableWithProgress resolutionsRunnable = new IRunnableWithProgress() {
 			public void run(IProgressMonitor monitor) {
-				monitor
-						.beginTask(
-								MarkerMessages.resolveMarkerAction_computationManyAction,
-								100);
+				monitor.beginTask(MarkerMessages.resolveMarkerAction_computationManyAction, 100);
 
 				IMarker[] allMarkers = (IMarker[]) ProjectExamplesActivator
 						.getMarkers(projects).toArray(new IMarker[0]);
@@ -353,7 +369,7 @@
 			wizard
 					.setWindowTitle(MarkerMessages.resolveMarkerAction_dialogTitle);
 			WizardDialog dialog = new QuickFixWizardDialog(PlatformUI
-					.getWorkbench().getActiveWorkbenchWindow().getShell(),
+					.getWorkbench().getModalDialogShellProvider().getShell(),
 					wizard);
 			dialog.open();
 		}

Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ProjectReadyWizard.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ProjectReadyWizard.java	2012-05-22 11:16:09 UTC (rev 41244)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ProjectReadyWizard.java	2012-05-22 11:29:37 UTC (rev 41245)
@@ -15,6 +15,7 @@
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.internal.ide.IDEInternalWorkbenchImages;
 import org.jboss.tools.project.examples.Messages;
 import org.jboss.tools.project.examples.ProjectExamplesActivator;
@@ -66,7 +67,7 @@
 				
 				@Override
 				public void run() {
-					Dialog dialog = new MarkerDialog(getShell(), projectExamples);
+					Dialog dialog = new MarkerDialog(PlatformUI.getWorkbench().getModalDialogShellProvider().getShell(), projectExamples);
 					dialog.open();
 				}
 			});