Commit graph

3133 commits

Author SHA1 Message Date
Max Schenkelberg
aee63f150f Issue #2190 Cleaned up sounding and cloud height dependencies
Change-Id: If07406f7e618fca0ea001b56a81b8552d9d44546

Former-commit-id: 0b21274439 [formerly dccc265ab0] [formerly d4c7a0c302] [formerly 56fef93541 [formerly d4c7a0c302 [formerly 767ecfd7f2930de641d532d08120d5023b6e38e4]]]
Former-commit-id: 56fef93541
Former-commit-id: 780ccd7e833e37069d808d836ad303c6cf184e97 [formerly 8ad1acdbc5]
Former-commit-id: 8ea57bfbac
2013-07-12 10:12:48 -05:00
Nate Jensen
54833aba7d Merge "Issue #2186 add generic pdo distributor and move the gfe routes to the gfe file; remove config.xml from warngen localization as it breaks things" into development
Former-commit-id: bd8525143d [formerly ef1d88ffc6] [formerly 2e3f246a9b] [formerly 1a0c6e540e [formerly 2e3f246a9b [formerly 22c11a51effb42dc41c91ee5bce622cfd64da7e5]]]
Former-commit-id: 1a0c6e540e
Former-commit-id: 6c2a821114eaef3cf9be268201e12764ac327b26 [formerly a288c26dbd]
Former-commit-id: f265de8ff2
2013-07-12 09:22:12 -05:00
Nate Jensen
f54aced105 Issue #2142 fix ingest logback configuration
Change-Id: I8e21298a190eb1d4f1aac087ce3d7efb0c6accbc

Former-commit-id: 7ccf58ee3b [formerly 2da58b4567] [formerly a4033ef96cda5d0ede96a75d228338ef18b9be9a [formerly 0a29d56ecb]] [formerly ace22e2bf8 [formerly 0a29d56ecb [formerly 8b0f80f46c4d0e148cacfbae39d249e8ae040b88]]]
Former-commit-id: ace22e2bf8
Former-commit-id: 58d0d4b6773b1d3576b2e002281771de92068ee1 [formerly 6a565452b2]
Former-commit-id: 795f43f53d
2013-07-12 08:58:53 -05:00
Nate Jensen
4e52491e63 Merge "Issue #2142 fix radar server logging" into development
Former-commit-id: f28b440fa8 [formerly e9684f0add] [formerly 90b000482e] [formerly 5f12c25177 [formerly 90b000482e [formerly f9822d956e4d2bd473f0954560499837949b6f8e]]]
Former-commit-id: 5f12c25177
Former-commit-id: 4c84ae155cc7d80b9af9489a4b726757d8fac8a3 [formerly 0948cc8925]
Former-commit-id: af75ff0ffb
2013-07-11 16:06:49 -05:00
Nate Jensen
4212d6f808 Issue #2142 fix radar server logging
Change-Id: Ic4678f22ffb7ab5edaa97f76b27e1e6ffd14b4ff

Former-commit-id: b4265150dd [formerly 0857f9334a] [formerly a6bd01028c] [formerly a421f83b66 [formerly a6bd01028c [formerly 8c139d0200e9619afaa2cd2cd95c8a5a7410ca19]]]
Former-commit-id: a421f83b66
Former-commit-id: 3a5c003e612589c93adb927cf083a1622dfa0422 [formerly 641b52bbab]
Former-commit-id: c551c5ea8f
2013-07-11 14:25:36 -05:00
Matt Nash
10dd336a9a Issue #2186 add generic pdo distributor and move the gfe routes to the gfe file; remove config.xml from warngen localization as it breaks things
Change-Id: I025fb4b799193478250b61bc492e5b0dbdfd973d

Former-commit-id: e41b83f7fb [formerly d2e5e7284a] [formerly 7d6e0677648072192a6d858e2fa8a42ec2b5b1dd [formerly 0470e7531a]] [formerly 3939a15ff9 [formerly 0470e7531a [formerly 894f51376ba69365192ad0b9c5dd19c9cfba4e5c]]]
Former-commit-id: 3939a15ff9
Former-commit-id: 489cbf67d681e142ef6ece3175ed698665d35b62 [formerly 8bb5a46772]
Former-commit-id: 388c2b5b13
2013-07-11 13:32:26 -05:00
Roger Ferrel
2447f8c5c8 Issue #2088 Changes for non-blocking ContactsDlg.
Change-Id: I8e9bd796b6b811cbcbd4159d7b209733fffa23df

