Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2

Former-commit-id: a73c8d4cda [formerly 8b1b457310] [formerly d3888b16f3 [formerly bdfe1c263b8bcc0f6ebc8fd31c506e76271319ea]]
Former-commit-id: d3888b16f3
Former-commit-id: 89941d5ca9
This commit is contained in:
Brian.Dyke 2014-08-15 11:52:35 -04:00
commit d0985451d7

View file

@ -140,6 +140,7 @@ import com.vividsolutions.jts.io.WKTReader;
* Mar 17, 2014 DR 16309 Qinglu Lin Updated getWatches(), processATEntries() and determineAffectedPortions(), and
* added determineAffectedMarinePortions().
* Jul 21, 2014 3419 jsanchez Refactored WatchUtil.
* Aug 15, 2014 DR15701 mgamazaychikov Removed static field watchUtil.
* </pre>
*
* @author njensen
@ -157,8 +158,6 @@ public class TemplateRunner {
private static Hashtable<String, DateFormat> dateFormat;
private static WatchUtil watchUtil;
static {
dateFormat = new Hashtable<String, DateFormat>();
dateFormat
@ -851,9 +850,7 @@ public class TemplateRunner {
// Store Watches
try {
t0 = System.currentTimeMillis();
if (watchUtil == null) {
watchUtil = new WatchUtil(warngenLayer);
}
WatchUtil watchUtil = new WatchUtil(warngenLayer);
List<Watch> watches = watchUtil.getWatches(config, warnPolygon,
simulatedTime);
System.out.println("getWatches time: "