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

Issue #697 fixed join issues with GFE

Browse source 
Change-Id: Idaaa9782865cd2299ba9fc8e18305df215f1d012

Former-commit-id: dac8374f52 [formerly dac8374f52 [formerly e648206c2e8129b2d63b9309f67e1ce46a1edbf0]]
Former-commit-id: 576dbcf340
Former-commit-id: 475623fe22
This commit is contained in:
Max Schenkelberg 2012-06-14 14:18:02 -05:00
parent eadb96f7a6
commit 8a0626ec3f
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/dataprovider/SharedEditorsManager.java
View file

@ -97,19 +97,33 @@ public class SharedEditorsManager implements IRemoteDisplayContainer {
for (UserId uid : session.getVenue().getParticipants()) { for (UserId uid : session.getVenue().getParticipants()) {
if (uid.getFQName().equals(userId)) { if (uid.getFQName().equals(userId)) {
user = uid; user = uid;
break;
} }
} }
if (user != null) { if (user != null) {
int displayId = event.getDisplayId(); int displayId = event.getDisplayId();
RemoteDisplay requested = null;
for (DisplayData data : displayData.values()) { for (DisplayData data : displayData.values()) {
if (data.displayId == displayId) { if (data.displayId == displayId) {
CreateRemoteDisplay creation = new CreateRemoteDisplay(); requested = new RemoteDisplay(data.displayId,
creation.setDisplayId(displayId); data.display);
creation.setDisplay(createRemoteDisplay(data.display));
sendEvent(creation);
break; break;
} }
} }
if (requested == null) {
requested = getActiveDisplay();
if (requested != null) {
ActivateRemoteDisplay activate = new ActivateRemoteDisplay();
activate.setDisplayId(requested.getDisplayId());
sendEvent(activate);
}
} else {
CreateRemoteDisplay creation = new CreateRemoteDisplay();
creation.setDisplayId(requested.getDisplayId());
creation.setDisplay(createRemoteDisplay(requested
.getDisplay()));
sendEvent(creation);
}
} }
} }
} }

10
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/CollaborationEditor.java
View file

@ -119,6 +119,16 @@ public class CollaborationEditor extends EditorPart implements
@Override @Override
public void createPartControl(Composite parent) { public void createPartControl(Composite parent) {
paneManager.initializeComponents(paneManager, parent); paneManager.initializeComponents(paneManager, parent);
RemoteDisplayRequested request = new RemoteDisplayRequested();
request.setDisplayId(-1);
request.setUserId(session.getUserID().getFQName());
try {
session.sendObjectToPeer(session.getCurrentDataProvider(), request);
} catch (CollaborationException e) {
Activator.statusHandler.handle(Priority.PROBLEM,
e.getLocalizedMessage(), e);
}
} }
/* /*