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

Omaha #3300 Fix merge of OB_14.3.1-25m

Browse source 
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632

Former-commit-id: f5dd25c8e4 [formerly a4bfd2d28b] [formerly a9562d992c [formerly 110499cec453532545431a6fa05057f47af66ed2]]
Former-commit-id: a9562d992c
Former-commit-id: 1be207dccb
This commit is contained in:
Richard Peter 2014-10-07 16:32:48 -05:00
parent 4f056d76c8
commit 901877ec7a
4 changed files with 57 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,7 +89,8 @@ public class FogMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg {
getValues();
resetStatus();
configMgr.saveConfigXml();
configMgr.saveAdjancentAreaConfigXml();
configMgr.saveAdjacentAreaConfigXml();
/**
* DR#11279: re-initialize threshold manager and the monitor
* using new monitor area configuration
@ -119,7 +120,7 @@ public class FogMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg {
}
}
}
if (fogMonitorDlg == null || fogMonitorDlg.isDisposed()) {
if ((fogMonitorDlg == null) || fogMonitorDlg.isDisposed()) {
setReturnValue(true);
close();
}
@ -147,12 +148,13 @@ public class FogMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg {
* com.raytheon.uf.viz.monitor.ui.dialogs.MonitoringAreaConfigDlg#getInstance
* ()
*/
@Override
protected FSSObsMonitorConfigurationManager getInstance() {
if (configMgr == null) {
configMgr = new FSSObsMonitorConfigurationManager(
MonName.fog.name());
}
return (FSSObsMonitorConfigurationManager) configMgr;
return configMgr;
}
/*

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

@ -83,6 +83,8 @@ public class SSMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg {
getValues();
resetStatus();
configMgr.saveConfigXml();
configMgr.saveAdjacentAreaConfigXml();
SSThresholdMgr.reInitialize();
fireConfigUpdateEvent();
@ -110,7 +112,7 @@ public class SSMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg {
}
}
}
if (ssMonitorDlg == null || ssMonitorDlg.isDisposed()) {
if ((ssMonitorDlg == null) || ssMonitorDlg.isDisposed()) {
setReturnValue(true);
close();
}
@ -138,11 +140,12 @@ public class SSMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg {
* com.raytheon.uf.viz.monitor.ui.dialogs.MonitoringAreaConfigDlg#getInstance
* ()
*/
@Override
public FSSObsMonitorConfigurationManager getInstance() {
if (configMgr == null) {
configMgr = new FSSObsMonitorConfigurationManager(MonName.ss.name());
}
return (FSSObsMonitorConfigurationManager) configMgr;
return configMgr;
}
/*

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

@ -87,12 +87,14 @@ public class SnowMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg {
getValues();
resetStatus();
configMgr.saveConfigXml();
configMgr.saveAdjacentAreaConfigXml();
SnowThresholdMgr.reInitialize();
fireConfigUpdateEvent();
if ((!configMgr.getAddedZones().isEmpty())
|| (!configMgr.getAddedStations().isEmpty())) {
if (editDialog() == SWT.YES) {
if (snowMonitorDlg == null
if ((snowMonitorDlg == null)
|| snowMonitorDlg.isDisposed()) {
snowMonitorDlg = new SnowMonDispThreshDlg(shell,
CommonConfig.AppName.SNOW,
@ -117,7 +119,7 @@ public class SnowMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg {
}
}
}
if (snowMonitorDlg == null || snowMonitorDlg.isDisposed()) {
if ((snowMonitorDlg == null) || snowMonitorDlg.isDisposed()) {
setReturnValue(true);
close();
}
@ -136,7 +138,7 @@ public class SnowMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg {
configMgr = new FSSObsMonitorConfigurationManager(
MonName.snow.name());
}
return (FSSObsMonitorConfigurationManager) configMgr;
return configMgr;
}
/*

46
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
View file

@ -117,7 +117,7 @@ public class FSSObsMonitorConfigurationManager implements
private String adjAreaConfigFileName = null;
/** List of listeners */
private List<MonitorConfigListener> listeners = new CopyOnWriteArrayList<MonitorConfigListener>();
private final List<MonitorConfigListener> listeners = new CopyOnWriteArrayList<MonitorConfigListener>();
/** Current site */
private String currentSite;
@ -175,7 +175,7 @@ public class FSSObsMonitorConfigurationManager implements
if (instance == null) {
instance = new FSSObsMonitorConfigurationManager(monitor);
}
return (FSSObsMonitorConfigurationManager) instance;
return instance;
}
/**
@ -417,10 +417,10 @@ public class FSSObsMonitorConfigurationManager implements
AreaIdXML area = new AreaIdXML();
area.setAreaId(areaId);
area.setType(type);
if (lat > -90.0 && lat < 90.0) {
if ((lat > -90.0) && (lat < 90.0)) {
area.setCLat(lat);
}
if (lon > -180.0 && lon < 180.0) {
if ((lon > -180.0) && (lon < 180.0)) {
area.setCLon(lon);
}
configXml.addAreaId(area);
@ -971,4 +971,42 @@ public class FSSObsMonitorConfigurationManager implements
this.isPopulated = isPopulated;
}
/**
* Remove Adjacent Area.
*
* @param zone
*/
public void removeAdjArea(String zone) {
List<AreaIdXML> adjAreaList = adjAreaConfigXml.getAreaIds();
for (int i = 0; i < adjAreaList.size(); i++) {
if (adjAreaList.get(i).getAreaId().equals(zone)) {
adjAreaList.remove(i);
break;
}
}
}
/**
* Add Adjacent Area.
*
* @param areaId
* @param type
*/
public void addAdjArea(String areaId, ZoneType type) {
List<AreaIdXML> adjAreaList = adjAreaConfigXml.getAreaIds();
boolean areaExists = false;
for (AreaIdXML area : adjAreaList) {
if (area.getAreaId().equals(areaId)) {
area.setType(type);
areaExists = true;
break;
}
}
if (areaExists == false) {
AreaIdXML area = new AreaIdXML();
area.setAreaId(areaId);
area.setType(type);
adjAreaConfigXml.addAreaId(area);
}
}
}