Commit graph

3319 commits

Author SHA1 Message Date
Lee Venable
898ebcf9bd Merge "Issue #2141 - Fix envelope validation for DD areal filter and selection dialogs" into development
Former-commit-id: 91e4c416ce [formerly 24d98f7668] [formerly c047f90db2] [formerly 91e4c416ce [formerly 24d98f7668] [formerly c047f90db2] [formerly 59018aeaae [formerly c047f90db2 [formerly 78996d6a3e7cb15f5084d30f02c8cf7c02e832b2]]]]
Former-commit-id: 59018aeaae
Former-commit-id: c1e295ebed [formerly 160da42ee8] [formerly 0dfa5e06bcd701776aca6930829e6a71ed809a65 [formerly 6a4a291218]]
Former-commit-id: fcefca1388ee730cee3cf53fd7911fd838a119e9 [formerly 159d5ae041]
Former-commit-id: a12e5b75d2
2013-07-16 08:50:10 -05:00
Lee Venable
ca8b932983 Merge "Issue #2166 - Fix to not open graph from CAVE menus" into development
Former-commit-id: bac0250570 [formerly 6b17378b91] [formerly 80425d74a2] [formerly bac0250570 [formerly 6b17378b91] [formerly 80425d74a2] [formerly d9d7f21d05 [formerly 80425d74a2 [formerly f5f136b9adc1a8f2c9c3da5c15d5018549643c07]]]]
Former-commit-id: d9d7f21d05
Former-commit-id: cf6f9eeb6b [formerly 98d7e8ac59] [formerly 8876d01b10462fe44aec4286e04a0afdb5ab2126 [formerly 4dbe0f423a]]
Former-commit-id: dcf6536d5e9e9674c96dae8abe571c943597c6d6 [formerly e0b89aaa0c]
Former-commit-id: ba85d649bb
2013-07-16 08:46:47 -05:00
Nate Jensen
6aa619f9d1 Merge "Issue #2149 Fix radar mesocyclone regex." into development
Former-commit-id: 55f9c8d563 [formerly f25314cfde] [formerly de002b6737] [formerly 55f9c8d563 [formerly f25314cfde] [formerly de002b6737] [formerly 79903a7f1f [formerly de002b6737 [formerly 8b11b9e86e5054dfaf6f5c993cc1c901479e5458]]]]
Former-commit-id: 79903a7f1f
Former-commit-id: 4e8c3afb38 [formerly 718f25ae22] [formerly cf640171a9e6995f32643d7a073bf2c43cf7a609 [formerly 47cb5229ea]]
Former-commit-id: c2c5e96244ef18d375fee0a0e52454adecf23652 [formerly 88a030367f]
Former-commit-id: 30424ea3ea
2013-07-16 08:44:21 -05:00
Dustin Johnson
9abecac6b5 Issue #2195 Fix ArchiveConfigManagerTest
Change-Id: I3f7dbe37d9fb14fa9eb5fb326c0e1eb18e901a9f

Former-commit-id: 596bb14749 [formerly 962d7ea2f7] [formerly 8587fc7317] [formerly 596bb14749 [formerly 962d7ea2f7] [formerly 8587fc7317] [formerly ee505a7b63 [formerly 8587fc7317 [formerly a86f2ef5cfa15fd8277dbe60e9a34c548af1f1c6]]]]
Former-commit-id: ee505a7b63
Former-commit-id: 3aa15787f8 [formerly 52c88b0eb2] [formerly 0bc85771910734c1fab915723a106d18106fb7a0 [formerly 3ce350c3f5]]
Former-commit-id: bbee76651a7a281703ddf68ff3d38b62119e47fe [formerly 30346d0f79]
Former-commit-id: b487b82d40
2013-07-16 08:33:39 -05:00
Mike Duff
243dee61fd Issue #2166 - Fix to not open graph from CAVE menus
Change-Id: If77854e7ea4e0c703649e2e1bc322b3833d21996

Former-commit-id: c8619b23d9 [formerly 013f05d57e] [formerly 03a9dcc4e3] [formerly c8619b23d9 [formerly 013f05d57e] [formerly 03a9dcc4e3] [formerly 764e4966d1 [formerly 03a9dcc4e3 [formerly f6d940c02245d59782d318fb482886a0df3216a9]]]]
Former-commit-id: 764e4966d1
Former-commit-id: 6a70faa62d [formerly 20b0d7a78a] [formerly 30f4692103bec481942822101e07d2ad4e1981b1 [formerly 8fc208e818]]
Former-commit-id: 3dbec85e5a5efb1ea0b66a20ec809e509756b0eb [formerly 70b13f9195]
Former-commit-id: 54e2e08ef4
2013-07-16 08:29:15 -05:00
Ben Steffensmeier
ce483216f7 Issue #2149 Fix radar mesocyclone regex.
Former-commit-id: 302f3fe7bc [formerly 4f93bf0f69] [formerly 5f8d325b05] [formerly 302f3fe7bc [formerly 4f93bf0f69] [formerly 5f8d325b05] [formerly 4b3024fe09 [formerly 5f8d325b05 [formerly 386cb76aaafd330cfb12367c71c3df7eb35bff1e]]]]
Former-commit-id: 4b3024fe09
Former-commit-id: f3477a033f [formerly 2022a02fa0] [formerly e582042ead5b49dbb89b28c32b4c2df3769eeb6a [formerly 68443a21f9]]
Former-commit-id: 4749690b7407f697c3b442d4bc90f243d9e7077d [formerly 4e8042a035]
Former-commit-id: 167ec4da75
2013-07-15 17:06:53 -05:00
Ben Steffensmeier
1e8b99a544 Issue #2107 Fix sampling of grid vector arrows.
Change-Id: If663d487fa31cba43d18b82bf93fdfacbbc65721

