Merge pull request #208 from eharris/207-changesForMessageReview

Issue #207: Fix up messages based on message review

Author: eharris369

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

@@ -15,32 +15,11 @@ public class Messages extends NLS {
 
 	public static String MicroclimateConnectionException_ConnectingToMCFailed;
 
-	public static String MicroclimateConnectionManager_CancelBtn;
-	public static String MicroclimateConnectionManager_DeleteServersBtn;
-	public static String MicroclimateConnectionManager_ErrDeletingServerDialogTitle;
-	public static String MicroclimateConnectionManager_ServersLinkedDialogMsg;
-	public static String MicroclimateConnectionManager_ServersLinkedDialogTitle;
-
 	public static String MicroclimateReconnectJob_ReconnectErrorDialogMsg;
 	public static String MicroclimateReconnectJob_ReconnectErrorDialogTitle;
 	public static String MicroclimateReconnectJob_ReconnectJobName;
 
-	public static String MicroclimateServer_CantModifyModules;
-
-	public static String MicroclimateServerBehaviour_CantRestartDialogMsg;
-	public static String MicroclimateServerBehaviour_CantRestartDialogTitle;
-	public static String MicroclimateServerBehaviour_ConnectionLostServerSuffix;
 	public static String MicroclimateServerBehaviour_DebugLaunchConfigName;
-	public static String MicroclimateServerBehaviour_DeletingServerModeSwitchMsg;
-	public static String MicroclimateServerBehaviour_DeletingServerModeSwitchTitle;
-	public static String MicroclimateServerBehaviour_ErrCreatingServerDialogMsg;
-	public static String MicroclimateServerBehaviour_ErrCreatingServerDialogTitle;
-	public static String MicroclimateServerBehaviour_ErrInitiatingRestartDialogTitle;
-	public static String MicroclimateServerBehaviour_ErrMissingAttribute;
-	public static String MicroclimateServerBehaviour_ErrSettingInitialStateDialogTitle;
-	public static String MicroclimateServerBehaviour_MissingProjectID;
-	public static String MicroclimateServerBehaviour_ProjectMissingServerSuffix;
-	public static String MicroclimateServerBehaviour_ServerDoesntSupportPublish;
 	public static String MicroclimateServerBehaviour_DebuggerConnectFailureDialogTitle;
 	public static String MicroclimateServerBehaviour_DebuggerConnectFailureDialogMsg;
 
@@ -50,9 +29,6 @@ public class Messages extends NLS {
 	public static String FileNotFoundTitle;
 	public static String FileNotFoundMsg;
 
-	public static String MicroclimateServerLaunchConfigDelegate_ErrInitServer;
-	public static String MicroclimateServerLaunchConfigDelegate_OnlyLaunchFromServers;
-
 	public static String MicroclimateSocket_ErrRestartingProjectDialogMsg;
 	public static String MicroclimateSocket_ErrRestartingProjectDialogTitle;
 

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

@@ -1,4 +1,4 @@
-MicroclimateConnection_ErrConnection_AlreadyExists=A Microclimate connection at {0} already exists.
+MicroclimateConnection_ErrConnection_AlreadyExists=A Microclimate connection already exists at {0}.
 MicroclimateConnection_ErrConnection_OldVersion=Version {0} of Microclimate is not supported. A minimum of Version {1} is required.
 MicroclimateConnection_ErrConnection_VersionUnknown=The Microclimate version could not be determined. A minimum of Version {0} is required.
 MicroclimateConnection_ErrConnection_WorkspaceErr=The location of your Microclimate workspace could not be determined.
@@ -8,48 +8,21 @@ MicroclimateConnection_ErrGettingProjectListTitle=Error getting list of projects
 
 MicroclimateConnectionException_ConnectingToMCFailed=Connecting to Microclimate at {0} failed.
 
-MicroclimateConnectionManager_CancelBtn=Cancel
-MicroclimateConnectionManager_DeleteServersBtn=Delete Servers
-MicroclimateConnectionManager_ErrDeletingServerDialogTitle=Error deleting the server 
-MicroclimateConnectionManager_ServersLinkedDialogMsg=The following Microclimate servers are linked to this Microclimate instance:\n{0}\n\n\
-				If you still want to delete the connection to {1}, \
-				these servers will be deleted from your Eclipse workspace.\n\
-				Are you sure that you want to proceed?
-MicroclimateConnectionManager_ServersLinkedDialogTitle=The connection has active servers
-
 MicroclimateReconnectJob_ReconnectJobName=Trying to reconnect to Microclimate at {0}
 MicroclimateReconnectJob_ReconnectErrorDialogTitle=Error reconnecting to Microclimate
 MicroclimateReconnectJob_ReconnectErrorDialogMsg=Eclipse could not reconnect to {0}.\nRecreate this connection in the Microclimate connection preferences.
 
-MicroclimateServer_CantModifyModules=Modules can't be modified on a Microclimate server.
-
-MicroclimateServerBehaviour_CantRestartDialogMsg=You can restart a server only if the server is in the Started state. Please wait for the server to start and then try again.
-MicroclimateServerBehaviour_CantRestartDialogTitle=Only a Started server can be restarted
-MicroclimateServerBehaviour_ConnectionLostServerSuffix=Connection to Microclimate at {0} lost
 MicroclimateServerBehaviour_DebugLaunchConfigName=Debugging {0}
-MicroclimateServerBehaviour_DeletingServerModeSwitchMsg=The server is in debug mode. The server will be restarted in run mode and then deleted.
-MicroclimateServerBehaviour_DeletingServerModeSwitchTitle=Deleting {0}
-MicroclimateServerBehaviour_ErrCreatingServerDialogMsg=Microclimate server creation failed at the following initialization: {0}
-MicroclimateServerBehaviour_ErrCreatingServerDialogTitle=An error occurred while creating the Microclimate server
-MicroclimateServerBehaviour_ErrInitiatingRestartDialogTitle=An error occurred while initiating the project restart
-MicroclimateServerBehaviour_ErrMissingAttribute=The {0} attribute is missing.
-MicroclimateServerBehaviour_ErrSettingInitialStateDialogTitle=An error occurred while setting the initial state of the server
-MicroclimateServerBehaviour_MissingProjectID=Couldn''t find project with ID {0} on Microclimate at {1}. Make sure the project has not been deleted or disabled.
-MicroclimateServerBehaviour_ProjectMissingServerSuffix=Project was deleted or disabled in Microclimate
-MicroclimateServerBehaviour_ServerDoesntSupportPublish=The Microclimate server does not support publishing.
 MicroclimateServerBehaviour_DebuggerConnectFailureDialogTitle=The debugger failed to connect
-MicroclimateServerBehaviour_DebuggerConnectFailureDialogMsg=The debugger failed to connect in time. Please increase the debug timeout in the Microclimate preferences.
+MicroclimateServerBehaviour_DebuggerConnectFailureDialogMsg=The debugger failed to connect in time. Increase the debug timeout in the Microclimate preferences.
 
 BuildConsoleName={0} - Build Log
 AppConsoleName={0} - Application Log
 
 FileNotFoundTitle=File not found
 FileNotFoundMsg=File {0} was not found.
 
-MicroclimateServerLaunchConfigDelegate_ErrInitServer=An error occurred while initializing {0}. Please delete and recreate the server.
-MicroclimateServerLaunchConfigDelegate_OnlyLaunchFromServers=The {0} server could not be launched. Please use the Servers view to control Microclimate servers.
-
-MicroclimateSocket_ErrRestartingProjectDialogMsg=The {0} server didn't restart. Status: {1}\nDelete the server and relink the project if the problem persists.
+MicroclimateSocket_ErrRestartingProjectDialogMsg=The {0} project did not restart. Status: {1}\nTry disabling and re-enabling the project if the problem persists.
 MicroclimateSocket_ErrRestartingProjectDialogTitle=An error occurred while the project restarted
 
 AppStateStarting=Starting

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

@@ -14,7 +14,7 @@ NewConnectionPage_ConnectSucceeded=Connecting to {0} succeeded.
 NewConnectionPage_ErrAConnectionAlreadyExists=You already have an existing Microclimate connection at {0}.\nOnly one Microclimate connection is permitted.
 NewConnectionPage_ErrCouldNotConnectToMC=Eclipse could not connect to Microclimate at {0}.
 NewConnectionPage_HostnameLabel=&Hostname:
-NewConnectionPage_NotValidPortNum={0} is not a valid port number. Please enter an integer for the port number.
+NewConnectionPage_NotValidPortNum={0} is not a valid port number. Enter an integer for the port number.
 NewConnectionPage_OnlyLocalhostSupported=Only localhost is supported.
 NewConnectionPage_PortLabel=&Port:
 NewConnectionPage_ShellTitle=New Microclimate connection
@@ -24,8 +24,8 @@ NewConnectionPage_WizardDescription=Create a connection to a Microclimate instan
 NewConnectionPage_WizardTitle=Create a Microclimate connection
 NewConnectionWizard_ShellTitle=New Microclimate connection
 
-OpenAppAction_CantOpenNotRunningAppMsg=The project on this server is not found or not running. Please make sure that the project started before opening the application.
-OpenAppAction_CantOpenNotRunningAppTitle=Please start the application before opening it.
+OpenAppAction_CantOpenNotRunningAppMsg=The project on this server is not found or not running. Make sure that the project started before opening the application.
+OpenAppAction_CantOpenNotRunningAppTitle=Start the application before opening it.
 
 StartBuildAction_AppMissingTitle=Project not found
 StartBuildAction_AppMissingMsg=The project on this server is not found or not running. Make sure any current builds are completed and the application is started before requesting a build.
@@ -66,10 +66,10 @@ DialogNoButton=No
 DialogCancelButton=Cancel
 
 ProjectNotImportedDialogTitle=The {0} project is not imported into Eclipse
-ProjectNotImportedDialogMsg=There will be no source available for debugging if the project is not imported. Do you want to import the {0} project?
+ProjectNotImportedDialogMsg=There is no source available for debugging because the project has not been imported. Import the {0} project?
 
 ProjectClosedDialogTitle=The {0} project is closed in Eclipse
-ProjectClosedDialogMsg=There will be no source available for debugging if the project is not opened. Do you want to open the {0} project?
+ProjectClosedDialogMsg=There is no source available for debugging because the project is closed. Open the {0} project?
 ProjectOpenJob=Open project {0}
 ProjectOpenError=An error occurred while trying to open the {0} project