Commit graph

151 commits

Author SHA1 Message Date
Tom Gurney
b4b0a95246 Omaha #5335 Add alert popup when TAF send fails
Change-Id: I75867e7c834e41d8d96dab6b0d0580d731968835

Former-commit-id: 02e15cc03441ae891136c5e5509ed6e71d0ca131
2016-02-12 15:53:51 -06:00
Nate Jensen
1bb89db5e1 Merge "Omaha #5242: Remove calls to deprecated Localization APIs from AvnFPS." into omaha_16.2.2
Former-commit-id: 320b6af8e417941cfc272a5ef98f8d8946406d32
2016-02-12 09:23:43 -06:00
David Gillingham
f7879e1114 Omaha #5242: Remove calls to deprecated Localization APIs from AvnFPS.
Change-Id: I48e64c52d29d0ff56920aa95bc3c2af657762011

Former-commit-id: cafbca5b171be325f40908079d100d193440e2f9
2016-02-11 16:30:12 -06:00
Nathan Bowler
063c473391 Omaha #5283 Remove support for discontinued NGM data
Change-Id: I9c3fcf3bff03ed78cf77a8fdcd8b95da4d470dae

Former-commit-id: 0867569ae733dee3632e31bc216a06d356530e24
2016-02-11 12:20:32 -05:00
Steve Harris
8c95084547 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: ff0808a91ab8b08878954b0fa32c00c20b3e5ef3
2016-02-10 13:31:20 -06:00
Steve Harris
85055fcc53 Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
	cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 68c13f9160746f365bd5f896b1400f1a8099ebe8
2016-02-01 11:57:52 -06:00
Steve Harris
dcaaf9f52b Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 13a968811d1cdde95f663d7af4b8a6030ece556e
2016-01-28 15:47:31 -06:00
Ron Anderson
d109fd978e Omaha #5054 Fix dialog parenting of avaiation dialogs
Change-Id: Ibfe4e152f8d779556ee4427dff6a3d8cf7939336

Former-commit-id: d0224012e3f4a2462db62956bce860b071823078
2016-01-27 15:04:05 -06:00
Shawn.Hooper
2861d7abd7 Merge tag 'OB_16.1.2-14' into master_16.2.1
16.1.2-14

Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Change-Id: If4483610b92d4c2ef975c3ac75403e12a70d612c

Former-commit-id: 66d3cd35731e59996c34f003e42cbb2a41010717
2016-01-25 14:32:31 -05:00
Shawn.Hooper
da0ff43173 Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java

Change-Id: I123674540179ec5fd35a953cb652f613a3400ed5

Former-commit-id: 9f821c69fc8c198fc44529e2e00ecaa13b286e6f
2016-01-20 16:48:34 -05:00
Steve Harris
11a5db155d Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java


Former-commit-id: 218244406e4be6cb31b3986ff6457398a0a00bb5
2016-01-20 15:23:43 -06:00
Steve Harris
dfcc52e766 Merge tag 'OB_16.2.1-6' into omaha_16.2.1
16.2.1-6


Former-commit-id: 29a43c58b69086667c47e86c4a0bb1c849ad4367
2016-01-20 13:29:19 -06:00
Zhidong.Hao
7255a50ee6 ASM #18482 AvnFPS: Improve help instructions for climate data update
Change-Id: Ibd14e269c06276bfee4f23b3511c7f716ded4b84

Former-commit-id: bb40c336afd2afcdb11b80e03ac3a6fa33ee6232
2016-01-15 14:24:51 -05:00
Steve Harris
25cee1be8c Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 58b1a82b5cf59525bf266416bc8c3ca6c0dea4ad
2016-01-13 09:20:51 -06:00
Shawn.Hooper
bd27f40c6d Merge tag 'OB_16.1.2-9' into master_16.2.1
16.1.2-9

Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c

Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
2016-01-12 15:10:02 -05:00
Slav Korolev
6e365fe428 Omaha #4860 - Fixed issue TextWorkstationNotStartedException
Former-commit-id: 6f5222c617c6f130b3a827beff5f1ec4bda45ee4
2016-01-07 09:56:49 -05:00
Steve Harris
8a07970ba6 Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java


Former-commit-id: d9745246c0f81ec088b3f4108b30e02c33f6a9ae
2016-01-06 11:55:00 -06:00
Steve Harris
77e9dd0e31 Merge tag 'OB_16.2.1-4' into omaha_16.2.1
16.2.1-4

 Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java


Former-commit-id: 8cf6955bc2f007b352bea3b2ffea1927f549caec
2016-01-04 19:43:07 -06:00
Shawn.Hooper
dc86635bb9 Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java

Former-commit-id: 071dbbc21ea440c1c4cb5bbd739ddcba861cdefd
2015-12-31 09:31:25 -05:00
Zhidong.Hao
40c3cb9749 ASM #18342 AvnFPS: Climatology chart calculation is incorrect as compared to A1
Change-Id: I19568e71de43f3eeec8412431e437ea01b76d7bc