Former-commit-id: 3231633fb5 [formerly 11625b6eb3] [formerly 9800f069e9] [formerly 88e0eeb81c [formerly 9800f069e9 [formerly 82e4a0edf2dbe2d2eca430b42adb50f8ec4e8125]]]
Former-commit-id: 88e0eeb81c
Former-commit-id: 9a47b039c83c5069185d5f85810abd6143d5b5a2 [formerly 69d3ccecf4]
Former-commit-id: 52ce08d4f7
2013-07-11 13:02:13 -05:00
Dustin Johnson
0d59700692 Issue #2106 Improve BandwidthManager performance, proposed changes are checked much quicker
Change-Id: I3a61de1904d7256de04a97f40f38bf18d78b1438

Former-commit-id: 285d121278 [formerly 0c6d48d985] [formerly b36200d583] [formerly ec2ddd13b1 [formerly b36200d583 [formerly 59eafdd07754e3711e9c3babd946dfd18c161404]]]
Former-commit-id: ec2ddd13b1
Former-commit-id: 4c84440e7d3de0a3cf51c58f0f79d1dab4671dba [formerly 580bc2cadf]
Former-commit-id: 10884ca137
2013-07-10 15:59:36 -05:00
Dustin Johnson
3b514a63ef Merge "Issue #2171 Got rid of dataURI" into development
Former-commit-id: fd54ae0d38 [formerly 058739c5a6] [formerly ef69b489db] [formerly 1beae9c973 [formerly ef69b489db [formerly cf64550e8a20afa75d7caada14a6efa0470adc38]]]
Former-commit-id: 1beae9c973
Former-commit-id: e7cf2eaadd21890a0f5daf90c474326a830bfd0e [formerly b827522f92]
Former-commit-id: 13983d843b
2013-07-10 14:58:52 -05:00
Dave Hladky
78910b5352 Issue #2171 Got rid of dataURI
Change-Id: Ic0ad11dc76329726462455c8569b8d9fa7876723

Former-commit-id: c95deb9e43 [formerly a0ed26d963] [formerly aedb327acf] [formerly 613a74b5aa [formerly aedb327acf [formerly e7533f6110da1803965f2266a7d7af322fd7b1fd]]]
Former-commit-id: 613a74b5aa
Former-commit-id: 86f2a1127f23fc3947a441c61f2d0f1dfc7b9677 [formerly 13c4727538]
Former-commit-id: 4bab9fe03a
2013-07-10 12:42:17 -05:00
Mike Duff
6a9ef8c64e Issue #2166 - Select the site before opening Hydro TS Control dialog
Change-Id: I2220de3092430e6af36f9e3c2a4c8f0fa3b00163

Former-commit-id: d34d1a83e3 [formerly bcd4a0aff1] [formerly 8a963939a8] [formerly afe9e049b3 [formerly 8a963939a8 [formerly bcf0b1285e46d62695515051cbec17945c2646f0]]]
Former-commit-id: afe9e049b3
Former-commit-id: 92ea947252a95dc424e84118b95d086a15965d25 [formerly fc46308738]
Former-commit-id: a8fd06f8d3
2013-07-10 11:45:56 -05:00
Lee Venable
3ed855e5a5 Issue #1928 - Removed SWT browser to prevent errors.
Change-Id: Ifad38700dfc12ec3cade8dc62fa8c46fbf06ed80

Former-commit-id: bf34a474cb [formerly 6a63ae3a79] [formerly 6d15b7795f] [formerly d8335ecd23 [formerly 6d15b7795f [formerly b69e08c40d305005b28c003b6165bcc8d4b41f10]]]
Former-commit-id: d8335ecd23
Former-commit-id: 1cbe32dc15cbff8f589b7c4963e68ad944c7c06d [formerly 89f2a6666a]
Former-commit-id: 1da9605d7e
2013-07-09 17:10:22 -05:00
Roger Ferrel
e2b92d0f6e Issue #2145 Verify movable ring coordinates prior to saving.
Change-Id: I4772e180d0af394985dbd1bdc65007a8c02feed0

