diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java index 871a06d02e..e4272b16cf 100644 --- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java @@ -51,7 +51,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * Oct 16, 2014 3220 skorolev Corrected getInstance() method. * Oct 27, 2014 3667 skorolev Cleaned code. * Nov 21, 2014 3841 skorolev Corrected handleOkBtnSelection. - * Dec 11, 2014 3220 skorolev Removed unnecessary code. + * Dec 11, 2014 3220 skorolev Removed unnecessary code. + * Feb 03, 2015 3841 skorolev Replaced resetParams with resetStatus. * * * @@ -109,7 +110,7 @@ public class FogMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg { * using new monitor area configuration */ fireConfigUpdateEvent(); - resetParams(); + resetStatus(); } else { // Return back to continue edit. return; } diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java index 0b9d61cad5..8b48a1f7c9 100644 --- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java @@ -58,8 +58,9 @@ import com.raytheon.uf.viz.monitor.ui.dialogs.ZoneTableDlg; * Dec 03, 2012 15216/15639 zhao fixed a bug related to Link-to-Frame * Dec 7, 2012 1351 skorolev Changes for non-blocking dialogs. * Apr 28, 2014 3086 skorolev Updated getConfigMgr method. - * Jan 27, 2015 3220 skorolev Removed "site".Added check on dispose.Corrected configMgr assignment.Added table cache update. - * + * Jan 27, 2015 3220 skorolev Removed "site".Added check on dispose.Corrected configMgr assignment. + * Added table cache update. + * Feb 04, 2015 3841 skorolev Corrected notify method for empty table update. * * * @author ? @@ -148,12 +149,11 @@ public class FogZoneTableDlg extends ZoneTableDlg { // The algorithm output. if (me.getSource() instanceof FogMonitor) { - FogMonitor fog = (FogMonitor) me.getSource(); + ObMultiHrsReports obData = fog.getObData(); Date date = fog.getDialogTime(); if (date != null) { Date nominalTime = date; - ObMultiHrsReports obData = fog.getObData(); if (!isLinkedToFrame()) { nominalTime = obData.getLatestNominalTime(); } @@ -162,6 +162,8 @@ public class FogZoneTableDlg extends ZoneTableDlg { .getAlgorithmData(nominalTime)); obData.setFogAlgCellType(fogAlgCellType); this.updateTableDlg(obData.getObHourReports(nominalTime)); + } else { + this.updateZoneTable(obData.getLatestNominalTime()); } } } diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java index 47c15886bd..645a823980 100644 --- a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java @@ -52,6 +52,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * Oct 27, 2014 3667 skorolev Cleaned code. * Nov 21, 2014 3841 skorolev Corrected handleOkBtnSelection. * Dec 11, 2014 3220 skorolev Removed unnecessary code. + * Feb 03, 2015 3841 skorolev Replaced resetParams with resetStatus. * * * @@ -101,7 +102,7 @@ public class SSMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg { } } fireConfigUpdateEvent(); - resetParams(); + resetStatus(); } else { // Return back to continue edit. return; } diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java index 2bfa211be8..d4041dcde5 100644 --- a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java @@ -56,7 +56,9 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants; * Nov 10, 2012 1297 skorolev Added initiateProdArray * Dec 7, 2012 1351 skorolev Changes for non-blocking dialogs. * Apr 28, 2014 3086 skorolev Updated getConfigMgr method. - * Jan 27, 2015 3220 skorolev Removed "site". Added check on dispose.Corrected configMgr assignment.Added table cache update. + * Jan 27, 2015 3220 skorolev Removed "site". Added check on dispose.Corrected configMgr assignment. + * Added table cache update. + * Feb 04, 2015 3841 skorolev Corrected notify method for empty table update. * * * @@ -153,10 +155,10 @@ public class SSZoneTableDlg extends ZoneTableDlg { if (me.getSource() instanceof SafeSeasMonitor) { SafeSeasMonitor monitor = (SafeSeasMonitor) me.getSource(); + ObMultiHrsReports obData = monitor.getObData(); Date date = monitor.getDialogTime(); if (date != null) { Date nominalTime = date; - ObMultiHrsReports obData = monitor.getObData(); if (!isLinkedToFrame()) { nominalTime = obData.getLatestNominalTime(); } @@ -165,6 +167,8 @@ public class SSZoneTableDlg extends ZoneTableDlg { obData.setFogAlgCellType(monitor.getAlgCellTypes(fogAlgThreats)); this.updateTableDlg(monitor.getObData().getObHourReports( nominalTime)); + } else { + this.updateZoneTable(obData.getLatestNominalTime()); } } } diff --git a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java index 9d6ff7a30d..79e7c74f3f 100644 --- a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java @@ -52,6 +52,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * Oct 27, 2014 3667 skorolev Cleaned code. * Nov 21, 2014 3841 skorolev Corrected handleOkBtnSelection. * Dec 11, 2014 3220 skorolev Removed unnecessary code. + * Feb 03, 2015 3841 skorolev Replaced resetParams with resetStatus. * * * @@ -110,7 +111,7 @@ public class SnowMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg { } } fireConfigUpdateEvent(); - resetParams(); + resetStatus(); } else { // Return back to continue edit. return; } diff --git a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java index 5e41084cee..af4cf204d2 100644 --- a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java @@ -53,7 +53,9 @@ import com.raytheon.uf.viz.monitor.ui.dialogs.ZoneTableDlg; * Nov. 8, 2012 1297 skorolev Added initiateProdArray method * Dec 7, 2012 1351 skorolev Changes for non-blocking dialogs * Apr 28, 2014 3086 skorolev Updated getConfigMgr method. - * Jan 27, 2015 3220 skorolev Removed "site". Added check on dispose.Corrected configMgr assignment.Added table cache update. + * Jan 27, 2015 3220 skorolev Removed "site". Added check on dispose.Corrected configMgr assignment. + * Added table cache update. + * Feb 04, 2015 3841 skorolev Corrected notify method for empty table update. * * * @@ -146,12 +148,15 @@ public class SnowZoneTableDlg extends ZoneTableDlg { if (me.getSource() instanceof SnowMonitor) { SnowMonitor monitor = (SnowMonitor) me.getSource(); + ObMultiHrsReports obData = monitor.getObData(); Date date = monitor.getDialogTime(); if (date != null) { if (!isLinkedToFrame()) { - date = monitor.getObData().getLatestNominalTime(); + date = obData.getLatestNominalTime(); } - this.updateTableDlg(monitor.getObData().getObHourReports(date)); + this.updateTableDlg(obData.getObHourReports(date)); + } else { + this.updateZoneTable(obData.getLatestNominalTime()); } } } diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java old mode 100755 new mode 100644 index 36acaceb81..655df52e99 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java @@ -55,7 +55,9 @@ import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr; * Jan 25, 2010 4281, 3888, 3877 wkwock/zhao added getHistTableData method * Oct.31, 2012 1297 skorolev Clean code. * Jan.29, 2013 15654 zhao add Wind Chill calculation for SNOW - * Jan 27, 2015 3220 skorolev Updated getStationTableData method.Replaced MonitoringArea with cfgMgr.Added multiHrsTabData - Table data cache. + * Jan 27, 2015 3220 skorolev Updated getStationTableData method.Replaced MonitoringArea with cfgMgr. + * Added multiHrsTabData - Table data cache. + * Feb 04, 2015 3841 skorolev Corrected getEmptyZoneTableData method. * * * @@ -245,6 +247,8 @@ public class ObMultiHrsReports { } else { tabData = hourReports.getZoneTableData(); } + // update data cache + multiHrsReports.put(nominalTime, hourReports); // update cache with empty table data if (multiHrsTabData.replace(nominalTime, tabData) == null) { multiHrsTabData.put(nominalTime, tabData); diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java index 71e0ff92c6..3a1f93a1d3 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java @@ -57,6 +57,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog; * Apr 28, 2014 3086 skorolev Removed local getAreaConfigMgr method. * Nov 10, 2014 3741 skorolev Fixed configXML issue. * Nov 21, 2014 3841 skorolev Content of ID field made an editable. + * Feb 03, 2015 3841 skorolev Fixed deleteSelected method. * * * @@ -358,9 +359,14 @@ public class EditNewZoneDlg extends CaveSWTDialog { } String area = zoneList.getItem(zoneList.getSelectionIndex()); zoneList.remove(zoneList.getSelectionIndex()); - idTF.setText(""); - latTF.setText(""); - lonTF.setText(""); + zoneList.select(0); + if (zoneList.getItemCount() != 0) { + handleZoneSelection(); + } else { + idTF.setText(""); + latTF.setText(""); + lonTF.setText(""); + } if (macDlg.getMaZones().contains(area)) { macDlg.getMaZones().remove(area); macDlg.configMgr.removeArea(area); diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java index e82e4927b1..81e5158952 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java @@ -80,6 +80,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * Nov 12, 2014 3650 skorolev Added confirmation box for unsaved changes in the dialog. * Nov 21, 2014 3841 skorolev Added formIsValid method. * Dec 18, 2014 3841 skorolev Corrected addZoneStn method. + * Feb 03, 2015 3841 skorolev Fixed saving problem for distance and time. * * * @@ -1336,18 +1337,11 @@ public abstract class MonitoringAreaConfigDlg extends CaveSWTDialog implements populateMaRegionalList(); } - /** - * Reset configuration parameters. - */ - protected void resetParams() { - getValues(); - resetStatus(); - } - /** * Saving configuration parameters. */ protected void saveConfigs() { + getValues(); configMgr.saveConfigXml(); configMgr.saveAdjacentAreaConfigXml(); }