Former-commit-id: 35d85e0599f73b5da4c4cc287fa7d25493ef5cab
2015-12-22 14:29:14 -05:00
Slav Korolev
fdcddb9f50 Omaha #4645 - Removed popup menu persistance.
Former-commit-id: db10233638a504ed2455c43272d1fd1dff2b4194
2015-12-14 08:28:30 -05:00
Slav Korolev
852e19b6d1 Omaha #4645 - Initiated wrapChk using ResourceTag.
Former-commit-id: e4da0f9f61b8a6d62b6bc27dd630d1db9931bcbd
2015-12-09 14:17:11 -05:00
Roger Ferrel
313365d533 Omaha #5156 MonitorData.Util.getCcfpData() only shrinks dtList when it size is greater then 3.
Change-Id: I81069010b9bdbe0484af4e47c7822c85876e3540

Former-commit-id: 6bc0b9e2e4dad9b799843874c62d798422c5c678
2015-12-01 14:47:30 -06:00
Nate Jensen
3511de9e2b Omaha #4834 remove more LocalizationOpFailedExceptions
Change-Id: I0b8717b72b051169360ce167e796b35a786ee1a1

Former-commit-id: 4605396f4a9d1f77df9566e02cca1bd3e9f56e26
2015-12-01 13:13:26 -06:00
Shawn.Hooper
e93839673c Merge branch 'asm_16.2.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py

Former-commit-id: 0d5c4caf82d74459f9412800955d6cb9da18f3fb
2015-11-25 14:31:20 -05:00
Nate Jensen
acc931788c Omaha #4834 remove catch LocalizationOpFailedException
replace catching LocalizationOpFailedException with
LocalizationException

Change-Id: Ib5ed69539474d798d04363106a5a2aaf47ac6e58

Former-commit-id: c465340cf3d5215c10409354b380ed76bbbca270
2015-11-12 14:32:01 -06:00
Steve Harris
260d20c920 Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/OgcLayer.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerCollector.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerTransformer.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/filter/ComparisonFilter.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/gml3_1_1/EnvelopeConverter.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/gml3_2_1/EnvelopeConverter.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/gml3_2_1/GeometryConverter.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/http/IOgcHttpPooler.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/http/OgcHttpHandler.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/http/SingleHttpPool.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/spatial/CoordinateUtil.java
	edexOsgi/com.raytheon.uf.edex.wfs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.wfs/src/com/raytheon/uf/edex/wfs/filter/v1_1_0/QueryFilterVisitor.java
	edexOsgi/com.raytheon.uf.edex.wfs/src/com/raytheon/uf/edex/wfs/filter/v2_0_0/AbstractQueryFilterVisitor.java
	edexOsgi/com.raytheon.uf.edex.wfs/src/com/raytheon/uf/edex/wfs/filter/v2_0_0/QueryExpressionVisitor.java
	edexOsgi/com.raytheon.uf.edex.wfs/src/com/raytheon/uf/edex/wfs/reg/WfsRegistryImpl.java


Former-commit-id: b9aab5f7931fde1d2aaf9ba0402bf35314cd0c5f
2015-11-12 13:57:32 -06:00
Roger Ferrel
2ef2bf0347 Omaha #5108 Display warning when sending forecast with same header time as one in the pending queue.
Change-Id: Id616718b1bb2c4af79d68f3569f5256fc06d9e87

Former-commit-id: 7670322cfa2e88c48dc0f10f44814ca736774555
2015-11-09 14:36:07 -06:00
Steve Harris
c5540f5ee4 Merge branch 'omaha_16.2.2' into omaha_16.3.1
Former-commit-id: a7e86405ee2a4c5ec5d183e171c3d53710f0dbbd
2015-11-04 16:02:22 -06:00
Roger Ferrel
a5c93be09f Omaha #5060 Remove scaling of top value to allow proper plotting of cig values.
Change-Id: If1c571eb38864027e2508d8fbbcf3df0e55b3531

Former-commit-id: ea172bb90d9fba6108831ede3d1ed16a09a57adb
2015-11-03 08:58:04 -06:00
David Gillingham
648bb0e367 Omaha #5003: Update A2 baseline code to utilize apache commons-lang version 3.
Change-Id: I2b23399b2cfd3d37a41f89cb3c3173ca628caecb

Former-commit-id: b9c41fe3354a90a03440e1ea67991e6ecd5885c0
2015-10-28 13:21:07 -05:00
Matthew Howard
22e0fc97f8 Merge "ASM #18061 AvnFPS: Problem with syntax checking (wrong error message)" into asm_16.2.1
Former-commit-id: be9f9d9d7c1e9daa7c99c1a10d59bf7058b66b8e
2015-10-23 10:27:12 -05:00
Yun.Teng
7eea886ae0 ASM #17445 - Set configurable alert interval for all AvnFPS alerts
Change-Id: I1683942429bd358daedca5c72dc2f635e20bd064

