Merge pull request #214 from eharris/204-disconnectBeforeRemovingLaunch

Issue #204: Disconnect the debugger before removing the launch.

Author: eharris369

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

@@ -111,8 +111,6 @@ public synchronized ILaunch getLaunch() {
 	@Override
 	public void clearDebugger() {
 		if (launch != null) {
-			ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
-			launchManager.removeLaunch(launch);
 			IDebugTarget debugTarget = launch.getDebugTarget();
 			if (debugTarget != null && !debugTarget.isDisconnected()) {
 				try {
@@ -121,6 +119,8 @@ public void clearDebugger() {
 					MCLogger.logError("An error occurred while disconnecting the debugger for project: " + name, e); //$NON-NLS-1$
 				}
 			}
+			ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
+			launchManager.removeLaunch(launch);
 		}
 		setLaunch(null);
 	}

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

@@ -19,14 +19,14 @@ ACTION_OPEN_APP=&Open Application
 ACTION_CONTAINER_SHELL=Open &Container Shell
 ACTION_START_BUILD=&Build
 ACTION_IMPORT_PROJECT=&Import Project
-ACTION_SHOW_APP_CONSOLE=&Show App Log
+ACTION_SHOW_APP_CONSOLE=&Show Application Log
 ACTION_SHOW_BUILD_CONSOLE=S&how Build Log
 ACTION_REFRESH=Re&fresh
 ACTION_RESTART_RUN_MODE=Restart in &Run Mode
 ACTION_RESTART_DEBUG_MODE=Restart in &Debug Mode
 ACTION_ENABLE_DISABLE_AUTO_BUILD=Disable &Auto Build
 ACTION_OPEN_MICROCLIMATE_UI=Open Microclimate &UI
-ACTION_OPEN_APP_MONITOR=Open App &Monitor
+ACTION_OPEN_APP_MONITOR=Open Application &Monitor
 
 PREFS_PARENT_PAGE_NAME=Microclimate
 PREFS_CONNECTION_PAGE_NAME=Microclimate Connections