Former-commit-id: c5b3bd54d0 [formerly f31f880a19] [formerly f279672f6f] [formerly 26ffb4d885 [formerly f279672f6f [formerly 8048d0e91041d734239b11b18df34a87b5e75c35]]]
Former-commit-id: 26ffb4d885
Former-commit-id: 35e26514d690b9801a953a0caef8eb7312b009f4 [formerly 9e195e5469]
Former-commit-id: cd63b071db
2013-07-09 14:05:35 -05:00
Roger Ferrel
dc01673b13 Issue #2088 Non-blocking ColorScaleMgrDlg and ColorChooserDlg.
Change-Id: I6f14726a466780e0dbab13d8b64fa2c55acf55d0

Former-commit-id: bcfe29ffeb [formerly e73559b871] [formerly 467fa72069001a5153490e0fb5522fbf84e14f24 [formerly d5e66e410d]] [formerly f3bdbde9d3 [formerly d5e66e410d [formerly 108c5a4957b6d3ab50eacd5792122f7cd2ff3cba]]]
Former-commit-id: f3bdbde9d3
Former-commit-id: 2c591fb8750544921169d97733aea020a1760e66 [formerly 696885dc4b]
Former-commit-id: 44724d9487
2013-07-09 11:13:43 -05:00
Mike Duff
34da0216ca Issue #2137 - Change Data Browser Dialog to only allow a single data type to be selected
Review comments

Change-Id: Ic4f508ea98683f750b906292094740a4538950b1

Former-commit-id: cb4624fc42 [formerly 53ebc492e1] [formerly 9aaf06ab73] [formerly 9f6213f9a5 [formerly 9aaf06ab73 [formerly 1015a76693e73c52d2bc56c18c4f3dfa25092771]]]
Former-commit-id: 9f6213f9a5
Former-commit-id: 04153a198540f2b015eac4a85a12d4eb9b845dca [formerly 502a141297]
Former-commit-id: 7a8d39b1da
2013-07-09 08:15:28 -05:00
Lee Venable
3e1ccaba1f Merge "Issue #2088 Made FcstPointGroupDlg, FloodReportDlg, HydroBaseDlg and StationFilterOptionsDlg non-blocking." into development
Former-commit-id: bc4b9ebf7b [formerly 7cf71c36af] [formerly ab16e2c8a1] [formerly 2933cc2ca8 [formerly ab16e2c8a1 [formerly c2d9a2d394fc2ab0f60c63d11323af8db90655da]]]
Former-commit-id: 2933cc2ca8
Former-commit-id: 63d100710b7892d9a2dcff5fa651609f6ed21112 [formerly b36c421c9a]
Former-commit-id: 33ec4dd688
2013-07-08 17:06:42 -05:00
Dustin Johnson
bcc5f523b3 Merge "Issue #2173 - Update unit tests for Java 1.7 and SLF4J" into development
Former-commit-id: 1e404f2e51 [formerly d11f3977cc] [formerly f09225135c] [formerly 6d84cb70a8 [formerly f09225135c [formerly 67b9b463a2463036a47f62b45bf140be8a0567eb]]]
Former-commit-id: 6d84cb70a8
Former-commit-id: 1a6fecb2f24d5536d64c34ac33e1d4bc3883f924 [formerly 7950c692a4]
Former-commit-id: 31e45da3d0
2013-07-08 17:00:59 -05:00
Mike Duff
2c78748c63 Issue #2173 - Update unit tests for Java 1.7 and SLF4J
Change-Id: I7cd6378b17d1388d6006bc8ade9708f4797ff51a

Former-commit-id: 63998469f8 [formerly bbd008a012] [formerly 40f30c4e7a] [formerly c76a29c074 [formerly 40f30c4e7a [formerly 6c2646847984f3f8ef7a1640128bd06a2abb6a57]]]
Former-commit-id: c76a29c074
Former-commit-id: 670b7b901a1f1387ba1044b5c27baefab36b6aa3 [formerly 8751b44abf]
Former-commit-id: f7e2ee9e2f
2013-07-08 16:22:05 -05:00
Dustin Johnson
6e93ea970d Issue #2106 Move deploy test properties to unit test code
Change-Id: I2463848448789858843cca436f236f71f57d2d95

