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

textws remove backup functionality, don't open editor by default

Browse source 
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
This commit is contained in:
Michael James 2017-06-28 13:57:53 -06:00 • committed by mjames-upc
parent 6749e243b0
commit acb8dc4574
2 changed files with 23 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
View file

@ -268,9 +268,8 @@ public class TextWorkstationDlg extends CaveSWTDialog implements
if (productToDisplay != null) { if (productToDisplay != null) {
wgDlg.showWarngenProduct(productToDisplay, notify); wgDlg.showWarngenProduct(productToDisplay, notify);
} }
// Display the first Text Editor // Display the first Text Editor
showTextEditor(0); //showTextEditor(0);
} }
private void createMenus() { private void createMenus() {

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

@ -399,13 +399,6 @@ public class TemplateRunner {
context.put("officeLoc", warngenLayer.getDialogConfig() context.put("officeLoc", warngenLayer.getDialogConfig()
.getWarngenOfficeLoc()); .getWarngenOfficeLoc());
if (backupData != null) {
context.remove("officeLoc");
context.remove("officeShort");
context.put("backupSite", warngenLayer.getDialogConfig()
.getWarngenOfficeShort());
}
String productId = config.getProductId(); String productId = config.getProductId();
if (productId == null) { if (productId == null) {
statusHandler.warn("Warngen configuration file: " statusHandler.warn("Warngen configuration file: "
@ -557,12 +550,12 @@ public class TemplateRunner {
warngenLayer, stormTrackState, selectedAction, wkt, warngenLayer, stormTrackState, selectedAction, wkt,
threeLetterSiteId, etn, phenSig); threeLetterSiteId, etn, phenSig);
if (std.getMotionSpeed() > 0) { // if (std.getMotionSpeed() > 0) {
t0 = System.currentTimeMillis(); // t0 = System.currentTimeMillis();
ToolsDataManager.getInstance().setStormTrackData(std); // ToolsDataManager.getInstance().setStormTrackData(std);
perfLog.logDuration("Save storm track data", // perfLog.logDuration("Save storm track data",
System.currentTimeMillis() - t0); // System.currentTimeMillis() - t0);
} // }
} else { } else {
// Retrieve the old Warning // Retrieve the old Warning
// Example: s[0-5] = T.CON-KLWX.SV.W.0123 // Example: s[0-5] = T.CON-KLWX.SV.W.0123
@ -880,25 +873,23 @@ public class TemplateRunner {
} }
context.put("oldvtec", context.get("etn")); // Depreciated context.put("oldvtec", context.get("etn")); // Depreciated
context.put("stationary", stormTrackState.timePoints == null); context.put("stationary", stormTrackState.timePoints == null);
/*
// Store Watches // Store Watches
try { // try {
t0 = System.currentTimeMillis(); // t0 = System.currentTimeMillis();
WatchUtil watchUtil = new WatchUtil(warngenLayer); // WatchUtil watchUtil = new WatchUtil(warngenLayer);
List<Watch> watches = watchUtil.getWatches(config, warnPolygon, // List<Watch> watches = watchUtil.getWatches(config, warnPolygon,
simulatedTime); // simulatedTime);
perfLog.logDuration("getWatches", System.currentTimeMillis() - t0); // perfLog.logDuration("getWatches", System.currentTimeMillis() - t0);
if ((watches != null) && (watches.isEmpty() == false)) { // if ((watches != null) && (watches.isEmpty() == false)) {
context.put("watches", watches); // context.put("watches", watches);
} // }
} catch (Exception e) { // } catch (Exception e) {
e.printStackTrace(); // e.printStackTrace();
statusHandler // statusHandler
.handle(Priority.VERBOSE, // .handle(Priority.VERBOSE,
"WarnGen cannot populate Active Watches. Check your local config.xml", // "WarnGen cannot populate Active Watches. Check your local config.xml",
e); // e);
} // }
*/
long tz0 = System.currentTimeMillis(); long tz0 = System.currentTimeMillis();
String script = createScript(warngenLayer.getTemplateName() + ".vm", String script = createScript(warngenLayer.getTemplateName() + ".vm",