Commit graph

1915 commits

Author SHA1 Message Date
Richard Peter
5977b7de0c Merge "Issue #1655 - Implement the framework for DD system status messaging" into development
Former-commit-id: e0564b3b6c [formerly d075546952] [formerly 51a097fb8d] [formerly e0564b3b6c [formerly d075546952] [formerly 51a097fb8d] [formerly 7ceaed43c3 [formerly 51a097fb8d [formerly 638b708123bb5a89292cc7778ed8211102718d28]]]]
Former-commit-id: 7ceaed43c3
Former-commit-id: bbd3b18d5f [formerly ce7e6eeeed] [formerly d38a47bc4241e93cb847b7f2b7c520baf5764f92 [formerly 5026801885]]
Former-commit-id: 8de0536fd2eff02f9c40a5b2f1e2b773ea915da0 [formerly 7fc81195f0]
Former-commit-id: 6ba6248d49
2013-07-21 22:54:14 -05:00
Richard Peter
dedba8b339 Merge "Issue #1653 - Add a subscription summary" into development
Former-commit-id: f5040c96b7 [formerly c926f71281] [formerly 73c2547981] [formerly f5040c96b7 [formerly c926f71281] [formerly 73c2547981] [formerly 68e565fdd9 [formerly 73c2547981 [formerly 74351187e3b7061ecfdfd040ff88b81823055889]]]]
Former-commit-id: 68e565fdd9
Former-commit-id: 0845c5e3d1 [formerly d922c86c26] [formerly 94ee77045edc6a368692dfc25e52a4a8f9104a06 [formerly 992b544e33]]
Former-commit-id: de6de7b31d9114349745d4351107561f72323ae8 [formerly 64adb6ec6c]
Former-commit-id: 56eac084b5
2013-07-21 22:04:02 -05:00
Mike Duff
d3d47d6d4e Issue #1653 - Add a subscription summary
Change-Id: I677ae6d472a4de5bd8905650b2e13ffc1e2af149

Former-commit-id: 271959462c [formerly 3cac2bd4ba] [formerly 823f064ef8] [formerly 271959462c [formerly 3cac2bd4ba] [formerly 823f064ef8] [formerly d5ef7f056f [formerly 823f064ef8 [formerly d64a7895e08df47feedfb95edec033d0c87384c1]]]]
Former-commit-id: d5ef7f056f
Former-commit-id: b8b8adfe89 [formerly efea9b3739] [formerly 8dcb19154786aa426856c5a801762302c07e0dc2 [formerly b4c9a0066a]]
Former-commit-id: ac8cbf8a13c1770ff77b165f9cefbcd1e953b9e1 [formerly 00904dc8ec]
Former-commit-id: 2b08ae68ff
2013-07-18 14:53:10 -05:00
Nate Jensen
2a221bafdf Merge "Issue #2156 added orphan checking to time match basis on time match and set to null if not on any descriptor" into development
Former-commit-id: 0a462628ed [formerly 60f15e1081] [formerly 12a9907775] [formerly 0a462628ed [formerly 60f15e1081] [formerly 12a9907775] [formerly 08a90aa293 [formerly 12a9907775 [formerly ae5a73adff9925796610ccdda83459a2f7ffb771]]]]
Former-commit-id: 08a90aa293
Former-commit-id: 4afebce15c [formerly a0bccec268] [formerly 13b893b0f852a3d356269b82bf262d7918a23468 [formerly 41fb919028]]
Former-commit-id: adbe7ad067219d5d0ae8300e9187e930a2e5cef2 [formerly d3526cc878]
Former-commit-id: 6f98f286d6
2013-07-17 17:10:32 -05:00
Nate Jensen
95d5b89058 Merge "Issue #2158 Allow VizGlobalsManager to work without accessing UI thread. Change-Id: I3cb8e97d68a76b371a93a52b1c4f7b860b0847c1" into development
Former-commit-id: 458688ba47 [formerly db2e2b8359] [formerly b42b2f12ec] [formerly 458688ba47 [formerly db2e2b8359] [formerly b42b2f12ec] [formerly 3c2cd76715 [formerly b42b2f12ec [formerly 91357f42f9762e47984cba6fcf5479deb1fd5724]]]]
Former-commit-id: 3c2cd76715
Former-commit-id: 787fec1106 [formerly 6a47dfacb6] [formerly 1e744dc5eeb81454e92687a341f543753c2eb7d1 [formerly bd489239a9]]
Former-commit-id: 60c3f94e11fe2ba426ff2e8c9670d5f3635e28bc [formerly 655050e317]
Former-commit-id: 5ddf889a93
2013-07-17 17:09:29 -05:00
Nate Jensen
c6b9b2dd7f Issue #2142 clean up dependencies and dead code
Change-Id: I30f94c9afb01cdd1b7bef98c6ba40f79c3acea59

