Merge pull request #203 from eharris/202-aCoupleMoreActions

Issue #202: Add a couple more actions and do some cleanup

Author: eharris369

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

@@ -152,7 +152,33 @@ public void reconnectDebugger() {
 			}
 		}
 	}
-
+	
+	public void attachDebugger() {
+		// Remove any existing launch such as for a disconnected debug target
+		if (launch != null) {
+			IDebugTarget debugTarget = launch.getDebugTarget();
+			if (debugTarget != null && !debugTarget.isDisconnected()) {
+				// Already attached
+				return;
+			}
+			DebugPlugin.getDefault().getLaunchManager().removeLaunch(launch);
+			launch = null;
+		}
+		connectDebugger();
+	}
+	
+	public IDebugTarget getDebugTarget() {
+		if (launch != null) {
+			ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
+			for (ILaunch launchItem : launchManager.getLaunches()) {
+				if (launch.equals(launchItem)) {
+					return launch.getDebugTarget();
+				}
+			}
+		}
+		return null;
+	}
+	
 	@Override
 	public void dispose() {
 		// Clean up the launch
@@ -217,7 +243,6 @@ private void validationEvent(int severity, String filePath, String message, Stri
 	        	}
 	            final IMarker marker = resource.createMarker(MARKER_TYPE);
 	            marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
-	            marker.setAttribute(IMarker.LINE_NUMBER, 1);
 	            marker.setAttribute(IMarker.MESSAGE, message);
 	            if (quickFixId != null && !quickFixId.isEmpty()) {
 	            	marker.setAttribute(CONNECTION_URL, mcConnection.baseUrl.toString());

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

@@ -173,7 +173,7 @@ public boolean isRunning() {
 	}
 
 	public boolean hasBuildLog() {
-		return (!projectType.isType(ProjectType.TYPE_NODE));
+		return (!projectType.isType(ProjectType.TYPE_NODEJS));
 	}
 
 	public synchronized void setHttpPort(int httpPort) {

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

@@ -13,6 +13,7 @@
 import java.net.ConnectException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -515,4 +516,21 @@ public void requestProjectDelete(String projectId)
 	public IPath getWorkspacePath() {
 		return localWorkspacePath;
 	}
+	
+	public URL getAppMonitorURL(MicroclimateApplication app) {
+		return getAppViewURL(app, MCConstants.VIEW_MONITOR);
+	}
+	
+	public URL getAppViewURL(MicroclimateApplication app, String view) {
+		try {
+			URI uri = baseUrl;
+			String query = MCConstants.QUERY_PROJECT + "=" + app.projectID;
+			query = query + "&" + MCConstants.QUERY_VIEW + "=" + view;
+			uri = new URI(uri.getScheme(), uri.getAuthority(), uri.getPath(), query, uri.getFragment());
+			return uri.toURL();
+		} catch (Exception e) {
+			MCLogger.logError("Failed to get the URL for the " + view + " view and the " + app.name + "application.", e);  //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$ 
+		}
+		return null;
+	}
 }

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

@@ -103,7 +103,12 @@ private MCConstants() {}
 
 			// Microclimate files
 			DOCKERFILE = "Dockerfile",
-			DOCKERFILE_BUILD = "Dockerfile-build"
+			DOCKERFILE_BUILD = "Dockerfile-build",
+			
+			QUERY_PROJECT = "project",
+			QUERY_VIEW = "view",
+			VIEW_MONITOR = "monitor",
+			VIEW_OVERVIEW = "overview"
 
 			;
 

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

@@ -18,11 +18,14 @@ public class ProjectType {
 
 	public static final String TYPE_LIBERTY = "liberty";
 	public static final String TYPE_SPRING = "spring";
-	public static final String TYPE_NODE = "nodejs";
+	public static final String TYPE_NODEJS = "nodejs";
 	public static final String TYPE_DOCKER = "docker";
 
 	public static final String LANGUAGE_JAVA = "java";
+	public static final String LANGUAGE_NODEJS = "nodejs";
+	public static final String LANGUAGE_SWIFT = "swift";
 	public static final String LANGUAGE_PYTHON = "python";
+	public static final String LANGUAGE_GO = "go";
 
 	public static final ProjectType UNKNOWN_TYPE = new ProjectType(UNKNOWN, UNKNOWN);