diff options
author | slewis | 2008-01-05 19:29:08 +0000 |
---|---|---|
committer | slewis | 2008-01-05 19:29:08 +0000 |
commit | ffa2e3563696d105a08e5356fa1cf2b322ba7b30 (patch) | |
tree | 5e0f2e6c727f3937b804cabd318664feac7aa986 | |
parent | 2f5c22eb49b15d5b8349cc1e2052254712039b37 (diff) | |
download | org.eclipse.ecf-ffa2e3563696d105a08e5356fa1cf2b322ba7b30.tar.gz org.eclipse.ecf-ffa2e3563696d105a08e5356fa1cf2b322ba7b30.tar.xz org.eclipse.ecf-ffa2e3563696d105a08e5356fa1cf2b322ba7b30.zip |
Cleaned up externalized strings. Made error/warning reporting more clear
3 files changed, 24 insertions, 35 deletions
diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Messages.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Messages.java index 3e7bc3901..eb4b58038 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Messages.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Messages.java @@ -20,31 +20,26 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.eclipse.ecf.internal.presence.collab.ui.messages"; //$NON-NLS-1$ public static String URLShare_ENTER_URL_DEFAULT_URL; public static String URLShare_ENTER_URL_DIALOG_TEXT; - public static String URLShare_ERROR_BROWSER_MESSAGE; - public static String URLShare_ERROR_BROWSER_TITLE; public static String ScreenCaptureShare_SCREEN_CAPTURE_RECEIVE_TITLE; public static String ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MENU; public static String ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_MESSAGE; public static String ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_TITLE; - public static String Share_ERROR_RECEIVE_MESSAGE; - public static String Share_ERROR_RECEIVE_TITLE; - public static String Share_ERROR_SEND_MESSAGE; - public static String Share_ERROR_SEND_TITLE; public static String URLShare_EXCEPTION_LOG_BROWSER; public static String Share_EXCEPTION_LOG_MESSAGE; public static String Share_EXCEPTION_LOG_SEND; + public static String ShareReceiversECFStart_STATUS_CAPTURESHARE_NOT_CREATED; + public static String ShareReceiversECFStart_STATUS_SCREENCAPTURESHARE_NOT_CREATED; + public static String ShareReceiversECFStart_STATUS_VIEWSHARE_NOT_CREATED; public static String URLShare_INPUT_URL_DIALOG_TITLE; public static String URLShare_RECEIVED_URL_MESSAGE; public static String URLShare_RECEIVED_URL_TITLE; public static String StartURLShareAndViewShare_ERROR_CONTAINERMANAGER_NOT_ACCESSIBLE; - public static String StartURLShareAndViewShare_STATUS_URLSHARE_NOT_CREATED; + public static String ShareReceiversECFStart_STATUS_URLSHARE_NOT_CREATED; public static String URLShareRosterContributionItem_ADD_URL_SHARE_MENU_TEXT; public static String URLShareRosterContributionItem_BROWSER_ICON; public static String URLShareRosterContributionItem_REMOVE_URL_SHARE_MENU_TEXT; public static String URLShareRosterEntryContributionItem_SEND_URL_MENU_TEXT; public static String ViewShare_EXCEPTION_WORKBENCHPAGE_NULL; - public static String ViewShare_VIEWSHARE_ERROR_DIALOG_MESSAGE; - public static String ViewShare_VIEWSHARE_ERROR_DIALOG_TITLE; public static String ViewShare_VIEWSHARE_ERROR_LOG_MESSAGE; public static String ViewShare_VIEWSHARE_RECEIVED_REQUEST_MESSAGE; public static String ViewShare_VIEWSHARE_RECEIVED_REQUEST_TITLE; @@ -55,8 +50,6 @@ public class Messages extends NLS { public static String ViewShareRosterEntryContributionItem_VIEWSHARE_MENU_TEXT; public static String ConsoleShare_RosterContributionItem_CONSOLE_ICON; - public static String ConsoleShare_STACKSHARE_ERROR_DIALOG_TITLE; - public static String ConsoleShare_STACKSHARE_ERROR_DIALOG_MESSAGE; public static String ConsoleShare_EXCEPTION_WP_NOT_AVAILABLE; public static String ConsoleShare_EXCEPTION_WW_NOT_AVAILABLE; public static String ConsoleShare_STACK_TRACE_FROM_MESSAGE; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/ShareReceiversECFStart.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/ShareReceiversECFStart.java index 9c9c3b0c1..edfe588f5 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/ShareReceiversECFStart.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/ShareReceiversECFStart.java @@ -11,17 +11,9 @@ package org.eclipse.ecf.internal.presence.collab.ui; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.ecf.core.IContainer; -import org.eclipse.ecf.core.IContainerListener; -import org.eclipse.ecf.core.IContainerManager; -import org.eclipse.ecf.core.IContainerManagerListener; -import org.eclipse.ecf.core.events.IContainerConnectedEvent; -import org.eclipse.ecf.core.events.IContainerDisconnectedEvent; -import org.eclipse.ecf.core.events.IContainerDisposeEvent; -import org.eclipse.ecf.core.events.IContainerEvent; +import org.eclipse.core.runtime.*; +import org.eclipse.ecf.core.*; +import org.eclipse.ecf.core.events.*; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.start.IECFStart; import org.eclipse.ecf.core.util.ECFException; @@ -55,11 +47,23 @@ public class ShareReceiversECFStart implements IECFStart { if (event instanceof IContainerConnectedEvent) { try { URLShare.addURLShare(containerID, cca); + } catch (ECFException e) { + Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, IStatus.WARNING, NLS.bind(Messages.ShareReceiversECFStart_STATUS_URLSHARE_NOT_CREATED, container.getID()), null)); + } + try { ViewShare.addViewShare(containerID, cca); + } catch (ECFException e) { + Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, IStatus.WARNING, NLS.bind(Messages.ShareReceiversECFStart_STATUS_VIEWSHARE_NOT_CREATED, container.getID()), null)); + } + try { ConsoleShare.addStackShare(containerID, cca); + } catch (ECFException e) { + Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, IStatus.WARNING, NLS.bind(Messages.ShareReceiversECFStart_STATUS_CAPTURESHARE_NOT_CREATED, container.getID()), null)); + } + try { ScreenCaptureShare.addScreenCaptureShare(containerID, cca); } catch (ECFException e) { - Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, IStatus.WARNING, NLS.bind(Messages.StartURLShareAndViewShare_STATUS_URLSHARE_NOT_CREATED, container.getID()), null)); + Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, IStatus.WARNING, NLS.bind(Messages.ShareReceiversECFStart_STATUS_SCREENCAPTURESHARE_NOT_CREATED, container.getID()), null)); } } else if (event instanceof IContainerDisconnectedEvent) { // disconnected diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties index 77d0d0459..a360053c3 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties @@ -16,38 +16,30 @@ URLShareRosterContributionItem_REMOVE_URL_SHARE_MENU_TEXT=Remove URL Share Liste URLShare_INPUT_URL_DIALOG_TITLE=Enter URL to Send URLShare_ENTER_URL_DIALOG_TEXT=URL URLShare_ENTER_URL_DEFAULT_URL=http://www.eclipse.org/ecf -URLShare_ERROR_BROWSER_MESSAGE=Error opening browser URLShare_EXCEPTION_LOG_BROWSER=Exception in createBrowser URLShare_RECEIVED_URL_TITLE=Received URL ScreenCaptureShare_SCREEN_CAPTURE_RECEIVE_TITLE=Screen capture from {0} ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MENU=Send Screen Capture ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_MESSAGE=To initiate screen capture, click OK, wait 5 seconds,\nand then select capture region with arrow cursor. ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_TITLE=Screen Capture -Share_ERROR_SEND_TITLE=Error sending message URLShare_RECEIVED_URL_MESSAGE=Received URL from {0}:\n\n{1}\n\nDo you want to display in browser? -URLShare_ERROR_BROWSER_TITLE=Error opening browser -Share_ERROR_RECEIVE_TITLE=Error receiving message -Share_ERROR_RECEIVE_MESSAGE=Error receiving message Share_EXCEPTION_LOG_SEND=Exception in send message Share_EXCEPTION_LOG_MESSAGE=Exception in URLShare.handleMessage -Share_ERROR_SEND_MESSAGE=Error sending message: {0} -Share_ERROR_SEND_TITLE=Error sending message +ShareReceiversECFStart_STATUS_CAPTURESHARE_NOT_CREATED=ConsoleShare for {0} not created +ShareReceiversECFStart_STATUS_SCREENCAPTURESHARE_NOT_CREATED=ScreenCaptureShare for {0} not created +ShareReceiversECFStart_STATUS_VIEWSHARE_NOT_CREATED=ViewShare for {0} not created ViewShareRosterEntryContributionItem_VIEWSHARE_MENU_TEXT=Send Show View Request StartURLShareAndViewShare_ERROR_CONTAINERMANAGER_NOT_ACCESSIBLE=ContainerManager service could not be accessed -StartURLShareAndViewShare_STATUS_URLSHARE_NOT_CREATED=URLShare for container {0} could not be created. +ShareReceiversECFStart_STATUS_URLSHARE_NOT_CREATED=URLShare for container {0} could not be created. ViewShareRosterContributionItem_VIEWSHARE_LISTENER_MENU_ADD_TEXT=Add Show View Listener ViewShareRosterContributionItem_VIEWSHARE_LISTENER_MENU_REMOVE_TEXT=Remove View Open Listener ViewShare_VIEWSHARE_RECEIVED_REQUEST_TITLE=Received Show View Request ViewShare_VIEWSHARE_RECEIVED_REQUEST_MESSAGE=Received show view request from {0}. Allow view to open? ViewShare_EXCEPTION_WORKBENCHPAGE_NULL=workbench page is null -ViewShare_VIEWSHARE_ERROR_DIALOG_TITLE=Error opening view -ViewShare_VIEWSHARE_ERROR_DIALOG_MESSAGE=Error opening view {0} ViewShare_VIEWSHARE_ERROR_LOG_MESSAGE=Exception in openView ViewShare_VIEWSHARE_VIEW_REQUEST_DIALOG_TITLE=Send Show View Request ViewShare_VIEWSHARE_VIEW_REQUEST_DIALOG_MESSAGE=Select View to Show Remotely -ConsoleShare_STACKSHARE_ERROR_DIALOG_TITLE=Error showing text to console -ConsoleShare_STACKSHARE_ERROR_DIALOG_MESSAGE=Error showing text to console {0} ConsoleShare_EXCEPTION_WP_NOT_AVAILABLE=workbench page not available ConsoleShare_EXCEPTION_WW_NOT_AVAILABLE=workbench window not available ConsoleShare_STACK_TRACE_CONTENT=\n\n------Received from {0}------\n\n{1}\n\n------End from {0}------ |