Former-commit-id: 8838a7ee75 [formerly c4bc1ef034] [formerly a636846295] [formerly 8838a7ee75 [formerly c4bc1ef034] [formerly a636846295] [formerly f28420dac4 [formerly a636846295 [formerly 593073cade120a95899f4f4d2c5a652c6ac3389a]]]]
Former-commit-id: f28420dac4
Former-commit-id: d39a175583 [formerly 8b070975aa] [formerly 222e227b908ca94947a44a0518892d94ce66b436 [formerly 65dbc62b59]]
Former-commit-id: 858ba69761701e13b33acad8a218e96e2b1ad8e4 [formerly 428d0c73dc]
Former-commit-id: 5a0dd6f037
2013-07-17 16:30:08 -05:00
Max Schenkelberg
57cc5782f0 Issue #2156 added orphan checking to time match basis on time match and set to null if not on any descriptor
Amend: Accepted ticket

Change-Id: I27df5b96cc411bb3b48850e3c6fb1ee862dbd760

Former-commit-id: 9552fdb7a3 [formerly bb53119678] [formerly 7f94b93c84] [formerly 9552fdb7a3 [formerly bb53119678] [formerly 7f94b93c84] [formerly 29943f945c [formerly 7f94b93c84 [formerly 782a1b71f83ee3d0db7b7df82eecabe7f7fecd4f]]]]
Former-commit-id: 29943f945c
Former-commit-id: e3141b8627 [formerly ecf47b4586] [formerly 861829e99bff8633e2158f386d4287e2a7c92c89 [formerly a2210eebf9]]
Former-commit-id: 0d0256c97f116f1812e56a912457f1a06697c51b [formerly 49d8014f85]
Former-commit-id: d515b0500e
2013-07-17 16:12:36 -05:00
Nate Jensen
bc564392d1 Issue #2142 logback cleanup
Change-Id: I48716f940fd2c8545d372bd16d881f87a75311f1

Former-commit-id: 9c575f1754 [formerly 621a4da9b7] [formerly 81d9a28d53] [formerly 9c575f1754 [formerly 621a4da9b7] [formerly 81d9a28d53] [formerly a0aeeedd23 [formerly 81d9a28d53 [formerly 38ee29e206824a1beeaad5837d731804b4affbdc]]]]
Former-commit-id: a0aeeedd23
Former-commit-id: 8b409d373f [formerly 5c123e60d8] [formerly 7e6549f719edb3018a4fa8735433e50b1367bd15 [formerly 447ac6311d]]
Former-commit-id: 71620ec8729f783f4d97d16161fe2bd5dd0c1285 [formerly 6d8c46e6d6]
Former-commit-id: 2a28bb772b
2013-07-17 14:03:43 -05:00
Mike Duff
9b97f03f55 Issue #1655 - Implement the framework for DD system status messaging
Change-Id: I621cd07fdf6a742b0af4408dad534844d08e9e55