Former-commit-id: a3622c531fd3cc0702d341bb711dd002a5e8effb
2015-10-23 16:10:36 +01:00
Zhidong.Hao
db46c4dc50 ASM #18061 AvnFPS: Problem with syntax checking (wrong error message)
Change-Id: I826b51da95d08a6505c782235b397f02db196cc1

Former-commit-id: e9aa99d35c5893a9483d56f9eab0385e3b6db955
2015-10-23 10:58:16 -04:00
Roger Ferrel
c477bb1c80 Omaha #5015 Fixed merge issue.
Former-commit-id: 866f4e7f8e9854920cf593efb16edde150a22fc9
2015-10-21 10:42:09 -05:00
Steve Harris
69071ae8d1 Omaha #5015 - import statement problem
Former-commit-id: 8c6c8731d9adaeef96899a88a820336b8dd87b79
2015-10-21 10:01:54 -05:00
Steve Harris
56131ac305 Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/GageData.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: fa9ad9b8a3900bd5f94017f27bec9a5673ecb881
2015-10-21 09:22:00 -05:00
Slav Korolev
650a078730 Omaha #4645 - Fixed AvnFPS TAF Viewer Editor issue.
Former-commit-id: 5909e51dc7cc03b749c50f74e78fe0de49ffe878
2015-10-16 12:04:58 -04:00
Shawn.Hooper
90badd7a3e Merge tag 'OB_15.1.2-9' into master_16.1.1
15.1.2-9

Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RiverStatData.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/ContactsDataManager.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/DescriptionDataManager.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/LocationAreaManager.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: e9e9660925d0afc016f88ec73182f9eae6ab0c18
2015-10-15 17:10:19 -04:00
Slav Korolev
2836ca0525 Omaha #4855 - Fixed problem with syntax checking.
Former-commit-id: 47e85b3b66a7b3adb887d17e41cf279cfdb7e402
2015-10-05 10:50:59 -04:00
Roger Ferrel
4bbc7f67e9 Omaha #4898 Prevent sending of TAF when in DRT mode.
Former-commit-id: 37f33962fae292bd531540f96b034017683ba2ea
2015-10-05 08:13:53 -05:00
Roger Ferrel
94ea173199 Omaha #4918 Allow forecaster to send out TAF as another forecaster.
Change-Id: I5b6bab07c60d4e77a31cb74410cc6f61d07070c5

Former-commit-id: 12b740baca30447aa753d703442ae68f44561320
2015-09-25 14:25:09 -05:00
Nate Jensen
429a844041 Omaha #4880 don't request tafs without a station name
Change-Id: If6460a791b091bdc85a0963b7c53b52b40503213

Former-commit-id: 5eee206be30097f09fe7b7c7093a5583e1a3729a
2015-09-21 16:35:34 -05:00
Nate Jensen
1c1d83f44c Omaha #4880 optimized avnfps monitor data requests
Change-Id: I08f916e2fd2f4b2b30cf7b02df5ca63097c4bb1a

Former-commit-id: 7d29da0fcc48cac0623431aa7b749e605c7dbf6a
2015-09-16 19:02:46 -05:00
Nate Jensen
a6c2a05e75 Merge "Omaha #4880 remove dead avnfps java code" into omaha_16.2.1
Former-commit-id: 892b612e66d7ab98afec1784929fc67d0708a9e2
2015-09-15 18:06:43 -05:00
Nate Jensen
97c8f777a1 Omaha #4880 remove dead avnfps java code
Change-Id: Iefdc821cdb21f7947ee8c2d97a346ff532a61fb3

Former-commit-id: 50136bba2d368b68d41ce76c0ce0a660ff5e73ce
2015-09-15 14:01:51 -05:00
Nate Jensen
b550d5a1f3 Omaha #4880 don't request ccfps if there are no times
Change-Id: Ia3e247452fe62d03dbdabdaae6db9a426f95882e

Former-commit-id: 445f60226e7e23fcd8a364f7f86c759a81dfe43c
2015-09-15 13:42:17 -05:00
David Friedman
4bdfeb8da8 Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
Conflicts:
	cave/build/static/linux/alertviz/alertviz.sh
	cave/build/static/linux/cave/cave.sh
	cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration

Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226

Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
2015-07-30 20:53:19 +00:00
Zhidong.Hao
3e12a5ecf4 ASM #16907 AvnFPS: Climate download files from NCDC server changed in format
Change-Id: Ifa6ee6b0fb64ce2a4fd9a9ac0f7976e855242d33

Former-commit-id: fc4a2bcfb918cce995444464aefe92a438ba995f
2015-07-10 15:13:44 -04:00
Zhidong.Hao
02599a6039 ASM #16907 AvnFPS: Climate download files from NCDC server changed in format
Change-Id: Ibfd5fa35b58ffd66eaf81945fb0b31f7ea632b65

Former-commit-id: 81c22bdd36a80a1f5deaf81926f8f07f24c929f9
2015-07-07 14:33:12 -04:00