Former-commit-id: b90c928b0b [formerly 77ce8e1acb] [formerly 04b9bf6b73] [formerly ac8bed9a2f [formerly 04b9bf6b73 [formerly ee39ca286312d9cd7629ba30e56faf3635c5b128]]]
Former-commit-id: ac8bed9a2f
Former-commit-id: 6014928e88eea88030ae7e26bb617e335ca5f703 [formerly f394cf27e8]
Former-commit-id: 96b277ce09
2013-07-08 16:19:21 -05:00
Dustin Johnson
2a6030f923 Merge "Issue #2106 Improve BandwidthManager performance - Use copy constructors - Separate BandwidthBucket handling into a DAO - Preparations to remove all in-memory object handling" into development
Former-commit-id: ed0ff8ff85 [formerly f519f21b79] [formerly f5d66a9f0d] [formerly 59c1cd7a5e [formerly f5d66a9f0d [formerly 1a45a8604e35d0b14caf8465905a806e79a2461d]]]
Former-commit-id: 59c1cd7a5e
Former-commit-id: 39781ab4005ee62454d7a9dab360d7dc13e5d156 [formerly 4db95fa534]
Former-commit-id: 8746dda5a6
2013-07-08 15:53:15 -05:00
Dustin Johnson
fa0b3e36a4 Merge "Issue #2106 Add ability to run deploy tests again" into development
Former-commit-id: ccfe596544 [formerly 2cb1fe005c] [formerly 02ceb9d667] [formerly dc8ea99af9 [formerly 02ceb9d667 [formerly 889fadcd5b4e6f261d275cab3a5b67e3edbb50d9]]]
Former-commit-id: dc8ea99af9
Former-commit-id: cf20c8f4cbf8d7fd69266b953c2b144345985787 [formerly f04680fb89]
Former-commit-id: c43e4e1812
2013-07-08 15:52:12 -05:00
Nate Jensen
f8cfbb2831 Merge "Issue #2145 Added slection indicator and verificaton of lat, lon and radius." into development
Former-commit-id: cfcb88f730 [formerly 4bb1dc7493] [formerly 5f07ddf81b] [formerly c7ec0ba929 [formerly 5f07ddf81b [formerly 12b690f90ee9cf5ab2fe632236f56254efc09a11]]]
Former-commit-id: c7ec0ba929
Former-commit-id: 3515602ccae91b726e559d7e95a6e9fbb305c144 [formerly 829cb5d9eb]
Former-commit-id: d2c398392d
2013-07-08 14:42:59 -05:00
Dustin Johnson
3d28ac32fb Issue #2106 Add ability to run deploy tests again
Change-Id: I912137e02d4decb0ff07f9d73d1debeb9d9226a1

Former-commit-id: 7d940d102c [formerly ccef13f8cd] [formerly 09b97672cd] [formerly 35305d2c1d [formerly 09b97672cd [formerly 290c1fb3bc7e9fd4871799e9884fcb10a28db46f]]]
Former-commit-id: 35305d2c1d
Former-commit-id: 8d7dc49f0b67ceddea9ae25296f5f90069dbd3cc [formerly 36e0fd26d8]
Former-commit-id: 79205e287a
2013-07-08 14:00:40 -05:00
Nate Jensen
6cd7b2c546 Merge "Issue #2154 Ensure all resource groups get removed from the time matcher." into development
Former-commit-id: 817b4b80da [formerly 84ccd3140d] [formerly 1287301152] [formerly 6bb28cddcf [formerly 1287301152 [formerly 11ee25f7b9eb2f041e75e5922c9ebe95c1e64bab]]]
Former-commit-id: 6bb28cddcf
Former-commit-id: 81c4a8a651ae50c86d9f296b775b9ee67245a9b7 [formerly 5ced5e04ff]
Former-commit-id: ed0df5c004
2013-07-08 13:33:30 -05:00
Bryan Kowal
ae8c2c45d7 Issue #2164 - fix 13.6.1 qpid build for slf4j / log4j
Change-Id: Iac18215b017ea4b285f6435b3b492a85bacf5da7

