Skip to content

Commit b4efd80

Browse files
eharris369eharris369
committed
Issue #207: Fix up messages based on message review
1 parent 2ad28f9 commit b4efd80

File tree

3 files changed

+8
-59
lines changed

3 files changed

+8
-59
lines changed

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,11 @@ public class Messages extends NLS {
1515

1616
public static String MicroclimateConnectionException_ConnectingToMCFailed;
1717

18-
public static String MicroclimateConnectionManager_CancelBtn;
19-
public static String MicroclimateConnectionManager_DeleteServersBtn;
20-
public static String MicroclimateConnectionManager_ErrDeletingServerDialogTitle;
21-
public static String MicroclimateConnectionManager_ServersLinkedDialogMsg;
22-
public static String MicroclimateConnectionManager_ServersLinkedDialogTitle;
23-
2418
public static String MicroclimateReconnectJob_ReconnectErrorDialogMsg;
2519
public static String MicroclimateReconnectJob_ReconnectErrorDialogTitle;
2620
public static String MicroclimateReconnectJob_ReconnectJobName;
2721

28-
public static String MicroclimateServer_CantModifyModules;
29-
30-
public static String MicroclimateServerBehaviour_CantRestartDialogMsg;
31-
public static String MicroclimateServerBehaviour_CantRestartDialogTitle;
32-
public static String MicroclimateServerBehaviour_ConnectionLostServerSuffix;
3322
public static String MicroclimateServerBehaviour_DebugLaunchConfigName;
34-
public static String MicroclimateServerBehaviour_DeletingServerModeSwitchMsg;
35-
public static String MicroclimateServerBehaviour_DeletingServerModeSwitchTitle;
36-
public static String MicroclimateServerBehaviour_ErrCreatingServerDialogMsg;
37-
public static String MicroclimateServerBehaviour_ErrCreatingServerDialogTitle;
38-
public static String MicroclimateServerBehaviour_ErrInitiatingRestartDialogTitle;
39-
public static String MicroclimateServerBehaviour_ErrMissingAttribute;
40-
public static String MicroclimateServerBehaviour_ErrSettingInitialStateDialogTitle;
41-
public static String MicroclimateServerBehaviour_MissingProjectID;
42-
public static String MicroclimateServerBehaviour_ProjectMissingServerSuffix;
43-
public static String MicroclimateServerBehaviour_ServerDoesntSupportPublish;
4423
public static String MicroclimateServerBehaviour_DebuggerConnectFailureDialogTitle;
4524
public static String MicroclimateServerBehaviour_DebuggerConnectFailureDialogMsg;
4625

@@ -50,9 +29,6 @@ public class Messages extends NLS {
5029
public static String FileNotFoundTitle;
5130
public static String FileNotFoundMsg;
5231

53-
public static String MicroclimateServerLaunchConfigDelegate_ErrInitServer;
54-
public static String MicroclimateServerLaunchConfigDelegate_OnlyLaunchFromServers;
55-
5632
public static String MicroclimateSocket_ErrRestartingProjectDialogMsg;
5733
public static String MicroclimateSocket_ErrRestartingProjectDialogTitle;
5834

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

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MicroclimateConnection_ErrConnection_AlreadyExists=A Microclimate connection at {0} already exists.
1+
MicroclimateConnection_ErrConnection_AlreadyExists=A Microclimate connection already exists at {0}.
22
MicroclimateConnection_ErrConnection_OldVersion=Version {0} of Microclimate is not supported. A minimum of Version {1} is required.
33
MicroclimateConnection_ErrConnection_VersionUnknown=The Microclimate version could not be determined. A minimum of Version {0} is required.
44
MicroclimateConnection_ErrConnection_WorkspaceErr=The location of your Microclimate workspace could not be determined.
@@ -8,48 +8,21 @@ MicroclimateConnection_ErrGettingProjectListTitle=Error getting list of projects
88

99
MicroclimateConnectionException_ConnectingToMCFailed=Connecting to Microclimate at {0} failed.
1010

11-
MicroclimateConnectionManager_CancelBtn=Cancel
12-
MicroclimateConnectionManager_DeleteServersBtn=Delete Servers
13-
MicroclimateConnectionManager_ErrDeletingServerDialogTitle=Error deleting the server
14-
MicroclimateConnectionManager_ServersLinkedDialogMsg=The following Microclimate servers are linked to this Microclimate instance:\n{0}\n\n\
15-
If you still want to delete the connection to {1}, \
16-
these servers will be deleted from your Eclipse workspace.\n\
17-
Are you sure that you want to proceed?
18-
MicroclimateConnectionManager_ServersLinkedDialogTitle=The connection has active servers
19-
2011
MicroclimateReconnectJob_ReconnectJobName=Trying to reconnect to Microclimate at {0}
2112
MicroclimateReconnectJob_ReconnectErrorDialogTitle=Error reconnecting to Microclimate
2213
MicroclimateReconnectJob_ReconnectErrorDialogMsg=Eclipse could not reconnect to {0}.\nRecreate this connection in the Microclimate connection preferences.
2314

24-
MicroclimateServer_CantModifyModules=Modules can't be modified on a Microclimate server.
25-
26-
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.
27-
MicroclimateServerBehaviour_CantRestartDialogTitle=Only a Started server can be restarted
28-
MicroclimateServerBehaviour_ConnectionLostServerSuffix=Connection to Microclimate at {0} lost
2915
MicroclimateServerBehaviour_DebugLaunchConfigName=Debugging {0}
30-
MicroclimateServerBehaviour_DeletingServerModeSwitchMsg=The server is in debug mode. The server will be restarted in run mode and then deleted.
31-
MicroclimateServerBehaviour_DeletingServerModeSwitchTitle=Deleting {0}
32-
MicroclimateServerBehaviour_ErrCreatingServerDialogMsg=Microclimate server creation failed at the following initialization: {0}
33-
MicroclimateServerBehaviour_ErrCreatingServerDialogTitle=An error occurred while creating the Microclimate server
34-
MicroclimateServerBehaviour_ErrInitiatingRestartDialogTitle=An error occurred while initiating the project restart
35-
MicroclimateServerBehaviour_ErrMissingAttribute=The {0} attribute is missing.
36-
MicroclimateServerBehaviour_ErrSettingInitialStateDialogTitle=An error occurred while setting the initial state of the server
37-
MicroclimateServerBehaviour_MissingProjectID=Couldn''t find project with ID {0} on Microclimate at {1}. Make sure the project has not been deleted or disabled.
38-
MicroclimateServerBehaviour_ProjectMissingServerSuffix=Project was deleted or disabled in Microclimate
39-
MicroclimateServerBehaviour_ServerDoesntSupportPublish=The Microclimate server does not support publishing.
4016
MicroclimateServerBehaviour_DebuggerConnectFailureDialogTitle=The debugger failed to connect
41-
MicroclimateServerBehaviour_DebuggerConnectFailureDialogMsg=The debugger failed to connect in time. Please increase the debug timeout in the Microclimate preferences.
17+
MicroclimateServerBehaviour_DebuggerConnectFailureDialogMsg=The debugger failed to connect in time. Increase the debug timeout in the Microclimate preferences.
4218

4319
BuildConsoleName={0} - Build Log
4420
AppConsoleName={0} - Application Log
4521

4622
FileNotFoundTitle=File not found
4723
FileNotFoundMsg=File {0} was not found.
4824

49-
MicroclimateServerLaunchConfigDelegate_ErrInitServer=An error occurred while initializing {0}. Please delete and recreate the server.
50-
MicroclimateServerLaunchConfigDelegate_OnlyLaunchFromServers=The {0} server could not be launched. Please use the Servers view to control Microclimate servers.
51-
52-
MicroclimateSocket_ErrRestartingProjectDialogMsg=The {0} server didn't restart. Status: {1}\nDelete the server and relink the project if the problem persists.
25+
MicroclimateSocket_ErrRestartingProjectDialogMsg=The {0} project did not restart. Status: {1}\nTry disabling and re-enabling the project if the problem persists.
5326
MicroclimateSocket_ErrRestartingProjectDialogTitle=An error occurred while the project restarted
5427

5528
AppStateStarting=Starting

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ NewConnectionPage_ConnectSucceeded=Connecting to {0} succeeded.
1414
NewConnectionPage_ErrAConnectionAlreadyExists=You already have an existing Microclimate connection at {0}.\nOnly one Microclimate connection is permitted.
1515
NewConnectionPage_ErrCouldNotConnectToMC=Eclipse could not connect to Microclimate at {0}.
1616
NewConnectionPage_HostnameLabel=&Hostname:
17-
NewConnectionPage_NotValidPortNum={0} is not a valid port number. Please enter an integer for the port number.
17+
NewConnectionPage_NotValidPortNum={0} is not a valid port number. Enter an integer for the port number.
1818
NewConnectionPage_OnlyLocalhostSupported=Only localhost is supported.
1919
NewConnectionPage_PortLabel=&Port:
2020
NewConnectionPage_ShellTitle=New Microclimate connection
@@ -24,8 +24,8 @@ NewConnectionPage_WizardDescription=Create a connection to a Microclimate instan
2424
NewConnectionPage_WizardTitle=Create a Microclimate connection
2525
NewConnectionWizard_ShellTitle=New Microclimate connection
2626

27-
OpenAppAction_CantOpenNotRunningAppMsg=The project on this server is not found or not running. Please make sure that the project started before opening the application.
28-
OpenAppAction_CantOpenNotRunningAppTitle=Please start the application before opening it.
27+
OpenAppAction_CantOpenNotRunningAppMsg=The project on this server is not found or not running. Make sure that the project started before opening the application.
28+
OpenAppAction_CantOpenNotRunningAppTitle=Start the application before opening it.
2929

3030
StartBuildAction_AppMissingTitle=Project not found
3131
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
6666
DialogCancelButton=Cancel
6767

6868
ProjectNotImportedDialogTitle=The {0} project is not imported into Eclipse
69-
ProjectNotImportedDialogMsg=There will be no source available for debugging if the project is not imported. Do you want to import the {0} project?
69+
ProjectNotImportedDialogMsg=There is no source available for debugging because the project has not been imported. Import the {0} project?
7070

7171
ProjectClosedDialogTitle=The {0} project is closed in Eclipse
72-
ProjectClosedDialogMsg=There will be no source available for debugging if the project is not opened. Do you want to open the {0} project?
72+
ProjectClosedDialogMsg=There is no source available for debugging because the project is closed. Open the {0} project?
7373
ProjectOpenJob=Open project {0}
7474
ProjectOpenError=An error occurred while trying to open the {0} project
7575

0 commit comments

Comments
 (0)