Merge pull request #238 from eharris/237-reorderMenuItems

Issue #237: Reorder menu items to match Microclimate VSCode extension

Author: eharris369

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

@@ -110,12 +110,12 @@
 			id="com.ibm.microclimate.ui.appObjectActions"
 			objectClass="com.ibm.microclimate.core.internal.MicroclimateApplication">
 			<action
-				id="com.ibm.microclimate.ui.importApplication"
+				id="com.ibm.microclimate.ui.openAppMonitor"
 				enablesFor="1"
-				menubarPath="group.generate"
-				icon="%IMPORT_ICON_PATH"
-				label="%ACTION_IMPORT_PROJECT"
-				class="com.ibm.microclimate.ui.internal.actions.ImportProjectAction"/>
+				menubarPath="group.open"
+				icon="%OPEN_BROWSER_ICON_PATH"
+				label="%ACTION_OPEN_APP_MONITOR"
+				class="com.ibm.microclimate.ui.internal.actions.OpenAppMonitorAction"/>
 			<action
 				id="com.ibm.microclimate.ui.containerShell"
 				enablesFor="1"
@@ -129,13 +129,6 @@
 				icon="%DEFAULT_ICON_PATH"
 				label="%ACTION_OPEN_APP_OVERVIEW"
 				class="com.ibm.microclimate.ui.internal.actions.OpenAppOverviewAction"/>
-			<action
-				id="com.ibm.microclimate.ui.openAppMonitor"
-				enablesFor="1"
-				menubarPath="group.open"
-				icon="%OPEN_BROWSER_ICON_PATH"
-				label="%ACTION_OPEN_APP_MONITOR"
-				class="com.ibm.microclimate.ui.internal.actions.OpenAppMonitorAction"/>
 			<action
 				id="com.ibm.microclimate.ui.openApplication"
 				enablesFor="1"
@@ -144,28 +137,28 @@
 				label="%ACTION_OPEN_APP"
 				class="com.ibm.microclimate.ui.internal.actions.OpenAppAction"/>
 			<action
-				id="com.ibm.microclimate.ui.toggleAppConsole"
+				id="com.ibm.microclimate.ui.toggleBuildConsole"
 				enablesFor="1"
 				menubarPath="group.show"
-				label="%ACTION_SHOW_APP_CONSOLE"
+				label="%ACTION_SHOW_BUILD_CONSOLE"
 				style="toggle"
 				state="false"
-				class="com.ibm.microclimate.ui.internal.actions.ToggleAppConsoleAction"/>
+				class="com.ibm.microclimate.ui.internal.actions.ToggleBuildConsoleAction"/>
 			<action
-				id="com.ibm.microclimate.ui.toggleBuildConsole"
+				id="com.ibm.microclimate.ui.toggleAppConsole"
 				enablesFor="1"
 				menubarPath="group.show"
-				label="%ACTION_SHOW_BUILD_CONSOLE"
+				label="%ACTION_SHOW_APP_CONSOLE"
 				style="toggle"
 				state="false"
-				class="com.ibm.microclimate.ui.internal.actions.ToggleBuildConsoleAction"/>
+				class="com.ibm.microclimate.ui.internal.actions.ToggleAppConsoleAction"/>
 			<action
-				id="com.ibm.microclimate.ui.restartRunMode"
+				id="com.ibm.microclimate.ui.importApplication"
 				enablesFor="1"
-				menubarPath="group.generate"
-				icon="%RUN_ICON_PATH"
-				label="%ACTION_RESTART_RUN_MODE"
-				class="com.ibm.microclimate.ui.internal.actions.RestartRunModeAction"/>
+				menubarPath="group.show"
+				icon="%IMPORT_ICON_PATH"
+				label="%ACTION_IMPORT_PROJECT"
+				class="com.ibm.microclimate.ui.internal.actions.ImportProjectAction"/>
 			<action
 				id="com.ibm.microclimate.ui.restartDebugMode"
 				enablesFor="1"
@@ -174,18 +167,25 @@
 				label="%ACTION_RESTART_DEBUG_MODE"
 				class="com.ibm.microclimate.ui.internal.actions.RestartDebugModeAction"/>
 			<action
-				id="com.ibm.microclimate.ui.buildApplication"
+				id="com.ibm.microclimate.ui.restartRunMode"
 				enablesFor="1"
-				menubarPath="group.build"
-				icon="%BUILD_ICON_PATH"
-				label="%ACTION_START_BUILD"
-				class="com.ibm.microclimate.ui.internal.actions.StartBuildAction"/>
+				menubarPath="group.generate"
+				icon="%RUN_ICON_PATH"
+				label="%ACTION_RESTART_RUN_MODE"
+				class="com.ibm.microclimate.ui.internal.actions.RestartRunModeAction"/>
 			<action
 				id="com.ibm.microclimate.ui.enableDisableAutoBuild"
 				enablesFor="1"
 				menubarPath="group.build"
 				label="%ACTION_ENABLE_DISABLE_AUTO_BUILD"
 				class="com.ibm.microclimate.ui.internal.actions.EnableDisableAutoBuildAction"/>
+			<action
+				id="com.ibm.microclimate.ui.buildApplication"
+				enablesFor="1"
+				menubarPath="group.build"
+				icon="%BUILD_ICON_PATH"
+				label="%ACTION_START_BUILD"
+				class="com.ibm.microclimate.ui.internal.actions.StartBuildAction"/>
 			<action
 				id="com.ibm.microclimate.ui.refreshApplication"
 				enablesFor="1"

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/messages/Messages.java

@@ -6,8 +6,6 @@ public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "com.ibm.microclimate.ui.internal.messages.messages"; //$NON-NLS-1$
 
 	public static String ConnectionPrefsPage_AddBtn;
-	public static String ConnectionPrefsPage_LinkedProjectsColumn;
-	public static String ConnectionPrefsPage_NoLinkedAppsDisplay;
 	public static String ConnectionPrefsPage_PageTitle;
 	public static String ConnectionPrefsPage_RemoveBtn;
 	public static String ConnectionPrefsPage_ShellTitle;

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/messages/messages.properties

@@ -10,8 +10,6 @@
 ###############################################################################
 
 ConnectionPrefsPage_AddBtn=&Add...
-ConnectionPrefsPage_LinkedProjectsColumn=Linked projects
-ConnectionPrefsPage_NoLinkedAppsDisplay=None
 ConnectionPrefsPage_PageTitle=Manage Microclimate connections
 ConnectionPrefsPage_RemoveBtn=&Remove
 ConnectionPrefsPage_ShellTitle=Microclimate connections
@@ -63,7 +61,7 @@ ErrorOnEnableDisableAutoBuildDialogTitle=An error occurred while enabling or dis
 ActionNewConnection=&New Microclimate Connection
 
 ValidateLabel=Validate
-AttachDebuggerLabel=Attach Debugger
+AttachDebuggerLabel=A&ttach Debugger
 refreshResourceJobLabel=Refresh resource
 RefreshResourceError=An error occurred while trying to refresh the {0} resource.