Commit graph

1157 commits

Author SHA1 Message Date
Richard Peter
2c135c4501 Issue #1343: Fix Derived Parameter clean up of global map performance
Change-Id: Id5a37b16ffe311891a39acd21dab792d6c62fb29

Former-commit-id: 374bd6faa9 [formerly 3fb4137264] [formerly a4ca44195e] [formerly 374bd6faa9 [formerly 3fb4137264] [formerly a4ca44195e] [formerly 94ff0868d8 [formerly a4ca44195e [formerly eeed667765a9da192ba4d28923fa447d8ea81437]]]]
Former-commit-id: 94ff0868d8
Former-commit-id: 746ecaa62d [formerly 1ee2e40970] [formerly dd7c634d6b85818a4854cd4c99615e90363cf4a9 [formerly 57b23523dc]]
Former-commit-id: 0b1aa4e7a6922b5a95c6a5c2308729bd8995658d [formerly c3e4b81c7c]
Former-commit-id: 42850516da
2012-11-20 16:42:27 -06:00
Dustin Johnson
91082e4360 Issue #1322 Add IDisplay
Change-Id: I0f20b5e2e4544c2a984c317a812855f92e935b92

Former-commit-id: bf8a8c3149 [formerly 973ffa6f71] [formerly 4425d25c71] [formerly bf8a8c3149 [formerly 973ffa6f71] [formerly 4425d25c71] [formerly d68c1f84f2 [formerly 4425d25c71 [formerly 039c475445ca8f049c46547dba63d413f3019817]]]]
Former-commit-id: d68c1f84f2
Former-commit-id: 3ad9e1cbc2 [formerly bd77ea1c11] [formerly e518e2329e6b688915efb09f32fb92d4054cdaf8 [formerly fe187f62f7]]
Former-commit-id: 0272b650a74150e45e1b8db0294bf8852d1a536b [formerly 5ca7396d38]
Former-commit-id: 5e480196a4
2012-11-20 15:22:52 -06:00
Richard Peter
9e0fc31af1 Merge "Issue #189 clean up unneeded references to grib." into development
Former-commit-id: 95efb81458 [formerly 42ce93afa8] [formerly b68a8d986f] [formerly 95efb81458 [formerly 42ce93afa8] [formerly b68a8d986f] [formerly 48e33e05e7 [formerly b68a8d986f [formerly 6cb68df37fd22b45abcaee309f9f364456905191]]]]
Former-commit-id: 48e33e05e7
Former-commit-id: b20e227cb1 [formerly d695c10d87] [formerly 604033f062de5fafc2e57bbf1ac475d77ee2c9f5 [formerly 36ce487edc]]
Former-commit-id: 39faf3a4ffbaf7528e8140375a48d71a84e88550 [formerly dfa27ccab6]
Former-commit-id: a63f796be5
2012-11-19 17:16:08 -06:00
Richard Peter
958ece7446 Merge "Issue #189 add some more catch blocks to contour subgridding so it works in more odd cases." into development
Former-commit-id: 5eca62acc6 [formerly cee57ad2c1] [formerly 8bb1e1675d] [formerly 5eca62acc6 [formerly cee57ad2c1] [formerly 8bb1e1675d] [formerly 625141ffb3 [formerly 8bb1e1675d [formerly 6570ee57790d482a212ee65dc2ed9482ba8de8b6]]]]
Former-commit-id: 625141ffb3
Former-commit-id: 2f00bb819e [formerly c063e130f1] [formerly 2947d8b18b27bef886d297c5bbf0b21d654d4de8 [formerly 379b303985]]
Former-commit-id: 629a2df5e5fda1551cca4f0a8ee897fa6c435a07 [formerly 9f3c913d32]
Former-commit-id: 3f48932678
2012-11-19 17:15:07 -06:00
Ben Steffensmeier
d1cdfbec7d Issue #189 clean up unneeded references to grib.
Former-commit-id: 72792fd1b8 [formerly 9dd5c8d545] [formerly 7226decbe2] [formerly 72792fd1b8 [formerly 9dd5c8d545] [formerly 7226decbe2] [formerly 7e1463f328 [formerly 7226decbe2 [formerly b25e86c8f369297b8e21efe7cdc0a9874c0cc470]]]]
Former-commit-id: 7e1463f328
Former-commit-id: 3c47e2bc6f [formerly f0c1fcae31] [formerly 623f130b6c25d38fa4d4e0a2c769c9011f96f103 [formerly 9b1b658f42]]
Former-commit-id: 81c76cfda13aded66ad0c485bb85ba568420a3f6 [formerly 08df92cccd]
Former-commit-id: 63f751fa7b
2012-11-19 13:33:02 -06:00
Dustin Johnson
a4b4e67a64 Issue #1322 Move router registry to edex.xml
Amend:
  Add requestRouterRegistry to viz Spring file.

Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864

