Merge pull request #191 from eharris/185-limitQuickFixesToDockerfile

Issue #185: Limit quick fixes to the ones that actually work.

Author: eharris369

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

@@ -25,6 +25,7 @@
 import com.ibm.microclimate.core.internal.MicroclimateApplication;
 import com.ibm.microclimate.core.internal.console.SocketConsole;
 import com.ibm.microclimate.core.internal.constants.MCConstants;
+import com.ibm.microclimate.core.internal.constants.ProjectType;
 import com.ibm.microclimate.core.internal.constants.StartMode;
 import com.ibm.microclimate.core.internal.messages.Messages;
 
@@ -440,7 +441,7 @@ private void onValidationEvent(JSONObject event) throws JSONException {
 				String details = result.getString(MCConstants.KEY_DETAILS);
 				String quickFixId = null;
 				String quickFixDescription = null;
-				if (result.has(MCConstants.KEY_QUICKFIX)) {
+				if (result.has(MCConstants.KEY_QUICKFIX) && supportsQuickFix(app, type, filename)) {
 					JSONObject quickFix = result.getJSONObject(MCConstants.KEY_QUICKFIX);
 					quickFixId = quickFix.getString(MCConstants.KEY_FIXID);
 					quickFixDescription = quickFix.getString(MCConstants.KEY_DESCRIPTION);
@@ -455,6 +456,19 @@ private void onValidationEvent(JSONObject event) throws JSONException {
 			MCLogger.log("Validation event indicates failure but no validation results,"); //$NON-NLS-1$
 		}
 	}
+	
+	private boolean supportsQuickFix(MicroclimateApplication app, String type, String filename) {
+		if (!MCConstants.VALUE_TYPE_MISSING.equals(type) || app.projectType.isType(ProjectType.TYPE_DOCKER)) {
+			return false;
+		}
+		if (MCConstants.DOCKERFILE.equals(filename)) {
+			return true;
+		}
+		if (app.projectType.isType(ProjectType.TYPE_LIBERTY) && MCConstants.DOCKERFILE_BUILD.equals(filename)) {
+			return true;
+		}
+		return false;
+	}
 
 	boolean blockUntilFirstConnection() {
 		final int delay = 100;

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/constants/MCConstants.java

@@ -94,7 +94,11 @@ private MCConstants() {}
 			KEY_AUTO_GENERATE = "autoGenerate",
 
 			// JSON attribute values
-			REQUEST_STATUS_SUCCESS = "success"
+			REQUEST_STATUS_SUCCESS = "success",
+			
+			// Microclimate files
+			DOCKERFILE = "Dockerfile",
+			DOCKERFILE_BUILD = "Dockerfile-build"
 
 			;
 

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/constants/StartMode.java

@@ -52,7 +52,7 @@ public static StartMode get(JSONObject obj) {
 				mode = obj.getString(MCConstants.KEY_START_MODE);
 			}
 			if (mode == null) {
-				MCLogger.logError("No start mode was specified on JSON object");
+				MCLogger.log("No start mode was specified on JSON object");
 				return StartMode.RUN;
 			} else {
 				StartMode startMode = StartMode.get(mode);

dev/com.ibm.microclimate.ui/plugin.properties

@@ -17,7 +17,7 @@ ACTION_REMOVE_CONNECTION=&Remove Connection
 
 ACTION_OPEN_APP=&Open Application
 ACTION_CONTAINER_SHELL=Open &Container Shell
-ACTION_START_BUILD=Start &Build
+ACTION_START_BUILD=&Build
 ACTION_IMPORT_PROJECT=&Import Project
 ACTION_SHOW_APP_CONSOLE=&Show App Console
 ACTION_SHOW_BUILD_CONSOLE=S&how Build Console