Former-commit-id: b1cb837528 [formerly fb1a0a203a] [formerly 767915b318] [formerly b1cb837528 [formerly fb1a0a203a] [formerly 767915b318] [formerly 4a25b32919 [formerly 767915b318 [formerly eae0b3931a3f5888b32c49a8c7e5b97addb3201a]]]]
Former-commit-id: 4a25b32919
Former-commit-id: f2777babaf [formerly a82bb6e999] [formerly 61ef9e737b64b455fe0c36337caebc3edabe3d2d [formerly abedf0f23a]]
Former-commit-id: 787307082d8bdff26dc28ad3d4ee49ab4a584b64 [formerly 5b68e9d57c]
Former-commit-id: e6b5f4f6a6
2013-07-15 15:51:41 -05:00
Roger Ferrel
bfd1b69128 Issue #2088 Changes for non-blocking DataSourcesDlg, ImpactStatementDlg and LowWaterStatementDlg.
Change-Id: Ib6b6a6b6a2b0c433c30ac31beb6858e4c7a0c768

Former-commit-id: 3249e81303 [formerly c90a989bd6] [formerly 0ba32179e6] [formerly 3249e81303 [formerly c90a989bd6] [formerly 0ba32179e6] [formerly e8d21c5d91 [formerly 0ba32179e6 [formerly cf769302b9a9b2055f42969dfe781d7aa9c2286b]]]]
Former-commit-id: e8d21c5d91
Former-commit-id: 60c5878266 [formerly 5ca4909f17] [formerly dacd9f6b5f98fed8c941edf4b269ac595dec085c [formerly ccd83dab88]]
Former-commit-id: 4fa1e952599c36bc3819df6a274943693aa7fc3e [formerly 2b4393850d]
Former-commit-id: ad4b1aff48
2013-07-15 14:26:35 -05:00
Max Schenkelberg
ad32bbd91d Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]]
Former-commit-id: 50825200a1
Former-commit-id: f025c05d04 [formerly d1881ffa51] [formerly 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e]]
Former-commit-id: a38fe0e4cd744ea32b4c88e97305cabc3dbac06f [formerly a47f187f4f]
Former-commit-id: 5ba50b4476
2013-07-15 14:26:15 -05:00
Dustin Johnson
f058fe60fd Issue #2195 Remove Spring name= use in constructor args
Change-Id: I00745ce0cc04ed9c7d0497063668ad127357d17d

Former-commit-id: 90acbc7a69 [formerly b02a30dad8] [formerly 4cea4279e7] [formerly 90acbc7a69 [formerly b02a30dad8] [formerly 4cea4279e7] [formerly 95b61618fe [formerly 4cea4279e7 [formerly 2ce8e4ebf5f67998c25cdb33ab44e169e73471b2]]]]
Former-commit-id: 95b61618fe
Former-commit-id: 70124993e5 [formerly 4185eedfe7] [formerly 083cd67fffe2ef123460c223343db91909387c7f [formerly 1d11983e38]]
Former-commit-id: 5b0da9341e643bbf2cc4aadbae353861a9b6f0b8 [formerly f482d3f09a]
Former-commit-id: 12c8a28863
2013-07-15 13:20:44 -05:00
Lee Venable
352915ecd0 Merge "Issue #2096 - Display of Madis point data" into development
Former-commit-id: 450f5f5026 [formerly 1e52c006b0] [formerly 7a00e7eb24] [formerly 450f5f5026 [formerly 1e52c006b0] [formerly 7a00e7eb24] [formerly 546524f278 [formerly 7a00e7eb24 [formerly 03bb912e339342ce7aab76abaf1d76f4522e7b01]]]]
Former-commit-id: 546524f278
Former-commit-id: 8df39f431e [formerly f87e9e018e] [formerly f9746ecb97670a971975e0aa76365e250c1cdfe6 [formerly fb0b7b4dd6]]
Former-commit-id: c55d1bb552b62bf6e80cc7c22c5b82b7dabe94b7 [formerly 54ab7ba176]
Former-commit-id: 0ae644b2d4
2013-07-15 13:20:06 -05:00
Lee Venable
4632216c44 Merge "Issue #2088 Changes for non-blocking CrestHistoryDlg." into development
Former-commit-id: 97f59dea45 [formerly b501b1456d] [formerly 8592362e5d] [formerly 97f59dea45 [formerly b501b1456d] [formerly 8592362e5d] [formerly fcefed6848 [formerly 8592362e5d [formerly 9f4f54c688621ba77e14cc3b7ebe3d1e92da1fa8]]]]
Former-commit-id: fcefed6848
Former-commit-id: 7d57b1b1c5 [formerly daa3eb2204] [formerly 9c97835a693d8420551fd59d47f86944559ddd35 [formerly 7834fd01e7]]
Former-commit-id: b60c1420f253b8f363c2f1719688660e9e5aa11b [formerly 09246566c8]
Former-commit-id: f32117951e
2013-07-15 12:57:36 -05:00
Bryan Kowal
7ee4dbc165 Issue #2164 - fix 13.6.1 build
Former-commit-id: 064ca2fcf9 [formerly 9e83dace0b] [formerly df29ab238d] [formerly 064ca2fcf9 [formerly 9e83dace0b] [formerly df29ab238d] [formerly 1e8cd0b65e [formerly df29ab238d [formerly a3eb33bc1e71a6930f17c63a09c924289d9d84ed]]]]
Former-commit-id: 1e8cd0b65e
Former-commit-id: 50a292b30e [formerly a122743a1f] [formerly a1413195b59ed5a8e2327ae264ec7b56959084a8 [formerly 030835264c]]
Former-commit-id: 6927cbca1affa89b7db7bc0bdea909c5bc8b2736 [formerly 1a93ae1636]
Former-commit-id: 8444164d1a
2013-07-15 11:33:10 -05:00
Benjamin Phillippe
7a8ac66610 Issue #2191 Eager loading of slot values
Change-Id: Ib83c82c55a2576245a89355065c7dc0f6eac0068

