Merge pull request #125 from eharris369/124-stopUpdateIfDisabled

Issue #124: Don't continue with update if project is disabled

Author: eharris369

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/MicroclimateApplication.java

@@ -129,7 +129,12 @@ public synchronized void setAutoBuild(boolean enabled) {
 	}
 
 	public synchronized void setEnabled(boolean enabled) {
+		boolean reenabled = enabled && !this.enabled;
 		this.enabled = enabled;
+		if (reenabled) {
+			mcConnection.refreshApps(projectID);
+			MCUtil.updateApplication(this);
+		}
 	}
 
 	public synchronized void setContainerId(String id) {

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/MicroclimateApplicationFactory.java

@@ -146,8 +146,12 @@ public static void updateApp(MicroclimateApplication mcApp, JSONObject appJso) {
 			// Set the app state
 			if (appJso.has(MCConstants.KEY_OPEN_STATE)) {
 				String state = appJso.getString(MCConstants.KEY_OPEN_STATE);
-				mcApp.setEnabled(!MCConstants.VALUE_STATE_CLOSED.equals(state));
+				if (MCConstants.VALUE_STATE_CLOSED.equals(state)) {
+					mcApp.setEnabled(false);
+					return;
+				}
 			}
+			mcApp.setEnabled(true);
 
 			// Set the app status
 			if (appJso.has(MCConstants.KEY_APP_STATUS)) {

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

@@ -70,7 +70,7 @@ public void run() {
 
     public boolean showAction() {
     	// Don't show the action if the app does not support debug
-    	return (app != null && app.supportsDebug());
+    	return (app != null && app.isAvailable() && app.supportsDebug());
     }
 
 }