Commit graph

4711 commits

Author SHA1 Message Date
Richard Peter
a6230649e7 Merge "Omaha #4562: Isolate simple text product decoding" into omaha_16.2.2
Former-commit-id: 067ed048ee4681602c10086a8dedbeffdeefbeb5
2016-01-21 16:03:03 -06:00
Tim Jensen
2a5b0ed793 Omaha #4562: Isolate simple text product decoding
Change-Id: I002bc67d0906b254a131f8a4f2d98d83555926c4

Former-commit-id: cd9fe9fed89fd732f5f904a3a7df9be544d01488
2016-01-21 14:21:15 -06: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
Richard Peter
25665d13f0 Merge "Omaha #4677 Fix bufrmos location caching" into omaha_16.2.2
Former-commit-id: 1800f6b8e48d0aa77a3d49f8035dddd01a5896f5
2016-01-19 17:17:21 -06:00
Tom Gurney
63ecf82c4f Omaha #4677 Fix bufrmos location caching
Follow-up to 22d027c. Correct BufrMosLocationCache to still use hash
code as a key, but to use lat/lon/stationId for database lookup (since
hash code is no longer stored in database)

Change-Id: I24249317d51d117f6a420a8ead5aad9e89b382d5

Former-commit-id: d1dc1292e2e0f8b5ea37dcb308bd7373f459f1dd
2016-01-19 17:10:14 -06:00
Tom Gurney
b05424c902 Omaha #5253 Remove dataURI from SvrWx plugin
Also update SvrWx regex to accept SvrWx hourly products (starting
with "NWUS22") which were incorrectly being rejected.

Change-Id: I58ece4293c0a011edccee5a065e7710557a3951b

Former-commit-id: 183079715d857fd085653a90a21eaeb4c615da07
2016-01-19 11:34:57 -06:00
Richard Peter
6fb20a2f16 Merge "Omaha #4677: Update PK column of bufrmos_location" into omaha_16.2.2
Former-commit-id: 2f2d4954c307d395d9565c11774b9fdffbd922af
2016-01-18 12:16:00 -06:00
Tom Gurney
31117fcda3 Omaha #4677: Update PK column of bufrmos_location
Change-Id: I265ad75ecaad2f1d829cdcd22ca7de3fc8e67299

Former-commit-id: 22d027cf0f7b0144473c7d3cf471d6d17ff51383
2016-01-18 11:39:25 -06:00
Tom Gurney
76bdbc2084 Omaha #5237: Replace calls to deprecated LocalizationFile methods
Change-Id: I81bd2c7fcf29db4b9dea4164b826b8880e707686

Former-commit-id: 843e2b439ea1609dff0583e8eaa25feeb3c6f3cb
2016-01-14 12:27:08 -06:00
Nate Jensen
1ba4b64743 Merge "Omaha #5244 replaced deprecated method calls on LocalizationFile" into omaha_16.2.2
Former-commit-id: 922b238db4d23d2bff341eda937b559f3da0ed2c
2016-01-13 09:28:40 -06: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
Steve Harris
d9dc7ac24a Merge tag 'OB_16.2.1-5' into omaha_16.2.1
16.2.1-5

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


Former-commit-id: 158c21db5a297b68b9c7007ebcbfd5374df3c648
2016-01-13 08:58:43 -06:00
Nate Jensen
b15fcd85b7 Omaha #5244 replaced deprecated method calls on LocalizationFile
Change-Id: Ifdd1382a35a8475137be54404cca0a5c48383990

Former-commit-id: fe12ffde9dcf6210b213ded4903d004263be50b4
2016-01-12 16:59:35 -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
Nate Jensen
8c21ca692b Omaha #5244 replaced deprecated method calls on LocalizationFile
Change-Id: I209036143d3aaf18b754b5484298f7f2156d24ba

Former-commit-id: 2a7817d6959210f4edc376e237604df0dc3dc830
2016-01-12 09:16:37 -06:00
Greg Armendariz
6495c4c3ef Omaha #5203 - Remove scriptLauncher from common-core deploy
Former-commit-id: d095a3b9a1b69adb17cf67b8ed1a3f141d79d6a6
2016-01-11 13:46:43 -06:00
Tom Gurney
f482b28005 Omaha #5226 - LSRDecoder - Gracefully reject ob w/bad location
Former-commit-id: ba957117ffbc7f07b883a04c9e93ae4996574be5
2016-01-08 11:04:13 -06:00
Richard Peter
900a062592 Omaha #5229 - Fix 16.2.1 merge issue
Change-Id: I09cb22b04af36423bcbb068976ce43ffa06add57

Former-commit-id: effbf2266f17a8480f1e598bf8d210d8c8c9412a
2016-01-06 15:16:56 -06:00
Shawn.Hooper
221d0396b2 ASM #18056 - Fix merge issues for serverConfig.py found in 16.2.1-5
Change-Id: Id36309a56d4e13093c4073256bba9aa5521e929d