Former-commit-id: 30285c687d [formerly 802f3e1557] [formerly c47062862c] [formerly 30285c687d [formerly 802f3e1557] [formerly c47062862c] [formerly c89449ba6d [formerly c47062862c [formerly f2fd040de924724f382e16054a7e2bea27bb99d9]]]]
Former-commit-id: c89449ba6d
Former-commit-id: fbe48b40f3 [formerly 3a4ceb9fc6] [formerly 152bc65a7e4bdfd71fb745463fd0bbd0d491bcb9 [formerly 9396b9b2d4]]
Former-commit-id: 059bb9feef5c5f79f0f2152bf04a1677bf3226b1 [formerly b6778a4830]
Former-commit-id: f115603d12
2013-07-15 10:41:52 -05:00
Roger Ferrel
37097f01bd Issue #2088 Changes for non-blocking CrestHistoryDlg.
Change-Id: Iebb031464ab25d1212b1748789f79051528d0c3a

Former-commit-id: 59451c11ad [formerly 77390e1f78] [formerly b394c8fa41] [formerly 59451c11ad [formerly 77390e1f78] [formerly b394c8fa41] [formerly 68bc54c334 [formerly b394c8fa41 [formerly fc0cd12d87493527c6a7ddaddd70b77182a7390f]]]]
Former-commit-id: 68bc54c334
Former-commit-id: 58fa2a4029 [formerly f4bafbf4d3] [formerly 7ed16a72c79d83b8328dd47e7385fa774ffd122c [formerly e73bfc1a54]]
Former-commit-id: 5955e021947b8a460f4cdeca9f428017deae0959 [formerly 4462cdf67f]
Former-commit-id: 0eaa7512c2
2013-07-15 07:56:14 -05:00
Mike Duff
5b291f577d Issue #2141 - Fix envelope validation for DD areal filter and selection dialogs
Change-Id: I401f44d9a8392f97e1b6ab7c769e3fbfb23a36d6

Former-commit-id: 4ed69f8195 [formerly cd9f3dc0e1] [formerly 9454dd76a7] [formerly 4ed69f8195 [formerly cd9f3dc0e1] [formerly 9454dd76a7] [formerly acf1f266e3 [formerly 9454dd76a7 [formerly b1ca1bb2ceb576e8e8664289e83e06708532bc97]]]]
Former-commit-id: acf1f266e3
Former-commit-id: d8fed3e4aa [formerly f2c5343ee2] [formerly 6a696cad457c573ed9799e8791c695202eed53e7 [formerly bad75bd14c]]
Former-commit-id: d600a264226ac91af3df246f9c871aa811ec4150 [formerly a4cecf0180]
Former-commit-id: f006d5e124
2013-07-12 16:12:41 -05:00
Dustin Johnson
35ff8477bd Merge "Issue #2106 Create SubscriptionRetrievalAttributes to only load Subscription objects when required" into development
Former-commit-id: ccee29532e [formerly 05712d159b] [formerly 98a5531095] [formerly ccee29532e [formerly 05712d159b] [formerly 98a5531095] [formerly 7f43d8d266 [formerly 98a5531095 [formerly f5cf83112d9dd697909a334a5ca2d34e51e6168b]]]]
Former-commit-id: 7f43d8d266
Former-commit-id: d201642eca [formerly e51ac6df59] [formerly a7a510f3342bc85cc4838adae907c717946e6390 [formerly 45cef4d8bc]]
Former-commit-id: c4266ec66597ffdbe1573d7471f4721b3500934c [formerly 3e7f61e413]
Former-commit-id: 54df426beb
2013-07-12 14:40:20 -05:00
Mike Duff
54919fb49a Issue #2096 - Display of Madis point data
Change-Id: Ic2f47dd592dca9694b7bed3260b5fb854eb4e52a