Former-commit-id: bb72b77398 [formerly 32c997aa00] [formerly 8dbd4df057b224e7dbada77a07f8bdad9e5560f6 [formerly c91e636399]] [formerly 86c27863fe [formerly c91e636399 [formerly 0d4ba397163e0a365178d5481e520011784104d9]]]
Former-commit-id: 86c27863fe
Former-commit-id: b33bf6be199d74747fbece34684c1b542a99bd8a [formerly 594835f311]
Former-commit-id: 37504822a2
2013-07-08 10:43:14 -05:00
Dustin Johnson
464d9be242 Issue #2106 Improve BandwidthManager performance
- Use copy constructors
- Separate BandwidthBucket handling into a DAO
- Preparations to remove all in-memory object handling

Amend: Copy more calendar and byte array objects

Change-Id: I72f4813c0780586585409a9a64c7915adc1ccbae

Former-commit-id: 01193120be [formerly 4526635405] [formerly 124edcbd15] [formerly a6575c3235 [formerly 124edcbd15 [formerly e11242447c3c93f403cd546df4315381486e465c]]]
Former-commit-id: a6575c3235
Former-commit-id: d4952a728ac03fe7d839f8ba980dce46b32f902f [formerly 11a1972265]
Former-commit-id: aaa34b241a
2013-07-08 10:22:30 -05:00
Dustin Johnson
942dc9e2de Merge "Issue #2138 - Fixed to not use filter if filter is disabled." into development
Former-commit-id: 19a9d2fd4a [formerly 6101c8a586] [formerly b8800c0616] [formerly e2ffbd9b27 [formerly b8800c0616 [formerly 35a2a6d54af2aa62cc3a256869e409cdb7868cb0]]]
Former-commit-id: e2ffbd9b27
Former-commit-id: 3a4fa8ae9ab537c1fae481841ae814e1ae244482 [formerly 56d1806f22]
Former-commit-id: 86710ba9b6
2013-07-08 08:39:14 -05:00
Dustin Johnson
19e9081e8f Merge "Issue #2132 - review comments" into development
Former-commit-id: b14826f2a7 [formerly 93c7fe3ac9] [formerly a414049f39] [formerly daf64a7923 [formerly a414049f39 [formerly 62394f1d0d8ebcd9781b5c3e377469c04ebd7dc2]]]
Former-commit-id: daf64a7923
Former-commit-id: 262993bd643ffe079d6a52742f3b7b653b9015f8 [formerly 7606d9e7ff]
Former-commit-id: 2bee69bceb
2013-07-08 08:38:47 -05:00
Richard Peter
4711199fe2 Merge "Issue #2133 - qpid is now a wrapped java application; incremented qpid release" into development
Former-commit-id: fa04a866a2 [formerly 620838babe] [formerly fbd6bb6421] [formerly 06f1945cbb [formerly fbd6bb6421 [formerly 44da96f5c268100f1e923b1f54120635c45d644c]]]
Former-commit-id: 06f1945cbb
Former-commit-id: a6d83d3575d83c67c9470ca59ff81044725b6e4b [formerly 89856968a8]
Former-commit-id: d1c70fdff5
2013-07-05 13:47:20 -05:00
Roger Ferrel
db35f1e599 Issue #2145 Added slection indicator and verificaton of lat, lon and radius.
Change-Id: I10492bdd2e74b5ea8fd9386528019665185ae584

Former-commit-id: 42739e0b9c [formerly a438c9ff2a] [formerly c44c11279d] [formerly 5224ab80f0 [formerly c44c11279d [formerly ab2bd047048b72ea69566925046b329dc67091ab]]]
Former-commit-id: 5224ab80f0
Former-commit-id: 3067acf59089b99bda24cc02c6cb85cc6b0ea28d [formerly 895d0dc823]
Former-commit-id: b057f27a94
2013-07-05 13:33:53 -05:00
Mike Duff
630ea0ab01 Issue #2138 - Fixed to not use filter if filter is disabled.
Change-Id: Id40d60b3a478572a1ff09bc92f20fbed9b199d4d