Former-commit-id: ab99fdc554ed8da307b88c463fb9302476def68b
2016-01-06 13:58:41 -05:00
Steve Harris
413679ac89 Merge branch 'omaha_16.2.1' into omaha_16.2.2
Former-commit-id: 8c2b257b4b0b53b9f20d64ea8be4438e87797266
2016-01-06 12:44:36 -06: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
Tim Jensen
46ca6aa907 Omaha #5203: Removed uEngine dependency from ScriptRunner
Change-Id: I0172184bd51ee2c5432a2a32f049eaf8d6d4eeff

Former-commit-id: 9d0a106129ad00aee6ffcaa1a553279be0a3de65
2016-01-06 11:39:16 -06:00
Shawn.Hooper
98d9f5522b Merge remote-tracking branch 'asm/asm_16.1.2' into master_16.1.2
Former-commit-id: 0ce43bc7d48723d2aebc2e6281a0e3356eb65beb
2016-01-05 23:09:53 -05:00
Shawn.Hooper
fad499c581 Merge remote-tracking branch 'omaha/omaha_16.1.1.1' into master_16.1.2
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java

Change-Id: I2e27575f864da841a07ca019a12819e0fcb16ced

Former-commit-id: 4b93303cd64cdae241f4dfc02fbdc3ab8a2c31f2
2016-01-05 20:33:34 -05:00
David Gillingham
51c6511b7d Omaha #5184: Make GHG Monitor mostly independent of GFE. viz.gfe has not been removed because ZoneSelector needs to be refactored out still.
Change-Id: I9826da4c73982ab5b0c1a78f5c4dc68060787c5c

Former-commit-id: 52a9798259aaeb3c0f5b9b6826ad23991d3dd191
2016-01-05 12:17:52 -06:00
Nate Jensen
8cd53d8783 Merge "Omaha #5221 Adding back guidanceType tag mising in config" into omaha_16.2.1
Former-commit-id: f8881b088f80695e4ce46088f9f2e273ca0346c7
2016-01-05 10:46:54 -06:00
Dave Hladky
6d02e8d660 Omaha #5221 Adding back guidanceType tag mising in config
Former-commit-id: a454cd3948f38a119049a26d1cad6cff7dd60901
2016-01-05 10:42:29 -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
417410b5c0 Merge remote-tracking branch 'asm/asm_16.2.1' into master_16.2.1
Former-commit-id: 5baf7ac552321cff537ab8ff1c90d864b2c508c6
2016-01-04 17:27:00 -05:00
Shawn.Hooper
f27a0b1e80 ASM #18056 - Fix merge issues for serverConfig.py in 1621-4
Change-Id: I22fb443dbdc32da185f1cec2ed1e427048d74e19

Former-commit-id: 497cbf7a4c272b823064edeeb55a36063ff09c6b
2016-01-04 16:54:55 -05:00
Shawn.Hooper
f3fafae42e Merge remote-tracking branch 'origin/master_16.2.1' into asm_16.2.1
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Change-Id: Ie67d751b1c68099a98826e6542ebff4cf0aae7e5

Former-commit-id: b9b551d68ed55536b2480b60ef1269bcf5402004
2016-01-04 16:47:59 -05:00
Shawn.Hooper
f7b4040970 ASM #18179 - WarnGen: Template Corrections for the hydro CTA, mixed case and other issues
Change-Id: Ibd5db3a6aa75f80f5700925596753231f484777a

Former-commit-id: fe5c90a91d03a24d5f16f47d4834807576ceac23
2016-01-04 13:59:00 -05:00
David Gillingham
11181247e2 Omaha #4262: Run GFESiteActivation off main EDEX thread.
Change-Id: I430464d80893f815cc1ddc2f9ea6419c29a99fc9

Former-commit-id: d7ce621b069954dc4a4b28b71c76726f63afb370
2016-01-04 10:12:14 -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
Shawn.Hooper
c7c3d81479 Merge remote-tracking branch 'vlab/tcv_16.1.2' into master_16.1.2
Former-commit-id: abfd5978ff55d595eaba09c4a70f763fb56986f9
2015-12-28 09:56:50 -05:00
Shawn.Hooper
c98e7908fe Merge remote-tracking branch 'asm/asm_16.1.2' into master_16.1.2
Former-commit-id: b4a41b2992ddfa2cea55a3ae25204ba57aeb3a00
2015-12-28 09:46:49 -05:00
Shawn.Hooper
c03bf2fc84 Merge tag 'OB_16.1.1-32' into master_16.1.2
16.1.1-32

Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/EditPrecipStationsDialog.java

Former-commit-id: bbe412da6e8b600bfcab446d46619c57a65efbe8
2015-12-22 10:23:34 -05:00
David Friedman
86673672a5 ASM #17942 - WarnGen Improvements: Polygon extension area
Change-Id: Ic3b0c5e74dddb8dc5f973b41ae78d85ffe50a002