Former-commit-id: ea7537804c [formerly dd82a472e5] [formerly 13b1683458] [formerly ea7537804c [formerly dd82a472e5] [formerly 13b1683458] [formerly a9d01486ed [formerly 13b1683458 [formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]]]
Former-commit-id: a9d01486ed
Former-commit-id: add45e6805 [formerly dd03bf9bd5] [formerly c8e8f27647ef18ecfbb5e4b6ae6a9f36c8133dea [formerly 1bb69653af]]
Former-commit-id: d71f218208ec47f1958e84baa204371a3d055b80 [formerly f91817813d]
Former-commit-id: 5b64ddb7ba
2012-11-19 13:21:03 -06:00
Ben Steffensmeier
b022158e4d Issue #189 add some more catch blocks to contour subgridding so it works in more odd cases.
Former-commit-id: b5d4cd8534 [formerly 7bb12231f6] [formerly 43d506d8eb] [formerly b5d4cd8534 [formerly 7bb12231f6] [formerly 43d506d8eb] [formerly 6c875b276a [formerly 43d506d8eb [formerly 6670aaff36bca8df4f6b841dc288199e69b5843d]]]]
Former-commit-id: 6c875b276a
Former-commit-id: 7a7b821029 [formerly 688c5b6119] [formerly e922532cd40d95b117ded20705442ec0d75139b6 [formerly 6758415123]]
Former-commit-id: bc1d2340c3d9d31d2ec484a941f8e98dce95a222 [formerly c6af2e27c9]
Former-commit-id: c12aa2f438
2012-11-19 12:30:44 -06:00
Steve Harris
ae2d459202 Merge "Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed" into development
Former-commit-id: 972bbe5676 [formerly 264dc4bc43] [formerly 0d16c0c0df] [formerly 972bbe5676 [formerly 264dc4bc43] [formerly 0d16c0c0df] [formerly 63cdc32988 [formerly 0d16c0c0df [formerly 4dac2ba9a01b36885188f93fdaf974099cbc9d0c]]]]
Former-commit-id: 63cdc32988
Former-commit-id: 042780cdc0 [formerly 082e1cbd09] [formerly 51ddde0dc0e8afec3e577c5e3a5b7875642863d7 [formerly 91bc36fda3]]
Former-commit-id: 6d39e10b4f48895af3c4344558f3acbb0f10c637 [formerly 1173d7fd8e]
Former-commit-id: e92c60d902
2012-11-16 15:35:47 -06:00
Steve Harris
d257f19e0a Merge "Issue #1151 fix radar updates to use levels" into development
Former-commit-id: e477d5c7ec [formerly 601eb746d1] [formerly 5c71f2551b] [formerly e477d5c7ec [formerly 601eb746d1] [formerly 5c71f2551b] [formerly 152c06a718 [formerly 5c71f2551b [formerly 939d9031e4bc1107333f066321ec28ea93cfd3c3]]]]
Former-commit-id: 152c06a718
Former-commit-id: 93c2fdf3e0 [formerly 3d628abebe] [formerly c9cf9e23e389b5119c8375282fb8d835d167b3df [formerly b04797de6f]]
Former-commit-id: 99e63617fdcb73331a3d17835d3a2511b09c4bf8 [formerly 03e30d568f]
Former-commit-id: 950e6f7ad7
2012-11-16 15:35:26 -06:00
Dustin Johnson
064ecbb159 Issue #1322 Add server keyed routing
Amend:
  Remove ServiceLoader files for RequestRouter.
  Resolve peer review comments.

Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b

Former-commit-id: 22c930824c [formerly d1024d091c] [formerly 87148a8061] [formerly 22c930824c [formerly d1024d091c] [formerly 87148a8061] [formerly 8a6be78eb0 [formerly 87148a8061 [formerly d7010894ecd0d1702567d52260fdf6088468eb09]]]]
Former-commit-id: 8a6be78eb0
Former-commit-id: 9b9f41cb5a [formerly a448369b44] [formerly 0e562f6e19c01c0c23b34e7e423696a3b7663f29 [formerly 1d5714b994]]
Former-commit-id: 960ecc6840d0a9a5daf8843cf376de88f65aa067 [formerly 2afb19d76b]
Former-commit-id: 08f3910ece
2012-11-16 14:43:45 -06:00
Max Schenkelberg
0cf0cec449 Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed
Change-Id: I25ab9832d725647c17aea505514334a7c0026ae7

Former-commit-id: 8b497d5900 [formerly 34c4ec44c3] [formerly 0daa22064b] [formerly 8b497d5900 [formerly 34c4ec44c3] [formerly 0daa22064b] [formerly 71367ef5bb [formerly 0daa22064b [formerly a7386c6570455fe6f9175eaeae1225923124cce8]]]]
Former-commit-id: 71367ef5bb
Former-commit-id: 09c3fa90aa [formerly afc4de9a1a] [formerly abe81bf3cd4269bfb4f9905a69a85f5a8e3dafd3 [formerly 102c2dbaa1]]
Former-commit-id: d6b0b16d2c9a2fc53d971c3121462eb681da9d9c [formerly 755c64bfdc]
Former-commit-id: dc4876fa33
2012-11-16 14:12:27 -06:00
Ben Steffensmeier
dc61fe019c Issue #1151 fix radar updates to use levels
Former-commit-id: f27749abb2 [formerly f04ac9f7b0] [formerly 9efd40dfd0] [formerly f27749abb2 [formerly f04ac9f7b0] [formerly 9efd40dfd0] [formerly 8ac1373035 [formerly 9efd40dfd0 [formerly 7666bee12af83d195fccd845e874df19eabd94f6]]]]
Former-commit-id: 8ac1373035
Former-commit-id: 069256d109 [formerly 956b6ecfdb] [formerly bc222ac0e4190182eb5a9af79adf31fd12a57a0b [formerly a1d70499eb]]
Former-commit-id: 42222488d45ceefd41f999f59e7141674d2c90a0 [formerly 060aed7ce2]
Former-commit-id: 07cae7c217
2012-11-16 13:53:05 -06:00
Slav Korolev
fdcb811cad Issue #1297. Changed non-blocking ZoneTableDlg. Next patch.
Changes from reviewers comments.

Change-Id: Ie812ef1167fa6b1ea78ee615190bd3059285a682

Former-commit-id: a519f985ec [formerly 487a9eabb8] [formerly d220f74018] [formerly a519f985ec [formerly 487a9eabb8] [formerly d220f74018] [formerly 4560efe149 [formerly d220f74018 [formerly 8f002a71cb688fe8fbf7378ef53398dfecb0354e]]]]
Former-commit-id: 4560efe149
Former-commit-id: 9bb8e24c52 [formerly 063c155818] [formerly 513793f8cfb0f26fa9576ec1dfb831fc65d80eec [formerly 765dbd8766]]
Former-commit-id: c377dec9d403627caffad2d4a3d988df6b86227a [formerly 711ba6b2b5]
Former-commit-id: 5c09c11912
2012-11-16 11:08:42 -05:00
Lee Venable
4745a2d434 Merge "Issue #1298 Changes for non-blocking GhgAlertDlg." into development
Former-commit-id: 3eba3cc1e6 [formerly eb297f00fc] [formerly 0540d84e4e] [formerly 3eba3cc1e6 [formerly eb297f00fc] [formerly 0540d84e4e] [formerly 40f11cfba5 [formerly 0540d84e4e [formerly e96cd422716fc6da7c0007b58fa75659c7600ad7]]]]
Former-commit-id: 40f11cfba5
Former-commit-id: f246c5746c [formerly 247a2859ca] [formerly db488b57f68a48ef282a9fda654e55329f0e887d [formerly aa4b1f4970]]
Former-commit-id: 47b9158ca8f8b6c3bb20bf5866ba92e44f028d4d [formerly 9bef16f8ab]
Former-commit-id: 84ac6354e8
2012-11-15 17:43:31 -06:00
Max Schenkelberg
f980bf1d4f Issue #1243 moved locking for getFile into adapter code for cave since that is the only time a file is actually downloaded and requires locking
Change-Id: I39920677769e1a885ac7b3f1003dd52ae1dc2737

Former-commit-id: a40abfda65 [formerly a472f5535b] [formerly 655f54b098] [formerly a40abfda65 [formerly a472f5535b] [formerly 655f54b098] [formerly f540f65fd7 [formerly 655f54b098 [formerly 4648ab539b37a0608ab7ebab5080317bbf618504]]]]
Former-commit-id: f540f65fd7
Former-commit-id: d86550c239 [formerly db2fe0b5e8] [formerly 6ed55cce2d899bb904eca4a9886c9f8d39f745d2 [formerly f1866b2e49]]
Former-commit-id: b6193bec079d86df90df890267f3f0fecb331b78 [formerly 7ffce5cd45]
Former-commit-id: a94b9c173d
2012-11-15 16:21:42 -06:00
Roger Ferrel
c67b4704a5 Issue #1298 Changes for non-blocking GhgAlertDlg.
Change-Id: I1da7317ad69203a4160c806458fdbf99a7d9108d

Former-commit-id: 7811b44376 [formerly b66bc0210a] [formerly 800c1a6908] [formerly 7811b44376 [formerly b66bc0210a] [formerly 800c1a6908] [formerly c0554d9686 [formerly 800c1a6908 [formerly b3c640da3fad8d1ce07e348b075b9b1a0468da37]]]]
Former-commit-id: c0554d9686
Former-commit-id: 273f68e6bf [formerly 0a11332193] [formerly f1224ad7a9ab994434fec5a5c2870efc11e20f61 [formerly 05f32527bd]]
Former-commit-id: cddcd29451786bb76e6ce9789bf1fd88d155b82a [formerly 342a35599b]
Former-commit-id: f805c4cccd
2012-11-15 15:51:46 -06:00
Roger Ferrel
5651e6cf94 Issue #1298 Changes for non-blocking GhgMonitorDlg.
Change-Id: I69a05b6d62e8d75c998b6cb9059c9f45e6cf39d3

Former-commit-id: 07cc6ec003 [formerly a29b52ca8c] [formerly dc82ad820b] [formerly 07cc6ec003 [formerly a29b52ca8c] [formerly dc82ad820b] [formerly 109dea21e1 [formerly dc82ad820b [formerly 782113272c208a32e6165c02404138fcaa79d523]]]]
Former-commit-id: 109dea21e1
Former-commit-id: 76d9479fb9 [formerly e35d7b3f15] [formerly 2ae5143718b7d58053a166fd95152a86a5f839a4 [formerly 2206167b00]]
Former-commit-id: 85588a6263d25f3adb28f0df471c45afbe533fc5 [formerly 418dd35a9d]
Former-commit-id: 64ae20f4a9
2012-11-15 14:37:29 -06:00
Roger Ferrel
1434078488 Issue #1298 Changes for non-blocking SelectionDlg.
Change-Id: I9829945037f8f5ce268eb3731302ae77e83d837b

Former-commit-id: 3087efb2e0 [formerly 5f3fab4677] [formerly 00693d83bb] [formerly 3087efb2e0 [formerly 5f3fab4677] [formerly 00693d83bb] [formerly 59181213a0 [formerly 00693d83bb [formerly cd85c4e60fd3863c39a7c61ad73848207e196a05]]]]
Former-commit-id: 59181213a0
Former-commit-id: c2ccf9dd90 [formerly d0cdc594f8] [formerly c9f30770363ef819d269136eb35a07599220439c [formerly fdfcb2ebea]]
Former-commit-id: 450d4e6ceac61771c28c73b3f3337fb38ef4d012 [formerly e424cb4bf2]
Former-commit-id: 619197cbb2
2012-11-15 12:55:49 -06:00
Roger Ferrel
95711528ad Issue #1298 Changes for non-blocking MoveWeatherElementDialog.
Change-Id: I5f41c52d45146a0e9cdfbf613ec3918382f6a455

Former-commit-id: 8cce309a6e [formerly fc87eccb77] [formerly a6fdc7b580] [formerly 8cce309a6e [formerly fc87eccb77] [formerly a6fdc7b580] [formerly acf1881cb7 [formerly a6fdc7b580 [formerly dd80807a0469e7c677f8e0d214fcdec715c67518]]]]
Former-commit-id: acf1881cb7
Former-commit-id: 4b6c5bc2d3 [formerly 8881e4d3ec] [formerly 092e0c8e86fd9af48cdabc168fe255b8d961546d [formerly d6c5839e0e]]
Former-commit-id: 8753a2bf60a5a6a69df5eac63b7ac9f764b8df27 [formerly 265adb9b1c]
Former-commit-id: aeb27b3c88
2012-11-14 16:33:27 -06:00
Max Schenkelberg
ecde93e6fc Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors.
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.

Amend: Rebased

Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567

Former-commit-id: 61f0c0501b [formerly fe11e31bfb] [formerly dcde9e8951] [formerly 61f0c0501b [formerly fe11e31bfb] [formerly dcde9e8951] [formerly 28e61c8285 [formerly dcde9e8951 [formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]]]
Former-commit-id: 28e61c8285
Former-commit-id: 91607fb03e [formerly 5aa26e4f13] [formerly 5f777b3fc72c55ae811d6c28a223bff8a71b24e9 [formerly 2e20c3e799]]
Former-commit-id: 2d176fd248163b3e85988708b437bfc1e899b487 [formerly 429ddc7312]
Former-commit-id: eec401909b
2012-11-14 16:19:37 -06:00
Nate Jensen
1929f50b1b Merge "Issue #189 fix contour subgridding for worldwide grids" into development
Former-commit-id: 38b27d23af [formerly ee7daccb2c] [formerly 5055164f55] [formerly 38b27d23af [formerly ee7daccb2c] [formerly 5055164f55] [formerly 340f8e1fa8 [formerly 5055164f55 [formerly 553b56aa362b452110a7f5a4f76aec9640d13599]]]]
Former-commit-id: 340f8e1fa8
Former-commit-id: 03192766ba [formerly 721ef4452d] [formerly 20413eb7c1980b78cd6d04d145b4b6df5833b8ad [formerly 6210f94be1]]
Former-commit-id: 286c5679d1cb42cf6daa5a907a37d31fb5d54c87 [formerly 85fdcaf854]
Former-commit-id: 3caa746f20
2012-11-14 16:09:51 -06:00
Lee Venable
11fff1b8a9 Merge "Issue #1298 Changes for non-blocking DisplayAttributesDialog." into development
Former-commit-id: 2c82bf1184 [formerly 6152ecccda] [formerly 695cf85335] [formerly 2c82bf1184 [formerly 6152ecccda] [formerly 695cf85335] [formerly 6134e5d3f7 [formerly 695cf85335 [formerly 33b0aada5191fd6a757f37029862cdcadf8c0692]]]]
Former-commit-id: 6134e5d3f7
Former-commit-id: e32f3dec10 [formerly d82072b975] [formerly 5f410f0507be8de6ebdea359793b084ce6d0667a [formerly 7ed335793f]]
Former-commit-id: fd8ba36786cde6648c7dcd2507759b25826950f3 [formerly 3369913a84]
Former-commit-id: f3cf44ffb4
2012-11-14 16:06:02 -06:00
Lee Venable
aa93fdbc1d Merge "Issue #1298 Changes for non-blocking TEWxSetValueDialog." into development
Former-commit-id: 39972763e4 [formerly 64d9ba9184] [formerly 8fa3d794fd] [formerly 39972763e4 [formerly 64d9ba9184] [formerly 8fa3d794fd] [formerly edfab7e56f [formerly 8fa3d794fd [formerly eceb7bed3794368ebb0cd57e466e7beaee88a19d]]]]
Former-commit-id: edfab7e56f
Former-commit-id: e251942c81 [formerly 2f4b1d9d5f] [formerly d1ce292dff3c47cb135f6e21036c0f1507192a9e [formerly bbba9b1b29]]
Former-commit-id: 9d5b108a89f2159f4cf9ac0dfb23af5dd88643c0 [formerly 9c177ca2c9]
Former-commit-id: 8f20559063
2012-11-14 16:05:20 -06:00
Roger Ferrel
cfd0219849 Issue #1298 Changes for non-blocking DisplayAttributesDialog.
Change-Id: I2175023db40ad6b24c47ebc2cd16e12572fb1b6d

Former-commit-id: 08919ea541 [formerly 82f9c74bef] [formerly 7ca75756ae] [formerly 08919ea541 [formerly 82f9c74bef] [formerly 7ca75756ae] [formerly 212045c1a6 [formerly 7ca75756ae [formerly 260f5085bba45ab5b3ad10dd3945a64195eb2d7b]]]]
Former-commit-id: 212045c1a6
Former-commit-id: 27b63206b7 [formerly 7f33d6ba18] [formerly fe1b8540deb8623751c11b171ed8881812641aa8 [formerly d069f186e1]]
Former-commit-id: 595a95d4a2e9268a01bcd2a146917008b3ea53c6 [formerly 9cf45444c3]
Former-commit-id: 9a04b3847b
2012-11-14 14:56:42 -06:00
Dustin Johnson
c6dbe1bc0c Merge branch 'ss_builds' (12.12.1-4) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]]
Former-commit-id: 0d1d663f41
Former-commit-id: 08fd67e94a [formerly 5d5dbe27e1] [formerly 96aa1003fe8c19de9bb5ccd77ca2429b1e310a1c [formerly e25b7c312b]]
Former-commit-id: bcac2231856130f2c05f39f9472f65a6c8313dca [formerly ff33643234]
Former-commit-id: 6d21c445c2
2012-11-14 14:41:57 -06:00
Roger Ferrel
d886446fd8 Issue #1298 Changes for non-blocking TEWxSetValueDialog.
Change-Id: I2d46c885ef0aa7aa8019665e8822d62ed221be8b

