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

Omaha #2697 Collaboration will no longer use local maps.

Browse source 
Former-commit-id: ebfa5f5daf [formerly 270e8805cc] [formerly 3e23857dcc] [formerly 1db137a21e [formerly 3e23857dcc [formerly 7e10b6d308a3bb17692abaefd9a8e84cc5016621]]]
Former-commit-id: 1db137a21e
Former-commit-id: a29ef2071bfc276e3293b4a194e4b553a2d44b4c [formerly 759b1460d4]
Former-commit-id: fc54a7f697
This commit is contained in:
Ben Steffensmeier 2014-05-14 13:52:12 -05:00
parent 92b26ad179
commit 99e30ac110
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,19 +71,17 @@ import com.raytheon.viz.ui.editor.AbstractEditor;
* Manager class for managing the sharing of editors in an
* {@link ISharedDisplaySession}
*
* TODO: Handle DataProviderRsc adding/removing! Maybe put in wrap/unwrap
* resource?
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jun 08, 2012 mschenke Initial creation
* Jan 28, 2014 2698 bclement removed venue info
* Feb 13, 2014 2751 bclement VenueParticipant refactor
* Mar 06, 2014 2848 bclement only send to venue if non empty
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Jun 08, 2012 mschenke Initial creation
* Jan 28, 2014 2698 bclement removed venue info
* Feb 13, 2014 2751 bclement VenueParticipant refactor
* Mar 06, 2014 2848 bclement only send to venue if non empty
* May 14, 2014 2697 bsteffen Do not use local maps by default.
*
* </pre>
*
@ -93,6 +91,11 @@ import com.raytheon.viz.ui.editor.AbstractEditor;
public class SharedEditorsManager implements IRemoteDisplayContainer {
private static final String LOCAL_MAPS_PROPERTY = "collaboration.localMaps";
private static final boolean localMaps = Boolean
.getBoolean(LOCAL_MAPS_PROPERTY);
public class RemoteDisplayEventHandler {
@Subscribe
public void remoteDisplayRequested(RemoteDisplayRequested event) {
@ -773,7 +776,7 @@ public class SharedEditorsManager implements IRemoteDisplayContainer {
* @return
*/
private boolean shouldBeLocal(ResourcePair rp) {
return rp.getProperties().isMapLayer();
return localMaps && rp.getProperties().isMapLayer();
}
/**