From 11db335c3aaafa60dca066d76656d2d70b26acc1 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Tue, 13 May 2014 13:06:09 -0500 Subject: [PATCH] Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt Change-Id: I362c5c2ece96e77a0cce5af7ac75a403c95ab851 Former-commit-id: 174fae77d1afd13b2770c621f630dc0079b2e598 [formerly 07426ce40898b287e11ab20245890ce0c3e6add4 [formerly b842a78cdfb945767aecf7da3ad55b71c9d09bfb]] Former-commit-id: 07426ce40898b287e11ab20245890ce0c3e6add4 Former-commit-id: e464500dfc5e1d2097107a9be7c6b391acb386b7 --- .../monitor/ffmp/ui/dialogs/FFMPTable.java | 2 +- .../ffmp/ui/dialogs/FFMPTableComp.java | 2 +- .../ffmp/ui/dialogs/FfmpTableConfigData.java | 4 +-- .../uf/viz/monitor/fog/FogDataGenerator.java | 4 +-- .../fog/ui/dialogs/FogZoneTableDlg.java | 2 +- .../viz/monitor/safeseas/SafeSeasMonitor.java | 2 +- .../uf/viz/monitor/scan/ScanMonitor.java | 2 +- .../uf/viz/monitor/scan/ScanStarterJob.java | 2 +- .../commondialogs/DmdDisplayFilterDlg.java | 4 +-- .../commondialogs/EditCreateTrendDlg.java | 2 +- .../scan/commondialogs/LoadSaveConfigDlg.java | 2 +- .../commondialogs/SCANAlarmThreshDlg.java | 4 +-- .../scan/commondialogs/SCANAttributesDlg.java | 2 +- .../commondialogs/SCANColorThreshDlg.java | 2 +- .../scan/commondialogs/SCANUnwarnedDlg.java | 2 +- .../commondialogs/StormCellIdDisplayDlg.java | 4 +-- .../scan/commondialogs/TimeHeightDlg.java | 2 +- .../scan/commondialogs/TimeHeightGraph.java | 2 +- .../scan/commondialogs/TrendGraphCanvas.java | 2 +- .../scan/commondialogs/TrendGraphDlg.java | 2 +- .../scan/commondialogs/TrendSetsGraphDlg.java | 2 +- .../monitor/scan/config/AbsConfigMgr.java | 5 +-- .../monitor/scan/config/CellConfigMgr.java | 2 +- .../monitor/scan/config/DmdConfigMgr.java | 2 +- .../monitor/scan/config/MesoConfigMgr.java | 2 +- .../viz}/monitor/scan/config/SCANConfig.java | 34 +++++-------------- .../monitor/scan/config/TvsConfigMgr.java | 2 +- .../monitor/scan/data/ScanDataGenerator.java | 2 +- .../monitor/scan/resource/ScanResource.java | 2 +- .../monitor/scan/tables/AbstractTableDlg.java | 2 +- .../scan/tables/SCANAlarmAlertManager.java | 2 +- .../monitor/scan/tables/SCANCellTableDlg.java | 6 ++-- .../monitor/scan/tables/SCANDmdTableDlg.java | 6 ++-- .../monitor/scan/tables/SCANMesoTableDlg.java | 4 +-- .../uf/viz/monitor/scan/tables/SCANTable.java | 4 +-- .../scan/tables/SCANTableCellData.java | 2 +- .../scan/tables/SCANToolTipTextMgr.java | 4 +-- .../monitor/scan/tables/SCANTvsTableDlg.java | 4 +-- .../viz/monitor/snow/test/DataGenerator.java | 4 +-- .../META-INF/MANIFEST.MF | 1 + .../monitor/config}/CommonTableConfig.java | 8 ++++- .../viz}/monitor/data/ColumnAttribData.java | 6 ++-- .../uf/viz/monitor/data/ObHourReports.java | 2 +- .../viz/monitor/data/ObMultiHrsReports.java | 4 +-- .../uf/viz/monitor/data/ObStnHourReports.java | 2 +- .../viz/monitor/data/ObZoneHourReports.java | 2 +- .../uf/viz/monitor/data/TableCellData.java | 4 +-- .../uf/viz/monitor/data/TableData.java | 2 +- .../uf/viz/monitor/data/TableUtil.java | 6 ++-- .../thresholds/AbstractThresholdMgr.java | 2 +- .../monitor/ui/dialogs/ObsHistConfigDlg.java | 4 +-- .../monitor/ui/dialogs/ObsHistTableComp.java | 6 ++-- .../monitor/ui/dialogs/ObsHistTableDlg.java | 2 +- .../monitor/ui/dialogs/StationTableComp.java | 4 +-- .../monitor/ui/dialogs/TableAttribDlg.java | 2 +- .../uf/viz/monitor/ui/dialogs/TableComp.java | 6 ++-- .../viz/monitor/ui/dialogs/ZoneTableComp.java | 4 +-- .../viz/monitor/ui/dialogs/ZoneTableDlg.java | 18 ++++++---- .../scan/data/CellTableDataRow.java | 5 +-- .../META-INF/MANIFEST.MF | 1 - .../config/MonitorConfigurationManager.java | 11 +++--- .../uf/common/monitor/scan/ScanUtils.java | 25 ++++++++++++++ .../scan/lightning/LightningRetriever.java | 7 +++- 63 files changed, 149 insertions(+), 126 deletions(-) rename {edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common => cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz}/monitor/scan/config/AbsConfigMgr.java (99%) rename {edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common => cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz}/monitor/scan/config/CellConfigMgr.java (99%) rename {edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common => cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz}/monitor/scan/config/DmdConfigMgr.java (99%) rename {edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common => cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz}/monitor/scan/config/MesoConfigMgr.java (99%) rename {edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common => cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz}/monitor/scan/config/SCANConfig.java (98%) rename {edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common => cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz}/monitor/scan/config/TvsConfigMgr.java (99%) rename {edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/data => cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/config}/CommonTableConfig.java (99%) rename {edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common => cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz}/monitor/data/ColumnAttribData.java (96%) diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java index 7c2ccaa8d4..3fc9f2624f 100644 --- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java +++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java @@ -47,9 +47,9 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import com.raytheon.uf.common.monitor.data.ColumnAttribData; import com.raytheon.uf.common.monitor.data.CommonConfig; import com.raytheon.uf.common.monitor.data.CommonConfig.AppName; +import com.raytheon.uf.viz.monitor.data.ColumnAttribData; import com.raytheon.uf.viz.monitor.ffmp.ui.dialogs.FFMPConfig.ThreshColNames; import com.raytheon.uf.viz.monitor.ffmp.ui.dialogs.FfmpTableConfigData.COLUMN_NAME; import com.raytheon.uf.viz.monitor.ffmp.xml.FFMPConfigBasinXML; diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTableComp.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTableComp.java index 1eb2ffc8f1..278f4fb2cf 100644 --- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTableComp.java +++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTableComp.java @@ -27,7 +27,7 @@ import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.TableItem; -import com.raytheon.uf.common.monitor.data.ColumnAttribData; +import com.raytheon.uf.viz.monitor.data.ColumnAttribData; import com.raytheon.uf.viz.monitor.ffmp.ui.dialogs.FFMPConfig.ThreshColNames; public class FFMPTableComp extends FFMPTable { diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpTableConfigData.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpTableConfigData.java index 96950ccc9c..b3007fab8b 100644 --- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpTableConfigData.java +++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpTableConfigData.java @@ -28,11 +28,11 @@ import java.util.Set; import com.raytheon.uf.common.monitor.config.FFMPRunConfigurationManager; import com.raytheon.uf.common.monitor.config.FFMPSourceConfigurationManager; -import com.raytheon.uf.common.monitor.data.ColumnAttribData; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.SortDirection; import com.raytheon.uf.common.monitor.xml.FFMPRunXML; import com.raytheon.uf.common.monitor.xml.ProductRunXML; import com.raytheon.uf.common.monitor.xml.ProductXML; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.SortDirection; +import com.raytheon.uf.viz.monitor.data.ColumnAttribData; import com.raytheon.uf.viz.monitor.ffmp.FFMPMonitor; import com.raytheon.uf.viz.monitor.ffmp.xml.FFMPTableColumnXML; diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogDataGenerator.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogDataGenerator.java index 539431bd18..630134bfbf 100644 --- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogDataGenerator.java +++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogDataGenerator.java @@ -26,9 +26,9 @@ import java.util.Map; import com.raytheon.uf.common.dataplugin.fog.FogRecord; import com.raytheon.uf.common.dataplugin.fog.FogRecord.FOG_THREAT; import com.raytheon.uf.common.monitor.data.CommonConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.CellType; import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.CellType; import com.raytheon.uf.viz.monitor.data.ObReport; import com.raytheon.uf.viz.monitor.data.ObsData; import com.raytheon.uf.viz.monitor.data.TableCellData; 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 9f9a5b10fa..dbc31b3cf8 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 @@ -30,10 +30,10 @@ import org.eclipse.swt.widgets.Shell; import com.raytheon.uf.common.monitor.config.FogMonitorConfigurationManager; import com.raytheon.uf.common.monitor.config.MonitorConfigurationManager; import com.raytheon.uf.common.monitor.data.CommonConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.CellType; import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey; import com.raytheon.uf.common.monitor.data.ObConst.DisplayVarName; import com.raytheon.uf.viz.monitor.IMonitor; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.CellType; import com.raytheon.uf.viz.monitor.data.ObMultiHrsReports; import com.raytheon.uf.viz.monitor.events.IMonitorConfigurationEvent; import com.raytheon.uf.viz.monitor.events.IMonitorEvent; 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 4f4a043532..b632297402 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 @@ -39,7 +39,6 @@ import com.raytheon.uf.common.monitor.MonitorAreaUtils; import com.raytheon.uf.common.monitor.config.SSMonitorConfigurationManager; import com.raytheon.uf.common.monitor.data.AdjacentWfoMgr; import com.raytheon.uf.common.monitor.data.CommonConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.CellType; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; @@ -49,6 +48,7 @@ import com.raytheon.uf.viz.core.notification.NotificationMessage; import com.raytheon.uf.viz.monitor.IMonitor; import com.raytheon.uf.viz.monitor.Monitor; import com.raytheon.uf.viz.monitor.ObsMonitor; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.CellType; import com.raytheon.uf.viz.monitor.data.MonitoringArea; import com.raytheon.uf.viz.monitor.data.ObMultiHrsReports; import com.raytheon.uf.viz.monitor.data.ObReport; diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanMonitor.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanMonitor.java index 814202a4d9..249715a34d 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanMonitor.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanMonitor.java @@ -62,7 +62,6 @@ import com.raytheon.uf.common.geospatial.SpatialException; import com.raytheon.uf.common.geospatial.SpatialQueryFactory; import com.raytheon.uf.common.geospatial.SpatialQueryResult; import com.raytheon.uf.common.monitor.scan.ScanUtils; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.DMDTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; @@ -84,6 +83,7 @@ import com.raytheon.uf.viz.monitor.events.IMonitorConfigurationEvent; import com.raytheon.uf.viz.monitor.events.IMonitorThresholdEvent; import com.raytheon.uf.viz.monitor.scan.ScanTime.ScanTimeType; import com.raytheon.uf.viz.monitor.scan.commondialogs.SCANSplash; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.uf.viz.monitor.scan.data.DMDScanData; import com.raytheon.uf.viz.monitor.scan.data.UnwarnedCell; import com.raytheon.uf.viz.monitor.scan.listeners.IScanDialogListener; diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanStarterJob.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanStarterJob.java index 196c8d9f1b..de1463732a 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanStarterJob.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanStarterJob.java @@ -26,9 +26,9 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.viz.core.VizApp; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; /** * A job that sets up the ScanMonitor then asks the UI thread to open the diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/DmdDisplayFilterDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/DmdDisplayFilterDlg.java index dd2be706ae..4542a1e54b 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/DmdDisplayFilterDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/DmdDisplayFilterDlg.java @@ -32,12 +32,12 @@ import org.eclipse.swt.widgets.Layout; import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Shell; -import com.raytheon.uf.common.monitor.scan.config.DmdConfigMgr; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.DMDTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.common.monitor.scan.xml.SCANAttributesXML; import com.raytheon.uf.common.monitor.scan.xml.SCANConfigDmdXML; +import com.raytheon.uf.viz.monitor.scan.config.DmdConfigMgr; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.viz.ui.dialogs.CaveSWTDialog; /** diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/EditCreateTrendDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/EditCreateTrendDlg.java index 6d58fce283..bdb4a6606b 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/EditCreateTrendDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/EditCreateTrendDlg.java @@ -37,9 +37,9 @@ import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.common.monitor.scan.config.TrendSetConfigMgr; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.viz.ui.dialogs.CaveSWTDialog; /** diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/LoadSaveConfigDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/LoadSaveConfigDlg.java index 3cad018797..10f0e5e5a4 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/LoadSaveConfigDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/LoadSaveConfigDlg.java @@ -42,8 +42,8 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType; import com.raytheon.uf.common.localization.LocalizationFile; import com.raytheon.uf.common.localization.PathManagerFactory; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.viz.ui.dialogs.CaveSWTDialog; /** diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANAlarmThreshDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANAlarmThreshDlg.java index 96735a8222..3e9f5ea3c7 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANAlarmThreshDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANAlarmThreshDlg.java @@ -37,10 +37,10 @@ import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import com.raytheon.uf.common.monitor.scan.config.AbsConfigMgr; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.viz.monitor.scan.ScanMonitor; +import com.raytheon.uf.viz.monitor.scan.config.AbsConfigMgr; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.uf.viz.monitor.scan.tables.AbstractTableDlg; import com.raytheon.uf.viz.monitor.scan.tables.SCANAlarmAlertManager; import com.raytheon.uf.viz.monitor.scan.tables.SCANAlarmAlertManager.AlarmType; diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANAttributesDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANAttributesDlg.java index 31744d6cfd..3c15e365db 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANAttributesDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANAttributesDlg.java @@ -32,8 +32,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Layout; import org.eclipse.swt.widgets.Shell; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.viz.ui.dialogs.CaveSWTDialog; /** diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANColorThreshDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANColorThreshDlg.java index 6306e70368..16d894775d 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANColorThreshDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANColorThreshDlg.java @@ -37,9 +37,9 @@ import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanThresholdColor; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.viz.ui.dialogs.CaveSWTDialog; /** diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java index 0dcb0d4afe..87884d22a7 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java @@ -33,9 +33,9 @@ import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Spinner; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanColors; import com.raytheon.uf.common.monitor.scan.config.UnwarnedConfig; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.viz.ui.dialogs.CaveSWTDialog; /** diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/StormCellIdDisplayDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/StormCellIdDisplayDlg.java index eae64f77b0..cfb0ffe75d 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/StormCellIdDisplayDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/StormCellIdDisplayDlg.java @@ -37,12 +37,12 @@ import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Spinner; -import com.raytheon.uf.common.monitor.scan.config.CellConfigMgr; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.CELLTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.common.monitor.scan.xml.SCANAttributesXML; import com.raytheon.uf.common.monitor.scan.xml.SCANConfigCellXML; +import com.raytheon.uf.viz.monitor.scan.config.CellConfigMgr; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.viz.ui.dialogs.CaveSWTDialog; /** diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TimeHeightDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TimeHeightDlg.java index e26c1611e5..e53b1b82b9 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TimeHeightDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TimeHeightDlg.java @@ -37,9 +37,9 @@ import org.eclipse.swt.widgets.Layout; import org.eclipse.swt.widgets.Shell; import com.raytheon.uf.common.dataplugin.scan.data.DMDTableDataRow; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.viz.ui.dialogs.CaveSWTDialog; import com.raytheon.viz.ui.dialogs.ICloseCallback; diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TimeHeightGraph.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TimeHeightGraph.java index 9dd8eeba9e..37d89520a1 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TimeHeightGraph.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TimeHeightGraph.java @@ -48,9 +48,9 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import com.raytheon.uf.common.dataplugin.scan.data.DMDTableDataRow; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.viz.monitor.scan.commondialogs.EllipseData.EllipseType; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; /** * Composite containing the Time Height Graph canvas that will draw the diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TrendGraphCanvas.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TrendGraphCanvas.java index 8652912fec..b60d8b4b6e 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TrendGraphCanvas.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TrendGraphCanvas.java @@ -44,10 +44,10 @@ import org.eclipse.swt.widgets.Display; import com.raytheon.rcm.products.ElevationInfo; import com.raytheon.uf.common.monitor.scan.ScanUtils; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.common.monitor.scan.xml.SCANAttributesXML; import com.raytheon.uf.viz.monitor.scan.TrendGraphData; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; /** * diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TrendGraphDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TrendGraphDlg.java index 82ada043fc..a26aee5b83 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TrendGraphDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TrendGraphDlg.java @@ -30,9 +30,9 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Layout; import org.eclipse.swt.widgets.Shell; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.viz.monitor.scan.TrendGraphData; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.viz.ui.dialogs.CaveSWTDialog; /** diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TrendSetsGraphDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TrendSetsGraphDlg.java index b478571152..bee5c02844 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TrendSetsGraphDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TrendSetsGraphDlg.java @@ -34,10 +34,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Layout; import org.eclipse.swt.widgets.Shell; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.common.monitor.scan.config.TrendSetConfigMgr; import com.raytheon.uf.viz.monitor.scan.TrendGraphData; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.viz.ui.dialogs.CaveSWTDialog; /** diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/AbsConfigMgr.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/AbsConfigMgr.java similarity index 99% rename from edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/AbsConfigMgr.java rename to cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/AbsConfigMgr.java index 09665f9bb2..f1cb54597d 100644 --- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/AbsConfigMgr.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/AbsConfigMgr.java @@ -17,7 +17,7 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.monitor.scan.config; +package com.raytheon.uf.viz.monitor.scan.config; import java.awt.Point; import java.util.ArrayList; @@ -32,7 +32,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType; import com.raytheon.uf.common.localization.LocalizationFile; import com.raytheon.uf.common.localization.PathManagerFactory; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.SortDirection; +import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanThresholdColor; import com.raytheon.uf.common.monitor.scan.xml.SCANAbstractXML; import com.raytheon.uf.common.monitor.scan.xml.SCANAttributesXML; @@ -43,6 +43,7 @@ import com.raytheon.uf.common.monitor.scan.xml.SCANConfigTvsXML; import com.raytheon.uf.common.serialization.JAXBManager; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.SortDirection; /** * Abstract class used for common configuration data for the CELL, DMD, MESO, diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/CellConfigMgr.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/CellConfigMgr.java similarity index 99% rename from edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/CellConfigMgr.java rename to cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/CellConfigMgr.java index 8353bd587e..3651a5af95 100644 --- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/CellConfigMgr.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/CellConfigMgr.java @@ -17,7 +17,7 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.monitor.scan.config; +package com.raytheon.uf.viz.monitor.scan.config; import java.io.File; import java.util.ArrayList; diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/DmdConfigMgr.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/DmdConfigMgr.java similarity index 99% rename from edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/DmdConfigMgr.java rename to cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/DmdConfigMgr.java index ddf7d49093..60e2c0cf65 100644 --- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/DmdConfigMgr.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/DmdConfigMgr.java @@ -17,7 +17,7 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.monitor.scan.config; +package com.raytheon.uf.viz.monitor.scan.config; import java.io.File; import java.util.ArrayList; diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/MesoConfigMgr.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/MesoConfigMgr.java similarity index 99% rename from edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/MesoConfigMgr.java rename to cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/MesoConfigMgr.java index 6cb945755f..3f4b92db7f 100644 --- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/MesoConfigMgr.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/MesoConfigMgr.java @@ -17,7 +17,7 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.monitor.scan.config; +package com.raytheon.uf.viz.monitor.scan.config; import java.io.File; import java.util.ArrayList; diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/SCANConfig.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/SCANConfig.java similarity index 98% rename from edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/SCANConfig.java rename to cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/SCANConfig.java index d149a7dc8a..a7c9c16c30 100644 --- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/SCANConfig.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/SCANConfig.java @@ -17,7 +17,7 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.monitor.scan.config; +package com.raytheon.uf.viz.monitor.scan.config; import java.awt.Point; import java.util.ArrayList; @@ -30,7 +30,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.widgets.Display; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.SortDirection; +import com.raytheon.uf.common.monitor.scan.config.DmdDisplayFilterConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.CELLTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.DMDTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.MESOTable; @@ -39,7 +39,11 @@ import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanThresholdColor; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.TVSTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.WARN_TYPE; +import com.raytheon.uf.common.monitor.scan.config.StormCellConfig; +import com.raytheon.uf.common.monitor.scan.config.TrendSetConfigMgr; +import com.raytheon.uf.common.monitor.scan.config.UnwarnedConfig; import com.raytheon.uf.common.monitor.scan.xml.SCANAttributesXML; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.SortDirection; /** * Configuration class used for SCAN. This is a singleton class. @@ -50,7 +54,8 @@ import com.raytheon.uf.common.monitor.scan.xml.SCANAttributesXML; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Oct 25, 2009 3039 lvenable Initial creation - * Apr 25, 2013 1926 njensen synchronized instance creation + * Apr 25, 2013 1926 njensen synchronized instance creation + * May 13, 2014 3133 njensen Moved from common to viz plugin * * * @@ -1604,29 +1609,6 @@ public class SCANConfig { return mesoClassificationFormatMap.get(rank); } - /** - * Convert strength rank from string to double - * - * @param stRank - * @return - */ - public double convertStrankValue(String stRank) { - double tmpValue = Double.NaN; - - if (stRank.matches("[0-9.]+") == true) { - tmpValue = Double.valueOf(stRank); - } else if (stRank.endsWith("L") || stRank.endsWith("M")) { - try { - tmpValue = Double.valueOf(stRank.substring(0, - stRank.length() - 1)); - } catch (Exception ex) { - tmpValue = -999.0; - } - } - - return tmpValue; - } - /** * Determine the Base data color for DMD * diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/TvsConfigMgr.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/TvsConfigMgr.java similarity index 99% rename from edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/TvsConfigMgr.java rename to cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/TvsConfigMgr.java index 50854331b1..91d9f2bf83 100644 --- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/TvsConfigMgr.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/config/TvsConfigMgr.java @@ -17,7 +17,7 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.monitor.scan.config; +package com.raytheon.uf.viz.monitor.scan.config; import java.io.File; import java.util.ArrayList; diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/data/ScanDataGenerator.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/data/ScanDataGenerator.java index 23f38e07e0..039f317817 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/data/ScanDataGenerator.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/data/ScanDataGenerator.java @@ -29,10 +29,10 @@ import com.raytheon.uf.common.dataplugin.scan.data.ScanTableDataRow; import com.raytheon.uf.common.dataplugin.scan.data.TVSTableDataRow; import com.raytheon.uf.common.monitor.scan.ScanUtils; import com.raytheon.uf.common.monitor.scan.config.DmdDisplayFilterConfig; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.viz.monitor.scan.ScanMonitor; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.uf.viz.monitor.scan.tables.SCANTableCellData; import com.raytheon.uf.viz.monitor.scan.tables.SCANTableData; import com.raytheon.uf.viz.monitor.scan.tables.SCANTableRowData; diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResource.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResource.java index b9698bd02f..83390e55a3 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResource.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResource.java @@ -38,7 +38,6 @@ import com.raytheon.uf.common.dataplugin.scan.data.DMDTableDataRow; import com.raytheon.uf.common.dataplugin.scan.data.ScanTableData; import com.raytheon.uf.common.dataplugin.scan.data.ScanTableDataRow; import com.raytheon.uf.common.geospatial.ReferencedCoordinate; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; @@ -63,6 +62,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability; import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability; import com.raytheon.uf.viz.monitor.scan.ScanMonitor; import com.raytheon.uf.viz.monitor.scan.ScanSampleConfigManager; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.uf.viz.monitor.scan.listeners.IScanRadarListener; import com.raytheon.uf.viz.monitor.scan.xml.CellXML; import com.raytheon.uf.viz.monitor.scan.xml.DmdXML; diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java index 446e093b63..9f3eefb9e1 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java @@ -49,7 +49,6 @@ import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Shell; import com.raytheon.uf.common.localization.LocalizationFile; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.common.time.DataTime; import com.raytheon.uf.viz.core.alerts.AlertMessage; @@ -66,6 +65,7 @@ import com.raytheon.uf.viz.monitor.scan.commondialogs.ICommonDialogAction; import com.raytheon.uf.viz.monitor.scan.commondialogs.IRequestTrendGraphData; import com.raytheon.uf.viz.monitor.scan.commondialogs.LoadSaveConfigDlg; import com.raytheon.uf.viz.monitor.scan.commondialogs.LoadSaveConfigDlg.DialogType; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.viz.ui.dialogs.CaveSWTDialog; import com.raytheon.viz.ui.dialogs.ICloseCallback; diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANAlarmAlertManager.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANAlarmAlertManager.java index c8cd2b35e4..c0fc8eab45 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANAlarmAlertManager.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANAlarmAlertManager.java @@ -34,10 +34,10 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.eclipse.swt.SWT; import com.raytheon.uf.common.dataplugin.scan.data.ScanTableData; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.viz.monitor.scan.ScanMonitor; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.uf.viz.monitor.scan.data.ScanDataGenerator; /** diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java index 44944ff4d7..55362ac9d2 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java @@ -48,9 +48,6 @@ import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Shell; -import com.raytheon.uf.common.monitor.scan.config.AbsConfigMgr; -import com.raytheon.uf.common.monitor.scan.config.CellConfigMgr; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.MESOTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanColors; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; @@ -71,6 +68,9 @@ import com.raytheon.uf.viz.monitor.scan.commondialogs.SCANAttributesDlg; import com.raytheon.uf.viz.monitor.scan.commondialogs.SCANColorThreshDlg; import com.raytheon.uf.viz.monitor.scan.commondialogs.SCANUnwarnedDlg; import com.raytheon.uf.viz.monitor.scan.commondialogs.StormCellIdDisplayDlg; +import com.raytheon.uf.viz.monitor.scan.config.AbsConfigMgr; +import com.raytheon.uf.viz.monitor.scan.config.CellConfigMgr; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.uf.viz.monitor.scan.data.ScanDataGenerator; import com.raytheon.uf.viz.monitor.scan.data.UnwarnedCell; import com.raytheon.uf.viz.monitor.scan.tables.SCANAlarmAlertManager.AlarmType; diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java index dd2a2a6871..17eceebde3 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java @@ -49,9 +49,6 @@ import org.eclipse.swt.widgets.Shell; import com.raytheon.uf.common.dataplugin.scan.data.DMDTableDataRow; import com.raytheon.uf.common.dataplugin.scan.data.ScanTableData; -import com.raytheon.uf.common.monitor.scan.config.AbsConfigMgr; -import com.raytheon.uf.common.monitor.scan.config.DmdConfigMgr; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.DMDTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanColors; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; @@ -74,6 +71,9 @@ import com.raytheon.uf.viz.monitor.scan.commondialogs.SCANAlarmThreshDlg; import com.raytheon.uf.viz.monitor.scan.commondialogs.SCANAlarmTimeLimitDlg; import com.raytheon.uf.viz.monitor.scan.commondialogs.SCANAttributesDlg; import com.raytheon.uf.viz.monitor.scan.commondialogs.SCANColorThreshDlg; +import com.raytheon.uf.viz.monitor.scan.config.AbsConfigMgr; +import com.raytheon.uf.viz.monitor.scan.config.DmdConfigMgr; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.uf.viz.monitor.scan.data.ScanDataGenerator; import com.raytheon.uf.viz.monitor.scan.tables.SCANAlarmAlertManager.AlarmType; import com.raytheon.viz.ui.EditorUtil; diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java index 26cfe774d7..ae60db3c32 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java @@ -42,8 +42,6 @@ import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.Shell; import com.raytheon.uf.common.dataplugin.scan.data.ScanTableData; -import com.raytheon.uf.common.monitor.scan.config.MesoConfigMgr; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.CELLTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.MESOTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanColors; @@ -58,6 +56,8 @@ import com.raytheon.uf.viz.monitor.scan.commondialogs.IThresholdUpdate; import com.raytheon.uf.viz.monitor.scan.commondialogs.SCANAlarmTimeLimitDlg; import com.raytheon.uf.viz.monitor.scan.commondialogs.SCANAttributesDlg; import com.raytheon.uf.viz.monitor.scan.commondialogs.SCANColorThreshDlg; +import com.raytheon.uf.viz.monitor.scan.config.MesoConfigMgr; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.uf.viz.monitor.scan.data.ScanDataGenerator; import com.raytheon.viz.ui.dialogs.ICloseCallback; diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTable.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTable.java index 9401f2dc17..144aed1a50 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTable.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTable.java @@ -54,13 +54,13 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.SortDirection; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanColors; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.TVSTable; import com.raytheon.uf.common.time.DataTime; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.SortDirection; import com.raytheon.uf.viz.monitor.scan.ScanMonitor; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; import com.raytheon.uf.viz.monitor.scan.data.ScanDataGenerator; import com.raytheon.uf.viz.monitor.scan.tables.SCANAlarmAlertManager.AlertedAlarms; diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTableCellData.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTableCellData.java index e765b0a52c..cf2c8050a9 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTableCellData.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTableCellData.java @@ -25,7 +25,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.widgets.Display; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.CELLTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.DMDTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.MESOTable; @@ -33,6 +32,7 @@ import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanThresholdColor; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.TVSTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.WARN_TYPE; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; /** * diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANToolTipTextMgr.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANToolTipTextMgr.java index 28442345fa..07371dc74c 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANToolTipTextMgr.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANToolTipTextMgr.java @@ -21,13 +21,13 @@ package com.raytheon.uf.viz.monitor.scan.tables; import java.util.HashMap; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.SortDirection; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.CELLTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.DMDTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.MESOTable; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.TVSTable; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.SortDirection; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; public class SCANToolTipTextMgr { private static SCANToolTipTextMgr classInstance; diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java index 32cc1fb0e1..b6f405e991 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java @@ -43,10 +43,8 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.Shell; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanColors; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; -import com.raytheon.uf.common.monitor.scan.config.TvsConfigMgr; import com.raytheon.uf.viz.monitor.IMonitor; import com.raytheon.uf.viz.monitor.events.IMonitorConfigurationEvent; import com.raytheon.uf.viz.monitor.events.IMonitorEvent; @@ -57,6 +55,8 @@ import com.raytheon.uf.viz.monitor.scan.commondialogs.IThresholdUpdate; import com.raytheon.uf.viz.monitor.scan.commondialogs.SCANAlarmTimeLimitDlg; import com.raytheon.uf.viz.monitor.scan.commondialogs.SCANAttributesDlg; import com.raytheon.uf.viz.monitor.scan.commondialogs.SCANColorThreshDlg; +import com.raytheon.uf.viz.monitor.scan.config.SCANConfig; +import com.raytheon.uf.viz.monitor.scan.config.TvsConfigMgr; import com.raytheon.uf.viz.monitor.scan.data.ScanDataGenerator; import com.raytheon.viz.ui.dialogs.ICloseCallback; diff --git a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/test/DataGenerator.java b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/test/DataGenerator.java index 3c0c80d212..a380c803e0 100644 --- a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/test/DataGenerator.java +++ b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/test/DataGenerator.java @@ -22,8 +22,8 @@ package com.raytheon.uf.viz.monitor.snow.test; import java.util.Date; import com.raytheon.uf.common.monitor.data.CommonConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.CellType; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.CellType; import com.raytheon.uf.viz.monitor.data.TableCellData; import com.raytheon.uf.viz.monitor.data.TableData; import com.raytheon.uf.viz.monitor.data.TableRowData; diff --git a/cave/com.raytheon.uf.viz.monitor/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.monitor/META-INF/MANIFEST.MF index 37cd2c8833..747166e428 100644 --- a/cave/com.raytheon.uf.viz.monitor/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.monitor/META-INF/MANIFEST.MF @@ -18,6 +18,7 @@ Require-Bundle: org.eclipse.ui, com.raytheon.uf.common.wxmath Bundle-ActivationPolicy: lazy Export-Package: com.raytheon.uf.viz.monitor, + com.raytheon.uf.viz.monitor.config, com.raytheon.uf.viz.monitor.data, com.raytheon.uf.viz.monitor.events, com.raytheon.uf.viz.monitor.filename, diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/data/CommonTableConfig.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/config/CommonTableConfig.java similarity index 99% rename from edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/data/CommonTableConfig.java rename to cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/config/CommonTableConfig.java index 02993b5dbb..69333a891c 100644 --- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/data/CommonTableConfig.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/config/CommonTableConfig.java @@ -17,13 +17,19 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.monitor.data; +package com.raytheon.uf.viz.monitor.config; import java.util.HashMap; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.RGB; +import com.raytheon.uf.common.monitor.data.CommonConfig; +import com.raytheon.uf.common.monitor.data.ObConst; +import com.raytheon.uf.common.monitor.data.CommonConfig.AppName; +import com.raytheon.uf.common.monitor.data.ObConst.VarName; +import com.raytheon.uf.viz.monitor.data.ColumnAttribData; + /** * Common configuration data for the table (zone, station, obs history, etc.). * diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/data/ColumnAttribData.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ColumnAttribData.java similarity index 96% rename from edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/data/ColumnAttribData.java rename to cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ColumnAttribData.java index c1685626d6..d6112195c3 100644 --- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/data/ColumnAttribData.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ColumnAttribData.java @@ -17,10 +17,10 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.monitor.data; +package com.raytheon.uf.viz.monitor.data; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.GraphType; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.SortDirection; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.GraphType; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.SortDirection; /** * Attributes for a table column. diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java index b2658e57f6..b3cf8d1397 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java @@ -27,9 +27,9 @@ import java.util.Map; import com.raytheon.uf.common.monitor.data.CommonConfig; import com.raytheon.uf.common.monitor.data.CommonConfig.AppName; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.CellType; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.CellType; import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr; /** 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 index 798abe5fff..f68b2a26c6 100644 --- 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 @@ -31,10 +31,10 @@ import java.util.TreeMap; import com.raytheon.uf.common.monitor.data.CommonConfig; import com.raytheon.uf.common.monitor.data.CommonConfig.AppName; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.CellType; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.ObsHistType; import com.raytheon.uf.common.monitor.data.ObConst; import com.raytheon.uf.common.time.SimulatedTime; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.CellType; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.ObsHistType; import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr; /** diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObStnHourReports.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObStnHourReports.java index e2a057dc3a..1da0062368 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObStnHourReports.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObStnHourReports.java @@ -25,7 +25,7 @@ import java.util.SortedMap; import java.util.TreeMap; import com.raytheon.uf.common.monitor.data.CommonConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.CellType; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.CellType; import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr; diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObZoneHourReports.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObZoneHourReports.java index 0bd541647a..2eab2d8cc6 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObZoneHourReports.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObZoneHourReports.java @@ -23,9 +23,9 @@ import java.util.Date; import java.util.HashMap; import com.raytheon.uf.common.monitor.data.CommonConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.CellType; import com.raytheon.uf.common.monitor.data.ObConst; import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.CellType; import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr; import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants; diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableCellData.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableCellData.java index ea17b3176e..f15e6fda2e 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableCellData.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableCellData.java @@ -25,9 +25,9 @@ import java.util.Date; import org.eclipse.swt.graphics.RGB; -import com.raytheon.uf.common.monitor.data.CommonTableConfig; import com.raytheon.uf.common.monitor.data.ObConst; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.CellType; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.CellType; /** * Table cell data class to define how the data is to be displayed in a table. diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableData.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableData.java index 72ec50247b..b0745bed39 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableData.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableData.java @@ -25,7 +25,7 @@ import java.util.Collections; import org.eclipse.swt.SWT; import com.raytheon.uf.common.monitor.data.CommonConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.SortDirection; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.SortDirection; import com.raytheon.uf.viz.monitor.ui.dialogs.ISortColumn; /** diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableUtil.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableUtil.java index 13cc78991c..0c393e01b0 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableUtil.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableUtil.java @@ -27,11 +27,11 @@ import com.raytheon.uf.common.geospatial.SpatialQueryFactory; import com.raytheon.uf.common.monitor.MonitorAreaUtils; import com.raytheon.uf.common.monitor.data.CommonConfig; import com.raytheon.uf.common.monitor.data.CommonConfig.AppName; -import com.raytheon.uf.common.monitor.data.CommonTableConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.CellType; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.ObsHistType; import com.raytheon.uf.common.monitor.data.ObConst; import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.CellType; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.ObsHistType; import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr; import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants; diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/thresholds/AbstractThresholdMgr.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/thresholds/AbstractThresholdMgr.java index 91aa4a8c89..821879e756 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/thresholds/AbstractThresholdMgr.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/thresholds/AbstractThresholdMgr.java @@ -31,9 +31,9 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType; import com.raytheon.uf.common.localization.LocalizationFile; import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.common.monitor.config.MonitorConfigurationManager; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.CellType; import com.raytheon.uf.common.monitor.data.ObConst; import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.CellType; import com.raytheon.uf.viz.monitor.filename.DefaultFilenameMgr; import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants; import com.raytheon.uf.viz.monitor.xml.AreaThresholdXML; diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ObsHistConfigDlg.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ObsHistConfigDlg.java index 86d6ef319d..90de8b93b7 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ObsHistConfigDlg.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ObsHistConfigDlg.java @@ -41,8 +41,8 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType; import com.raytheon.uf.common.localization.LocalizationFile; import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.common.monitor.data.CommonConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.ObsHistType; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.ObsHistType; import com.raytheon.uf.viz.monitor.xml.HistConfigXML; import com.raytheon.viz.ui.dialogs.CaveSWTDialog; diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ObsHistTableComp.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ObsHistTableComp.java index 2993f62072..b671861b68 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ObsHistTableComp.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ObsHistTableComp.java @@ -22,11 +22,11 @@ package com.raytheon.uf.viz.monitor.ui.dialogs; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.widgets.Composite; -import com.raytheon.uf.common.monitor.data.ColumnAttribData; import com.raytheon.uf.common.monitor.data.CommonConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig; import com.raytheon.uf.common.monitor.data.CommonConfig.AppName; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.ObsHistType; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.ObsHistType; +import com.raytheon.uf.viz.monitor.data.ColumnAttribData; import com.raytheon.uf.viz.monitor.data.TableData; /** diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ObsHistTableDlg.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ObsHistTableDlg.java index 5aaf55d944..7c3ead5747 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ObsHistTableDlg.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ObsHistTableDlg.java @@ -39,7 +39,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType; import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.common.monitor.data.CommonConfig.AppName; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.ObsHistType; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.ObsHistType; import com.raytheon.uf.viz.monitor.data.TableData; import com.raytheon.uf.viz.monitor.xml.HistConfigXML; import com.raytheon.viz.ui.dialogs.CaveSWTDialog; diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/StationTableComp.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/StationTableComp.java index 53a13ea019..8441e5c079 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/StationTableComp.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/StationTableComp.java @@ -32,12 +32,12 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.TableItem; -import com.raytheon.uf.common.monitor.data.ColumnAttribData; import com.raytheon.uf.common.monitor.data.CommonConfig; import com.raytheon.uf.common.monitor.data.CommonConfig.AppName; -import com.raytheon.uf.common.monitor.data.CommonTableConfig; import com.raytheon.uf.viz.core.IDisplayPane; import com.raytheon.uf.viz.core.IDisplayPaneContainer; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig; +import com.raytheon.uf.viz.monitor.data.ColumnAttribData; import com.raytheon.uf.viz.monitor.data.TableData; import com.raytheon.viz.ui.EditorUtil; diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableAttribDlg.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableAttribDlg.java index c64c5f5bad..5e7bfdbdfb 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableAttribDlg.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableAttribDlg.java @@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import com.raytheon.uf.common.monitor.data.CommonConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig; /** * Table attributes dialog for changing the visible column on a table. diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java index 7323190ac6..27bf30cf6f 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java @@ -45,10 +45,10 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import com.raytheon.uf.common.monitor.data.ColumnAttribData; import com.raytheon.uf.common.monitor.data.CommonConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.SortDirection; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.SortDirection; +import com.raytheon.uf.viz.monitor.data.ColumnAttribData; import com.raytheon.uf.viz.monitor.data.TableCellData; import com.raytheon.uf.viz.monitor.data.TableData; import com.raytheon.uf.viz.monitor.data.TableRowData; diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableComp.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableComp.java index 8404cc8fed..4b31d8760c 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableComp.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableComp.java @@ -28,10 +28,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.TableItem; -import com.raytheon.uf.common.monitor.data.ColumnAttribData; import com.raytheon.uf.common.monitor.data.CommonConfig; import com.raytheon.uf.common.monitor.data.CommonConfig.AppName; -import com.raytheon.uf.common.monitor.data.CommonTableConfig; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig; +import com.raytheon.uf.viz.monitor.data.ColumnAttribData; import com.raytheon.uf.viz.monitor.data.TableData; /** diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java index 4fd5d6a7fe..49e173cfc5 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java @@ -46,15 +46,15 @@ import com.raytheon.uf.common.monitor.MonitorAreaUtils; import com.raytheon.uf.common.monitor.config.MonitorConfigurationManager; import com.raytheon.uf.common.monitor.data.CommonConfig; import com.raytheon.uf.common.monitor.data.CommonConfig.AppName; -import com.raytheon.uf.common.monitor.data.CommonTableConfig; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.GraphType; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.ObsHistType; import com.raytheon.uf.common.monitor.data.ObConst; import com.raytheon.uf.viz.core.IDisplayPane; import com.raytheon.uf.viz.core.IDisplayPaneContainer; import com.raytheon.uf.viz.core.drawables.IDescriptor; import com.raytheon.uf.viz.core.map.IMapDescriptor; import com.raytheon.uf.viz.monitor.IMonitor; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.GraphType; +import com.raytheon.uf.viz.monitor.config.CommonTableConfig.ObsHistType; import com.raytheon.uf.viz.monitor.data.ObHourReports; import com.raytheon.uf.viz.monitor.data.ObMultiHrsReports; import com.raytheon.uf.viz.monitor.data.ObStnHourReports; @@ -85,6 +85,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * Oct 07, 2010 5105 zhao Disabled the 'X' button of the shell * Oct 26, 2012 1280 skorolev Changes for non-blocking dialog. * Nov.11, 2012 1297 skorolev new abstract initiateProdArray() + * May 13, 2014 3133 njensen Updated getting ObsHistType from configMgr * * * @@ -604,6 +605,7 @@ public abstract class ZoneTableDlg extends CaveSWTDialog implements * com.raytheon.uf.viz.monitor.ui.dialogs.IStationTableAction#launchTrendPlot * (int, int) */ + @Override public void launchTrendPlot(int rowIndex, int colIndex) { setRowIndex(rowIndex); setColIndex(colIndex); @@ -695,6 +697,7 @@ public abstract class ZoneTableDlg extends CaveSWTDialog implements * @see com.raytheon.uf.viz.monitor.ui.dialogs.IStationTableAction# * launchObHistoryTable(int) */ + @Override public void launchObHistoryTable(int rowIndex) { String station = stnTblData.getTableRows().get(rowIndex) .getTableCellData(0).getCellText(); @@ -711,7 +714,9 @@ public abstract class ZoneTableDlg extends CaveSWTDialog implements // Set dialog index String dialogID = appName.name() + station; MonitorConfigurationManager configMgr = getConfigMgr(); - ObsHistType histType = configMgr.getStationType(selectedZone, station); + String strHistType = configMgr.getStationType(selectedZone, station); + ObsHistType histType = ObsHistType.valueOf(strHistType); + /** * For Snow monitor, no history table is displayed for a Maritime * station @@ -779,6 +784,7 @@ public abstract class ZoneTableDlg extends CaveSWTDialog implements * com.raytheon.uf.viz.monitor.ui.dialogs.IStationTableAction#zoomToStation * (int) */ + @Override public void zoomToStation(int rowIndex) { String selectedStation = stnTblData.getTableRows().get(rowIndex) .getTableCellData(0).getCellText(); @@ -808,7 +814,7 @@ public abstract class ZoneTableDlg extends CaveSWTDialog implements } else { mapWidth = 10000; } - float zoomLevel = (float) zoom / mapWidth; + float zoomLevel = zoom / mapWidth; for (IDisplayPane pane : container.getDisplayPanes()) { pane.getRenderableDisplay().getExtent().reset(); pane.getRenderableDisplay().recenter(center); @@ -905,7 +911,7 @@ public abstract class ZoneTableDlg extends CaveSWTDialog implements */ private String getTrendPlotName(List prod) { String varName = null; - String name = (String) prod.get(0); + String name = prod.get(0); int stInd = name.indexOf("_"); if (prod.size() > 1) { varName = name.substring(0, stInd); diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/data/CellTableDataRow.java b/edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/data/CellTableDataRow.java index 36d95e2440..642cf2340f 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/data/CellTableDataRow.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/data/CellTableDataRow.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import com.raytheon.uf.common.monitor.scan.config.SCANConfig; +import com.raytheon.uf.common.monitor.scan.ScanUtils; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @@ -41,6 +41,7 @@ import com.vividsolutions.jts.geom.Coordinate; * ------------ ---------- ----------- -------------------------- * April 29, 2009 2037 dhladky Initial creation * 02/01/13 1569 D. Hladky removed XML where not needed + * May 13, 2014 3133 njensen Use ScanUtils instead of ScanConfig * * * @author dhladky @@ -753,7 +754,7 @@ public class CellTableDataRow extends ScanTableDataRow { // if (mdaSR.length() > 1) { // value = new Double(mdaSR.substring(0, 1)); // } - value = SCANConfig.getInstance().convertStrankValue(mdaSR); + value = ScanUtils.convertStrankValue(mdaSR); } else if (column.equals(SCANConfigEnums.CELLTable.POSH.getColName())) { value = posh; } else if (column.equals(SCANConfigEnums.CELLTable.POH.getColName())) { diff --git a/edexOsgi/com.raytheon.uf.common.monitor/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.monitor/META-INF/MANIFEST.MF index ab445ceaf4..1d62ddd614 100644 --- a/edexOsgi/com.raytheon.uf.common.monitor/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.monitor/META-INF/MANIFEST.MF @@ -22,7 +22,6 @@ Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.11.5", com.raytheon.uf.common.geospatial;bundle-version="1.0.0", com.raytheon.uf.common.dataplugin.binlightning;bundle-version="1.0.0", com.raytheon.uf.common.localization;bundle-version="1.11.17", - org.eclipse.swt, com.raytheon.uf.common.sounding;bundle-version="1.12.1112", com.raytheon.uf.common.dataplugin.bufrua;bundle-version="1.12.1112", com.raytheon.uf.common.pointdata;bundle-version="1.12.1112", diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java index b9822a1204..ed68adf352 100644 --- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java +++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java @@ -30,7 +30,6 @@ import com.raytheon.uf.common.localization.LocalizationFile; import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.common.monitor.MonitorAreaUtils; import com.raytheon.uf.common.monitor.data.AdjacentWfoMgr; -import com.raytheon.uf.common.monitor.data.CommonTableConfig.ObsHistType; import com.raytheon.uf.common.monitor.xml.AreaIdXML; import com.raytheon.uf.common.monitor.xml.AreaIdXML.ZoneType; import com.raytheon.uf.common.monitor.xml.MonAreaConfigXML; @@ -57,6 +56,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority; * Oct 02 2013 2361 njensen Use JAXBManager for XML * Oct 17 2013 16682 zhao fixed a bug in readConfigXml() * Apr 23 2014 3054 skorolev Removed unnecessary parameter in the addArea method. + * May 13 2014 3133 njensen getStationType returns String instead of ObsHistType * * * @@ -688,18 +688,15 @@ public abstract class MonitorConfigurationManager { * @param theStation * @return type of station */ - public ObsHistType getStationType(String theZone, String theStation) { - ObsHistType result = null; + public String getStationType(String theZone, String theStation) { + String result = null; List areaList = configXml.getAreaIds(); for (AreaIdXML area : areaList) { if (area.getAreaId().equals(theZone)) { List stationList = area.getStationIds(); for (StationIdXML station : stationList) { if (station.getName().equals(theStation)) { - String typeString = station.getType(); - result = typeString.equals(xmlDataType) ? ObsHistType.METAR - : ObsHistType.Maritime; - return result; + return station.getType(); } } } diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/ScanUtils.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/ScanUtils.java index e0313db12c..649cc1f4f5 100644 --- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/ScanUtils.java +++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/ScanUtils.java @@ -75,6 +75,7 @@ import com.vividsolutions.jts.io.WKTWriter; * 09/03/2013 DR 13083 gzhang Added getZRvalue2() to fix an error. * 12/20/2013 DR 16894 gzhang Fixed getZRvalue2() bias issue. * 05/12/2014 3133 njensen Extracted getLightningRecord + * 05/13/2014 3133 njensen Moved convertStrankValue here from ScanConfig * * * @author dhladky @@ -1933,4 +1934,28 @@ public class ScanUtils { return (float) (bias * MM_TO_INCH * rValue); } + + /** + * Convert strength rank from string to double + * + * @param stRank + * @return + */ + public static double convertStrankValue(String stRank) { + double tmpValue = Double.NaN; + + if (stRank.matches("[0-9.]+") == true) { + tmpValue = Double.valueOf(stRank); + } else if (stRank.endsWith("L") || stRank.endsWith("M")) { + try { + tmpValue = Double.valueOf(stRank.substring(0, + stRank.length() - 1)); + } catch (Exception ex) { + tmpValue = -999.0; + } + } + + return tmpValue; + } + } diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/lightning/LightningRetriever.java b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/lightning/LightningRetriever.java index c156ed11de..542913f161 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/lightning/LightningRetriever.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/lightning/LightningRetriever.java @@ -21,6 +21,8 @@ package com.raytheon.uf.edex.plugin.scan.lightning; import com.raytheon.uf.common.dataplugin.binlightning.BinLightningRecord; import com.raytheon.uf.common.datastorage.IDataStore; +import com.raytheon.uf.common.status.IUFStatusHandler; +import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.edex.database.plugin.PluginDao; import com.raytheon.uf.edex.database.plugin.PluginFactory; @@ -44,6 +46,9 @@ import com.raytheon.uf.edex.database.plugin.PluginFactory; public class LightningRetriever { + private static final IUFStatusHandler logger = UFStatus + .getHandler(LightningRetriever.class); + private LightningRetriever() { } @@ -64,7 +69,7 @@ public class LightningRetriever { IDataStore dataStore = ld.getDataStore(lightRec); lightRec.retrieveFromDataStore(dataStore); } catch (Exception e) { - e.printStackTrace(); + logger.error("Error retrieving lightning record", e); } return lightRec;