Former-commit-id: cac846718a [formerly 679d967382] [formerly 7f22145bf2] [formerly cac846718a [formerly 679d967382] [formerly 7f22145bf2] [formerly dd8f8a9fa7 [formerly 7f22145bf2 [formerly f489ae636459e2dfcf7092d0ede7a37e84398cb2]]]]
Former-commit-id: dd8f8a9fa7
Former-commit-id: 086f464e38 [formerly 56ed69fc83] [formerly 9c581c148e8a0d69f42133e580578c5ccbd32780 [formerly 89653eb5e1]]
Former-commit-id: 789d2bb255666f1d1de0f8dd7cc54d54cc11ef0e [formerly eb20af7237]
Former-commit-id: 52425e6b99
2012-11-14 14:20:40 -06:00
Steve Harris
ccb16b9b44 12.12.1-4 baseline
Former-commit-id: b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]]
Former-commit-id: 57578da521
Former-commit-id: 4300583fc2 [formerly e35a321a8c] [formerly 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6]]
Former-commit-id: 83b699079d09b1ae989d5d92097f6ebe23a8c242 [formerly 493f335c0b]
Former-commit-id: 2c2bfc949d
2012-11-14 14:19:20 -06:00
Roger Ferrel
3da9e354ef Issue #1298 Changes for non-blocking TEDiscreteSetValueDialog.
Change-Id: I4e015b94f20b5075c4dc22d2165718d02109e0a8

