From fd3a6ea1999d249e16f51c4f876cb6530c93b825 Mon Sep 17 00:00:00 2001 From: Slav Korolev Date: Thu, 11 Dec 2014 15:38:47 -0500 Subject: [PATCH] Omaha #3220 - Moved refreshing of table in the UI thread. Former-commit-id: 7454b39e71eeca348f4f167b8aa70d6ce5253004 --- .../com/raytheon/uf/viz/monitor/fog/FogMonitor.java | 13 +++++++++++-- .../fog/ui/dialogs/FogMonitoringAreaConfigDlg.java | 2 +- .../uf/viz/monitor/safeseas/SafeSeasMonitor.java | 13 +++++++++++-- .../ui/dialogs/SSMonitoringAreaConfigDlg.java | 2 +- .../raytheon/uf/viz/monitor/snow/SnowMonitor.java | 13 +++++++++++-- .../ui/dialogs/SnowMonitoringAreaConfigDlg.java | 4 ++-- 6 files changed, 37 insertions(+), 10 deletions(-) diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java index c0585efc33..6cf0949ac1 100644 --- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java +++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java @@ -46,6 +46,7 @@ import com.raytheon.uf.common.monitor.data.CommonConfig; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; +import com.raytheon.uf.viz.core.VizApp; import com.raytheon.uf.viz.core.alerts.AlertMessage; import com.raytheon.uf.viz.core.notification.NotificationMessage; import com.raytheon.uf.viz.monitor.IMonitor; @@ -90,6 +91,7 @@ import com.vividsolutions.jts.geom.Geometry; * Sep 04, 2014 3220 skorolev Updated configUpdate method and added updateMonitoringArea. * Sep 23, 2014 3356 njensen Remove unnecessary import * Oct 16, 2014 3220 skorolev Corrected fogConfig assignment. + * Dec 11, 2014 3220 skorolev Moved refreshing of table in the UI thread. * * * @@ -318,8 +320,15 @@ public class FogMonitor extends ObsMonitor implements IFogResourceListener { fogConfig = (FSSObsMonitorConfigurationManager) me.getSource(); updateMonitoringArea(); if (zoneDialog != null && !zoneDialog.isDisposed()) { - zoneDialog.refreshZoneTableData(obData); - fireMonitorEvent(zoneDialog.getClass().getName()); + VizApp.runAsync(new Runnable() { + + @Override + public void run() { + zoneDialog.refreshZoneTableData(obData); + fireMonitorEvent(zoneDialog.getClass().getName()); + } + }); + } } 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 07b4932d45..e26d96425d 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,6 +51,7 @@ 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. * * * @@ -126,7 +127,6 @@ public class FogMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg { private void fireConfigUpdateEvent() { final IMonitorConfigurationEvent me = new IMonitorConfigurationEvent( configMgr); - shell.setCursor(getDisplay().getSystemCursor(SWT.CURSOR_WAIT)); Display.getDefault().asyncExec(new Runnable() { @Override public void run() { diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java index d3a1683a4c..f5b980ac35 100644 --- a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java +++ b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java @@ -42,6 +42,7 @@ import com.raytheon.uf.common.monitor.data.CommonConfig; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; +import com.raytheon.uf.viz.core.VizApp; import com.raytheon.uf.viz.core.alerts.AlertMessage; import com.raytheon.uf.viz.core.notification.NotificationMessage; import com.raytheon.uf.viz.monitor.IMonitor; @@ -87,6 +88,7 @@ import com.vividsolutions.jts.geom.Geometry; * Apr 28, 2014 3086 skorolev Removed local getMonitorAreaConfig method. * Sep 04, 2014 3220 skorolev Updated configUpdate method and added updateMonitoringArea. * Oct 16, 2014 3220 skorolev Corrected ssAreaConfig assignment. + * Dec 11, 2014 3220 skorolev Moved refreshing of table in the UI thread. * * * @@ -357,8 +359,15 @@ public class SafeSeasMonitor extends ObsMonitor implements ISSResourceListener { ssAreaConfig = (FSSObsMonitorConfigurationManager) me.getSource(); updateMonitoringArea(); if (zoneDialog != null && !zoneDialog.isDisposed()) { - zoneDialog.refreshZoneTableData(obData); - fireMonitorEvent(zoneDialog.getClass().getName()); + VizApp.runAsync(new Runnable() { + + @Override + public void run() { + zoneDialog.refreshZoneTableData(obData); + fireMonitorEvent(zoneDialog.getClass().getName()); + } + + }); } } 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 db2422c0de..4cdefc0730 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 @@ -51,6 +51,7 @@ 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. * * * @@ -118,7 +119,6 @@ public class SSMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg { private void fireConfigUpdateEvent() { final IMonitorConfigurationEvent me = new IMonitorConfigurationEvent( configMgr); - shell.setCursor(getDisplay().getSystemCursor(SWT.CURSOR_WAIT)); Display.getDefault().asyncExec(new Runnable() { @Override public void run() { diff --git a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java index 9ba20cfe39..c4cf314362 100644 --- a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java +++ b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java @@ -34,6 +34,7 @@ import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager; import com.raytheon.uf.common.monitor.data.CommonConfig; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; +import com.raytheon.uf.viz.core.VizApp; import com.raytheon.uf.viz.core.alerts.AlertMessage; import com.raytheon.uf.viz.core.notification.NotificationMessage; import com.raytheon.uf.viz.monitor.IMonitor; @@ -74,6 +75,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * Apr 28, 2014 3086 skorolev Removed local getMonitorAreaConfig method. * Sep 04, 2014 3220 skorolev Updated configUpdate method and added updateMonitoringArea. * Oct 16, 2014 3220 skorolev Corrected snowConfig assignment. + * Dec 11, 2014 3220 skorolev Moved refreshing of table in the UI thread. * * * @@ -306,8 +308,15 @@ public class SnowMonitor extends ObsMonitor implements ISnowResourceListener { snowConfig = (FSSObsMonitorConfigurationManager) me.getSource(); updateMonitoringArea(); if (zoneDialog != null && !zoneDialog.isDisposed()) { - zoneDialog.refreshZoneTableData(obData); - fireMonitorEvent(zoneDialog.getClass().getName()); + VizApp.runAsync(new Runnable() { + + @Override + public void run() { + zoneDialog.refreshZoneTableData(obData); + fireMonitorEvent(zoneDialog.getClass().getName()); + } + }); + } } 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 25801c9121..6628e2a5a7 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 @@ -50,7 +50,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * Sep 19, 2014 2757 skorolev Updated handlers for dialog buttons. * Oct 16, 2014 3220 skorolev Corrected getInstance() method. * Oct 27, 2014 3667 skorolev Cleaned code. - * Nov 21, 2014 3841 skorolev Corrected handleOkBtnSelection. + * Nov 21, 2014 3841 skorolev Corrected handleOkBtnSelection. + * Dec 11, 2014 3220 skorolev Removed unnecessary code. * * * @@ -150,7 +151,6 @@ public class SnowMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg { private void fireConfigUpdateEvent() { final IMonitorConfigurationEvent me = new IMonitorConfigurationEvent( configMgr); - shell.setCursor(getDisplay().getSystemCursor(SWT.CURSOR_WAIT)); Display.getDefault().asyncExec(new Runnable() { @Override public void run() {