Merge pull request #223 from eharris/205-removeOldLaunchConfigs

Issue #205: Remove old launch configurations

Author: eharris369

dev/com.ibm.microclimate.core/.gitignore

@@ -3,4 +3,5 @@
 /build
 /depcache
 /dist
+/lib
 /about.mappings

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

@@ -121,6 +121,14 @@ public void clearDebugger() {
 			}
 			ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
 			launchManager.removeLaunch(launch);
+			ILaunchConfiguration launchConfig = launch.getLaunchConfiguration();
+			if (launchConfig != null) {
+				try {
+					launchConfig.delete();
+				} catch (CoreException e) {
+					MCLogger.logError("An error occurred while deleting the launch configuration for project: " + name, e); //$NON-NLS-1$
+				}
+			}
 		}
 		setLaunch(null);
 	}
@@ -161,9 +169,9 @@ public void reconnectDebugger() {
 					// Check if the debugger is still attached (for Liberty, a small change to the app does not require a server restart)
 					IDebugTarget debugTarget = launch.getDebugTarget();
 					if (debugTarget == null || debugTarget.isDisconnected()) {
+						// Clean up
+						clearDebugger();
 						// Reconnect the debugger
-						launchManager.removeLaunch(launch);
-						launch = null;
 						connectDebugger();
 					}
 				}
@@ -179,8 +187,7 @@ public void attachDebugger() {
 				// Already attached
 				return;
 			}
-			DebugPlugin.getDefault().getLaunchManager().removeLaunch(launch);
-			launch = null;
+			clearDebugger();
 		}
 		connectDebugger();
 	}
@@ -200,10 +207,7 @@ public IDebugTarget getDebugTarget() {
 	@Override
 	public void dispose() {
 		// Clean up the launch
-		if (launch != null) {
-			ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
-			launchManager.removeLaunch(launch);
-		}
+		clearDebugger();
 
 		// Clean up the consoles
 		List<IConsole> consoles = new ArrayList<IConsole>();

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

@@ -254,11 +254,9 @@ public MicroclimateApplication removeApp(String projectID) {
 	 * @return The app with the given ID, if it exists in this Microclimate instance, else null.
 	 */
 	public synchronized MicroclimateApplication getAppByID(String projectID) {
-		MicroclimateApplication app = null;
 		synchronized(appMap) {
-			app = appMap.get(projectID);
+			return appMap.get(projectID);
 		}
-		return app;
 	}
 
 	public MicroclimateApplication getAppByName(String name) {