Former-commit-id: c07c4b9e8c [formerly 1ca50d2c4f] [formerly 7acfe076a0] [formerly c07c4b9e8c [formerly 1ca50d2c4f] [formerly 7acfe076a0] [formerly 2c98a91d05 [formerly 7acfe076a0 [formerly 4f51d50f9d6ea76f3b2cb2e828c6b6f8e192fb38]]]]
Former-commit-id: 2c98a91d05
Former-commit-id: 87ebf5b62c [formerly 7971b31475] [formerly 20fcd925338e1b43130104d89f2dd2ca5f14a124 [formerly 218c46928b]]
Former-commit-id: e550532c1ec421d33570b8321aa72307f2f9aba9 [formerly 299845987c]
Former-commit-id: f8dde28fc5
2013-07-17 08:55:27 -05:00
Roger Ferrel
0798ccce64 Issue #2088 Changes for non-blocking PrintTextReportDlg and TextReportDlg.
Change-Id: I0f999c8334aefb3f2d0e27d91bdea419a96d65e6

Former-commit-id: d9d74ca4bf [formerly 1dbcb165df] [formerly 6f6da35020] [formerly d9d74ca4bf [formerly 1dbcb165df] [formerly 6f6da35020] [formerly edb32da7ce [formerly 6f6da35020 [formerly 648aa82a0d6b10a92a44df55eb278b6cc4c9bc1b]]]]
Former-commit-id: edb32da7ce
Former-commit-id: acea3a7a54 [formerly 656e94d8f8] [formerly 15150632c51a17b283884abaa77f3b8c3c32d393 [formerly 79f72c3195]]
Former-commit-id: 8296b32348ce8cfc9e4ad50b1a9e2f417823474a [formerly 798c82f832]
Former-commit-id: cbd87fe3e2
2013-07-16 14:03:20 -05:00
Ben Steffensmeier
a469270e54 Issue #2158 Allow VizGlobalsManager to work without accessing UI thread.
Change-Id: I3cb8e97d68a76b371a93a52b1c4f7b860b0847c1

Former-commit-id: ccf4ec5c3d [formerly 0cbe0e996d] [formerly 872ad4dfa9] [formerly ccf4ec5c3d [formerly 0cbe0e996d] [formerly 872ad4dfa9] [formerly ffed387cce [formerly 872ad4dfa9 [formerly d3621cf3155841086cd24eecf4543bd70c890e41]]]]
Former-commit-id: ffed387cce
Former-commit-id: d12902e725 [formerly 0b336d418b] [formerly 0a629899d7899e902f1daebcfdead2043ab8a4f1 [formerly 9606262e7e]]
Former-commit-id: 07094cc973c3df36a824e8d0e5b836f971dc835f [formerly 0a48ee47f7]
Former-commit-id: 701859fefc
2013-07-16 11:04:08 -05:00
Roger Ferrel
36347f3704 Issue #2088 changes for non-blocking RatingCurveDlg, FindReplaceDlg and TextEditorDlg.
Change-Id: I8d651254e862a45c1dad33c0d4991b29f1611828

