diff options
Diffstat (limited to 'framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui')
6 files changed, 30 insertions, 27 deletions
diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Activator.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Activator.java index 8141e1fe5..0b5031e5d 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Activator.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Activator.java @@ -34,6 +34,7 @@ public class Activator extends AbstractUIPlugin { * The constructor */ public Activator() { + // nothing } /* @@ -41,10 +42,10 @@ public class Activator extends AbstractUIPlugin { * * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ - public void start(BundleContext context) throws Exception { - super.start(context); + public void start(BundleContext context1) throws Exception { + super.start(context1); plugin = this; - this.context = context; + this.context = context1; } /* @@ -52,8 +53,8 @@ public class Activator extends AbstractUIPlugin { * * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ - public void stop(BundleContext context) throws Exception { - super.stop(context); + public void stop(BundleContext context1) throws Exception { + super.stop(context1); if (containerManagerTracker != null) { containerManagerTracker.close(); containerManagerTracker = null; 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 45c5a3a2d..3e7bc3901 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 @@ -22,6 +22,10 @@ public class Messages extends NLS { 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; @@ -67,5 +71,6 @@ public class Messages extends NLS { } private Messages() { + // do nothing } } 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 5596ec07e..9c9c3b0c1 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 @@ -27,6 +27,7 @@ import org.eclipse.ecf.core.start.IECFStart; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.datashare.IChannelContainerAdapter; import org.eclipse.ecf.presence.collab.ui.console.ConsoleShare; +import org.eclipse.ecf.presence.collab.ui.screencapture.ScreenCaptureShare; import org.eclipse.ecf.presence.collab.ui.url.URLShare; import org.eclipse.ecf.presence.collab.ui.view.ViewShare; import org.eclipse.osgi.util.NLS; @@ -56,6 +57,7 @@ public class ShareReceiversECFStart implements IECFStart { URLShare.addURLShare(containerID, cca); ViewShare.addViewShare(containerID, cca); ConsoleShare.addStackShare(containerID, cca); + 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)); } @@ -64,6 +66,7 @@ public class ShareReceiversECFStart implements IECFStart { URLShare.removeURLShare(containerID); ViewShare.removeViewShare(containerID); ConsoleShare.removeStackShare(containerID); + ScreenCaptureShare.removeScreenCaptureShare(containerID); } else if (event instanceof IContainerDisposeEvent) { containerManager.removeListener(containerManagerListener); container.removeListener(containerListener); @@ -94,6 +97,7 @@ public class ShareReceiversECFStart implements IECFStart { }; public ShareReceiversECFStart() { + // do nothing } /* (non-Javadoc) 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 4fda68cea..eb5d16f0d 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 @@ -19,6 +19,10 @@ 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 diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogTreeContentProvider.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogTreeContentProvider.java index 6bfcedbf1..771482227 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogTreeContentProvider.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogTreeContentProvider.java @@ -19,17 +19,14 @@ import org.eclipse.ui.views.IViewCategory; import org.eclipse.ui.views.IViewDescriptor; import org.eclipse.ui.views.IViewRegistry; -public class ShowViewDialogTreeContentProvider implements - ITreeContentProvider { +public class ShowViewDialogTreeContentProvider implements ITreeContentProvider { private HashMap parents = new HashMap(); public Object[] getChildren(Object element) { if (element instanceof IViewRegistry) - return ((IViewRegistry) element) - .getCategories(); + return ((IViewRegistry) element).getCategories(); else if (element instanceof IViewCategory) { - IViewDescriptor[] children = ((IViewCategory) element) - .getViews(); + final IViewDescriptor[] children = ((IViewCategory) element).getViews(); for (int i = 0; i < children.length; ++i) parents.put(children[i], element); @@ -40,8 +37,7 @@ public class ShowViewDialogTreeContentProvider implements public Object getParent(Object element) { if (element instanceof IViewCategory) - return PlatformUI.getWorkbench() - .getViewRegistry(); + return PlatformUI.getWorkbench().getViewRegistry(); else if (element instanceof IViewDescriptor) return parents.get(element); else @@ -49,11 +45,9 @@ public class ShowViewDialogTreeContentProvider implements } public boolean hasChildren(Object element) { - if (element instanceof IViewRegistry - || element instanceof IViewCategory) + if (element instanceof IViewRegistry || element instanceof IViewCategory) return true; - else - return false; + return false; } public Object[] getElements(Object inputElement) { @@ -64,8 +58,7 @@ public class ShowViewDialogTreeContentProvider implements parents = null; } - public void inputChanged(Viewer viewer, - Object oldInput, Object newInput) { + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { parents.clear(); } }
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogViewerFilter.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogViewerFilter.java index d288942dd..829ca7be3 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogViewerFilter.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogViewerFilter.java @@ -15,14 +15,10 @@ import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.ui.views.IViewDescriptor; public class ShowViewDialogViewerFilter extends ViewerFilter { - public boolean select(Viewer viewer, Object parentElement, - Object element) { - if (element instanceof IViewDescriptor - && "org.eclipse.ui.internal.introview" //$NON-NLS-1$ - .equals(((IViewDescriptor) element) - .getId())) + public boolean select(Viewer viewer, Object parentElement, Object element) { + if (element instanceof IViewDescriptor && "org.eclipse.ui.internal.introview" //$NON-NLS-1$ + .equals(((IViewDescriptor) element).getId())) return false; - else - return true; + return true; } }
\ No newline at end of file |