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

Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1

Browse source 
Former-commit-id: 2e6f3e057a [formerly 797a9c6c10] [formerly f85eb2d0ac] [formerly 2e6f3e057a [formerly 797a9c6c10] [formerly f85eb2d0ac] [formerly 6ae3795b7c [formerly f85eb2d0ac [formerly 344f436cfabfa5c1d0aa552467be7a6f9656a1ec]]]]
Former-commit-id: 6ae3795b7c
Former-commit-id: 4962750f7e [formerly 6034909d2d] [formerly b9b756a1fb303b55472d87a26e19fc89a60a9ac7 [formerly 36571c8238]]
Former-commit-id: 4dee77ada5e45267109cee2b90e6dc3c62342602 [formerly 969b40b517]
Former-commit-id: fdfc95c5ff
This commit is contained in:
Brian.Dyke 2014-10-10 11:01:01 -04:00
commit 03f65ca414
3 changed files with 17 additions and 21 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);
}

9
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
View file

@ -14,6 +14,7 @@
##### Qinglu Lin 05-21-2014 DR 16309. Updated inserttorwatches and insertsvrwatches by changing 'FOR##' to 'FOR ##'.
##### D. Friedman 08-28-2014 ASM #15658. Add marine watch wording.
##### Qinglu Lin 09-15-2014 ASM #15551. Overhauled inserttorwatches and insertsvrwatches, added until.
##### Qinglu Lin 10-06-2014 ASN #556. Updated secondBullet.
####################################################################################################
#*
Mile Marker Test Code
@ -1184,15 +1185,15 @@ ${partOfArea}${area.name}...
######### MACRO TO GENERATE SECOND BULLET (UNTIL XXXX AMPM TZ (DAY) IN WARNINGS ##########
#macro(secondBullet $dateUtil $expire $timeFormat $localtimezone $secondtimezone $duration)
#if(${duration} >= 360)
UNTIL ${dateUtil.format(${expire}, ${timeFormat.plain}, 15, ${localtimezone})}##
UNTIL ${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.plain}, 15, ${localtimezone})}##
#else
UNTIL ${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${localtimezone})}##
UNTIL ${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.clock}, 15, ${localtimezone})}##
#end
#if(${secondtimezone})
#if(${duration} >= 360)
/${dateUtil.format(${expire}, ${timeFormat.plain}, 15, ${secondtimezone})}/##
/${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.plain}, 15, ${secondtimezone})}/##
#else
/${dateUtil.format(${expire}, ${timeFormat.clock}, 15, ${secondtimezone})}/##
/${dateUtil.formatUseNoonMidnight(${expire}, ${timeFormat.clock}, 15, ${secondtimezone})}/##
#end
#end
#end

7
edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh
View file

@ -115,8 +115,11 @@ function setupEnv() {
logIt INFO main "User passed an argument which we're using for the input file name : $1"
fi
inputFile=${fullScriptPath}/${inputFileName}
if echo ${inputFileName} | grep '/' > /dev/null ; then
inputFile=${inputFileName}
else
inputFile=${fullScriptPath}/${inputFileName}
fi
runTimeStamp=$( date +%Y%m%d_%H%M%S )