Merge pull request #224 from eharris/200-cleanUpSourceCode

Issue #200: Clean up the source code before open sourcing

Author: eharris369

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

@@ -83,7 +83,6 @@ public static HttpResult get(URI uri) throws IOException {
 
 		try {
 			connection = (HttpURLConnection) uri.toURL().openConnection();
-			// MCLogger.log("GET " + url);
 
 			connection.setRequestMethod("GET");
 			connection.setReadTimeout(5000);

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

@@ -22,8 +22,6 @@
  */
 public class MCLogger implements DebugOptionsListener {
 
-	// private static final SimpleDateFormat TIME_SDF = new SimpleDateFormat("k:mm:ss");
-
 	private static final ILog logger = MicroclimateCorePlugin.getDefault().getLog();
 
 	private static MCLogger instance;

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

@@ -9,12 +9,10 @@
 
 package com.ibm.microclimate.core.internal;
 
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
 import org.eclipse.core.runtime.IPath;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.ibm.microclimate.core.internal.connection.MicroclimateConnection;
@@ -125,8 +123,6 @@ public synchronized void setAction(String action) {
 		this.action = action;
 	}
 
-	// Getters for our project state fields
-
 	/**
 	 * Can return null if this project hasn't started yet (ie httpPort == -1)
 	 */

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

@@ -81,8 +81,7 @@ public static MicroclimateApplication createApp(MicroclimateConnection mcConnect
 			try {
 				// from portal: projectType and buildType are equivalent - however
 				// buildType is always present, projectType is missing for disabled/stopped projects
-				// We should use projectType if it gets fixed
-				// see see https://github.ibm.com/dev-ex/portal/issues/520
+				// We should use projectType if it gets fixed.
 				// String typeStr = appJso.getString(MCConstants.KEY_PROJECT_TYPE);
 
 				String typeStr = appJso.getString(MCConstants.KEY_BUILD_TYPE);

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

@@ -34,7 +34,7 @@
 import io.socket.emitter.Emitter;
 
 /**
- * Wrapper for a SocketIO client socket, which connects to FileWatcher and listens for project state changes,
+ * Wrapper for a SocketIO client socket, which connects to Microclimate and listens for project state changes,
  * then updates the corresponding MicroclimateApplication's state.
  * One of these exists for each MicroclimateConnection. That connection is stored here so we can access
  * its applications.

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

@@ -34,8 +34,6 @@
  */
 public class CreateConnectionAction extends Action implements IViewActionDelegate, IActionDelegate2 {
 
-	private Shell shell;
-	
 	public CreateConnectionAction(Shell shell) {
         super(Messages.ActionNewConnection);
         setImageDescriptor(MicroclimateUIPlugin.getImageDescriptor(MicroclimateUIPlugin.MICROCLIMATE_ICON));

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

@@ -12,7 +12,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
-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;
@@ -30,6 +29,7 @@
  * Action for importing a Microclimate project into Eclipse.  This makes
  * the source available for editing and debugging.
  */
+@SuppressWarnings("restriction")
 public class ImportProjectAction implements IObjectActionDelegate {
 
 	protected MicroclimateApplication app;

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

@@ -16,10 +16,6 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;