Former-commit-id: 659a8f37ed [formerly 5884bb5692] [formerly d620283c3b] [formerly 659a8f37ed [formerly 5884bb5692] [formerly d620283c3b] [formerly 3eacead9bb [formerly d620283c3b [formerly d71b87606a93f744984f45aec8887dbc0052bb4e]]]]
Former-commit-id: 3eacead9bb
Former-commit-id: 5ee2faff34 [formerly 19ef062429] [formerly a018799df11c533f6ed97b64c91dc8cf9e42b7ea [formerly c556150c27]]
Former-commit-id: 3094ae8920f7ff3f764f041032c2dd5eff0c8ec4 [formerly a0b46a31ba]
Former-commit-id: adec97370a
2013-07-16 10:28:32 -05:00
Lee Venable
165ad4e74e Merge "Issue #2088 Changes for non-blocking DataSourcesDlg, ImpactStatementDlg and LowWaterStatementDlg." into development
Former-commit-id: d01a28d968 [formerly aae2be3488] [formerly c1371b2429] [formerly d01a28d968 [formerly aae2be3488] [formerly c1371b2429] [formerly e78b2c6cfc [formerly c1371b2429 [formerly ba0218361df0703fa7600f0f32459aa2fd846d62]]]]
Former-commit-id: e78b2c6cfc
Former-commit-id: eb1623a01b [formerly acec066de3] [formerly 4801dbb30962094624f1061c308c1e54fa814510 [formerly 82267f30fd]]
Former-commit-id: a9639d7ee5247aab9a733f8b2f97c061edb34f5c [formerly b85743a62d]
Former-commit-id: 6b5bb6c22c
2013-07-16 09:15:57 -05:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Dustin Johnson
5b583e69f8 Merge "Issue #2138 - Fixed to not use filter if filter is disabled." into development
Former-commit-id: 19a9d2fd4a [formerly 6101c8a586] [formerly b8800c0616] [formerly 19a9d2fd4a [formerly 6101c8a586] [formerly b8800c0616] [formerly e2ffbd9b27 [formerly b8800c0616 [formerly 35a2a6d54af2aa62cc3a256869e409cdb7868cb0]]]]
Former-commit-id: e2ffbd9b27
Former-commit-id: 942dc9e2de [formerly 86710ba9b6] [formerly 3a4fa8ae9ab537c1fae481841ae814e1ae244482 [formerly 56d1806f22]]
Former-commit-id: 3a142b27749d64823dd4ee5eff8e774a0ce51db5 [formerly aae6466381]
Former-commit-id: 0a1abe8f7c
2013-07-08 08:39:14 -05:00
Dustin Johnson
d1c9bc4fa2 Merge "Issue #2132 - review comments" into development
Former-commit-id: b14826f2a7 [formerly 93c7fe3ac9] [formerly a414049f39] [formerly b14826f2a7 [formerly 93c7fe3ac9] [formerly a414049f39] [formerly daf64a7923 [formerly a414049f39 [formerly 62394f1d0d8ebcd9781b5c3e377469c04ebd7dc2]]]]
Former-commit-id: daf64a7923
Former-commit-id: 19e9081e8f [formerly 2bee69bceb] [formerly 262993bd643ffe079d6a52742f3b7b653b9015f8 [formerly 7606d9e7ff]]
Former-commit-id: 7ad1e6a136df87854445a2f40a0f902c63671166 [formerly 47f8f65a38]
Former-commit-id: 9b724cea3f
2013-07-08 08:38:47 -05:00
Roger Ferrel
1667335d31 Issue #2145 Added slection indicator and verificaton of lat, lon and radius.
Change-Id: I10492bdd2e74b5ea8fd9386528019665185ae584

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