Former-commit-id: 0a10e07093 [formerly 42a26cef99] [formerly 95c8e6422f] [formerly 0a10e07093 [formerly 42a26cef99] [formerly 95c8e6422f] [formerly b3eb6be510 [formerly 95c8e6422f [formerly c2f940c204e7cce42cc00eb3ab607bf710a3a2e3]]]]
Former-commit-id: b3eb6be510
Former-commit-id: 07b6f123b3 [formerly 53e6e2de49] [formerly 10940e7fe40f83484953a68b75897ac8404652f6 [formerly 88f90382e4]]
Former-commit-id: 779291a0db1f5482520b6a53ad063a92180582f9 [formerly 981adc2413]
Former-commit-id: 2a9f890c9d
2013-07-12 14:39:09 -05:00
Benjamin Phillippe
bc2eeb7767 Issue #2191: Registry Garbage Collection
Change-Id: I15094a928b4f8793daab751b85a20b19b6352438

Former-commit-id: 4a482184ca [formerly 0af12c7e8b] [formerly 3aebfb2956] [formerly 4a482184ca [formerly 0af12c7e8b] [formerly 3aebfb2956] [formerly 34764a4a09 [formerly 3aebfb2956 [formerly 6afda27e19d0ea38c547afc9a28c55525706f9f1]]]]
Former-commit-id: 34764a4a09
Former-commit-id: 07b82c9a22 [formerly 1184adc820] [formerly a424752427eb180390d4e0310c5eea44eacf943e [formerly 1653b3f10c]]
Former-commit-id: a98b9bbf6575fea4cd796cb51bb11cc96cc48efb [formerly 1946a678a7]
Former-commit-id: cb32a8ab43
2013-07-12 11:33:21 -05:00
Max Schenkelberg
aabbb25c6d Issue #2190 Cleaned up sounding and cloud height dependencies
Change-Id: If07406f7e618fca0ea001b56a81b8552d9d44546

Former-commit-id: 0b21274439 [formerly dccc265ab0] [formerly d4c7a0c302] [formerly 0b21274439 [formerly dccc265ab0] [formerly d4c7a0c302] [formerly 56fef93541 [formerly d4c7a0c302 [formerly 767ecfd7f2930de641d532d08120d5023b6e38e4]]]]
Former-commit-id: 56fef93541
Former-commit-id: aee63f150f [formerly 8ea57bfbac] [formerly 780ccd7e833e37069d808d836ad303c6cf184e97 [formerly 8ad1acdbc5]]
Former-commit-id: deb62ce2eff58fb093fa318250144087333c3c68 [formerly 43344e0340]
Former-commit-id: 7f1784e352
2013-07-12 10:12:48 -05:00
Nate Jensen
fe957cbbf6 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 bd8525143d [formerly ef1d88ffc6] [formerly 2e3f246a9b] [formerly 1a0c6e540e [formerly 2e3f246a9b [formerly 22c11a51effb42dc41c91ee5bce622cfd64da7e5]]]]
Former-commit-id: 1a0c6e540e
Former-commit-id: 54833aba7d [formerly f265de8ff2] [formerly 6c2a821114eaef3cf9be268201e12764ac327b26 [formerly a288c26dbd]]
Former-commit-id: 8b0266710e35b5922f3c7b117a370a6cde76f6df [formerly d7c57f620c]
Former-commit-id: 67fda060da
2013-07-12 09:22:12 -05:00
Dustin Johnson
2ebda62400 Issue #2106 Create SubscriptionRetrievalAttributes to only load Subscription objects when required
Amend: Peer review comments, also fixed bug where subscriptions weren't being loaded on changing bandwidth

Change-Id: I8b5a122b0434d54dcfcbff9df6283edad68d7eb1

Former-commit-id: aa7c916c05 [formerly a821cdac28] [formerly 050b38fa9a] [formerly aa7c916c05 [formerly a821cdac28] [formerly 050b38fa9a] [formerly 5f38365571 [formerly 050b38fa9a [formerly 4da045d4c13a7d14cdbea3269409f2020e0c78f1]]]]
Former-commit-id: 5f38365571
Former-commit-id: e661886f15 [formerly 2756292e27] [formerly 16859d755061ef88819854b3e926a64c2319151e [formerly 6992ae7a11]]
Former-commit-id: cc6bde95b0633ccbb060512d7a72c99115c94a82 [formerly 273928f386]
Former-commit-id: 5f55b64857
2013-07-12 09:01:05 -05:00
Nate Jensen
1c4aa6f91b Issue #2142 fix ingest logback configuration
Change-Id: I8e21298a190eb1d4f1aac087ce3d7efb0c6accbc

