xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Former-commit-id: a0f919d73ea4d1da7d79e721800079f0698070db
This commit is contained in:
Matt Nash 2012-04-20 15:30:39 -05:00
parent 7116eb79cd
commit b418af8aa9
4 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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()

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

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

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

@ -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);

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

@ -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)
.getColorManager().getColors());
invite.setRGBColors(SharedDisplaySessionMgr
.getSessionContainer(sessionId).getColorManager().getColors());
invite.setDataProvider(SharedDisplaySessionMgr
.getSessionContainer(sessionId).getSession()
.getCurrentDataProvider());