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

Merged 13.5.5 -4 into 1412

Browse source 
Former-commit-id: 30bbd2d1cd [formerly 5a6425b6b0 [formerly f27d1b1efe] [formerly 30bbd2d1cd [formerly 5644361dffaae25c63748a52c23506907210c741]]]
Former-commit-id: 5a6425b6b0 [formerly f27d1b1efe]
Former-commit-id: 5a6425b6b0
Former-commit-id: dd9f977f4f
This commit is contained in:
Brian.Dyke 2014-05-07 13:07:15 -04:00
parent b887733496
commit 66826584c9
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WWAResourceData.java
View file

@ -41,6 +41,7 @@ import com.raytheon.viz.core.mode.CAVEMode;
* ------------ ---------- ----------- --------------------------
* May 3, 2011 jsanchez Initial creation
* Oct 25, 2013 2249 rferrel getAvailableTimes always returns a non-empty list.
* Apr 28, 2014 DR 17310 D. Friedman Handle null VTEC fields.
*
* </pre>
*
@ -79,8 +80,8 @@ public class WWAResourceData extends AbstractRequestableResourceData {
for (int i = 0; i < objects.length; i++) {
records.add((AbstractWarningRecord) objects[i]);
}
watchResource = ((AbstractWarningRecord) objects[0]).getSig()
.equals("A");
watchResource = "A".equals(((AbstractWarningRecord) objects[0])
.getSig());
} else if (loadProperties.isLoadWithoutData()) {
// I must be trying to load without data, Ill try.
RequestConstraint phenSig = metadataMap.get("phensig");
@ -172,8 +173,10 @@ public class WWAResourceData extends AbstractRequestableResourceData {
TreeSet<DataTime> startTimes = new TreeSet<DataTime>();
for (AbstractWarningRecord warnRec : warnings) {
boolean valid = true;
WarningAction action = WarningAction.valueOf(warnRec.getAct());
if (action == WarningAction.CAN || action == WarningAction.EXP) {
WarningAction action = warnRec.getAct() != null ?
WarningAction.valueOf(warnRec.getAct()) : null;
if ((action == WarningAction.CAN || action == WarningAction.EXP) &&
warnRec.getEtn() != null && warnRec.getPhensig() != null) {
valid = false;
for (AbstractWarningRecord w : warnings) {
if (warnRec.equals(w)) {
@ -182,8 +185,8 @@ public class WWAResourceData extends AbstractRequestableResourceData {
TimeRange tr = new TimeRange(w.getStartTime(),
w.getEndTime());
if (tr.contains(warnRec.getStartTime().getTime())
&& w.getEtn().equals(warnRec.getEtn()) == false
&& w.getPhensig().equals(warnRec.getPhensig()) == false) {
&& warnRec.getEtn().equals(w.getEtn()) == false
&& warnRec.getPhensig().equals(w.getPhensig()) == false) {
valid = true;
}
}