Former-commit-id: 7ccf58ee3b [formerly 2da58b4567] [formerly 0a29d56ecb] [formerly 7ccf58ee3b [formerly 2da58b4567] [formerly 0a29d56ecb] [formerly ace22e2bf8 [formerly 0a29d56ecb [formerly 8b0f80f46c4d0e148cacfbae39d249e8ae040b88]]]]
Former-commit-id: ace22e2bf8
Former-commit-id: f54aced105 [formerly 795f43f53d] [formerly 58d0d4b6773b1d3576b2e002281771de92068ee1 [formerly 6a565452b2]]
Former-commit-id: 28c7365017601f643231f275b039d9a169bcdb43 [formerly eb8279cede]
Former-commit-id: 41469baa50
2013-07-12 08:58:53 -05:00
Nate Jensen
c67cf9e81d Merge "Issue #2142 fix radar server logging" into development
Former-commit-id: f28b440fa8 [formerly e9684f0add] [formerly 90b000482e] [formerly f28b440fa8 [formerly e9684f0add] [formerly 90b000482e] [formerly 5f12c25177 [formerly 90b000482e [formerly f9822d956e4d2bd473f0954560499837949b6f8e]]]]
Former-commit-id: 5f12c25177
Former-commit-id: 4e52491e63 [formerly af75ff0ffb] [formerly 4c84ae155cc7d80b9af9489a4b726757d8fac8a3 [formerly 0948cc8925]]
Former-commit-id: 8ab0111a7983662937080358e1030f49fa88407d [formerly 1303acb408]
Former-commit-id: 133c793f60
2013-07-11 16:06:49 -05:00
Nate Jensen
4c394503c6 Issue #2142 fix radar server logging
Change-Id: Ic4678f22ffb7ab5edaa97f76b27e1e6ffd14b4ff

Former-commit-id: b4265150dd [formerly 0857f9334a] [formerly a6bd01028c] [formerly b4265150dd [formerly 0857f9334a] [formerly a6bd01028c] [formerly a421f83b66 [formerly a6bd01028c [formerly 8c139d0200e9619afaa2cd2cd95c8a5a7410ca19]]]]
Former-commit-id: a421f83b66
Former-commit-id: 4212d6f808 [formerly c551c5ea8f] [formerly 3a5c003e612589c93adb927cf083a1622dfa0422 [formerly 641b52bbab]]
Former-commit-id: f09ddaaebb7b95d5d83d683c7669c4811e140866 [formerly 69f59343b9]
Former-commit-id: cf151e4e1b
2013-07-11 14:25:36 -05:00
Matt Nash
09e4900a66 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 0470e7531a] [formerly e41b83f7fb [formerly d2e5e7284a] [formerly 0470e7531a] [formerly 3939a15ff9 [formerly 0470e7531a [formerly 894f51376ba69365192ad0b9c5dd19c9cfba4e5c]]]]
Former-commit-id: 3939a15ff9
Former-commit-id: 10dd336a9a [formerly 388c2b5b13] [formerly 489cbf67d681e142ef6ece3175ed698665d35b62 [formerly 8bb5a46772]]
Former-commit-id: 2736d4159ada8d436e94524bda62b3c4fcc015bf [formerly 2003f89be3]
Former-commit-id: caec447a3e
2013-07-11 13:32:26 -05:00
Roger Ferrel
d7681669d0 Issue #2088 Changes for non-blocking ContactsDlg.
Change-Id: I8e9bd796b6b811cbcbd4159d7b209733fffa23df

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

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

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

Former-commit-id: d34d1a83e3 [formerly bcd4a0aff1] [formerly 8a963939a8] [formerly d34d1a83e3 [formerly bcd4a0aff1] [formerly 8a963939a8] [formerly afe9e049b3 [formerly 8a963939a8 [formerly bcf0b1285e46d62695515051cbec17945c2646f0]]]]
Former-commit-id: afe9e049b3
Former-commit-id: 6a9ef8c64e [formerly a8fd06f8d3] [formerly 92ea947252a95dc424e84118b95d086a15965d25 [formerly fc46308738]]
Former-commit-id: e48cb5c3a7cd213a3c508376405f28e06ccb6369 [formerly 38ed97d48b]
Former-commit-id: 6a0a9400ad
2013-07-10 11:45:56 -05:00
Greg Armendariz
df73c0e2e9 13.5.1-6 baseline
Former-commit-id: e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]]
Former-commit-id: b9044b1195
Former-commit-id: f23d42e977 [formerly 93b71934c0] [formerly 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7]]
Former-commit-id: cca9e123a3f6f9da3810eec2cc36ef7c717f111a [formerly ec2637676d]
Former-commit-id: b601345c9f
2013-07-10 10:04:22 -04:00
Ben Steffensmeier
7b48c5038a Issue #1869 Switch location hibernate type to use hibernate spatial.
Former-commit-id: 9d1910ba9d [formerly f8596f1f5a] [formerly 7a31fbb386] [formerly 9d1910ba9d [formerly f8596f1f5a] [formerly 7a31fbb386] [formerly bbdd5cdc79 [formerly 7a31fbb386 [formerly b434131d412788c478ec45114a86abe925a79d4c]]]]
Former-commit-id: bbdd5cdc79
Former-commit-id: 87cc8f9112 [formerly a524c3f17d] [formerly 4c381305878cb140792b9d6b0b8239024c1f483f [formerly d0b0d981cc]]
Former-commit-id: abce4baedd0fd36fcdcf80fdb8b4981ea85727b7 [formerly db54975911]
Former-commit-id: c02d27fe9e
2013-07-09 18:25:11 -05:00
Lee Venable
86372d82f9 Issue #1928 - Removed SWT browser to prevent errors.
Change-Id: Ifad38700dfc12ec3cade8dc62fa8c46fbf06ed80

