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

warngen cleanup: remove backup office refs; use close() instead of hide() which hangs eclipse

Browse source
This commit is contained in:
mjames-upc 2017-06-26 13:31:52 -06:00
parent 8c3d9dfc2b
commit 331f7f7694
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
View file

@ -346,7 +346,7 @@ public class WarngenDialog extends CaveSWTDialog implements
public WarngenDialog(Shell parentShell, WarngenLayer layer) {
super(parentShell,
SWT.MIN | SWT.CLOSE | SWT.MODELESS | SWT.BORDER | SWT.TITLE | SWT.ON_TOP,
SWT.MIN | SWT.CLOSE | SWT.MODELESS | SWT.BORDER | SWT.TITLE,
CAVE.DO_NOT_BLOCK | CAVE.INDEPENDENT_SHELL );
setText("WarnGen");
bulletListManager = new BulletListManager();
@ -1421,7 +1421,7 @@ public class WarngenDialog extends CaveSWTDialog implements
*/
private void closePressed() {
EditableManager.makeEditable(warngenLayer, false);
hide();
close();
}
/**

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

@ -402,8 +402,6 @@ public class TemplateRunner {
if (backupData != null) {
context.remove("officeLoc");
context.remove("officeShort");
context.put("officeLoc", warngenLayer.getBackupOfficeLoc());
context.put("officeShort", warngenLayer.getBackupOfficeShort());
context.put("backupSite", warngenLayer.getDialogConfig()
.getWarngenOfficeShort());
}
@ -882,6 +880,7 @@ public class TemplateRunner {
}
context.put("oldvtec", context.get("etn")); // Depreciated
context.put("stationary", stormTrackState.timePoints == null);
/*
// Store Watches
try {
t0 = System.currentTimeMillis();
@ -899,6 +898,7 @@ public class TemplateRunner {
"WarnGen cannot populate Active Watches. Check your local config.xml",
e);
}
*/
long tz0 = System.currentTimeMillis();
String script = createScript(warngenLayer.getTemplateName() + ".vm",