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

ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.

Browse source 
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410

Former-commit-id: 74c03e5b81 [formerly 3851e4c961] [formerly f0b644d92e] [formerly e6d3baaa9c [formerly f0b644d92e [formerly dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463]]]
Former-commit-id: e6d3baaa9c
Former-commit-id: 7008af67fcd8171a0d155c064f558b3a2f7043fe [formerly 4613f0e9d1]
Former-commit-id: a2c89ea11c
This commit is contained in:
Michael Gamazaychikov 2014-10-06 15:31:37 -04:00
parent beb7a3f448
commit c338697738
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
View file

@ -369,14 +369,11 @@ public class WarngenLayer extends AbstractStormTrackResource {
private Set<String> mapsToLoad;
private Set<String> preloadedMaps;
private final MapManager manager;
public CustomMaps() {
super("Loading WarnGen Maps");
manager = MapManager.getInstance(descriptor);
preloadedMaps=new HashSet<String>();
}
@Override
@ -393,15 +390,15 @@ public class WarngenLayer extends AbstractStormTrackResource {
if (toLoad != null) {
for (String loaded : customMaps) {
if (!preloadedMaps.contains(loaded)) {
manager.unloadMap(loaded);
manager.unloadMap(loaded);
}
customMaps.clear();
for (String load : toLoad) {
if (!manager.isMapLoaded(load)) {
manager.loadMapByName(load);
customMaps.add(load);
}
}
for (String load : toLoad) {
manager.loadMapByName(load);
}
customMaps = toLoad;
issueRefresh();
}
@ -411,11 +408,6 @@ public class WarngenLayer extends AbstractStormTrackResource {
}
public void loadCustomMaps(Collection<String> maps) {
for (String map : maps) {
if (manager.isMapLoaded(map)) {
preloadedMaps.add(map);
}
}
synchronized (this) {
mapsToLoad = new HashSet<String>(maps);
}