Former-commit-id: bf34a474cb [formerly 6a63ae3a79] [formerly 6d15b7795f] [formerly bf34a474cb [formerly 6a63ae3a79] [formerly 6d15b7795f] [formerly d8335ecd23 [formerly 6d15b7795f [formerly b69e08c40d305005b28c003b6165bcc8d4b41f10]]]]
Former-commit-id: d8335ecd23
Former-commit-id: 3ed855e5a5 [formerly 1da9605d7e] [formerly 1cbe32dc15cbff8f589b7c4963e68ad944c7c06d [formerly 89f2a6666a]]
Former-commit-id: 63080882ac719b523830120e48e41c191a5031b7 [formerly 4e6206ccc3]
Former-commit-id: d82304ac79
2013-07-09 17:10:22 -05:00
Dustin Johnson
e46cb588f2 Issue #2038 Correct unregisterFromBandwidthEventBus() to actually do it
Change-Id: Ic82c974dcf354d9fb871b1b2f81cea52e2502fe8

Former-commit-id: 215e3fbd8d [formerly 2cfe1506a4] [formerly 0393cec5d5] [formerly 215e3fbd8d [formerly 2cfe1506a4] [formerly 0393cec5d5] [formerly 9f6bd8b32b [formerly 0393cec5d5 [formerly 198c9895608d22b3e3a616f2812628be32da514b]]]]
Former-commit-id: 9f6bd8b32b
Former-commit-id: d506f63c65 [formerly 617fdd6b44] [formerly d307875965a1a0d3fecaaf627504cf76ab5c4496 [formerly 3cb8e1336c]]
Former-commit-id: 8c41760d6ddca7ab7a22a2d092e358ead6a94526 [formerly b9f992626c]
Former-commit-id: 06ce541b67
2013-07-09 14:55:22 -05:00
Roger Ferrel
1928fea36e Issue #2145 Verify movable ring coordinates prior to saving.
Change-Id: I4772e180d0af394985dbd1bdc65007a8c02feed0

Former-commit-id: c5b3bd54d0 [formerly f31f880a19] [formerly f279672f6f] [formerly c5b3bd54d0 [formerly f31f880a19] [formerly f279672f6f] [formerly 26ffb4d885 [formerly f279672f6f [formerly 8048d0e91041d734239b11b18df34a87b5e75c35]]]]
Former-commit-id: 26ffb4d885
Former-commit-id: e2b92d0f6e [formerly cd63b071db] [formerly 35e26514d690b9801a953a0caef8eb7312b009f4 [formerly 9e195e5469]]
Former-commit-id: 260ba1fc066ce6baf8e00db8d351248d58ced2bc [formerly 73fd01fa51]
Former-commit-id: 5d1d211890
2013-07-09 14:05:35 -05:00
Ben Steffensmeier
b6764e390e Issue #1869 Format Calendar when making Constraint Mapping.
Former-commit-id: bbea2d76c5 [formerly 2cccbc8e0d] [formerly f53f702b9e] [formerly bbea2d76c5 [formerly 2cccbc8e0d] [formerly f53f702b9e] [formerly c3f48bac0a [formerly f53f702b9e [formerly 58d020c1b09b4f5efc1fc9b558ef7defef80adba]]]]
Former-commit-id: c3f48bac0a
Former-commit-id: 3555a55bda [formerly 4bdec4b2bb] [formerly efa98dc017879571de4c3992f60b9a80924bd274 [formerly 1017dfae5b]]
Former-commit-id: 028655e89b75a3bb704036327e99d1ed4a519937 [formerly 236ec98da1]
Former-commit-id: 364a7ec1b6
2013-07-09 14:01:13 -05:00
Roger Ferrel
a9e593136c Issue #2088 Non-blocking ColorScaleMgrDlg and ColorChooserDlg.
Change-Id: I6f14726a466780e0dbab13d8b64fa2c55acf55d0

Former-commit-id: bcfe29ffeb [formerly e73559b871] [formerly d5e66e410d] [formerly bcfe29ffeb [formerly e73559b871] [formerly d5e66e410d] [formerly f3bdbde9d3 [formerly d5e66e410d [formerly 108c5a4957b6d3ab50eacd5792122f7cd2ff3cba]]]]
Former-commit-id: f3bdbde9d3
Former-commit-id: dc01673b13 [formerly 44724d9487] [formerly 2c591fb8750544921169d97733aea020a1760e66 [formerly 696885dc4b]]
Former-commit-id: 544f386fbd37410b6480e9f28944dc4523aac519 [formerly b82c76157c]
Former-commit-id: 9f1f91258f
2013-07-09 11:13:43 -05:00
Brad Gonzales
86569acffd Issue #1965 Changed to use File.delete() instead of Apache FileUtil.deleteQuietly().
Amend: Update from peer review.

