Issue #697 fixed join issues with GFE
Change-Id: Idaaa9782865cd2299ba9fc8e18305df215f1d012 Former-commit-id:dac8374f52
[formerlydac8374f52
[formerly e648206c2e8129b2d63b9309f67e1ce46a1edbf0]] Former-commit-id:576dbcf340
Former-commit-id:475623fe22
This commit is contained in:
parent
eadb96f7a6
commit
8a0626ec3f
2 changed files with 28 additions and 4 deletions
|
@ -97,19 +97,33 @@ public class SharedEditorsManager implements IRemoteDisplayContainer {
|
|||
for (UserId uid : session.getVenue().getParticipants()) {
|
||||
if (uid.getFQName().equals(userId)) {
|
||||
user = uid;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (user != null) {
|
||||
int displayId = event.getDisplayId();
|
||||
RemoteDisplay requested = null;
|
||||
for (DisplayData data : displayData.values()) {
|
||||
if (data.displayId == displayId) {
|
||||
CreateRemoteDisplay creation = new CreateRemoteDisplay();
|
||||
creation.setDisplayId(displayId);
|
||||
creation.setDisplay(createRemoteDisplay(data.display));
|
||||
sendEvent(creation);
|
||||
requested = new RemoteDisplay(data.displayId,
|
||||
data.display);
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -119,6 +119,16 @@ public class CollaborationEditor extends EditorPart implements
|
|||
@Override
|
||||
public void createPartControl(Composite 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);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Add table
Reference in a new issue