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: b7c7cfdec3fb50edd7b9c164de6d29af465f6a8d
This commit is contained in:
Shawn.Hooper 2015-10-26 16:14:37 -04:00
commit aeba8deb71
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
View file

@ -173,6 +173,7 @@ import com.raytheon.viz.ui.simulatedtime.SimulatedTimeOperations;
* 08/06/2015 13753 lshi removed updateTime flag, undo the change of updateIssueExpireTimes, etc.
* 08/10/2015 4721 randerso Changed getNNNid() to use the productID field (not textdbPil)
* 09/15/2015 4858 dgilling Disable store/transmit in DRT mode.
* 10/26/2015 18244 lshi fixed NullPointerException (pds, updateIssueExpireTimes)
* </pre>
*
* @author lvenable
@ -380,7 +381,6 @@ public class ProductEditorComp extends Composite implements
private final Listener visibilityListener;
/**
* Enumeration of product types.
*
@ -1954,7 +1954,7 @@ public class ProductEditorComp extends Composite implements
this.expireDate = cal.getTime();
dateTimeLbl.setText(expireLabelFmt.format(expireDate));
if (!dead) { //&& !editorCorrectionMode) { // && !spellDialog) {
if (!dead) {
changeTimes();
}
}
@ -1977,15 +1977,14 @@ public class ProductEditorComp extends Composite implements
try {
textComp.startUpdate();
ProductDataStruct pds = textComp.getProductDataStruct();
if (!textComp.isCorMode()) {
if (pds != null) {
if (!textComp.isCorMode()) {
TextIndexPoints pit = pds.getPIT();
if (pit != null) {
String time = purgeTimeFmt.format(now);
textComp.replaceText(pit, time);
}
}
}
// Update MND time
TextIndexPoints tip = pds.getMndMap().get("nwstime");
@ -1994,8 +1993,6 @@ public class ProductEditorComp extends Composite implements
longLocalFmtStr);
fmt.setTimeZone(localTimeZone);
String issueTime = fmt.format(now).toUpperCase();
if (tip != null) {
textComp.replaceText(tip, issueTime);
}
}
@ -2022,7 +2019,6 @@ public class ProductEditorComp extends Composite implements
fmt.setTimeZone(localTimeZone);
String officeIssueTime = fmt.format(now).toUpperCase();
for (int i = 0; i < numSegments; i++) {
textComp.startUpdate();
HashMap<String, TextIndexPoints> segMap = pds

17
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/svcbu.properties
View file

@ -1,3 +1,14 @@
# ----------------------------------------------------------------------------
#
# SOFTWARE HISTORY
#
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 10/22/2015 DR #17873 lshi remove quotes from default
# SVCBU_USER_ID
#
#################################################################
#Variables used by service backup:
#
@ -124,6 +135,10 @@ SVCBU_GRIDAREA=ISC_Send_Area
SVCBU_ADDRESSEE="ANCF,BNCF"
SVCBU_WMO_HEADER=SVCBKPIFP
SVCBU_USER=0
SVCBU_USER_ID=""
# Do not use quotes when setting SVCBU_USER_ID
# Example syntax: SVCBU_USER_ID=backuser
SVCBU_USER_ID=
EXPORT_GRID=1
PRIMARY_SITES=