Change-Id: Ia58b75f8f8be62f3aaddbe46aed5558714d276bd

Former-commit-id: cc89d3939d [formerly 2ced007de9] [formerly b462162996] [formerly cc89d3939d [formerly 2ced007de9] [formerly b462162996] [formerly 503d6d6cca [formerly b462162996 [formerly defb699314eec545eff3b3b603b059ef05ac1a23]]]]
Former-commit-id: 503d6d6cca
Former-commit-id: 2a3706a8f1 [formerly 222965ca7f] [formerly ece70e73a38f366159776702fbedeee0c1c366ee [formerly 4f80abebaa]]
Former-commit-id: 84d33297e2e3c72a87a8cbf7c52ee2f49f1d1d66 [formerly 6de2098f63]
Former-commit-id: 1405b1f061
2013-07-09 09:07:38 -05:00
Mike Duff
ee0718d7e6 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 cb4624fc42 [formerly 53ebc492e1] [formerly 9aaf06ab73] [formerly 9f6213f9a5 [formerly 9aaf06ab73 [formerly 1015a76693e73c52d2bc56c18c4f3dfa25092771]]]]
Former-commit-id: 9f6213f9a5
Former-commit-id: 34da0216ca [formerly 7a8d39b1da] [formerly 04153a198540f2b015eac4a85a12d4eb9b845dca [formerly 502a141297]]
Former-commit-id: 6539c57a5fac000e28d3b7eb56933b11ade3e991 [formerly 70492fbb2d]
Former-commit-id: fee7cdb0f1
2013-07-09 08:15:28 -05:00
Bryan Kowal
66be02b953 Issue #2153 - fix commons-logging dependencies for wes2bridge
Former-commit-id: a9f9517cfc [formerly 8485164fa2] [formerly 650509604a] [formerly a9f9517cfc [formerly 8485164fa2] [formerly 650509604a] [formerly c3a87eadea [formerly 650509604a [formerly 3eab5b0c2ae5ed93526edd0b13c40180d6d7cc65]]]]
Former-commit-id: c3a87eadea
Former-commit-id: a5d925cf35 [formerly bdabcac203] [formerly 7544cc885821cce005f9f789f2f8be15b1c17560 [formerly 2dc96499d0]]
Former-commit-id: 9d0ccc0282df419cdba68586b88024f8b87a7069 [formerly b3a93df1df]
Former-commit-id: 259a7d99b1
2013-07-08 20:14:11 -05:00
Lee Venable
173110a514 Merge "Issue #2088 Made FcstPointGroupDlg, FloodReportDlg, HydroBaseDlg and StationFilterOptionsDlg non-blocking." into development
Former-commit-id: bc4b9ebf7b [formerly 7cf71c36af] [formerly ab16e2c8a1] [formerly bc4b9ebf7b [formerly 7cf71c36af] [formerly ab16e2c8a1] [formerly 2933cc2ca8 [formerly ab16e2c8a1 [formerly c2d9a2d394fc2ab0f60c63d11323af8db90655da]]]]
Former-commit-id: 2933cc2ca8
Former-commit-id: 3e1ccaba1f [formerly 33ec4dd688] [formerly 63d100710b7892d9a2dcff5fa651609f6ed21112 [formerly b36c421c9a]]
Former-commit-id: 059c92abf6f0f15b7aeb19a4899d031d3c99c698 [formerly 2b7feb420d]
Former-commit-id: 4b90569add
2013-07-08 17:06:42 -05:00
Dustin Johnson
6d514fac43 Merge "Issue #2173 - Update unit tests for Java 1.7 and SLF4J" into development
Former-commit-id: 1e404f2e51 [formerly d11f3977cc] [formerly f09225135c] [formerly 1e404f2e51 [formerly d11f3977cc] [formerly f09225135c] [formerly 6d84cb70a8 [formerly f09225135c [formerly 67b9b463a2463036a47f62b45bf140be8a0567eb]]]]
Former-commit-id: 6d84cb70a8
Former-commit-id: bcc5f523b3 [formerly 31e45da3d0] [formerly 1a6fecb2f24d5536d64c34ac33e1d4bc3883f924 [formerly 7950c692a4]]
Former-commit-id: 263a1e6f70c707afb3811414c18a33c5d267037a [formerly 7d21788705]
Former-commit-id: 21ac764524
2013-07-08 17:00:59 -05:00
Mike Duff
521766a794 Issue #2173 - Update unit tests for Java 1.7 and SLF4J
Change-Id: I7cd6378b17d1388d6006bc8ade9708f4797ff51a

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

