Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2009-10-12 19:37:10 -0400
committerslewis2009-10-12 19:37:10 -0400
commit78047f7c1c54a70f15a5f0c593e3b9c69e2ba611 (patch)
treea5feb54a55269cad86b49f132f77885f2fef567d /examples/bundles/org.eclipse.ecf.example.collab
parentb0a42b5716b15bd3bee19a368b4d5d405dcc08c8 (diff)
downloadorg.eclipse.ecf-78047f7c1c54a70f15a5f0c593e3b9c69e2ba611.tar.gz
org.eclipse.ecf-78047f7c1c54a70f15a5f0c593e3b9c69e2ba611.tar.xz
org.eclipse.ecf-78047f7c1c54a70f15a5f0c593e3b9c69e2ba611.zip
Fix for externalized messages
Diffstat (limited to 'examples/bundles/org.eclipse.ecf.example.collab')
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java2
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransferAndLaunch.java22
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/Messages.java13
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/messages.properties13
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/MessageLoader.properties17
5 files changed, 6 insertions, 61 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java
index 7d552ccd7..97ccd9f1c 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java
@@ -621,7 +621,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject {
});
shells.put(id, showImageShell);
}
- showImageShell.initialize(Messages.bind(Messages.EclipseCollabSharedObject_SCREEN_CAPTURE_FROM, fromUser), imageWrapper);
+ showImageShell.initialize(NLS.bind(Messages.EclipseCollabSharedObject_SCREEN_CAPTURE_FROM, fromUser), imageWrapper);
showImageShell.open();
}
});
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransferAndLaunch.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransferAndLaunch.java
index 61ed20dc1..fee6aea9c 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransferAndLaunch.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransferAndLaunch.java
@@ -32,11 +32,8 @@ public class EclipseFileTransferAndLaunch extends EclipseFileTransfer {
senderUI.sendDone(transferParams.getRemoteFile(), e);
// Now launch file locally, if it's sucessful
if (e == null) {
- String senderPath = ((EclipseCollabSharedObject) getContext()
- .getSharedObjectManager().getSharedObject(sharedObjectID))
- .getLocalFullDownloadPath();
- launchFile(new File(new File(senderPath), transferParams
- .getRemoteFile().getName()).getAbsolutePath());
+ String senderPath = ((EclipseCollabSharedObject) getContext().getSharedObjectManager().getSharedObject(sharedObjectID)).getLocalFullDownloadPath();
+ launchFile(new File(new File(senderPath), transferParams.getRemoteFile().getName()).getAbsolutePath());
}
}
@@ -47,18 +44,9 @@ public class EclipseFileTransferAndLaunch extends EclipseFileTransfer {
ClientPlugin.log(MessageLoader.getFormattedString("EclipseFileTransferAndLaunch.EXCEPTION_LAUNCHING", localFile), e1); //$NON-NLS-1$
Display.getDefault().asyncExec(new Runnable() {
public void run() {
- MessageDialog
- .openInformation(
- null,
- MessageLoader
- .getString(MessageLoader.getString("EclipseFileTransferAndLaunch.PROGRAM_LAUNCH_MSGBOX_TITLE")), //$NON-NLS-1$
- MessageLoader
- .getString(NLS
- .bind(
- MessageLoader.getString("EclipseFileTransferAndLaunch.PROGRAM_LAUNCH_MSGBOX_TEXT"), //$NON-NLS-1$
- localFile
- .getAbsolutePath(),
- e1.getMessage())));
+ MessageDialog.openInformation(null, MessageLoader.getString("EclipseFileTransferAndLaunch.PROGRAM_LAUNCH_MSGBOX_TITLE"), //$NON-NLS-1$
+ NLS.bind(MessageLoader.getString("EclipseFileTransferAndLaunch.PROGRAM_LAUNCH_MSGBOX_TEXT"), //$NON-NLS-1$
+ localFile.getAbsolutePath(), e1.getMessage()));
}
});
}
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/Messages.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/Messages.java
index 26db32485..004ec262e 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/Messages.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/Messages.java
@@ -33,17 +33,6 @@ public class Messages extends NLS {
public static String CollabClient_WORKSPACE_NAME;
public static String CollabStart_EXCEPTION_STARTING_CONNECTION;
public static String CollabStart_STATUS_OK_MESSAGE;
- public static String ConnectionDialog_AUTOLOGIN_TEXT;
- public static String ConnectionDialog_CHOOSE_PROVIDER_MESSAGE;
- public static String ConnectionDialog_CONNECT_PAGE_TITLE;
- public static String ConnectionDialog_CONNECT_TEXT;
- public static String ConnectionDialog_CONNECTION_TITLE;
- public static String ConnectionDialog_JOIN_GROUP_FIELD_TEXT;
- public static String ConnectionDialog_NICKNAME_TEXT;
- public static String ConnectionDialog_PASSWORD_TEXT;
- public static String ConnectionDialog_PROTOCOL_TEXT;
- public static String ConnectionDialog_SELECT_PROVIDER_DESCRIPTION;
- public static String ConnectionDialog_TEMPLATE_URL;
public static String EclipseCollabHyperlink_EXCEPTION_OPEN_EDITOR;
public static String EclipseCollabHyperlink_EXCEPTION_OPEN_EDITOR_TITLE;
public static String EclipseCollabHyperlink_MESSAGE_EXCEPTION_OPEN_EDITOR;
@@ -95,10 +84,8 @@ public class Messages extends NLS {
public static String OpenSharedEditorAction_DIALOG_NOT_CONNECTED_TITLE;
public static String SetSharedEditorSelectionAction_DIALOG_NOT_CONNECTED_TEXT;
public static String SetSharedEditorSelectionAction_DIALOG_NOT_CONNECTED_TITLE;
- public static String SharedObjectContainerUI_JAVA_VERSION_LABEL;
public static String SharedObjectContainerUI_LANGUAGE_LABEL;
public static String SharedObjectContainerUI_OS_LABEL;
- public static String SharedObjectContainerUI_OSGI_VERSION_LABEL;
public static String SharedObjectContainerUI_PROJECT_LABEL;
public static String SharedObjectContainerUI_TIME_LABEL;
public static String SharedObjectContainerUI_TIME_ZONE_LABEL;
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/messages.properties b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/messages.properties
index bb1251513..727233043 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/messages.properties
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/messages.properties
@@ -13,17 +13,6 @@ ClientPreferencePage_USE_CHAT_WINDOW_FIELD_TEXT=Display ECF Collaboration outsid
CollabClient_WORKSPACE_NAME=<workspace>
CollabStart_EXCEPTION_STARTING_CONNECTION=Exception in starting connection
CollabStart_STATUS_OK_MESSAGE=OK
-ConnectionDialog_AUTOLOGIN_TEXT=Login &automatically at startup
-ConnectionDialog_CHOOSE_PROVIDER_MESSAGE=Please choose a provider and supply connection parameters.
-ConnectionDialog_CONNECT_PAGE_TITLE=Connect with ECF
-ConnectionDialog_CONNECT_TEXT=Connect
-ConnectionDialog_CONNECTION_TITLE=ECF Connection
-ConnectionDialog_JOIN_GROUP_FIELD_TEXT=Group ID:
-ConnectionDialog_NICKNAME_TEXT=Nickname:
-ConnectionDialog_PASSWORD_TEXT=Password:
-ConnectionDialog_PROTOCOL_TEXT=Connection Protocol
-ConnectionDialog_SELECT_PROVIDER_DESCRIPTION=Select protocol provider, complete account info and login
-ConnectionDialog_TEMPLATE_URL=<protocol>://<machinename>:<port>/<servicename>
EclipseCollabHyperlink_EXCEPTION_OPEN_EDITOR=Exception in openEditorAndSelectForFile
EclipseCollabHyperlink_EXCEPTION_OPEN_EDITOR_TITLE=Open Editor Failed
EclipseCollabHyperlink_MESSAGE_EXCEPTION_OPEN_EDITOR=Cannot open editor for {0}. It was not found in your workspace.
@@ -75,10 +64,8 @@ OpenSharedEditorAction_DIALOG_NOT_CONNECTED_TEXT=Project {0} not connected to an
OpenSharedEditorAction_DIALOG_NOT_CONNECTED_TITLE=Project Not Connected to Collaboration Group
SetSharedEditorSelectionAction_DIALOG_NOT_CONNECTED_TEXT=Not connected to any collaboration group. To connect, open Collaboration View
SetSharedEditorSelectionAction_DIALOG_NOT_CONNECTED_TITLE=Not Connected to Collaboration Session
-SharedObjectContainerUI_JAVA_VERSION_LABEL=Java
SharedObjectContainerUI_LANGUAGE_LABEL=Language
SharedObjectContainerUI_OS_LABEL=OS
-SharedObjectContainerUI_OSGI_VERSION_LABEL=OSGi Version
SharedObjectContainerUI_PROJECT_LABEL=Project
SharedObjectContainerUI_TIME_LABEL=Time
SharedObjectContainerUI_TIME_ZONE_LABEL=Time Zone
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/MessageLoader.properties b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/MessageLoader.properties
index e1e6e2e75..853e16f60 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/MessageLoader.properties
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/MessageLoader.properties
@@ -19,8 +19,6 @@ ChatComposite.MESSAGE_TO_GROUP_TITLE=Send Message to Group
ChatComposite.MESSAGE_TO_TEXT=Talking to yourself again aren't you\!\!\n\n\tUsername: {0}
ChatComposite.MESSAGE_TO_TITLE=Message to {0}
ChatComposite.NO_HYPERLINKING=Source viewer not available. Hyperlinking will be disabled.
-ChatComposite.PRIVATE_MESSAGE_TEXT=Message:
-ChatComposite.PRIVATE_MESSAGE_TITLE=Private Message for {0}
ChatComposite.RING_GROUP_TITLE=Ring Group
ChatComposite.RING_MESSAGE_TEXT=Ring Message:
ChatComposite.RING_OTHER_TEXT=Ring {0}...
@@ -42,23 +40,11 @@ ChatComposite.START_PROGRAM_TITLE=Start Program for {0}
EclipseFileTransferAndLaunch.EXCEPTION_LAUNCHING=Exception launching {0}
EclipseFileTransferAndLaunch.PROGRAM_LAUNCH_MSGBOX_TEXT=Program launch failed for {0}\nException: {1}
EclipseFileTransferAndLaunch.PROGRAM_LAUNCH_MSGBOX_TITLE=Program Launch Failed
-LineChatClientView.contextmenu.send=Send EclipseProjectComponent...
-LineChatClientView.contextmenu.message=Message to EclipseProjectComponent...
-LineChatClientView.contextmenu.remove=Remove EclipseProjectComponent...
LineChatClientView.contextmenu.sendmessage=Send Message to Group...
LineChatClientView.contextmenu.appshare=Start Application Share...
-LineChatClientView.contextmenu.appshare.confirmtitle=Confirm Start Application Share
-LineChatClientView.contextmenu.appshare.confirmmessage=Choose 'OK' to start application sharing. Once you choose 'OK', the cursor will change to allow you to select an application. Move the mouse to select the application, and click the left mouse button to start sharing. To cancel window selection, hit Esc or click the right mouse button
-
-LineChatClientView.contextmenu.appshare.activetitle=Application Share Active
-LineChatClientView.contextmenu.appshare.activemessage=Application Sharing Already Active. To stop, click on stop icon in upper right of view
-
-LineChatClientView.contextmenu.appshare.cancelledtitle=Application Share Cancelled
-LineChatClientView.contextmenu.appshare.cancelledmessage=Application Sharing Cancelled by User
LineChatClientView.contextmenu.sendfile=Send File...
-LineChatClientView.contextmenu.sendfileandlaunch=Send File and launch...
LineChatClientView.contextmenu.cobrowse=Co-Browse URL...
LineChatClientView.contextmenu.selectall=Select All
@@ -69,9 +55,6 @@ LineChatClientView.contextmenu.clear=Clear
LineChatClientView.contextmenu.clear.tooltip=Clear Output Window
LineChatClientView.contextmenu.paste=Paste
LineChatClientView.contextmenu.paste.tooltip=Paste Clipboard for Input
-LineChatClientView.contextmenu.runprogram=Start Remote Program...
-LineChatClientView.contextmenu.repobject=Send Replicated Object to Group...
-LineChatClientView.contextmenu.repobjectserver=Send Replicated Object to Server...
LineChatClientView.contextmenu.leaveGroup=Disconnect
LineChatClientView.contextmenu.sendShowViewRequest=Send Show View Request...

Back to the top