Merge pull request #123 from eharris369/113-useJobForDelete

Issue #113: Use job for project delete

Author: eharris369

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/DeleteProjectAction.java

@@ -13,7 +13,10 @@
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.osgi.util.NLS;
@@ -24,6 +27,7 @@
 import com.ibm.microclimate.core.internal.MCEclipseApplication;
 import com.ibm.microclimate.core.internal.MCLogger;
 import com.ibm.microclimate.core.internal.MCUtil;
+import com.ibm.microclimate.ui.MicroclimateUIPlugin;
 import com.ibm.microclimate.ui.internal.messages.Messages;
 
 /**
@@ -63,17 +67,24 @@ public void run() {
 		}
 
 		if (MCUtil.openConfirmDialog(Messages.DeleteProjectTitle, NLS.bind(Messages.DeleteProjectMessage, app.name))) {
-			try {
-				app.mcConnection.requestProjectDelete(app.projectID);
-				IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(app.name);
-				if (project != null && project.exists() && project.getLocation().toFile().equals(app.fullLocalPath.toFile())) {
-					project.delete(false, true, new NullProgressMonitor());
-				}
-			} catch (Exception e) {
-				MCLogger.logError("An error occurred deleting the project: " + app.name + ", with id: " + app.projectID, e);
-				MCUtil.openDialog(true, Messages.DeleteProjectErrorTitle,
-						NLS.bind(Messages.DeleteProjectErrorMsg, new String[] {app.name, e.getMessage()}));
-			}
+			Job job = new Job(NLS.bind(Messages.DeleteProjectJobTitle, app.name)) {
+    			@Override
+    			protected IStatus run(IProgressMonitor monitor) {
+    				try {
+    					app.mcConnection.requestProjectDelete(app.projectID);
+    					IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(app.name);
+    					if (project != null && project.exists() && project.getLocation().toFile().equals(app.fullLocalPath.toFile())) {
+    						project.delete(false, true, monitor);
+    					}
+    					return Status.OK_STATUS;
+    				} catch (Exception e) {
+    					MCLogger.logError("An error occurred deleting the project: " + app.name + ", with id: " + app.projectID, e);
+    					return new Status(IStatus.ERROR, MicroclimateUIPlugin.PLUGIN_ID, NLS.bind(Messages.DeleteProjectErrorMsg, app.name), e);
+    				}
+    			}
+    		};
+    		job.schedule();
+			
 		}
 	}
 }

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/messages/Messages.java

@@ -83,7 +83,7 @@ public class Messages extends NLS {
 	public static String DeleteProjectLabel;
 	public static String DeleteProjectTitle;
 	public static String DeleteProjectMessage;
-	public static String DeleteProjectErrorTitle;
+	public static String DeleteProjectJobTitle;
 	public static String DeleteProjectErrorMsg;
 	public static String refreshResourceJobLabel;
 	public static String RefreshResourceError;

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/messages/messages.properties

@@ -76,8 +76,8 @@ LaunchDebugSessionLabel=&Launch Debug Session
 DeleteProjectLabel=D&elete
 DeleteProjectTitle=Project Delete
 DeleteProjectMessage=Are you sure you want to delete project {0} in Microclimate and from your filesystem?
-DeleteProjectErrorTitle=Project Delete Error
-DeleteProjectErrorMsg=An error occurred trying to delete Microclimate project {0}: {1}
+DeleteProjectJobTitle=Deleting project: {0}
+DeleteProjectErrorMsg=An error occurred trying to delete Microclimate project: {0}
 refreshResourceJobLabel=Refreshing resource: {0}
 RefreshResourceError=An error occurred while trying to refresh the {0} resource.
 RefreshConnectionJobLabel=Refreshing connection: {0}