Commit graph

5909 commits

Author SHA1 Message Date
Steve Harris
9c145d8e2e Merge branch 'master_14.3.1' (14.3.1-14) into omaha_14.3.1
Former-commit-id: 7a8cdaea54 [formerly 941efaf857 [formerly f158314a854a081cb12cd15cab3f6340d5c0fb78]]
Former-commit-id: 941efaf857
Former-commit-id: 3a10442f6e
2014-08-04 16:04:11 -05:00
Brian.Dyke
590e37a8f2 Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	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
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 270d2b0ddb [formerly 9abb02ea8a [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]
Former-commit-id: 9abb02ea8a
Former-commit-id: 301f3094be
2014-08-04 13:10:13 -04:00
Brian.Dyke
a9cf7e9951 Merge branch 'asm_14.2.2' into master_14.2.2
Former-commit-id: 905728d2fb [formerly 3598f7b549 [formerly 96ff2234e0d8893695b33a79d24a026a1a409073]]
Former-commit-id: 3598f7b549
Former-commit-id: eeca2f2ec8
2014-07-31 09:56:21 -04:00
Ben Steffensmeier
fa3207a140 Issue #3455 Fix gridless grib models.
Former-commit-id: 12f84a9427 [formerly 7341c62f40 [formerly 1228b73957fc4a407e9075292faffeff3a84bdb4]]
Former-commit-id: 7341c62f40
Former-commit-id: 1005d4d4b1
2014-07-30 16:44:07 -05:00
Shawn.Hooper
adcd4dfa64 ASM #15627 Revert "ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products."
This reverts commit c71189dd92 [formerly e24dd6958e] [formerly ba4c386f30] [formerly 8cffe955a9 [formerly ba4c386f30 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]].

Change-Id: Ie01ca9463a4db371ffce0b6e38d5c43e1f9addf2

Former-commit-id: 4e322737ce [formerly 976c7b2d4a [formerly d272d426f8bd218954a75a7b2e19d21b30f975cb]]
Former-commit-id: 976c7b2d4a
Former-commit-id: 27f50397aa
2014-07-30 14:03:51 -04:00
Juliya Dynina
6f2a585d52 Merge "ASM #15648 Change to Cities.xml" into asm_14.2.2
Former-commit-id: 37587144c0 [formerly fc27de56d2 [formerly 264920b8af1b2665b17c1015afe02e6f4a719419]]
Former-commit-id: fc27de56d2
Former-commit-id: 92e7f244fc
2014-07-30 07:48:43 -05:00
Daniel.Huffman
0604b6151f ASM #15648 Change to Cities.xml
Change-Id: Idc89484cf45fcd1fb30538119d254ed9c0fd79e2

Former-commit-id: ea11c48008 [formerly aca63e248f [formerly 1e2b8582fa4dec428b70a2e8aaa1e401ddbfcee7]]
Former-commit-id: aca63e248f
Former-commit-id: 008255ad0e
2014-07-29 21:41:00 +00:00
Kiran.Shrestha
d7c8a9a458 ASM #97 - Freezing Level Height AGL for all models has units of dam instead of feet
Change-Id: Ib92fbb1c153a8a4739371d8148673a5e32ea36f9

Former-commit-id: 11bab40785 [formerly a044b44c8b [formerly 1730a6dea78cfd922b59c6cccc1c6f44d3a56949]]
Former-commit-id: a044b44c8b
Former-commit-id: e9a417f5f8
2014-07-28 16:18:39 -04:00
Michael Gamazaychikov
c71189dd92 ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products.
Change-Id: Ic5689db7714be086d6e4543602db33a07e5b2fc1

Former-commit-id: 8cffe955a9 [formerly ba4c386f30 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]
Former-commit-id: ba4c386f30
Former-commit-id: e24dd6958e
2014-07-28 15:12:10 -04:00
Qinglu.Lin
632ec498ff ASM #15554 - Improve speed/efficiency of WarngenLayer.populateStrings
Change-Id: I6a3b9823ac7c23ba171206708187ab3fc3c7c1ca

Former-commit-id: 2aa16c114a [formerly 1eca5ef51a [formerly 3b971d52a82099142fe08986df879a379dfa6314]]
Former-commit-id: 1eca5ef51a
Former-commit-id: f69a06238b
2014-07-28 12:36:07 -04:00
Rici.Yu
9b78be1622 ASM #15655 - Negate raising exception for empty db from IFPDB()
Change-Id: I5c96d654f3080a4b0f10113648f290a0d09961cb

Former-commit-id: 661737fb39 [formerly 9a1310d1ac [formerly 9af51efbef229984de09a5ad338885d54f720270]]
Former-commit-id: 9a1310d1ac
Former-commit-id: a75c0c2f15
2014-07-28 11:30:49 -04:00
Ron Anderson
be5794d464 Issue #3423 Move alarm/alert product requests off UI thread
Change-Id: I44149b5af54fbeac75231d6caeb3929fbf6ecf5e

Former-commit-id: 174d8b59e0 [formerly 17b681f355 [formerly c3401cee78edae8dea6d21736fac25bfed996fb3]]
Former-commit-id: 17b681f355
Former-commit-id: ac0799ce35
2014-07-24 14:02:10 -05:00
Steve Harris
07e2a77ce4 Merge branch 'master_14.2.2' (14.2.2-22) into omaha_14.2.2
Former-commit-id: 7d90ae4468 [formerly a14b996684 [formerly 6a7f00f07d1ee3e9f39b299306083228eb5adb18]]
Former-commit-id: a14b996684
Former-commit-id: 943a8270d8
2014-07-24 11:35:24 -05:00
Brian.Dyke
6fe1fbbd47 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 3d6c40b341 [formerly cef9771fe1 [formerly 69c55eff70bbfb445bdd9bf708ed5e4df896b42a]]
Former-commit-id: cef9771fe1
Former-commit-id: cd099c0902
2014-07-24 09:03:57 -04:00
Brian.Dyke
ff85bf3855 Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 6f47712e32 [formerly ff4e52fc75 [formerly df900c3156da1ed48c512fe4b1356c4b4301ad5f]]
Former-commit-id: ff4e52fc75
Former-commit-id: 80ebce9354
2014-07-23 16:46:09 -04:00
Matthew Howard
e8e3e65fbb Merge "ASM #15645 - Fix for AvnFPS: TAF syntax check fails when equal sign is missing" into asm_14.2.2
Former-commit-id: 06e7733a1d [formerly 6aa8d2102e [formerly b7a12394c70b928222d3aa5e819d1558f4033458]]
Former-commit-id: 6aa8d2102e
Former-commit-id: fecf7f3777
2014-07-23 15:12:14 -05:00
Zhidong.Hao
e085f07dd5 ASM #15645 - Fix for AvnFPS: TAF syntax check fails when equal sign is missing
Change-Id: I1a4fb9be1253b4655bd43674aab4a4ddcf6d0ce7

Former-commit-id: a3cda853cf [formerly 26c4bb2414 [formerly 192948e00538bcf0dfc0aaf20ea1dcb216313ffb]]
Former-commit-id: 26c4bb2414
Former-commit-id: d7cce22d02
2014-07-23 14:37:28 -04:00
Steve Harris
79c2727251 Merge branch 'master_14.2.2' (14.2.2-21) into omaha_14.2.2
Former-commit-id: 35130cb3f5 [formerly eaa4456fa7 [formerly 2c17b02a196584edbaa2cef33d8e9adc91567f8e]]
Former-commit-id: eaa4456fa7
Former-commit-id: 619ed933ac
2014-07-23 13:07:11 -05:00
Matthew Howard
92dfe3cb38 Merge "ASM #15649 - these 5 files are rolled back to 14.1.3" into asm_14.2.2
Former-commit-id: 621be56dbc [formerly b84f1255f0 [formerly 75a9fd67f7093fe2f8eb21cec6762210a3014351]]
Former-commit-id: b84f1255f0
Former-commit-id: 4cf9cc1178
2014-07-23 11:17:38 -05:00
Ying-Lian.Shi
a258d2fe22 ASM #15649 - these 5 files are rolled back to 14.1.3
Change-Id: Ifc52168f1faf3984f2a2d72947273686c5a00fd9

Former-commit-id: 1f6d24a076 [formerly 22d46f2658 [formerly ab5a6807a591605e230d4180f1dcf3c2eaa8657f]]
Former-commit-id: 22d46f2658
Former-commit-id: 9dbfbbe0c3
2014-07-23 12:24:22 +00:00
Jonathan Sanchez
c479178882 Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1

Former-commit-id: b991838494 [formerly 86a8ca4a30 [formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]]
Former-commit-id: 86a8ca4a30
Former-commit-id: 997485dd22
2014-07-22 15:32:12 -05:00
Shawn.Hooper
11196e7275 ASM #15630 - Check-in fix for GFE: Missing ISC Wind Grids on behalf of Ron Anderson
Change-Id: I9053182b6c02d6c77e10e23b017b94bcff4da58b

Former-commit-id: ae272328a3 [formerly 2a32d5945c [formerly 4bca3ffd258a6869150154e93abb652a1f22bc4d]]
Former-commit-id: 2a32d5945c
Former-commit-id: a70786ff22
2014-07-22 15:59:22 -04:00
Steve Harris
51f80b4c58 Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 8a7ea92c2b [formerly bce7039508 [formerly c0033681d38af55bff79efbceec119606fcc5c2f]]
Former-commit-id: bce7039508
Former-commit-id: 7b0b043c67
2014-07-22 10:26:33 -05:00
Shawn Hooper
3555c2504b Merge "Revert "ASM #15630 -- GFE: Missing ISC Wind Grids"" into asm_14.2.2
Former-commit-id: 1e2324481b [formerly 1a57a9adea [formerly 553333f8542d272d5412d9a8b1804e096c8031ff]]
Former-commit-id: 1a57a9adea
Former-commit-id: be7b6c166f
2014-07-22 10:19:27 -05:00
Shawn Hooper
c3c267fbdc Revert "ASM #15630 -- GFE: Missing ISC Wind Grids"
This reverts commit 4c06eca38e [formerly 212fcd9eb4] [formerly a5791db7cb] [formerly 8de6be5219 [formerly a5791db7cb [formerly db678db964b46a46e062cd0602cf9ce8bc96e4cd]]].

Change-Id: Ib5d03f81b35c0371e063a89739b823b8264c439f

Former-commit-id: 65802e34fd [formerly 425bcea65d [formerly 7dcfb55353ba7ec9d0619737da37781b0b186e5d]]
Former-commit-id: 425bcea65d
Former-commit-id: faf934a05a
2014-07-22 10:15:46 -05:00
Brian.Dyke
dc0fcade07 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 6811770438 [formerly 6c121acf63 [formerly 184da085244822b37575bf90e7f798c2abb842e9]]
Former-commit-id: 6c121acf63
Former-commit-id: 1fdf03034a
2014-07-22 07:08:34 -04:00
Ron Anderson
e0bfbb796b Issue #3415 Fixed d2dGridDataPurged to not purge NetCDF databases.
Change-Id: Ie52a5b8c46d58cb39acde27f0ebdde0c42fdfa67

Former-commit-id: 6ea726136b [formerly f3a6393b96 [formerly a2362b68b103c9013d615815924514ebe44be147]]
Former-commit-id: f3a6393b96
Former-commit-id: 7903a20dbc
2014-07-21 12:47:12 -05:00
Fay.Liang
4c06eca38e ASM #15630 -- GFE: Missing ISC Wind Grids
Change-Id: I289f1fafac8e034faa38dcddf639d5744fabe901

Former-commit-id: 8de6be5219 [formerly a5791db7cb [formerly db678db964b46a46e062cd0602cf9ce8bc96e4cd]]
Former-commit-id: a5791db7cb
Former-commit-id: 212fcd9eb4
2014-07-21 12:57:21 -04:00
Brian.Dyke
c16617e7f7 Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: c26e0cd548 [formerly e55b892fc3 [formerly 499b825592fdbdf150c918e5f3abacc4f37ddd70]]
Former-commit-id: e55b892fc3
Former-commit-id: 9ef7783251
2014-07-21 11:18:25 -04:00
David Friedman
59de9e6c91 ASM #15049 - LAPS time matching problem
Change-Id: I52eee87defb407b741208e183b9829558bfa6733

Former-commit-id: 188e25d2e7 [formerly ec25c44fe7 [formerly 624c3a4225910863d5cc0b795493a39c0422a3e3]]
Former-commit-id: ec25c44fe7
Former-commit-id: 6aebd3a19b
2014-07-18 17:06:05 +00:00
Nate Jensen
9aa3ba110f Issue #2954 actually log when the scalesInfo.xml cannot be parsed before
falling back to the base version

Change-Id: I2df669504061160c6ace76560f07845f99a80912

Former-commit-id: 2a01b1ebcd [formerly da731be2f7 [formerly 894e6ac1db5b34e6466c68aefa5877b9405bfd59]]
Former-commit-id: da731be2f7
Former-commit-id: 82bef00378
2014-07-17 13:27:48 -05:00
Nate Jensen
ef72e8e222 Issue #2954 fall back to existing map scales if map scale is missing
Change-Id: I75083325edec689c38f2fe7661c635ddf3e0f527

Former-commit-id: ed9bee5533 [formerly 6e21526fd2 [formerly c7167ad2f59ba02edc842f321d12cd36cd6da8bb]]
Former-commit-id: 6e21526fd2
Former-commit-id: c07802a208
2014-07-15 18:27:09 -05:00
Fay.Liang
e571f735bb ASM #15468 Shefdecode failed to ingest RVF product at OUN
Change-Id: I6238c25f867c0e6e491831e9c2b1c47e22484620

Former-commit-id: a00be8447d [formerly 87d50e7296 [formerly 3637d6387396f88811ec3964bd61d10ce0ee38eb]]
Former-commit-id: 87d50e7296
Former-commit-id: 7cbd90018e
2014-07-15 10:22:09 -04:00
Richard Peter
935b0c20e0 Issue #3146 Fix alert viz log statement.
Change-Id: Id55d73a77b7f408e02ea6fe6d528650839e535d0

Former-commit-id: 216d3ba749 [formerly e484749e1c [formerly deef73c921f9ba90b3db0f5793355f05ae861ffa]]
Former-commit-id: e484749e1c
Former-commit-id: 148bbebd42
2014-07-14 17:01:53 -05:00
Nate Jensen
c0d1fe1bd8 Issue #3372 make LocalizationStreamHandler thread safe
Change-Id: I208b66fbd2b0bfcd225c3df98f96bcdcf5cb9a88

Former-commit-id: aaa0ed7ed7 [formerly 47bf21d7b5 [formerly 87d5faa03ea63759a6805ed063174fb09ca4800a]]
Former-commit-id: 47bf21d7b5
Former-commit-id: 801ed7154f
2014-07-14 09:18:16 -05:00
Fay.Liang
a6b6b401f2 ASM #15468 Shefdecode failed to ingest RVF product at OUN
Change-Id: Ie345c88c4a3a0ff995c4d33772f90e863bed7ee5

Former-commit-id: 65677246c2 [formerly 400561ac9c [formerly f78783d2ea194539414294abff46d4f2acda65d1]]
Former-commit-id: 400561ac9c
Former-commit-id: 34465f09ce
2014-07-11 15:19:08 -04:00
Juliya Dynina
da9c6c35d2 Merge "ASM #15557 - Restore ability to display HPCGuide2.5" into asm_14.2.2
Former-commit-id: 8d967f1ecf [formerly ac39f9cb43 [formerly 9826716e2a5f59826e8a3789ca8d2d8f8dc58cce]]
Former-commit-id: ac39f9cb43
Former-commit-id: b9cd9042dd
2014-07-11 08:37:30 -05:00
Mike Duff
c5a344ac75 Issue #3370 - Revert "Issue #3370 - Fix for mulitple shef types in same file."
This reverts commit 6ce3e57525 [formerly e3b7a99388] [formerly b5b61650d3] [formerly 30655cf2ca [formerly b5b61650d3 [formerly 0c0b14929f74f2262559a4919171623870139313]]].


Former-commit-id: 73c75303a8 [formerly a35529bba4 [formerly 43cbf77bb90ba12a6ee11bc35b18c226f9490a88]]
Former-commit-id: a35529bba4
Former-commit-id: c8bfcd54a3
2014-07-10 16:01:56 -05:00
Melissa Porricel
73063fd894 ASM #15557 - Restore ability to display HPCGuide2.5
Change-Id: Ibdcdd0aa95e406b5cd886dc8f51e74a3cde54d17

Change-Id: I5594c2151026247d48e657a30c7b4f94b14f036f

Former-commit-id: 1f7cf4a165 [formerly d3c29b834d [formerly 5998e7ad9690e3b87805c75dcb711d299e8f1427]]
Former-commit-id: d3c29b834d
Former-commit-id: 1e5bef6820
2014-07-10 16:15:12 -04:00
Mike Duff
6ce3e57525 Issue #3370 - Fix for mulitple shef types in same file.
Change-Id: I23110d7887b68ff073afdf61815d7dced9c4a3ad

Former-commit-id: 30655cf2ca [formerly b5b61650d3 [formerly 0c0b14929f74f2262559a4919171623870139313]]
Former-commit-id: b5b61650d3
Former-commit-id: e3b7a99388
2014-07-10 10:05:05 -05:00
Ron Anderson
6ead047f79 Issue #3146 Added check for duplicate smartInit.
Added alertViz message for GFE site activation failure

Change-Id: I68a2b995922ac9ba7e75d02f317357fddde7f004

Former-commit-id: 468668e19b [formerly 0c0739bd72 [formerly eafc406ec75d5e1a1bbc93bb0b472a053922eb3a]]
Former-commit-id: 0c0739bd72
Former-commit-id: 9f4e89347a
2014-07-09 16:42:43 -05:00
steve.naples
72ae26401d ASM #253 Update RadarBiasTableDialog fix issue of not saving undo.
Change-Id: I57ad9d4407665fd4c5f7e922cbf3daac373c9f88

Former-commit-id: 0bd7b6c65b [formerly 339fcbc18a [formerly 24b9a6e0801cc653062a71d86090df3836aa86a4]]
Former-commit-id: 339fcbc18a
Former-commit-id: 2ebfd61f12
2014-07-09 15:42:51 +00:00
Ron Anderson
10f629428e Issue #3332 Fixed race condition which could cause GFE grid saving to hang
Change-Id: I4a2ef9e25999d95ac1ecf204907c59b2f1e85652

Former-commit-id: 5efba03474 [formerly 111b04296c [formerly b01b72b896b894568acce6a8dc4d45328a06067a]]
Former-commit-id: 111b04296c
Former-commit-id: 4b4629a2fd
2014-07-09 08:56:06 -05:00
steve.naples
9dcf27e217 ASM #253 Update RadarBiasTableDialog fix issue of not saving.
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673

Former-commit-id: 24b0d49a5b [formerly 75969ceec2 [formerly 9021eca6b32dd2b3859cd928c14a0e40a4907c13]]
Former-commit-id: 75969ceec2
Former-commit-id: 29ca2338b8
2014-07-08 16:32:08 +00:00
Brian.Dyke
6ea9a4cc23 Merge branch 'asm_14.2.2' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.2
Former-commit-id: 89c0457b1d [formerly 2ef4767652 [formerly 845aebda9d8af143e3a6828c066b291e0343a020]]
Former-commit-id: 2ef4767652
Former-commit-id: a33fdeb558
2014-07-07 13:33:35 -04:00
David Friedman
b82fb691e0 ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1

Former-commit-id: db8977e281 [formerly a45fe1dad0 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]]
Former-commit-id: a45fe1dad0
Former-commit-id: 8784501bba
2014-07-03 13:58:24 +00:00
Juliya Dynina
3cb8068313 Merge "ASM #253 Update RadarBiasTableDialog to remove old code." into asm_14.2.2
Former-commit-id: 470d50b4e4 [formerly 244b2f5f3a [formerly d6ae0d12f104de38b8fa770e4576b96a32da360c]]
Former-commit-id: 244b2f5f3a
Former-commit-id: 67580e73cd
2014-07-02 14:17:11 -05:00
Steve Harris
eaa91efeec Merge branch 'master_14.2.2' (14.2.2-17,18) into omaha_14.2.2
Former-commit-id: 0ef8a057f9 [formerly 136af3f7e2 [formerly c88d3136dbadab41df5fbf37b4b7c821dfcd07d9]]
Former-commit-id: 136af3f7e2
Former-commit-id: 9b7f820b06
2014-07-02 13:38:08 -05:00
Brian.Dyke
e68dd70904 Merge branch 'm1413_m1422_merge' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2 CM-MERGE:14.1.3-4 into 14.2.2
Former-commit-id: 658cf3dd56 [formerly d56843d0e8 [formerly 142e61e538fb094633933e5a2e1244441fc0106b]]
Former-commit-id: d56843d0e8
Former-commit-id: 0fc76ff807
2014-07-02 13:18:10 -04:00
steve.naples
e82b0ae895 ASM #253 Update RadarBiasTableDialog to remove old code.
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f

Former-commit-id: 4e959af1b4 [formerly 66c3241bc4 [formerly b9f868e0ced53987accf675bfe2ce1a1f4f34da1]]
Former-commit-id: 66c3241bc4
Former-commit-id: 3d75da3db0
2014-07-02 15:30:48 +00:00