Former-commit-id: a785cb459f [formerly cb024359ad] [formerly 4442946626] [formerly c493182fa4 [formerly 4442946626 [formerly 2ced83baa19c11c0eb37f02779ae344e75d108b7]]]
Former-commit-id: c493182fa4
Former-commit-id: 80ed31360dd4b4afc6a14bb6dee09aa0b1c8a521 [formerly 49cf68617f]
Former-commit-id: a4dfdd7313
2013-07-05 12:35:53 -05:00
Bryan Kowal
27686fad8b Issue #2164 - fix pde build for RadarServer.
Change-Id: I439fb9db7d26d1e80bff5e1620691246c92608e3

Former-commit-id: 8924d8fc22 [formerly 4815b78b6f] [formerly b4df3267bd] [formerly 92b2c6ae65 [formerly b4df3267bd [formerly b5f4fb2cfb101a9a43bb7036a952bf58ed388721]]]
Former-commit-id: 92b2c6ae65
Former-commit-id: 705f7197809a3a559d87c56da87de7baa0ca23a6 [formerly 5e4350392b]
Former-commit-id: ad1d8e35e0
2013-07-03 19:36:42 -05:00
Bryan Kowal
3c0cb232c2 Issue #2133 - qpid is now a wrapped java application; incremented qpid release
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf

Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58

Former-commit-id: 93e2de5223 [formerly 1932480e2b] [formerly f6412117e1] [formerly 38aa7723c6 [formerly f6412117e1 [formerly 24c451a8afbd1b406ee7f83997e0ab92f1625b89]]]
Former-commit-id: 38aa7723c6
Former-commit-id: 2f3b48fdc497c9180ad73d6b0dbc1d60d2ff66f5 [formerly 32190c8848]
Former-commit-id: 56c7afbc0f
2013-07-03 15:55:53 -05:00
Bryan Kowal
4076dec94a Issue #2164 - fix 13.6.1 wes2bridge build
Former-commit-id: c087e22ce2 [formerly f484a47d43] [formerly 63345a298b] [formerly 9f632d9e2d [formerly 63345a298b [formerly 31b29f11b0e60c0741f69be824093d4f76961eb5]]]
Former-commit-id: 9f632d9e2d
Former-commit-id: f3b3951a079ee2c3525215ec62394bf5fd3f4f19 [formerly 4a492c0059]
Former-commit-id: 588503289a
2013-07-03 15:35:12 -05:00
Ben Steffensmeier
ab4bea19cc Issue #2154 Ensure all resource groups get removed from the time matcher.
Former-commit-id: c95b7b3fb5 [formerly 808941ac45] [formerly a7bfd8ee28] [formerly 519d0f3ef8 [formerly a7bfd8ee28 [formerly f652fd3f3126f04c2ced9ceb027875a47ea23f51]]]
Former-commit-id: 519d0f3ef8
Former-commit-id: cecb39b36e774cbcea3c6b25c66d6a91990ce545 [formerly 4b9138dc0f]
Former-commit-id: 1c678fb024
2013-07-03 14:42:59 -05:00
Nate Jensen
aa6f46efd6 Merge "Issue #2145 Changes to RangeRingDialog so it doesn't double the movable range rings when a point is modified." into development
Former-commit-id: 22ee16a803 [formerly d883392d05] [formerly f13bd6391a] [formerly 6465fb58ad [formerly f13bd6391a [formerly 929f2145983f183722dbeacbbf996b78179657c6]]]
Former-commit-id: 6465fb58ad
Former-commit-id: 490a3b990cacecdc884502035e965659982a0e8d [formerly 6a9b54cd4e]
Former-commit-id: 0cb178f835
2013-07-03 13:32:49 -05:00
Greg Armendariz
b727fab06d Merge "Issue #2142 attempt to fix build" into development
Former-commit-id: 425f676b5a [formerly 7f6ae6bca4] [formerly 40d7855af0] [formerly 27ba2d1d3c [formerly 40d7855af0 [formerly d41ed7c37f51551fd426a56a5e7762424fd00167]]]
Former-commit-id: 27ba2d1d3c
Former-commit-id: 02da8c26502280bd3b12ab7a8202f3d0ecf41d14 [formerly 3360d5f0b2]
Former-commit-id: a695123c7d
2013-07-03 13:23:05 -05:00
Nate Jensen
671a9a81ef Merge "Issue #2159 Synchronize TimeCache access in D2DTimeMatcher. Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55" into development
Former-commit-id: 3bb2890812 [formerly b7ddbeed41] [formerly d4261fcc45] [formerly 6b93db235f [formerly d4261fcc45 [formerly c9dd4fe32a28f20a3d5883d767787f37598e435d]]]
Former-commit-id: 6b93db235f
Former-commit-id: 0f31486a4098733feacb024f5bbfc2b05fa3cab2 [formerly 8793ca3101]
Former-commit-id: b688000175
2013-07-03 13:10:39 -05:00
Nate Jensen
f7920f833c Issue #2142 attempt to fix build
Change-Id: I465de277a20aa354731e45abbb685e108cdb4377

