diff options
author | slewis | 2007-11-20 19:28:16 +0000 |
---|---|---|
committer | slewis | 2007-11-20 19:28:16 +0000 |
commit | c23739dab6840c7c64d466453b70bf6c1334f076 (patch) | |
tree | 03a71f0c711f47f5d8a41e4dc82a7d661e6e4f69 /framework/bundles/org.eclipse.ecf.docshare | |
parent | b1dc6398d28495c1a0041c0940ed52348fdd6a70 (diff) | |
download | org.eclipse.ecf-c23739dab6840c7c64d466453b70bf6c1334f076.tar.gz org.eclipse.ecf-c23739dab6840c7c64d466453b70bf6c1334f076.tar.xz org.eclipse.ecf-c23739dab6840c7c64d466453b70bf6c1334f076.zip |
Updates for simplification
Diffstat (limited to 'framework/bundles/org.eclipse.ecf.docshare')
5 files changed, 27 insertions, 21 deletions
diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java index 7e23a325c..8ad5dd008 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java @@ -15,7 +15,6 @@ import java.io.File; import java.io.IOException; import java.io.InvalidObjectException; import java.io.OutputStream; -import java.util.Hashtable; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileStore; @@ -56,20 +55,6 @@ import org.eclipse.ui.texteditor.ITextEditor; */ public class DocShare extends AbstractShare { - private static final Hashtable docsharechannels = new Hashtable(); - - public static DocShare getDocShare(ID containerID) { - return (DocShare) docsharechannels.get(containerID); - } - - public static DocShare addDocShare(ID containerID, IChannelContainerAdapter channelAdapter) throws ECFException { - return (DocShare) docsharechannels.put(containerID, new DocShare(channelAdapter)); - } - - public static DocShare removeDocShare(ID containerID) { - return (DocShare) docsharechannels.remove(containerID); - } - /** * The ID of the initiator */ diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuContributionItem.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuContributionItem.java index 2f61cc92e..066b7cee2 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuContributionItem.java @@ -6,6 +6,7 @@ import java.util.List; import org.eclipse.ecf.core.IContainer; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.docshare.DocShare; +import org.eclipse.ecf.internal.docshare.Activator; import org.eclipse.ecf.internal.docshare.Messages; import org.eclipse.ecf.presence.IPresenceContainerAdapter; import org.eclipse.ecf.presence.roster.IRoster; @@ -55,7 +56,7 @@ public class DocShareRosterMenuContributionItem extends AbstractRosterMenuContri final IContainer container = (IContainer) presenceContainerAdapter.getAdapter(IContainer.class); if (container == null) return null; - return DocShare.getDocShare(container.getID()); + return Activator.getDefault().getDocShare(container.getID()); } /* (non-Javadoc) @@ -87,7 +88,7 @@ public class DocShareRosterMenuContributionItem extends AbstractRosterMenuContri final IContainer container = (IContainer) presenceContainerAdapter.getAdapter(IContainer.class); if (container == null) return NO_CONTRIBUTIONS; - final DocShare docShare = DocShare.getDocShare(container.getID()); + final DocShare docShare = Activator.getDefault().getDocShare(container.getID()); if (docShare == null) return NO_CONTRIBUTIONS; final IRoster roster = presenceContainerAdapter.getRosterManager().getRoster(); diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuHandler.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuHandler.java index 6cabf82cf..93c021078 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuHandler.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuHandler.java @@ -16,6 +16,7 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.ecf.core.IContainer; import org.eclipse.ecf.core.user.IUser; import org.eclipse.ecf.docshare.DocShare; +import org.eclipse.ecf.internal.docshare.Activator; import org.eclipse.ecf.internal.docshare.Messages; import org.eclipse.ecf.presence.roster.IRosterEntry; import org.eclipse.ecf.presence.ui.menu.AbstractRosterMenuHandler; @@ -72,7 +73,7 @@ public class DocShareRosterMenuHandler extends AbstractRosterMenuHandler { final IContainer container = (IContainer) getRosterEntry().getRoster().getPresenceContainerAdapter().getAdapter(IContainer.class); if (container.getConnectedID() == null) throw new ExecutionException(Messages.DocShareRosterMenuHandler_ERROR_NOT_CONNECTED); - final DocShare sender = DocShare.getDocShare(container.getID()); + final DocShare sender = Activator.getDefault().getDocShare(container.getID()); if (sender == null) throw new ExecutionException(Messages.DocShareRosterMenuHandler_ERROR_NO_SENDER); if (sender.isSharing()) diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Activator.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Activator.java index e30e28963..a39d9daf1 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Activator.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Activator.java @@ -1,6 +1,12 @@ package org.eclipse.ecf.internal.docshare; +import java.util.Hashtable; + import org.eclipse.ecf.core.IContainerManager; +import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.util.ECFException; +import org.eclipse.ecf.datashare.IChannelContainerAdapter; +import org.eclipse.ecf.docshare.DocShare; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; import org.osgi.util.tracker.ServiceTracker; @@ -22,6 +28,20 @@ public class Activator extends AbstractUIPlugin { private boolean listenerActive; + private static final Hashtable docsharechannels = new Hashtable(); + + public DocShare getDocShare(ID containerID) { + return (DocShare) docsharechannels.get(containerID); + } + + public DocShare addDocShare(ID containerID, IChannelContainerAdapter channelAdapter) throws ECFException { + return (DocShare) docsharechannels.put(containerID, new DocShare(channelAdapter)); + } + + public DocShare removeDocShare(ID containerID) { + return (DocShare) docsharechannels.remove(containerID); + } + /** * The constructor */ diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/ECFStart.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/ECFStart.java index a6b865633..d7b414176 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/ECFStart.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/ECFStart.java @@ -26,7 +26,6 @@ import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.start.IECFStart; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.datashare.IChannelContainerAdapter; -import org.eclipse.ecf.docshare.DocShare; import org.eclipse.osgi.util.NLS; public class ECFStart implements IECFStart { @@ -51,13 +50,13 @@ public class ECFStart implements IECFStart { ID containerID = container.getID(); if (event instanceof IContainerConnectedEvent) { try { - DocShare.addDocShare(containerID, cca); + Activator.getDefault().addDocShare(containerID, cca); } catch (ECFException e) { Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, IStatus.WARNING, NLS.bind(Messages.ECFStart_ERROR_DOCUMENT_SHARE_NOT_CREATED, container.getID()), null)); } } else if (event instanceof IContainerDisconnectedEvent) { // disconnected - DocShare.removeDocShare(containerID); + Activator.getDefault().removeDocShare(containerID); } else if (event instanceof IContainerDisposeEvent) { containerManager.removeListener(containerManagerListener); container.removeListener(containerListener); |