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

Merge "Issue #2935 fix refresh issue" into development

Browse source 
Former-commit-id: bda24f04c3 [formerly 61653d8e45] [formerly 07c97d0fda] [formerly 07c97d0fda [formerly 4fe0db7411]] [formerly 21d448c0bc [formerly 07c97d0fda [formerly 4fe0db7411] [formerly 21d448c0bc [formerly 170854eea4ebb9c1f89f7b9f3fa67d47322643de]]]]
Former-commit-id: 21d448c0bc
Former-commit-id: ab99ea104a5681aaf68cd73fe4bd594df455e910 [formerly 428b0f96016670efcf89eef5a265277ea2a064c3] [formerly 33c20da77f [formerly c726dd0589]]
Former-commit-id: 33c20da77f
Former-commit-id: c4eb2113d8
This commit is contained in:
Nate Jensen 2014-03-25 11:25:38 -05:00 • committed by Gerrit Code Review
commit 059ce7882f
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,6 +74,7 @@ import com.raytheon.viz.ui.input.InputManager;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 16, 2012 njensen Initial creation
* Mar 25, 2014 2935 njensen Fix refresh issue
*
* </pre>
*
@ -167,7 +168,15 @@ public class CollaborationEditor extends EditorPart implements
displayMap.put(displayId, display);
fireListeners(displayId, display, RemoteDisplayChangeType.CREATED);
if (currentActiveDisplay == displayId) {
if (currentActiveDisplay == displayId || currentActiveDisplay == -1) {
/*
* when transferring leader, it's possible the leader told us to
* activate a display that we don't have so we request it (see
* activateRemoteDisplay when display==null), so the leader
* responds with this create event, but then the display had
* missed the activate event so we still have to activate it,
* hence the == -1 check
*/
ActivateRemoteDisplay activate = new ActivateRemoteDisplay();
activate.setDisplayId(displayId);
activateRemoteDisplay(activate);