Former-commit-id: abb3ff9cec [formerly d5d5c5e674] [formerly 1fb11fbdf7] [formerly 47520c7b30 [formerly 1fb11fbdf7 [formerly a6e205373831d0d029f3a34cc6e34030cc496d9c]]]
Former-commit-id: 47520c7b30
Former-commit-id: 6cc45042cab77ebaeffcf4ae395f265095604db7 [formerly 577292d8d5]
Former-commit-id: 1bd4d15d7a
2013-07-03 13:05:57 -05:00
Ben Steffensmeier
679ef95297 Issue #2159 Synchronize TimeCache access in D2DTimeMatcher.
Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55

Former-commit-id: af51ecc7c9 [formerly 2d8e1e5e6c] [formerly 60ab89a3c68b3137496a7647972e3494926dcd06 [formerly a868d3d0b5]] [formerly 53d969d0db [formerly a868d3d0b5 [formerly 3eaca3d7a18ab9c8ab601fc7ed9fb899eced1134]]]
Former-commit-id: 53d969d0db
Former-commit-id: f9fb487f9e5019b31c24a98c3d01a0959d8527a4 [formerly dde0846fc3]
Former-commit-id: b18f4bbe89
2013-07-03 12:44:45 -05:00
Bryan Kowal
b94334199e Issue #2164 - fix 13.6.1 build
Change-Id: I9f4e29f8f19abf7700baad125617054c8a561ff3

Former-commit-id: 970eaad447 [formerly 34efd01a4f] [formerly c2b54d7c31] [formerly 1c49dff18e [formerly c2b54d7c31 [formerly ea1628be6840c42fffd2e8b8437386a4df3aacca]]]
Former-commit-id: 1c49dff18e
Former-commit-id: fe53471fbd73b96c7f069b638956ba81e12ff83b [formerly 0787aca88b]
Former-commit-id: c9fa275089
2013-07-03 11:25:46 -05:00
Nate Jensen
614cdb58a8 Merge "Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code." into development
Former-commit-id: 7b6481ba36 [formerly ae004c8c77] [formerly 7bd12afa02] [formerly 679bf314e0 [formerly 7bd12afa02 [formerly d679aae13498d67d79a1134275f1016699583e1f]]]
Former-commit-id: 679bf314e0
Former-commit-id: 0681c396fa825b8599c62566e72b40ac503776b2 [formerly c8d221b46c]
Former-commit-id: 7bb4d66cbf
2013-07-03 09:37:05 -05:00
Roger Ferrel
2f5994b297 Issue #2145 Changes to RangeRingDialog so it doesn't double the movable range rings when a point is modified.
Change-Id: I229ce3e40769961c9c1b296c7c42d919a21cfd0b

Former-commit-id: 8cab528dc8 [formerly ebb76daf14] [formerly fab96d28f2] [formerly 752933c7fe [formerly fab96d28f2 [formerly f7cb404093a0a2bdda1e202bc8cdd98ba146bd85]]]
Former-commit-id: 752933c7fe
Former-commit-id: 0187d6cc339bec8a38231e4fb72a3c74d9c45138 [formerly 3c24739b72]
Former-commit-id: 477d8b0317
2013-07-02 17:27:22 -05:00
Mike Duff
a48d17ef7e Issue #2132 - review comments
Change-Id: I65b880b5f96471b6f8e0f5ae89ee3981a96a1094

