1 files changed, 16 insertions, 41 deletions

diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterContributionItem.java
index e01d17168..c5d3e9c60 100644
--- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterContributionItem.java
+++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterContributionItem.java
@@ -10,8 +10,6 @@
  *****************************************************************************/
 package org.eclipse.ecf.presence.collab.ui.view;
 
-import java.util.Hashtable;
-
 import org.eclipse.ecf.core.IContainer;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.util.ECFException;
@@ -24,10 +22,7 @@ import org.eclipse.jface.action.IAction;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
 
-public class ViewShareRosterContributionItem extends
-		AbstractRosterContributionItem {
-
-	private static Hashtable viewSharechannels = new Hashtable();
+public class ViewShareRosterContributionItem extends AbstractRosterContributionItem {
 
 	public ViewShareRosterContributionItem() {
 	}
@@ -36,67 +31,47 @@ public class ViewShareRosterContributionItem extends
 		super(id);
 	}
 
-	protected static ViewShare getViewShare(ID containerID) {
-		return (ViewShare) viewSharechannels.get(containerID);
-	}
-
-	protected static ViewShare addViewShare(ID containerID, ViewShare ViewShare) {
-		return (ViewShare) viewSharechannels.put(containerID, ViewShare);
-	}
-
-	protected static ViewShare removeViewShare(ID containerID) {
-		return (ViewShare) viewSharechannels.remove(containerID);
-	}
-
-	private IAction[] createActionAdd(final ID containerID,
-			final IChannelContainerAdapter channelAdapter) {
-		IAction action = new Action() {
+	private IAction[] createActionAdd(final ID containerID, final IChannelContainerAdapter channelAdapter) {
+		final IAction action = new Action() {
 			public void run() {
 				try {
-					addViewShare(containerID, new ViewShare(containerID, channelAdapter));
+					ViewShare.addViewShare(containerID, channelAdapter);
 				} catch (ECFException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 			}
 		};
-		action
-				.setText(Messages.ViewShareRosterContributionItem_VIEWSHARE_LISTENER_MENU_ADD_TEXT);
-		action.setImageDescriptor(PlatformUI.getWorkbench()
-				.getSharedImages().getImageDescriptor(
-						ISharedImages.IMG_DEF_VIEW));
-		return new IAction[] { action };
+		action.setText(Messages.ViewShareRosterContributionItem_VIEWSHARE_LISTENER_MENU_ADD_TEXT);
+		action.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_DEF_VIEW));
+		return new IAction[] {action};
 	}
 
-	private IAction[] createActionRemove(final ID containerID,
-			final ViewShare viewShare) {
-		IAction action = new Action() {
+	private IAction[] createActionRemove(final ID containerID, final ViewShare viewShare) {
+		final IAction action = new Action() {
 			public void run() {
-				removeViewShare(containerID);
+				ViewShare.removeViewShare(containerID);
 				viewShare.dispose();
 			}
 		};
-		action
-				.setText(Messages.ViewShareRosterContributionItem_VIEWSHARE_LISTENER_MENU_REMOVE_TEXT);
-		return new IAction[] { action };
+		action.setText(Messages.ViewShareRosterContributionItem_VIEWSHARE_LISTENER_MENU_REMOVE_TEXT);
+		return new IAction[] {action};
 	}
 
 	protected IAction[] makeActions() {
 		final IRoster roster = getSelectedRoster();
 		if (roster != null) {
 			// Roster is selected
-			IContainer c = getContainerForRoster(roster);
+			final IContainer c = getContainerForRoster(roster);
 			if (c != null) {
 				// Get existing ViewShare for this container (if it exists)
-				ViewShare viewShare = getViewShare(c.getID());
+				final ViewShare viewShare = ViewShare.getViewShare(c.getID());
 				// If it does exist already, then create action to remove
 				if (viewShare != null)
 					return createActionRemove(c.getID(), viewShare);
 				else {
-					IChannelContainerAdapter channelAdapter = (IChannelContainerAdapter) c
-							.getAdapter(IChannelContainerAdapter.class);
-					return (channelAdapter == null) ? null : createActionAdd(c
-							.getID(), channelAdapter);
+					final IChannelContainerAdapter channelAdapter = (IChannelContainerAdapter) c.getAdapter(IChannelContainerAdapter.class);
+					return (channelAdapter == null) ? null : createActionAdd(c.getID(), channelAdapter);
 				}
 			}
 		}