Former-commit-id: a785cb459f [formerly cb024359ad] [formerly 4442946626] [formerly a785cb459f [formerly cb024359ad] [formerly 4442946626] [formerly c493182fa4 [formerly 4442946626 [formerly 2ced83baa19c11c0eb37f02779ae344e75d108b7]]]]
Former-commit-id: c493182fa4
Former-commit-id: 630ea0ab01 [formerly a4dfdd7313] [formerly 80ed31360dd4b4afc6a14bb6dee09aa0b1c8a521 [formerly 49cf68617f]]
Former-commit-id: 906ff993aeed3fe23cda67fa565b36ee5531597e [formerly bd9ee4c7d3]
Former-commit-id: 1ec831f66c
2013-07-05 12:35:53 -05:00
Ben Steffensmeier
5630ec9b85 Issue #2154 Ensure all resource groups get removed from the time matcher.
Former-commit-id: c95b7b3fb5 [formerly 808941ac45] [formerly a7bfd8ee28] [formerly c95b7b3fb5 [formerly 808941ac45] [formerly a7bfd8ee28] [formerly 519d0f3ef8 [formerly a7bfd8ee28 [formerly f652fd3f3126f04c2ced9ceb027875a47ea23f51]]]]
Former-commit-id: 519d0f3ef8
Former-commit-id: ab4bea19cc [formerly 1c678fb024] [formerly cecb39b36e774cbcea3c6b25c66d6a91990ce545 [formerly 4b9138dc0f]]
Former-commit-id: dfd1d7ec13443ca9d72d91b79ff193e33eded7a1 [formerly 17c7cd4734]
Former-commit-id: 86b0a0a2c3
2013-07-03 14:42:59 -05:00
Nate Jensen
3563e5ae4d 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 22ee16a803 [formerly d883392d05] [formerly f13bd6391a] [formerly 6465fb58ad [formerly f13bd6391a [formerly 929f2145983f183722dbeacbbf996b78179657c6]]]]
Former-commit-id: 6465fb58ad
Former-commit-id: aa6f46efd6 [formerly 0cb178f835] [formerly 490a3b990cacecdc884502035e965659982a0e8d [formerly 6a9b54cd4e]]
Former-commit-id: f9e981c314aed87eb685eb09a10d5c5eb4286016 [formerly 29f4bf22a3]
Former-commit-id: 3f990ebc8a
2013-07-03 13:32:49 -05:00
Nate Jensen
7370ec316d Merge "Issue #2159 Synchronize TimeCache access in D2DTimeMatcher. Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55" into development
Former-commit-id: 3bb2890812 [formerly b7ddbeed41] [formerly d4261fcc45] [formerly 3bb2890812 [formerly b7ddbeed41] [formerly d4261fcc45] [formerly 6b93db235f [formerly d4261fcc45 [formerly c9dd4fe32a28f20a3d5883d767787f37598e435d]]]]
Former-commit-id: 6b93db235f
Former-commit-id: 671a9a81ef [formerly b688000175] [formerly 0f31486a4098733feacb024f5bbfc2b05fa3cab2 [formerly 8793ca3101]]
Former-commit-id: 58174f88e02ed157fc82bf0834031e8b68e4610f [formerly f732b4ccbb]
Former-commit-id: 5e7b468622
2013-07-03 13:10:39 -05:00
Ben Steffensmeier
51559078de Issue #2159 Synchronize TimeCache access in D2DTimeMatcher.
Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55

Former-commit-id: af51ecc7c9 [formerly 2d8e1e5e6c] [formerly a868d3d0b5] [formerly af51ecc7c9 [formerly 2d8e1e5e6c] [formerly a868d3d0b5] [formerly 53d969d0db [formerly a868d3d0b5 [formerly 3eaca3d7a18ab9c8ab601fc7ed9fb899eced1134]]]]
Former-commit-id: 53d969d0db
Former-commit-id: 679ef95297 [formerly b18f4bbe89] [formerly f9fb487f9e5019b31c24a98c3d01a0959d8527a4 [formerly dde0846fc3]]
Former-commit-id: 2c5f78ab0eb4866cb5826c16f9208561eabb617f [formerly 6804d5f9b3]
Former-commit-id: e7443b5ef6
2013-07-03 12:44:45 -05:00
Bryan Kowal
7826d2a96d Issue #2164 - fix 13.6.1 build
Change-Id: I9f4e29f8f19abf7700baad125617054c8a561ff3

