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

ASM #525 - Text Workstation expiration pop-up inconsistent

Browse source 
Change-Id: I3867a0050962d97125ca6612fcded2fe62b48619

Former-commit-id: ae90da3011 [formerly f7bfa197b1b61b69029efd8e225ba5dea22c17f2]
Former-commit-id: 8b595435e2
This commit is contained in:
David Friedman 2014-04-25 19:31:58 +00:00
parent a53243358e
commit 01b0960ac9
2 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/notify/NotifyExpiration.java
View file

@ -42,6 +42,7 @@ import com.raytheon.viz.texteditor.util.VtecUtil;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* May 24, 2010 jsanchez Initial creation
* Apr 25, 2014 DR 16668 D. Friedman Only notify on NEW products.
*
* </pre>
*
@ -83,7 +84,7 @@ public class NotifyExpiration {
}
VtecObject vtecObject = VtecUtil.parseMessage(warning);
if (vtecObject == null) {
if (vtecObject == null || !"NEW".equals(vtecObject.getAction())) {
return;
}
Calendar expire = vtecObject.getEndTime();

37
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/notify/NotifyExpirationTask.java
View file

@ -51,6 +51,7 @@ import com.raytheon.viz.ui.dialogs.SWTMessageBox;
* Sep 21, 2010 2187 cjeanbap Removed hard coded values of
* tables names.
* Dec 20, 2010 7210 cjeanbap Added non-blocking dialog.
* Apr 25, 2014 DR 16668 D. Friedman Handle partial cancellations
* </pre>
*
* @author jsanchez
@ -114,8 +115,6 @@ public class NotifyExpirationTask extends TimerTask {
req.setMode(ActiveTableMode.OPERATIONAL);
}
/* textNotifyExpiration.tcl ln 76: Only queries for a CAN */
req.setAct("CAN");
req.setSiteID(office);
req.setPhensigList(phenSig);
req.setEtn(etn);
@ -127,22 +126,32 @@ public class NotifyExpirationTask extends TimerTask {
activeTable = resp.getActiveTable();
} catch (VizException e) {
statusHandler.handle(Priority.ERROR,
"Error querying active table for CAN." + office + "."
"Error querying active table for " + office + "."
+ phenSig + "." + etn, e);
}
if (activeTable != null && activeTable.size() > 0) {
ActiveTableRecord record = activeTable.get(0);
/*
* textNotifyExpiration.tcl ln 97: If any of the found products are
* less than 48 hours old,return true.
*/
if (record != null
&& (System.currentTimeMillis()
- record.getIssueTime().getTimeInMillis() < TWO_DAYS)) {
return true;
if (activeTable != null) {
boolean haveCAN = false;
for (ActiveTableRecord record : activeTable) {
if (record != null) {
/*
* textNotifyExpiration.tcl ln 106: If any of the found products are
* less than 48 hours old,return true.
*/
if ("CAN".equals(record.getAct())
&& (System.currentTimeMillis()
- record.getIssueTime().getTimeInMillis() < TWO_DAYS)) {
haveCAN = true;
} else if ("CON".equals(record.getAct())) {
/* If there CANs and the event is still active, there
* should be some CONs. Thus, it is not necessary to
* check for every other kind of non-terminal action.
*/
return false;
}
}
}
return haveCAN;
}
return false;