Former-commit-id: a49ee93898 [formerly 62faa06ddf] [formerly e267248b57] [formerly a49ee93898 [formerly 62faa06ddf] [formerly e267248b57] [formerly 2331b8e1f5 [formerly e267248b57 [formerly 5c0eef28a67b874f184fd391d9220957030e43c7]]]]
Former-commit-id: 2331b8e1f5
Former-commit-id: 33cd82df5c [formerly ce623db367] [formerly f3b0d96220d8990a788ce98360553eaaec46477f [formerly 3f0dc83f89]]
Former-commit-id: f8a232315a21dff3d1fc6aebae60af3f68f041c1 [formerly 55b052c849]
Former-commit-id: 51b30ca9b5
2012-11-14 14:02:01 -06:00
Lee Venable
9ea463500b Merge "Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog." into development
Former-commit-id: 68a58d808a [formerly a6e88a6856] [formerly e755889643] [formerly 68a58d808a [formerly a6e88a6856] [formerly e755889643] [formerly e9ae25e781 [formerly e755889643 [formerly dbb1bc97d99827f7e97039f7a333ae0fc00353f0]]]]
Former-commit-id: e9ae25e781
Former-commit-id: 0f3fb27af1 [formerly 680373301f] [formerly 298e4f53220a5c54f7602fa97c954e24234058eb [formerly 09591687a9]]
Former-commit-id: 1403991e984897e87d6f3d04391b121fc1204131 [formerly 9cbd7cdcbe]
Former-commit-id: 12e2e49950
2012-11-14 13:30:42 -06:00
Roger Ferrel
2f56256eb8 Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog.
Change-Id: I5c2ae63c0461d5e3e96a050c0055a625b1271072