Former-commit-id: b90c928b0b [formerly 77ce8e1acb] [formerly 04b9bf6b73] [formerly b90c928b0b [formerly 77ce8e1acb] [formerly 04b9bf6b73] [formerly ac8bed9a2f [formerly 04b9bf6b73 [formerly ee39ca286312d9cd7629ba30e56faf3635c5b128]]]]
Former-commit-id: ac8bed9a2f
Former-commit-id: 6e93ea970d [formerly 96b277ce09] [formerly 6014928e88eea88030ae7e26bb617e335ca5f703 [formerly f394cf27e8]]
Former-commit-id: b83f4acceb68c9fa98c480d6bfa31b5be474f690 [formerly 21a4444e0e]
Former-commit-id: 482a4463c8
2013-07-08 16:19:21 -05:00
Dustin Johnson
c3295adae5 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 ed0ff8ff85 [formerly f519f21b79] [formerly f5d66a9f0d] [formerly 59c1cd7a5e [formerly f5d66a9f0d [formerly 1a45a8604e35d0b14caf8465905a806e79a2461d]]]]
Former-commit-id: 59c1cd7a5e
Former-commit-id: 2a6030f923 [formerly 8746dda5a6] [formerly 39781ab4005ee62454d7a9dab360d7dc13e5d156 [formerly 4db95fa534]]
Former-commit-id: d54b6089164fe7a7ae594e619c161d49eb5ead76 [formerly 41ca04fcbd]
Former-commit-id: b886f349c5
2013-07-08 15:53:15 -05:00
Dustin Johnson
2a296d51e7 Merge "Issue #2106 Add ability to run deploy tests again" into development
Former-commit-id: ccfe596544 [formerly 2cb1fe005c] [formerly 02ceb9d667] [formerly ccfe596544 [formerly 2cb1fe005c] [formerly 02ceb9d667] [formerly dc8ea99af9 [formerly 02ceb9d667 [formerly 889fadcd5b4e6f261d275cab3a5b67e3edbb50d9]]]]
Former-commit-id: dc8ea99af9
Former-commit-id: fa0b3e36a4 [formerly c43e4e1812] [formerly cf20c8f4cbf8d7fd69266b953c2b144345985787 [formerly f04680fb89]]
Former-commit-id: bc87f485bf2c3ca7dbf4eb867c866a4ca7153091 [formerly 9c948e69c9]
Former-commit-id: 8d55090453
2013-07-08 15:52:12 -05:00
Nate Jensen
6f88b60e12 Merge "Issue #2145 Added slection indicator and verificaton of lat, lon and radius." into development
Former-commit-id: cfcb88f730 [formerly 4bb1dc7493] [formerly 5f07ddf81b] [formerly cfcb88f730 [formerly 4bb1dc7493] [formerly 5f07ddf81b] [formerly c7ec0ba929 [formerly 5f07ddf81b [formerly 12b690f90ee9cf5ab2fe632236f56254efc09a11]]]]
Former-commit-id: c7ec0ba929
Former-commit-id: f8cfbb2831 [formerly d2c398392d] [formerly 3515602ccae91b726e559d7e95a6e9fbb305c144 [formerly 829cb5d9eb]]
Former-commit-id: 1ad2c7dfe6993ac7db8107f43a6f371cca480546 [formerly 84e7cf173d]
Former-commit-id: 27b9cde410
2013-07-08 14:42:59 -05:00
Dustin Johnson
bf74f5bb6c Issue #2106 Add ability to run deploy tests again
Change-Id: I912137e02d4decb0ff07f9d73d1debeb9d9226a1

Former-commit-id: 7d940d102c [formerly ccef13f8cd] [formerly 09b97672cd] [formerly 7d940d102c [formerly ccef13f8cd] [formerly 09b97672cd] [formerly 35305d2c1d [formerly 09b97672cd [formerly 290c1fb3bc7e9fd4871799e9884fcb10a28db46f]]]]
Former-commit-id: 35305d2c1d
Former-commit-id: 3d28ac32fb [formerly 79205e287a] [formerly 8d7dc49f0b67ceddea9ae25296f5f90069dbd3cc [formerly 36e0fd26d8]]
Former-commit-id: b461c44e9e288d7a70db918069280a96ca423e5d [formerly ea2b206bc6]
Former-commit-id: 8d4c94b29b
2013-07-08 14:00:40 -05:00
Nate Jensen
943f34244b Merge "Issue #2154 Ensure all resource groups get removed from the time matcher." into development
Former-commit-id: 817b4b80da [formerly 84ccd3140d] [formerly 1287301152] [formerly 817b4b80da [formerly 84ccd3140d] [formerly 1287301152] [formerly 6bb28cddcf [formerly 1287301152 [formerly 11ee25f7b9eb2f041e75e5922c9ebe95c1e64bab]]]]
Former-commit-id: 6bb28cddcf
Former-commit-id: 6cd7b2c546 [formerly ed0df5c004] [formerly 81c4a8a651ae50c86d9f296b775b9ee67245a9b7 [formerly 5ced5e04ff]]
Former-commit-id: 3f53748fde1740a45b5e198155cb454f33d7cdfb [formerly a42c398300]
Former-commit-id: 6f4d06acfe
2013-07-08 13:33:30 -05:00