Former-commit-id: dfc678f705d33e1245bec773cc8fac7594de7579
2015-12-21 16:55:59 +00:00
Richard Peter
5849d054e8 Merge "Omaha #5166: Update logging to use SLF4J:shef" into omaha_16.2.2
Former-commit-id: 8082963e8622b5c805f1df1c6c1f9822f2a743a9
2015-12-18 11:16:53 -06:00
Richard Peter
c3dbc10158 Omaha #5178 - Fix style rules for MxT and MnT
Change-Id: I7f0a34c93c4f48809f26ccf43c8c3c423d1764e4

Former-commit-id: 34a7a2f737c0802ee55b314b097a9d4f88eef331
2015-12-18 11:08:34 -06:00
Richard Peter
44085a03c9 Merge "Omaha #5166: Update logging to use SLF4J:sfcobs" into omaha_16.2.2
Former-commit-id: a02118968af857747f8ee60425b851d0b93dfce6
2015-12-18 10:04:03 -06:00
Kevin Bisanz
a4c55cc55e Omaha #5166: Update logging to use SLF4J:sfcobs
Update the following to use SLF4J:
com.raytheon.edex.plugin.sfcobs

Change-Id: I07993deeef9124592e7457fe9621d1e7cdc9339a

Former-commit-id: 9c5ab139702f30142d36264c7b57a7d97ba85d59
2015-12-17 18:01:48 -06:00
Kevin Bisanz
b26aa7b4da Omaha #5166: Update logging to use SLF4J:ldad*,plugin.txt,python.decoder
Update the following to use SLF4J:
com.raytheon.edex.plugin.ldadhydro
com.raytheon.edex.plugin.ldadmanual
com.raytheon.edex.plugin.ldadprofiler
com.raytheon.uf.edex.plugin.text
com.raytheon.uf.edex.python.decoder

Some files were deriving directly or indirectly from the deprecated
AbstractDecoder class and using a protected logger member variable. This
change adds a private logger member variable. In some cases a class no
longer extends AbstractDecoder if the (now hidden) protected logger was
the only inherited item used.

Change-Id: I0eee737af6b40dbf8e04015a40275996dcbc59c9

Former-commit-id: fa9297eaedc80b80e9da0bd144e10d211167be54
2015-12-17 16:07:05 -06:00
Kevin Bisanz
0211f7bd68 Omaha #5166: Update logging to use SLF4J:shef
Update the following to use SLF4J:
com.raytheon.edex.plugin.shef

amend:Correct typo in error message
amend:Fix comments

Change-Id: I18a7d735319903d4359ea7a73084928b1b8419b8

Former-commit-id: 5f2f1cac226afa83ca8295d92a4d87c26381a83e
2015-12-17 15:20:50 -06:00
Sean.Webb
74dadb8f58 ASM #18420 - Removed incorrect entry for channel 10
Change-Id: I5db2433a32a1c29123d750157889e990ef905cce

Former-commit-id: 71c49c12ede410301f4906d13ea17e6817138463
2015-12-17 09:21:41 -05:00
Kevin Bisanz
d4d1b01f2a Omaha #5166: Update logging to use SLF4J:radar,recco,npp.viirs
Update the following to use SLF4J:
com.raytheon.edex.plugin.radar
com.raytheon.edex.plugin.recco
com.raytheon.uf.edex.plugin.npp.viirs

Most files were deriving directly or indirectly from the deprecated
AbstractDecoder class and using a protected logger member variable. This
change adds a private logger member variable.  In some cases a class no
longer extends AbstractDecoder if the (now hidden) protected logger was
the only inherited item used.

amend:Do not throw PluginException in RadarDecoder.java

Change-Id: Ib65b4624d713be6d9db4d6ff216e0307593f0acf

Former-commit-id: d00fe48ce641253dae3adcad7cb56d48ec9376cd
2015-12-16 16:42:17 -06:00
Richard Peter
876f7c0762 Merge "Omaha #4816: Fix baseline code to support refactored PythonJobCoordinator API." into omaha_16.2.2
Former-commit-id: e347e3599a21b2fdc24f5aec23ec00418c438597
2015-12-16 12:56:34 -06:00
David Gillingham
60313a2120 Omaha #4816: Fix baseline code to support refactored PythonJobCoordinator API.
Change-Id: I906946954158e2c5fa39195e8869bca815720aa0

Former-commit-id: c30f24c376f2548126fe08369951bd5a4cf78225
2015-12-16 10:03:31 -06:00
Richard Peter
e7f92606e1 Merge "Omaha #5166: Update logging to use SLF4J:grib,obs,warning" into omaha_16.2.2
Former-commit-id: e5f8552133b08a67bb541c60df5a23a8c55fd367
2015-12-16 09:39:35 -06:00