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

Issue #437 Check for null session in ParticipantsLabelProvider.

Browse source 
Change-Id: Ie327860fdf1feac700e646885a641a283fe54291

Former-commit-id: 69675cf20b [formerly e326edf566] [formerly 8dd86fc331] [formerly 208f84da4d [formerly 8dd86fc331 [formerly 7e73af55a678595cb39f58e109235f9a0310d14c]]]
Former-commit-id: 208f84da4d
Former-commit-id: cbd2235651f41b2540abd22793276b3487ecf1f5 [formerly 11d59449ca]
Former-commit-id: 05399a980f
This commit is contained in:
Roger Ferrel 2012-04-16 13:36:27 -05:00
parent 4290f8477e
commit 3f7f7666b8
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/ParticipantsLabelProvider.java
View file

@ -36,6 +36,7 @@ import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
import com.raytheon.uf.viz.collaboration.comm.identity.ISharedDisplaySession; import com.raytheon.uf.viz.collaboration.comm.identity.ISharedDisplaySession;
import com.raytheon.uf.viz.collaboration.comm.identity.IVenueSession;
import com.raytheon.uf.viz.collaboration.comm.identity.user.ParticipantRole; import com.raytheon.uf.viz.collaboration.comm.identity.user.ParticipantRole;
import com.raytheon.uf.viz.collaboration.data.CollaborationDataManager; import com.raytheon.uf.viz.collaboration.data.CollaborationDataManager;
import com.raytheon.uf.viz.collaboration.data.CollaborationUser; import com.raytheon.uf.viz.collaboration.data.CollaborationUser;
@ -100,6 +101,13 @@ public class ParticipantsLabelProvider implements ITableColorProvider,
@Override @Override
public Image getColumnImage(Object element, int columnIndex) { public Image getColumnImage(Object element, int columnIndex) {
IVenueSession session = CollaborationDataManager.getInstance()
.getSession(sessionId);
if (session == null) {
return null;
}
CollaborationUser user = (CollaborationUser) element; CollaborationUser user = (CollaborationUser) element;
Image image = null; Image image = null;
String key = user.getImageKey(); String key = user.getImageKey();
@ -114,9 +122,7 @@ public class ParticipantsLabelProvider implements ITableColorProvider,
} }
if (image != null) { if (image != null) {
CollaborationDataManager.getInstance().getSession(sessionId); ISharedDisplaySession sdSession = session
ISharedDisplaySession sdSession = CollaborationDataManager
.getInstance().getSession(sessionId)
.spawnSharedDisplaySession(); .spawnSharedDisplaySession();
String userId = user.getId(); String userId = user.getId();
String sessionLeaderId = CollaborationUtils.makeUserId(sdSession String sessionLeaderId = CollaborationUtils.makeUserId(sdSession