Issue #429 fixes for colors, needs to refactor user id to make work

Former-commit-id: 31510dae8d [formerly ac53206f1f] [formerly b418af8aa9] [formerly 7f7bd73014 [formerly b418af8aa9 [formerly a0f919d73ea4d1da7d79e721800079f0698070db]]]
Former-commit-id: 7f7bd73014
Former-commit-id: 58a7b49922dc1994ad90e5f3e4c2c8b7f6fa7bda [formerly 4f3a414d6d]
Former-commit-id: bd87f5c798

cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/CollaborationDataManager.java

@@ -68,6 +68,7 @@ import com.raytheon.uf.viz.collaboration.comm.provider.roster.RosterEntry;
 import com.raytheon.uf.viz.collaboration.comm.provider.session.CollaborationConnection;
 import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId;
 import com.raytheon.uf.viz.collaboration.ui.CollaborationUtils;
+import com.raytheon.uf.viz.collaboration.ui.SessionColorManager;
 import com.raytheon.uf.viz.collaboration.ui.editor.CollaborationEditor;
 import com.raytheon.uf.viz.collaboration.ui.login.LoginData;
 import com.raytheon.uf.viz.collaboration.ui.login.LoginDialog;
@@ -507,7 +508,7 @@ public class CollaborationDataManager implements IRosterEventSubscriber {
             ISharedDisplaySession displaySession = (ISharedDisplaySession) session;
             sessionsMap.put(sessionId, session);
             SharedDisplaySessionMgr.joinSession(displaySession,
-                    SharedDisplayRole.DATA_PROVIDER);
+                    SharedDisplayRole.DATA_PROVIDER, null);
 
         }
 
@@ -576,16 +577,12 @@ public class CollaborationDataManager implements IRosterEventSubscriber {
                     String sessionId = session.getSessionId();
                     sessionsMap.put(sessionId, session);
                     if (sharedDisplay) {
-                        SharedDisplaySessionMgr
-                                .getSessionContainer(sessionId)
-                                .getColorManager()
-                                .setColors(
-                                        ((SharedDisplayVenueInvite) invitation
-                                                .getInvite()).getColors());
-
                         ISharedDisplaySession displaySession = (ISharedDisplaySession) session;
+                        SessionColorManager man = new SessionColorManager();
+                        man.setColors(((SharedDisplayVenueInvite) invitation
+                                .getInvite()).getRGBColors());
                         SharedDisplaySessionMgr.joinSession(displaySession,
-                                SharedDisplayRole.PARTICIPANT);
+                                SharedDisplayRole.PARTICIPANT, man);
 
                         PlatformUI
                                 .getWorkbench()

cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/SessionContainer.java

@@ -129,4 +129,12 @@ public class SessionContainer {
         }
         return colorManager;
     }
+
+    /**
+     * @param colorManager
+     *            the colorManager to set
+     */
+    public void setColorManager(SessionColorManager colorManager) {
+        this.colorManager = colorManager;
+    }
 }

cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/SharedDisplaySessionMgr.java

@@ -25,11 +25,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.swt.graphics.RGB;
-
 import com.raytheon.uf.viz.collaboration.comm.identity.ISharedDisplaySession;
 import com.raytheon.uf.viz.collaboration.comm.identity.user.SharedDisplayRole;
-import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId;
+import com.raytheon.uf.viz.collaboration.ui.SessionColorManager;
 import com.raytheon.uf.viz.collaboration.ui.role.DataProviderEventController;
 import com.raytheon.uf.viz.collaboration.ui.role.IRoleEventController;
 import com.raytheon.uf.viz.collaboration.ui.role.ParticipantEventController;
@@ -67,7 +65,7 @@ public class SharedDisplaySessionMgr {
     }
 
     protected static void joinSession(ISharedDisplaySession session,
-            SharedDisplayRole initialRole, Map<UserId, RGB> colors) {
+            SharedDisplayRole initialRole, SessionColorManager colors) {
         SessionContainer container = new SessionContainer();
         container.setSessionId(session.getSessionId());
         container.setSession(session);
@@ -96,7 +94,7 @@ public class SharedDisplaySessionMgr {
         }
         container.setRoleEventController(rec);
         if (colors != null) {
-            container.getColorManager().setColors(colors);
+            container.setColorManager(colors);
         }
         sharedDisplaySessionMap.put(session.getSessionId(), container);
 

cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CollaborationGroupView.java

@@ -680,8 +680,8 @@ public class CollaborationGroupView extends ViewPart implements IPartListener {
         invite.setMessage(msg);
         invite.setSessionId(sessionId);
         invite.setSubject(subject);
-        invite.setColors(SharedDisplaySessionMgr.getSessionContainer(sessionId)
+        invite.setRGBColors(SharedDisplaySessionMgr
-                .getColorManager().getColors());
+                .getSessionContainer(sessionId).getColorManager().getColors());
         invite.setDataProvider(SharedDisplaySessionMgr
                 .getSessionContainer(sessionId).getSession()
                 .getCurrentDataProvider());