Former-commit-id: 970eaad447 [formerly 34efd01a4f] [formerly c2b54d7c31] [formerly 970eaad447 [formerly 34efd01a4f] [formerly c2b54d7c31] [formerly 1c49dff18e [formerly c2b54d7c31 [formerly ea1628be6840c42fffd2e8b8437386a4df3aacca]]]]
Former-commit-id: 1c49dff18e
Former-commit-id: b94334199e [formerly c9fa275089] [formerly fe53471fbd73b96c7f069b638956ba81e12ff83b [formerly 0787aca88b]]
Former-commit-id: a5cdeeff20003c17b4c880bb19089237906e7df1 [formerly 5c14f56265]
Former-commit-id: ca7f9097f6
2013-07-03 11:25:46 -05:00
Nate Jensen
95cd15b40b 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 7b6481ba36 [formerly ae004c8c77] [formerly 7bd12afa02] [formerly 679bf314e0 [formerly 7bd12afa02 [formerly d679aae13498d67d79a1134275f1016699583e1f]]]]
Former-commit-id: 679bf314e0
Former-commit-id: 614cdb58a8 [formerly 7bb4d66cbf] [formerly 0681c396fa825b8599c62566e72b40ac503776b2 [formerly c8d221b46c]]
Former-commit-id: 33fa2337cb05e1f1a2732d5c07392dd6d2407b9b [formerly 64a7f0d148]
Former-commit-id: d97721eda9
2013-07-03 09:37:05 -05:00
Roger Ferrel
25ebc33066 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 8cab528dc8 [formerly ebb76daf14] [formerly fab96d28f2] [formerly 752933c7fe [formerly fab96d28f2 [formerly f7cb404093a0a2bdda1e202bc8cdd98ba146bd85]]]]
Former-commit-id: 752933c7fe
Former-commit-id: 2f5994b297 [formerly 477d8b0317] [formerly 0187d6cc339bec8a38231e4fb72a3c74d9c45138 [formerly 3c24739b72]]
Former-commit-id: 68c6ec861090e911963c0c012b7fd34292902451 [formerly 0fb0ff7a5a]
Former-commit-id: 9f8b831148
2013-07-02 17:27:22 -05:00
Mike Duff
c14c159f24 Issue #2132 - review comments
Change-Id: I65b880b5f96471b6f8e0f5ae89ee3981a96a1094

Former-commit-id: 876960a2cb [formerly 57d37e9761] [formerly 4399429e74] [formerly 876960a2cb [formerly 57d37e9761] [formerly 4399429e74] [formerly 2618c1a4e4 [formerly 4399429e74 [formerly 7a85b96863dece9c1b5a356f4e929665e0ce03f8]]]]
Former-commit-id: 2618c1a4e4
Former-commit-id: a48d17ef7e [formerly 617abbd8f1] [formerly 9f07a473781aa8232e833e400eac68c9f1b191a5 [formerly 82d713083a]]
Former-commit-id: 55f66b799033e6ea0cc6b2f2e3796e34fc925ef8 [formerly 3e20961fe0]
Former-commit-id: c1abe64b72
2013-07-02 16:08:37 -05:00
Max Schenkelberg
5bc6ca2784 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 fa03e3f2ef [formerly bc91a9f6de] [formerly 9709b0500a] [formerly fef6056519 [formerly 9709b0500a [formerly 9982c3ffdb399b8c3587d08e9427710ddbc61cb4]]]]
Former-commit-id: fef6056519
Former-commit-id: 358ad28927 [formerly 63d69a5435] [formerly 41e73cad8a29f48a4d17728ff37661b0f76dc35e [formerly dc78010e74]]
Former-commit-id: cfc13968fb55ee8f651dcfb7836932ef8db807d9 [formerly 1e7b73c44e]
Former-commit-id: 738d6bcae8
2013-07-02 15:22:31 -05:00
Mike Duff
1f44740b1a Issue #2160 - Fix for MPE display 7x7 dialog, field changes
Change-Id: Ib428d1aab246863bfdbbb271d27a4687197a3ebe

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

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

Former-commit-id: 289011dc92 [formerly 1c3c9e461b] [formerly 1e7ae55676] [formerly 289011dc92 [formerly 1c3c9e461b] [formerly 1e7ae55676] [formerly 220818df3a [formerly 1e7ae55676 [formerly dd9ba84811ee60b4dae7fb940abf6ff2526869ba]]]]
Former-commit-id: 220818df3a
Former-commit-id: 97d130d022 [formerly ee5b120929] [formerly a92ee8e9a863e9b74742101f3ea578f6cb0c4219 [formerly 3cabedbd45]]
Former-commit-id: 115a4eef8bed57e9bdd3175321d311ae29f63f40 [formerly ac04c66be2]
Former-commit-id: d52ab020d1
2013-07-01 13:03:39 -05:00