Former-commit-id: 876960a2cb [formerly 57d37e9761] [formerly 4399429e74] [formerly 2618c1a4e4 [formerly 4399429e74 [formerly 7a85b96863dece9c1b5a356f4e929665e0ce03f8]]]
Former-commit-id: 2618c1a4e4
Former-commit-id: 9f07a473781aa8232e833e400eac68c9f1b191a5 [formerly 82d713083a]
Former-commit-id: 617abbd8f1
2013-07-02 16:08:37 -05:00
Max Schenkelberg
358ad28927 Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code.
Amend: Fixed comment

Change-Id: I384a3fac3ad6e3ee8b4efd17246a26a1c4476c63

Former-commit-id: fa03e3f2ef [formerly bc91a9f6de] [formerly 9709b0500a] [formerly fef6056519 [formerly 9709b0500a [formerly 9982c3ffdb399b8c3587d08e9427710ddbc61cb4]]]
Former-commit-id: fef6056519
Former-commit-id: 41e73cad8a29f48a4d17728ff37661b0f76dc35e [formerly dc78010e74]
Former-commit-id: 63d69a5435
2013-07-02 15:22:31 -05:00
Mike Duff
d09183f6d7 Issue #2160 - Fix for MPE display 7x7 dialog, field changes
Change-Id: Ib428d1aab246863bfdbbb271d27a4687197a3ebe

Former-commit-id: d82c72b52b [formerly cc4ac57b22] [formerly 655d9eb928] [formerly 5b676b122d [formerly 655d9eb928 [formerly 1fbaa2721a4b2d79a06c1d4d8b8526b5b25150a9]]]
Former-commit-id: 5b676b122d
Former-commit-id: d2cd687662b0530ea34852c00595d332ebbac558 [formerly d87b4bceb5]
Former-commit-id: 70d25a48dd
2013-07-02 12:31:10 -05:00
Richard Peter
45070c3a98 Merge "Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog" into development
Former-commit-id: 2764b2edf4 [formerly f12b08401f] [formerly 37042f0b2a] [formerly a3bd7b3e9c [formerly 37042f0b2a [formerly 556e2ca39b7c93355cfa10ece835bdc63fd12d2c]]]
Former-commit-id: a3bd7b3e9c
Former-commit-id: 63a1c03ad480f03852b9a9486718f0c5cb33e35e [formerly 8e15d6aa0a]
Former-commit-id: aef289d287
2013-07-02 10:30:51 -05:00
Nate Jensen
cce5d8e8ff Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: 338b0ae310 [formerly a4de603bcf] [formerly 316d6c09c6] [formerly db6152e524 [formerly 316d6c09c6 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]
Former-commit-id: db6152e524
Former-commit-id: 2c4eb0e65e048d5b4c2a5c36ff3eca32312ad167 [formerly 6da64f329c]
Former-commit-id: 5a6b0f99cc
2013-07-01 14:41:05 -05:00
Roger Ferrel
97d130d022 Issue #2088 Made FcstPointGroupDlg, FloodReportDlg, HydroBaseDlg and StationFilterOptionsDlg non-blocking.
Change-Id: I44d41a5e3e4e00d924df190e253ae2568988d987

Former-commit-id: 289011dc92 [formerly 1c3c9e461b] [formerly 1e7ae55676] [formerly 220818df3a [formerly 1e7ae55676 [formerly dd9ba84811ee60b4dae7fb940abf6ff2526869ba]]]
Former-commit-id: 220818df3a
Former-commit-id: a92ee8e9a863e9b74742101f3ea578f6cb0c4219 [formerly 3cabedbd45]
Former-commit-id: ee5b120929
2013-07-01 13:03:39 -05:00
Mike Duff
93bbabda66 Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog
Change-Id: I97ce5323002d6c1ae230c446de9837e541e02c86

Former-commit-id: 44e60899d3 [formerly 3fed839344] [formerly cd511c1a0c] [formerly 5c7fd77f98 [formerly cd511c1a0c [formerly d2fbc8fca1efa7c1a467fe9970da74d47d0ba759]]]
Former-commit-id: 5c7fd77f98
Former-commit-id: 6861a04120f0e5954cbc5868c9ecf103bfd55a3d [formerly 053082cb80]
Former-commit-id: 2250983ad8
2013-07-01 11:53:07 -05:00