Former-commit-id: a8453f1f81 [formerly 7f3d893c84] [formerly d16a448e05] [formerly a8453f1f81 [formerly 7f3d893c84] [formerly d16a448e05] [formerly 590eca2cba [formerly d16a448e05 [formerly eadf4e9a28df6687a8e0bee6c6cef74356cd26d7]]]]
Former-commit-id: 590eca2cba
Former-commit-id: f954d3dbe5 [formerly 78422d9893] [formerly 8bfed4f98086bca15c0c91bc03d65765d14477ce [formerly 950300e16d]]
Former-commit-id: 5109692e005e1bf78b156e94f1028cd351020468 [formerly a39abc035b]
Former-commit-id: 51e6ed0bcb
2012-11-14 12:04:18 -06:00
Ben Steffensmeier
d9c29bf16b Issue #189 fix contour subgridding for worldwide grids
Former-commit-id: 3165998c1c [formerly 33d07530c6] [formerly 3ee95cff21] [formerly 3165998c1c [formerly 33d07530c6] [formerly 3ee95cff21] [formerly 929a785e1b [formerly 3ee95cff21 [formerly e0fb632cc7e0d089436b64a3f2bc6977a0487708]]]]
Former-commit-id: 929a785e1b
Former-commit-id: 8f5469f3a5 [formerly 7de15734e9] [formerly 3043904c1186406f3a7c5e40c122df9a7ee2f7ad [formerly 76996706f4]]
Former-commit-id: 58d373587bc0aa0677f2e326061e5892fcf68274 [formerly acd5002c94]
Former-commit-id: 1bf949a006
2012-11-14 11:38:25 -06:00
Roger Ferrel
a19864da10 Issue #1298 Changes for non-blocking WeatherElementGroupDialog.
Changes from reviewer comments.

