Merge pull request #102 from eharris369/101-runRefreshActionsInJob

Issue #101: Run refresh actions in a job

Author: eharris369

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/connection/MicroclimateConnection.java

@@ -281,15 +281,8 @@ public void refreshApps(String projectID) {
 
 		final URI projectsURL = baseUrl.resolve(MCConstants.APIPATH_PROJECT_LIST);
 
-		String projectsResponse = null;
-		try {
-			projectsResponse = HttpUtil.get(projectsURL).response;
-		} catch (IOException e) {
-			MCLogger.logError("Error contacting Projects endpoint", e);  //$NON-NLS-1$
-			return;
-		}
-
 		try {
+			String projectsResponse = HttpUtil.get(projectsURL).response;
 			MicroclimateApplicationFactory.getAppsFromProjectsJson(this, projectsResponse, projectID);
 			MCLogger.log("App list update success"); //$NON-NLS-1$
 		}

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 IBM Corporation and others.
+ * Copyright (c) 2018, 2019 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -11,15 +11,21 @@
 
 package com.ibm.microclimate.ui.internal.actions;
 
+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.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
 import com.ibm.microclimate.core.internal.MCLogger;
 import com.ibm.microclimate.core.internal.MicroclimateApplication;
 import com.ibm.microclimate.core.internal.connection.MicroclimateConnection;
+import com.ibm.microclimate.ui.internal.messages.Messages;
 import com.ibm.microclimate.ui.internal.views.ViewHelper;
 
 /**
@@ -52,13 +58,27 @@ public void selectionChanged(IAction action, ISelection selection) {
     @Override
     public void run(IAction action) {
         if (microclimateObject instanceof MicroclimateConnection) {
-        	MicroclimateConnection connection = (MicroclimateConnection) microclimateObject;
-        	connection.refreshApps(null);
-        	ViewHelper.refreshMicroclimateExplorerView(connection);
+        	final MicroclimateConnection connection = (MicroclimateConnection) microclimateObject;
+        	Job job = new Job(NLS.bind(Messages.RefreshConnectionJobLabel, connection.baseUrl.toString())) {
+    			@Override
+    			protected IStatus run(IProgressMonitor monitor) {
+		        	connection.refreshApps(null);
+		        	ViewHelper.refreshMicroclimateExplorerView(connection);
+		        	return Status.OK_STATUS;
+    			}
+    		};
+    		job.schedule();
         } else if (microclimateObject instanceof MicroclimateApplication) {
-        	MicroclimateApplication app = (MicroclimateApplication) microclimateObject;
-        	app.mcConnection.refreshApps(app.projectID);
-        	ViewHelper.refreshMicroclimateExplorerView(app);
+        	final MicroclimateApplication app = (MicroclimateApplication) microclimateObject;
+        	Job job = new Job(NLS.bind(Messages.RefreshProjectJobLabel, app.name)) {
+    			@Override
+    			protected IStatus run(IProgressMonitor monitor) {
+    				app.mcConnection.refreshApps(app.projectID);
+    				ViewHelper.refreshMicroclimateExplorerView(app);
+		        	return Status.OK_STATUS;
+    			}
+    		};
+    		job.schedule();
         } else {
         	// Should not happen
         	MCLogger.logError("RefreshAction ran but no Microclimate object was selected");

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

@@ -86,6 +86,8 @@ public class Messages extends NLS {
 	public static String DeleteProjectErrorMsg;
 	public static String refreshResourceJobLabel;
 	public static String RefreshResourceError;
+	public static String RefreshConnectionJobLabel;
+	public static String RefreshProjectJobLabel;
 
 	public static String ImportProjectError;
 	public static String StartBuildError;

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

@@ -79,7 +79,9 @@ DeleteProjectErrorTitle=Project Delete Error
 DeleteProjectErrorMsg=An error occurred trying to delete Microclimate project {0}: {1}
 refreshResourceJobLabel=Refreshing resource: {0}
 RefreshResourceError=An error occurred while trying to refresh the {0} resource.
-
+RefreshConnectionJobLabel=Refreshing connection: {0}
+RefreshProjectJobLabel=Refreshing project: {0}
+	
 ImportProjectError=An error occurred while importing the {0} project.
 StartBuildError=An error occurred while starting a build for the {0} project.
 OpenMicroclimateUIError=An error occurred while opening the Microclimate UI.