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

Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1

Browse source 
Former-commit-id: c83f9c732f8fb0738b130d7377fbde0720203e0a
This commit is contained in:
Shawn.Hooper 2015-11-25 15:10:55 -05:00
commit 505b003def
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
View file

@ -66,6 +66,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* Mar 10, 2015 14575 snaples Added additional status flags. * Mar 10, 2015 14575 snaples Added additional status flags.
* Oct 14, 2015 17977 snaples Fixed loadData to read station * Oct 14, 2015 17977 snaples Fixed loadData to read station
* lists when new area, which means it needs to read some tokens also. * lists when new area, which means it needs to read some tokens also.
* Nov 25, 2015 17986 snaples Updated array func to adjust QC codes for update to dialogs.
* *
* </pre> * </pre>
* *
@ -437,7 +438,7 @@ public class DailyQcUtils {
public static int new_area_flag = 0; public static int new_area_flag = 0;
public int func[] = { 8, 0, 3, 1, 2 }; public int func[] = { 8, 3, 0, 1, 2 };
public static int hrgt12z = -1; public static int hrgt12z = -1;

13
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
View file

@ -740,10 +740,15 @@ public class TemplateRunner {
if (atIndex > 0) { if (atIndex > 0) {
int hhmmStart = atIndex + 3; int hhmmStart = atIndex + 3;
hhmmEnd = message.indexOf(", ", hhmmStart); hhmmEnd = message.indexOf(", ", hhmmStart);
if (hhmmEnd > 0) { if (hhmmEnd < 0) {
context.put("corToNewMarker", "cortonewmarker"); // check for ellipsis
context.put("corEventtime", hhmmEnd = message.indexOf("...", hhmmStart);
message.substring(hhmmStart, hhmmEnd)); } else {
if (hhmmEnd > 0) {
context.put("corToNewMarker", "cortonewmarker");
context.put("corEventtime",
message.substring(hhmmStart, hhmmEnd));
}
} }
} }
} }