Merge pull request #219 from eharris/210-checkActionValueOnProject

eharris369 · GitHub Enterprise · commit 1e4273d8c843 · 2018-11-29T12:50:19.000-05:00
Issue #210: Check the project action value
diff --git a/dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/MicroclimateApplication.java b/dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/MicroclimateApplication.java
@@ -20,6 +20,7 @@
 import com.ibm.microclimate.core.internal.connection.MicroclimateConnection;
 import com.ibm.microclimate.core.internal.constants.AppState;
 import com.ibm.microclimate.core.internal.constants.BuildStatus;
+import com.ibm.microclimate.core.internal.constants.MCConstants;
 import com.ibm.microclimate.core.internal.constants.ProjectCapabilities;
 import com.ibm.microclimate.core.internal.constants.ProjectType;
 import com.ibm.microclimate.core.internal.constants.StartMode;
@@ -44,6 +45,7 @@ public class MicroclimateApplication {
 	private boolean enabled = true;
 	private String containerId;
 	private ProjectCapabilities projectCapabilities;
+	private String action;
 
 	// Must be updated whenever httpPort changes. Can be null
 	private URL baseUrl;
@@ -119,6 +121,10 @@ public synchronized void setContainerId(String id) {
 		this.containerId = id;
 	}
 	
+	public synchronized void setAction(String action) {
+		this.action = action;
+	}
+	
 	// Getters for our project state fields
 
 	/**
@@ -163,14 +169,27 @@ public synchronized boolean isEnabled() {
 	public synchronized String getContainerId() {
 		return containerId;
 	}
-
+	
 	public boolean isActive() {
 		return getAppState() == AppState.STARTING || getAppState() == AppState.STARTED;
 	}
 
 	public boolean isRunning() {
 		return baseUrl != null;
 	}
+	
+	public boolean isDeleting() {
+		return MCConstants.VALUE_ACTION_DELETING.equals(action);
+	}
+	
+	public boolean isImporting() {
+		// The action value is called "validating" but really this means the project is importing
+		return MCConstants.VALUE_ACTION_VALIDATING.equals(action);
+	}
+	
+	public boolean isAvailable() {
+		return isEnabled() && !isImporting();
+	}
 
 	public boolean hasBuildLog() {
 		return (!projectType.isType(ProjectType.TYPE_NODEJS));
diff --git a/dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/MicroclimateApplicationFactory.java b/dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/MicroclimateApplicationFactory.java
@@ -47,9 +47,13 @@ public static void getAppsFromProjectsJson(MicroclimateConnection mcConnection,
 							MicroclimateApplication app = mcConnection.getAppByID(id);
 							if (app != null) {
 								updateApp(app, appJso);
+								if (app.isDeleting()) {
+									// Remove the app from the list
+									mcConnection.removeApp(id);
+								}
 							} else {
 								app = createApp(mcConnection, appJso);
-								if (app != null) {
+								if (app != null && !app.isDeleting()) {
 									mcConnection.addApp(app);
 								}
 							}
@@ -113,6 +117,18 @@ public static MicroclimateApplication createApp(MicroclimateConnection mcConnect
 	 */
 	public static void updateApp(MicroclimateApplication mcApp, JSONObject appJso) {
 		try {
+			// Set the action
+			if (appJso.has(MCConstants.KEY_ACTION)) {
+				String action = appJso.getString(MCConstants.KEY_ACTION);
+				mcApp.setAction(action);
+				if (MCConstants.VALUE_ACTION_DELETING.equals(action)) {
+					// No point in updating any further since this app should be removed from the list
+					return;
+				}
+			} else {
+				mcApp.setAction(null);
+			}
+			
 			// Set the app status
 			if (appJso.has(MCConstants.KEY_APP_STATUS)) {
 				String appStatus = appJso.getString(MCConstants.KEY_APP_STATUS);
@@ -143,28 +159,31 @@ public static void updateApp(MicroclimateApplication mcApp, JSONObject appJso) {
 				if (appJso.has(MCConstants.KEY_PORTS) && (appJso.get(MCConstants.KEY_PORTS) instanceof JSONObject)) {
 					JSONObject portsObj = appJso.getJSONObject(MCConstants.KEY_PORTS);
 	
+					int httpPortNum = -1;
 					if (portsObj != null && portsObj.has(MCConstants.KEY_EXPOSED_PORT)) {
 						String httpPort = portsObj.getString(MCConstants.KEY_EXPOSED_PORT);
 						if (httpPort != null && !httpPort.isEmpty()) {
-							int portNum = MCUtil.parsePort(httpPort);
-							if (portNum != -1) {
-								mcApp.setHttpPort(portNum);
-							}
+							httpPortNum = MCUtil.parsePort(httpPort);
 						}
 					}
+					if (httpPortNum != -1) {
+						mcApp.setHttpPort(httpPortNum);
+					}
 	
+					int debugPortNum = -1;
 					if (portsObj != null && portsObj.has(MCConstants.KEY_EXPOSED_DEBUG_PORT)) {
 						String debugPort = portsObj.getString(MCConstants.KEY_EXPOSED_DEBUG_PORT);
 						if (debugPort != null && !debugPort.isEmpty()) {
-							int portNum = MCUtil.parsePort(debugPort);
-							if (portNum != -1) {
-								mcApp.setDebugPort(portNum);
-							}
+							debugPortNum = MCUtil.parsePort(debugPort);
 						}
 					}
+					mcApp.setDebugPort(debugPortNum);
+
+				} else {
+					MCLogger.logError("No ports object on project info for application: " + mcApp.name); //$NON-NLS-1$
 				}
 			} catch (Exception e) {
-				MCLogger.logError("Failed to get the ports for application: " + mcApp.name, e);
+				MCLogger.logError("Failed to get the ports for application: " + mcApp.name, e); //$NON-NLS-1$
 			}
 			
 			// Set the start mode
diff --git a/dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/connection/MicroclimateSocket.java b/dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/connection/MicroclimateSocket.java
@@ -262,17 +262,14 @@ private void onProjectChanged(JSONObject event) throws JSONException {
         // Update ports
         JSONObject portsObj = event.getJSONObject(MCConstants.KEY_PORTS);
 
-		// If the app is started, get the http port. If it's not started, this will be missing, and we can't proceed.
-        if (!portsObj.has(MCConstants.KEY_EXPOSED_PORT)) {
-        	MCLogger.log(String.format("No %s key - %s is not running.", 		//$NON-NLS-1$
-        			MCConstants.KEY_EXPOSED_PORT, app.name));
-        	return;
+        if (portsObj != null && portsObj.has(MCConstants.KEY_EXPOSED_PORT)) {
+        	int port = MCUtil.parsePort(portsObj.getString(MCConstants.KEY_EXPOSED_PORT));
+    		app.setHttpPort(port);
+        } else {
+        	MCLogger.logError("No http port on project changed event for: " + app.name); //$NON-NLS-1$
         }
 
-		int port = MCUtil.parsePort(portsObj.getString(MCConstants.KEY_EXPOSED_PORT));
-		app.setHttpPort(port);
-
-		if (portsObj.has(MCConstants.KEY_EXPOSED_DEBUG_PORT)) {
+		if (portsObj != null && portsObj.has(MCConstants.KEY_EXPOSED_DEBUG_PORT)) {
 			int debugPort = MCUtil.parsePort(portsObj.getString(MCConstants.KEY_EXPOSED_DEBUG_PORT));
 			app.setDebugPort(debugPort);
 			if (StartMode.DEBUG_MODES.contains(app.getStartMode()) && debugPort != -1) {
@@ -338,23 +335,23 @@ private void onProjectRestart(JSONObject event) throws JSONException {
 			return;
 		}
 
-		// this event should always have a 'ports' sub-object
+		// This event should always have a 'ports' sub-object
 		JSONObject portsObj = event.getJSONObject(MCConstants.KEY_PORTS);
 
-		// ports object should always have an http port
-		int port = MCUtil.parsePort(portsObj.getString(MCConstants.KEY_EXPOSED_PORT));
-		if (port != -1) {
+		// The ports object should always have an http port
+		if (portsObj != null && portsObj.has(MCConstants.KEY_EXPOSED_PORT)) {
+			int port = MCUtil.parsePort(portsObj.getString(MCConstants.KEY_EXPOSED_PORT));
 			app.setHttpPort(port);
+		} else {
+			MCLogger.logError("No http port on project restart event for: " + app.name); //$NON-NLS-1$
 		}
 
-		// Debug port will obviously be missing if the restart was into Run mode.
+		// Debug port will be missing if the restart was into Run mode.
 		int debugPort = -1;
-		if (portsObj.has(MCConstants.KEY_EXPOSED_DEBUG_PORT)) {
+		if (portsObj != null && portsObj.has(MCConstants.KEY_EXPOSED_DEBUG_PORT)) {
 			debugPort = MCUtil.parsePort(portsObj.getString(MCConstants.KEY_EXPOSED_DEBUG_PORT));
-			if (debugPort != -1) {
-				app.setDebugPort(debugPort);
-			}
 		}
+		app.setDebugPort(debugPort);
 		
 		StartMode startMode = StartMode.get(event);
 		app.setStartMode(startMode);
diff --git a/dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/constants/MCConstants.java b/dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/constants/MCConstants.java
@@ -73,6 +73,8 @@ private MCConstants() {}
 			VALUE_ACTION_BUILD = "build",
 			VALUE_ACTION_ENABLEAUTOBUILD = "enableautobuild",
 			VALUE_ACTION_DISABLEAUTOBUILD = "disableautobuild",
+			VALUE_ACTION_DELETING = "deleting",
+			VALUE_ACTION_VALIDATING = "validating",
 			
 			KEY_VALIDATION_STATUS = "validationStatus",
 			KEY_VALIDATION_RESULTS = "validationResults",
diff --git a/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/AttachDebuggerAction.java b/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/AttachDebuggerAction.java
@@ -40,7 +40,7 @@ public void selectionChanged(IStructuredSelection sel) {
 			Object obj = sel.getFirstElement();
 			if (obj instanceof MCEclipseApplication) {
             	app = (MCEclipseApplication) obj;
-            	if (app.isEnabled() && StartMode.DEBUG_MODES.contains(app.getStartMode()) &&
+            	if (app.isAvailable() && StartMode.DEBUG_MODES.contains(app.getStartMode()) && app.getDebugPort() != -1 &&
             			(app.getAppState() == AppState.STARTED || app.getAppState() == AppState.STARTING)) {
             		IDebugTarget debugTarget = app.getDebugTarget();
             		setEnabled(debugTarget == null || debugTarget.isDisconnected());
diff --git a/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/ContainerShellAction.java b/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/ContainerShellAction.java
@@ -54,7 +54,7 @@ public void selectionChanged(IAction action, ISelection selection) {
             Object obj = sel.getFirstElement();
             if (obj instanceof MicroclimateApplication) {
             	app = (MicroclimateApplication)obj;
-            	action.setEnabled(app.isEnabled() && app.getContainerId() != null);
+            	action.setEnabled(app.isAvailable() && app.getContainerId() != null);
             	return;
             }
         }
diff --git a/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/EnableDisableAutoBuildAction.java b/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/EnableDisableAutoBuildAction.java
@@ -40,7 +40,7 @@ public void selectionChanged(IAction action, ISelection selection) {
             Object obj = sel.getFirstElement();
             if (obj instanceof MCEclipseApplication) {
             	app = (MCEclipseApplication)obj;
-            	if (app.isEnabled()) {
+            	if (app.isAvailable()) {
 	            	if (app.isAutoBuild()) {
 	                	action.setText(Messages.DisableAutoBuildLabel);
 	                } else {
diff --git a/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/EnableDisableProjectAction.java b/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/EnableDisableProjectAction.java
@@ -39,7 +39,7 @@ public void selectionChanged(IAction action, ISelection selection) {
             Object obj = sel.getFirstElement();
             if (obj instanceof MCEclipseApplication) {
             	app = (MCEclipseApplication)obj;
-            	if (app.isEnabled()) {
+            	if (app.isAvailable()) {
                 	action.setText(Messages.DisableProjectLabel);
                 } else {
                 	action.setText(Messages.EnableProjectLabel);
diff --git a/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/ImportProjectAction.java b/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/ImportProjectAction.java
@@ -46,7 +46,7 @@ public void selectionChanged(IAction action, ISelection selection) {
 			Object obj = sel.getFirstElement();
 			if (obj instanceof MicroclimateApplication) {
 				app = (MicroclimateApplication) obj;
-				if (app.isEnabled()) {
+				if (app.isAvailable()) {
 					IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(app.name);
 					action.setEnabled(project == null || !project.exists());
 					return;
diff --git a/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/OpenAppAction.java b/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/OpenAppAction.java
@@ -47,7 +47,7 @@ public void selectionChanged(IAction action, ISelection selection) {
             Object obj = sel.getFirstElement();
             if (obj instanceof MicroclimateApplication) {
             	app = (MicroclimateApplication)obj;
-            	action.setEnabled(app.isEnabled() && app.getAppState() == AppState.STARTED);
+            	action.setEnabled(app.isAvailable() && app.getAppState() == AppState.STARTED);
             	return;
             }
         }
diff --git a/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/OpenAppMonitorAction.java b/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/OpenAppMonitorAction.java
@@ -48,7 +48,7 @@ public void selectionChanged(IAction action, ISelection selection) {
             Object obj = sel.getFirstElement();
             if (obj instanceof MicroclimateApplication) {
             	app = (MicroclimateApplication)obj;
-            	action.setEnabled(app.isEnabled() && app.getAppState() == AppState.STARTED);
+            	action.setEnabled(app.isAvailable() && app.getAppState() == AppState.STARTED);
             	return;
             }
         }
diff --git a/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/RestartDebugModeAction.java b/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/RestartDebugModeAction.java
@@ -61,7 +61,7 @@ public void selectionChanged(IAction action, ISelection selection) {
             Object obj = sel.getFirstElement();
             if (obj instanceof MCEclipseApplication) {
             	app = (MCEclipseApplication)obj;
-            	if (app.isEnabled() && app.supportsDebug()) {
+            	if (app.isAvailable() && app.supportsDebug()) {
 		            action.setEnabled(app.getAppState() == AppState.STARTED || app.getAppState() == AppState.STARTING);
 	            	return;
             	}
diff --git a/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/RestartRunModeAction.java b/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/RestartRunModeAction.java
@@ -9,9 +9,6 @@
 
 package com.ibm.microclimate.ui.internal.actions;
 
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -48,7 +45,7 @@ public void selectionChanged(IAction action, ISelection selection) {
             Object obj = sel.getFirstElement();
             if (obj instanceof MCEclipseApplication) {
             	app = (MCEclipseApplication)obj;
-            	if (app.isEnabled() && app.getProjectCapabilities().canRestart()) {
+            	if (app.isAvailable() && app.getProjectCapabilities().canRestart()) {
 		            action.setEnabled(app.getAppState() == AppState.STARTED || app.getAppState() == AppState.STARTING);
 	            	return;
             	}
diff --git a/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/StartBuildAction.java b/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/StartBuildAction.java
@@ -42,7 +42,7 @@ public void selectionChanged(IAction action, ISelection selection) {
 			Object obj = sel.getFirstElement();
 			if (obj instanceof MicroclimateApplication) {
 				app = (MicroclimateApplication) obj;
-				if (app.isEnabled() && app.getBuildStatus() != BuildStatus.IN_PROGRESS && app.getBuildStatus() != BuildStatus.QUEUED) {
+				if (app.isAvailable() && app.getBuildStatus() != BuildStatus.IN_PROGRESS && app.getBuildStatus() != BuildStatus.QUEUED) {
 					action.setEnabled(true);
 					return;
 				}
diff --git a/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/ToggleConsoleAction.java b/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/ToggleConsoleAction.java
@@ -41,7 +41,7 @@ public void selectionChanged(IAction action, ISelection selection) {
             Object obj = sel.getFirstElement();
             if (obj instanceof MicroclimateApplication) {
             	app = (MCEclipseApplication)obj;
-            	if (app.isEnabled() && supportsConsole()) {
+            	if (app.isAvailable() && supportsConsole()) {
 	            	action.setChecked(hasConsole());
 	            	action.setEnabled(true);
 	            	return;
diff --git a/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/ValidateAction.java b/dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/ValidateAction.java
@@ -38,7 +38,7 @@ public void selectionChanged(IStructuredSelection sel) {
 			Object obj = sel.getFirstElement();
 			if (obj instanceof MicroclimateApplication) {
 				app = (MicroclimateApplication) obj;
-				if (app.isEnabled()) {
+				if (app.isAvailable()) {
 					setEnabled(true);
 					return;
 				}

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public void selectionChanged(IAction action, ISelection selection) {`
`54`	`54`	`Object obj = sel.getFirstElement();`
`55`	`55`	`if (obj instanceof MicroclimateApplication) {`
`56`	`56`	`app = (MicroclimateApplication)obj;`
`57`		`- action.setEnabled(app.isEnabled() && app.getContainerId() != null);`
	`57`	`+ action.setEnabled(app.isAvailable() && app.getContainerId() != null);`
`58`	`58`	`return;`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void selectionChanged(IAction action, ISelection selection) {`
`47`	`47`	`Object obj = sel.getFirstElement();`
`48`	`48`	`if (obj instanceof MicroclimateApplication) {`
`49`	`49`	`app = (MicroclimateApplication)obj;`
`50`		`- action.setEnabled(app.isEnabled() && app.getAppState() == AppState.STARTED);`
	`50`	`+ action.setEnabled(app.isAvailable() && app.getAppState() == AppState.STARTED);`
`51`	`51`	`return;`
`52`	`52`	`}`
`53`	`53`	`}`