Change-Id: Ib21a454575115f26da165704454caaa76d86b5ac

Former-commit-id: 4424131662 [formerly 5e805da0e1] [formerly 049ecefe1d] [formerly 4424131662 [formerly 5e805da0e1] [formerly 049ecefe1d] [formerly b32480ed08 [formerly 049ecefe1d [formerly d8b828e6bc0a47caa01165cdb22e87f301534e30]]]]
Former-commit-id: b32480ed08
Former-commit-id: ffefe1fe90 [formerly be24ca5ed6] [formerly 488a54e8e90966466526378b7880051a98a03d8f [formerly af0ad0433b]]
Former-commit-id: 1a8432622a51776a62fa26692467b1aa2e8e42ff [formerly bdeb05acbb]
Former-commit-id: d5e0266a5e
2012-11-14 11:36:52 -06:00
Steve Harris
b5fd6ed2fd Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]]
Former-commit-id: 00f3d51546
Former-commit-id: 98670f1cc2 [formerly 21ecd53719] [formerly 2de30d78d62b41d67562abff25e91b45ac8ab8fc [formerly c8cac52915]]
Former-commit-id: 02f982c590df771367e3d55fa354bfe951bed8de [formerly 59efd9a217]
Former-commit-id: ae9d9985cd
2012-11-13 17:28:50 -06:00
Steve Harris
f21d879641 12.12.1-3 baseline
Former-commit-id: 48fa2a9106 [formerly a81c46987b] [formerly c999505fba] [formerly 48fa2a9106 [formerly a81c46987b] [formerly c999505fba] [formerly b3b5e6d28f [formerly c999505fba [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 5f628acefd [formerly 2e3662028f] [formerly b188535ef6619becad681ca44d5bacd7a27bb351 [formerly 2797cbcdd0]]
Former-commit-id: 379f849720c82d98605dec3a6a94876bfa6a52fb [formerly 314495dc8e]
Former-commit-id: 7058ebec23
2012-11-13 17:27:04 -06:00
Steve Harris
9e4dbe2640 12.12.1-2 baseline
Former-commit-id: 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 5365b72401 [formerly 111e7607cf] [formerly 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed]]
Former-commit-id: 0a26a9f757bec6107dd0eb5024ce9aaf5d84b865 [formerly 96a4a4f3f5]
Former-commit-id: 53d74c66e7
2012-11-13 17:14:24 -06:00
Lee Venable
1716ce4706 Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
Former-commit-id: 4320165247 [formerly 2827143110] [formerly 989d5dc5e4] [formerly 4320165247 [formerly 2827143110] [formerly 989d5dc5e4] [formerly dbdfda1d04 [formerly 989d5dc5e4 [formerly 7f22292e89e05b881466efd1d81ef851c454246a]]]]
Former-commit-id: dbdfda1d04
Former-commit-id: 4c936e9bb8 [formerly 77af9b8699] [formerly a654acdd7cf3477fb8a44e9b6bf136dee6be7b3d [formerly 282e8858da]]
Former-commit-id: 39a32350f8aad475612690d01a1181af0a42bb21 [formerly 5f79e0f562]
Former-commit-id: 4353b75410
2012-11-13 16:02:05 -06:00
Steve Harris
ccddf90d74 Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
Former-commit-id: 5569785336 [formerly 1f1659cb16] [formerly 63b0f18a89] [formerly 5569785336 [formerly 1f1659cb16] [formerly 63b0f18a89] [formerly 5c23f057b3 [formerly 63b0f18a89 [formerly b0c071ca9877eb73e312a530d6abb94563cbc980]]]]
Former-commit-id: 5c23f057b3
Former-commit-id: 7abc2601da [formerly 6db07e2e5e] [formerly b9c2ea0185e67881a053d4f784a50c258b57989c [formerly 1e0ad343d6]]
Former-commit-id: 5b2963e196fa2df8ead47999d773eb0a16ae2a62 [formerly 07abe90d1c]
Former-commit-id: 81015f6f41
2012-11-13 16:02:03 -06:00
Ben Steffensmeier
b57a30d18d Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: 626f398224 [formerly ed4f88aa22] [formerly 69fc030bb4] [formerly 626f398224 [formerly ed4f88aa22] [formerly 69fc030bb4] [formerly e8090e654b [formerly 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]]
Former-commit-id: e8090e654b
Former-commit-id: fa599c93a8 [formerly 109ec1e778] [formerly 5df39335de7af8262df41e9b6116647d8d9986f5 [formerly 60f78c22e3]]
Former-commit-id: 1922ebb0208920ac3ef27814907ade54d1a0244a [formerly 7761060a12]
Former-commit-id: 9f2f2591ee
2012-11-13 16:00:19 -06:00
Roger Ferrel
2ad77ad5af Issue #1298 Changes for non-blocking SetValueDialog.
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f

Former-commit-id: f9265a7f55 [formerly cbacc77367] [formerly 1d5bd95866] [formerly f9265a7f55 [formerly cbacc77367] [formerly 1d5bd95866] [formerly dceb2cde5d [formerly 1d5bd95866 [formerly 5c94dd5727420ff612ff1fa5bbdb06a041e89459]]]]
Former-commit-id: dceb2cde5d
Former-commit-id: 12ad9f9732 [formerly c498e21b23] [formerly 064d919288c957d602a2f2cbce59be833dac3237 [formerly 29eb436b19]]
Former-commit-id: 1d576bb378acf793b8153df70fc725f7aa86fb57 [formerly 0b8ecada1b]
Former-commit-id: de65e19817
2012-11-13 15:53:03 -06:00
Lee Venable
0aa9ed1a70 Merge "Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg." into development
Former-commit-id: 65c0b3953e [formerly 5b4f3c68f1] [formerly c1e46f52ca] [formerly 65c0b3953e [formerly 5b4f3c68f1] [formerly c1e46f52ca] [formerly 9d149bef29 [formerly c1e46f52ca [formerly 795564ae453a7afb423980679c3719a7c453aa74]]]]
Former-commit-id: 9d149bef29
Former-commit-id: 57725df0a1 [formerly 3d07136ccc] [formerly 1d750981a09a5ee9d6d9bde6568cd2d514c44071 [formerly 32f088d986]]
Former-commit-id: 27c9dce3c76731042201961c69a8816f8461eb51 [formerly 07c1a3b61b]
Former-commit-id: c79fb63b54
2012-11-13 15:35:13 -06:00
Roger Ferrel
318a56771a Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0

Former-commit-id: 9ec6ee1fe4 [formerly 6f6b9dd21a] [formerly 1e8dfdc857] [formerly 9ec6ee1fe4 [formerly 6f6b9dd21a] [formerly 1e8dfdc857] [formerly b421a30116 [formerly 1e8dfdc857 [formerly 149198a0ab46b58518edb02c1bfb19e2f432726c]]]]
Former-commit-id: b421a30116
Former-commit-id: dce9814cc7 [formerly 1272837397] [formerly 9fb3810dd061a915575be1fa8b5d2e12821cf89c [formerly d646f32d6e]]
Former-commit-id: 598844707b6924bafba9f9d28c39f879556aa343 [formerly 3eb1da1b66]
Former-commit-id: 295c73d59e
2012-11-13 13:20:28 -06:00
Roger Ferrel
909a8285d0 Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081

Former-commit-id: 2209d4d650 [formerly e3ae2eb355] [formerly 22f8bc10f0] [formerly 2209d4d650 [formerly e3ae2eb355] [formerly 22f8bc10f0] [formerly 4c3af2a258 [formerly 22f8bc10f0 [formerly 4da71d30d62eeeee3546c3019850e77cab757c78]]]]
Former-commit-id: 4c3af2a258
Former-commit-id: af8fa780d2 [formerly c1c0e53b2d] [formerly 1c4ed8e46fd206b5fb6dfee23125c65e6807a1ec [formerly 8e85e1c8df]]
Former-commit-id: e264bdded33ddcea6a27100220ede625d7040a4f [formerly 1b582e49a6]
Former-commit-id: 046da0519b
2012-11-13 12:55:33 -06:00
Roger Ferrel
fa64ad879e Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
Changes from reviewer's comments.

Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f

Former-commit-id: e82a2e2d5c [formerly fdfa0f2030] [formerly 5ce67ffd9e] [formerly e82a2e2d5c [formerly fdfa0f2030] [formerly 5ce67ffd9e] [formerly ae52206cc7 [formerly 5ce67ffd9e [formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]]]]
Former-commit-id: ae52206cc7
Former-commit-id: e4283e3ccd [formerly 122a5cf0a4] [formerly e30f66c230e0ca09d4cf1ce286c67a28b4b91763 [formerly 30c70cc181]]
Former-commit-id: 3709ef12351e9d79d8edef04d9bb2919d7e91d9d [formerly d31e866744]
Former-commit-id: 58dc77407c
2012-11-13 09:49:16 -06:00
Nate Jensen
62d2ccbfa8 Merge "Issue #1324 make times display in 24 hour time" into development
Former-commit-id: dcff3f4711 [formerly ca20259c16] [formerly 8a07ba3c11] [formerly dcff3f4711 [formerly ca20259c16] [formerly 8a07ba3c11] [formerly e7045022ad [formerly 8a07ba3c11 [formerly 40c13a1ca4345f791c9f6f3849fe896ba27a2830]]]]
Former-commit-id: e7045022ad
Former-commit-id: e6f79c3e2a [formerly 2be953df6b] [formerly 0145a91c7598ae528ddbebde30ec8710ab7722e0 [formerly 7baf10fc53]]
Former-commit-id: 5164924ccea10acce2c3ce5e7c8e2be59f6be1d1 [formerly b4bfd19895]
Former-commit-id: 7be1809e99
2012-11-13 09:28:05 -06:00
Nate Jensen
6c6feff5ab Merge "Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels." into development
Former-commit-id: 35ea1b7773 [formerly 254e88a70c] [formerly 8a1f3a10a4] [formerly 35ea1b7773 [formerly 254e88a70c] [formerly 8a1f3a10a4] [formerly e51d86ce3a [formerly 8a1f3a10a4 [formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]]]
Former-commit-id: e51d86ce3a
Former-commit-id: 826c997e0b [formerly 14b61ef0f8] [formerly 41eca00d43f0977ae5f16683be5bae42fb520906 [formerly cf8fd9f731]]
Former-commit-id: b90abea64ee950c05accfd4ff636e4e81d7537dd [formerly d94afa6a55]
Former-commit-id: 0f982fbf32
2012-11-12 17:16:07 -06:00
Lee Venable
65d9170e0d Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
Former-commit-id: ca88126428 [formerly e62c2fb732] [formerly a576274c3c] [formerly ca88126428 [formerly e62c2fb732] [formerly a576274c3c] [formerly d4276e6474 [formerly a576274c3c [formerly 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5]]]]
Former-commit-id: d4276e6474
Former-commit-id: 70142d8fa5 [formerly eaf7e7c724] [formerly dfb666f53c8640e84e9243b56e5e8a82310819b7 [formerly fb4b76b003]]
Former-commit-id: 6ad648ee3c192704b4ec913645fb0df7af756b2e [formerly 85b200a973]
Former-commit-id: e383520c28
2012-11-12 16:58:17 -06:00
Max Schenkelberg
9de9bb8cb1 Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e

Former-commit-id: 1ed5f10230 [formerly 30c1802398] [formerly d1099addc6] [formerly 1ed5f10230 [formerly 30c1802398] [formerly d1099addc6] [formerly 00822a4f39 [formerly d1099addc6 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]]]
Former-commit-id: 00822a4f39
Former-commit-id: 25f5a9b1aa [formerly 4408af827f] [formerly 5eaaf2b42110ba677fab87f22b62f6cd269072be [formerly c4e5092f94]]
Former-commit-id: ce52baa9c7936da99037dab8b484c380e17a0b39 [formerly 9a13824af2]
Former-commit-id: c6b516ff9e
2012-11-12 16:46:21 -06:00
Roger Ferrel
25370d4e80 Issue #1298 Changes for non-blocking WrapLengthDialog.
Changes from reviewer's comments.
Fix merge conflict.

Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4

Former-commit-id: 5f0a583d86 [formerly ab77dfa758] [formerly 66606f88de] [formerly 5f0a583d86 [formerly ab77dfa758] [formerly 66606f88de] [formerly e982c0f43a [formerly 66606f88de [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]]]]
Former-commit-id: e982c0f43a
Former-commit-id: 4f08c126b6 [formerly 3b07bb1ae6] [formerly bad97768d4ebf7b70752c8307f99e51df3dd9fe0 [formerly de21a3f2ef]]
Former-commit-id: 2f7bf56cdf35e135b2334c51978e89aa272307ed [formerly d9c7c4ae56]
Former-commit-id: 3bc3bf17fd
2012-11-12 16:27:08 -06:00
Roger Ferrel
9fe8203d77 Issue #1298 Changes for non-blocking StoreTransmitDlg.
Changes from reviewer's coments.

Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f

Former-commit-id: e6030885a1 [formerly 13c0fb3f3d] [formerly 6445081aa9] [formerly e6030885a1 [formerly 13c0fb3f3d] [formerly 6445081aa9] [formerly 76109f3bf7 [formerly 6445081aa9 [formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]]]]
Former-commit-id: 76109f3bf7
Former-commit-id: 4a8b71a632 [formerly 01899535e3] [formerly d744cdfac526c0ce2d581c461d6fbaafbdfaa2c9 [formerly e7cd99ff0d]]
Former-commit-id: 87078a296e6b644d33870f062f02c134e7e2f190 [formerly 3ebaaa8992]
Former-commit-id: a3608d98fd
2012-11-12 15:26:03 -06:00
Ben Steffensmeier
e93dcd17d2 Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels.
Former-commit-id: dfe697a59c [formerly 65441372df] [formerly 7d3f479031] [formerly dfe697a59c [formerly 65441372df] [formerly 7d3f479031] [formerly b5b472dee1 [formerly 7d3f479031 [formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]]]]
Former-commit-id: b5b472dee1
Former-commit-id: 58ba7be711 [formerly 810e0abd77] [formerly 4bb07970a3378bedd6d8d48f328087592e3c8036 [formerly 220f41ec4c]]
Former-commit-id: 223e4373f81b95cb6e11301886a243f1b7c34c53 [formerly 94d44ed440]
Former-commit-id: 19f9437de6
2012-11-12 15:15:49 -06:00