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

Merge branch 'omaha_14.4.1' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_14.4.1

Browse source 
Former-commit-id: 286cf3e921 [formerly 644a076c76] [formerly 286cf3e921 [formerly 644a076c76] [formerly 5ce93f49eb [formerly 5b26ce7815295057f79a114de83e4443a5464ae4]]]
Former-commit-id: 5ce93f49eb
Former-commit-id: 58d80d455a [formerly cc41ebd2e0]
Former-commit-id: f2babdc51a
This commit is contained in:
Richard Peter 2014-12-12 10:57:15 -06:00
commit 087ce6633b
6 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java
View file

@ -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.
*
*
* </pre>
@ -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());
}
});
}
}

2
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
View file

@ -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.
*
* </pre>
*
@ -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() {

13
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java
View file

@ -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.
*
* </pre>
*
@ -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());
}
});
}
}

2
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
View file

@ -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.
*
*
* </pre>
@ -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() {

13
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java
View file

@ -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.
*
* </pre>
*
@ -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());
}
});
}
}

4
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
View file

@ -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.
*
* </pre>
*
@ -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() {