Commit graph

1477 commits

Author SHA1 Message Date
Ben Steffensmeier
25cf2e55b7 Issue #1355 fix bilinear interpolation for grid cells between -1 and 0
Former-commit-id: 52c4a1b36e [formerly 97ebdae978] [formerly 52c4a1b36e [formerly 97ebdae978] [formerly bb2094a69d [formerly 6ea390529a24a0a74be227b6d1cd6bdf0de7a27b]]]
Former-commit-id: bb2094a69d
Former-commit-id: c2877a3b60 [formerly 04d67c8932]
Former-commit-id: 70b2a2b947
2012-11-27 15:15:57 -06:00
Bryan Kowal
0afc122e00 Issue #1292 - delta scripts
Change-Id: Iec5eb9746e0531349b6bdbe70577125a7a6254d5

Former-commit-id: 3bfb3b93b3 [formerly 623812116b] [formerly 3bfb3b93b3 [formerly 623812116b] [formerly 11c98b66a2 [formerly 0f1643912c5713f556a931725a6ad4b75620a4df]]]
Former-commit-id: 11c98b66a2
Former-commit-id: cb142a0650 [formerly 2bcc0bbd60]
Former-commit-id: c49ac64444
2012-11-27 14:05:24 -06:00
Richard Peter
c1ed2217e0 Merge "Issue #1350: Fix ingestGrib and ingestDat posting of stats" into development
Former-commit-id: 5a5b7274ba [formerly fb3a4b154b] [formerly 5a5b7274ba [formerly fb3a4b154b] [formerly 0dc908bc45 [formerly 46c26b2b58b0bf9d59e0005d537f82ccf3f0acbd]]]
Former-commit-id: 0dc908bc45
Former-commit-id: 45a173ddc9 [formerly 442c2778fa]
Former-commit-id: 66f8cfe826
2012-11-27 11:20:59 -06:00
Richard Peter
38829d92c3 Issue #1350: Fix ingestGrib and ingestDat posting of stats
Change-Id: I74154680ff6b4e8f5b5e4b2b3440e2b99a16b6df

Former-commit-id: cffbf1da06 [formerly 98297abdd0] [formerly cffbf1da06 [formerly 98297abdd0] [formerly 6c81be8499 [formerly e9afcf3d12599fc3bace2b140deb0d85ee303c6c]]]
Former-commit-id: 6c81be8499
Former-commit-id: 7e93b3d90d [formerly 251cc3764d]
Former-commit-id: e139125e89
2012-11-27 10:59:46 -06:00
Roger Ferrel
bb21c0b2f7 Issue #1298 Plugin changes to get localization import of files to work for test procedures.
Change-Id: I91e5e5abc76789f0b65ebc2dc7c793f7afa32d7d

Former-commit-id: ac09c59d38 [formerly 2a1024ff50] [formerly ac09c59d38 [formerly 2a1024ff50] [formerly 230e24addc [formerly 67b55ee03d17a878375be75bc36bcb5500ca98fd]]]
Former-commit-id: 230e24addc
Former-commit-id: 0011eb0ff4 [formerly ea3b2aebc6]
Former-commit-id: 2cc1b72f9e
2012-11-27 10:37:06 -06:00
Richard Peter
8c6ea90652 Issue #1350: Fix cave feature dependencies
Change-Id: Ia96e46656ae21388cce0196a5fad7f7badeb36da

Former-commit-id: 25c47696b9 [formerly 8a149f1671] [formerly 25c47696b9 [formerly 8a149f1671] [formerly 955025940c [formerly 19dc217fe08245411df16efd34bab8980ec7dcb5]]]
Former-commit-id: 955025940c
Former-commit-id: 3efd48eded [formerly 4cc389183e]
Former-commit-id: ffb053edb2
2012-11-27 09:18:01 -06:00
Nate Jensen
2621f23dfa Issue #1323 fix build issue
Change-Id: I5918a05535bc7e928214075784f615cf454d2972

Former-commit-id: cbb77b884b [formerly d76ab40583] [formerly cbb77b884b [formerly d76ab40583] [formerly f24fcc07cf [formerly db083d70f18b771740f73ecb787c103b5264881d]]]
Former-commit-id: f24fcc07cf
Former-commit-id: 8a4544a632 [formerly 10be056dcb]
Former-commit-id: 2385f6223a
2012-11-27 09:07:07 -06:00
Richard Peter
a67465cf41 Merge "Issue #1350: Track ingestGrib and ingestDat statistics" into development
Former-commit-id: 5c398cb93f [formerly 53426e2e90] [formerly 5c398cb93f [formerly 53426e2e90] [formerly 9a90b123e7 [formerly 08b5d690e71afd7424fc00e0d4c06b497447d93a]]]
Former-commit-id: 9a90b123e7
Former-commit-id: 88602c16f4 [formerly a7d31535da]
Former-commit-id: 3e12efe275
2012-11-26 18:15:21 -06:00
Richard Peter
688cc569f5 Issue #1350: Track ingestGrib and ingestDat statistics
Change-Id: Ieba6ca1de1dc6bd78a37ee1a9d9b49d69ca4e132

Former-commit-id: 0db7ec08a2 [formerly 8d40a8fea9] [formerly 0db7ec08a2 [formerly 8d40a8fea9] [formerly 4d5f2fd360 [formerly 3bbb6602d8ee99792b4a65e040091d1a1923d0b1]]]
Former-commit-id: 4d5f2fd360
Former-commit-id: d1d28437ad [formerly b891bb63e1]
Former-commit-id: 17189b1862
2012-11-26 18:13:13 -06:00
Mike Duff
d6b3380e9a Issue #728 - Make graph scale to visible data when adding or removing data from graph
Change-Id: I44150e19b52436b7103226f6ce539b0e9536d072

Former-commit-id: 94a1921f8b [formerly fb04389920] [formerly 94a1921f8b [formerly fb04389920] [formerly 0675868464 [formerly dd45abb6461510408a92e66e68a25222d45e9ecf]]]
Former-commit-id: 0675868464
Former-commit-id: e6647d5e9a [formerly dc8a5420d4]
Former-commit-id: f98e4fa57e
2012-11-26 18:07:10 -06:00
Richard Peter
55e043169e Merge "Issue #728 - Implementation of Statistics graphs peer review comments Changing to use average value rather than sum." into development
Former-commit-id: e48eef4e8c [formerly 56627c6391] [formerly e48eef4e8c [formerly 56627c6391] [formerly 3124712dd5 [formerly d4c42ddc3e1f15ec7f415fe1abca1da05ac76ae7]]]
Former-commit-id: 3124712dd5
Former-commit-id: a810e06c03 [formerly 5eb311271a]
Former-commit-id: 786d9183ef
2012-11-26 17:36:43 -06:00
Mike Duff
4ec36b8ce4 Issue #728 - Implementation of Statistics graphs
peer review comments
Changing to use average value rather than sum.

Change-Id: I7f97e27c4f463fe60bec2cbc52f3eac66d8fa77f

Former-commit-id: 4e15f63b4e [formerly c49759d28e] [formerly 4e15f63b4e [formerly c49759d28e] [formerly f000c1a9cf [formerly f15ba1ee009abf4a562bb37450d65f97c7ffa217]]]
Former-commit-id: f000c1a9cf
Former-commit-id: 830a3918d9 [formerly 56cd5da64d]
Former-commit-id: 514c93b9b8
2012-11-26 17:31:29 -06:00
Roger Ferrel
2200b9b31e Issue #1298 Changes for WeatherPlogDialog found in testing of 1229 (part 2).
Change-Id: I86d06e37a791a8d73937d487a8f1c22cc23199b3

Former-commit-id: 4b1c9a1d2c [formerly 1bc40b2daf] [formerly 4b1c9a1d2c [formerly 1bc40b2daf] [formerly 520fa44d23 [formerly 98d0d27124baa44bcbbdf6e9276aa1966e420207]]]
Former-commit-id: 520fa44d23
Former-commit-id: 49c3225d11 [formerly 05da65c512]
Former-commit-id: 4a01a00a5d
2012-11-26 15:15:38 -06:00
Nate Jensen
43444e6839 Merge "Issue #1323 Improving framework based on first factory implementation" into development
Former-commit-id: 72b4ab6ae7 [formerly 912eec5fab] [formerly 72b4ab6ae7 [formerly 912eec5fab] [formerly c665e9c43c [formerly 4d8d7ba7dc2acc827171856657ceea3c8bf13d2f]]]
Former-commit-id: c665e9c43c
Former-commit-id: 47768a36a2 [formerly 4c041aa2b0]
Former-commit-id: 6b9b85de24
2012-11-26 14:27:06 -06:00
Roger Ferrel
b1cbcb5716 Issue #1298 Testing for 1229 discovered existing bug in WeatherPlotDialog where dispose listener was being added in a non UI thread.
Change-Id: I2bced344aa83035fc62e36a377e8182bf3aebf7c

Former-commit-id: c34b777804 [formerly 0b87e0fdfd] [formerly c34b777804 [formerly 0b87e0fdfd] [formerly 5e7227d1b0 [formerly bdf2bf3c1e3b907fb16acf82dda230f97a3cc517]]]
Former-commit-id: 5e7227d1b0
Former-commit-id: 77db62f285 [formerly 8319d7245d]
Former-commit-id: 8c64034eb1
2012-11-26 14:06:03 -06:00
Nate Jensen
4d018e06aa Issue #1323 Improving framework based on first factory implementation
Change-Id: I817cb7fbab8ae517cf134e1fd53c9b5c3eee5ab1

Former-commit-id: 7d4aac94c5 [formerly b3602e6bf8] [formerly 7d4aac94c5 [formerly b3602e6bf8] [formerly 9bbba94c53 [formerly f95518ac0b8bb862dc69af9f07d72f286cbea085]]]
Former-commit-id: 9bbba94c53
Former-commit-id: e8a1a72f31 [formerly a1a21d5af4]
Former-commit-id: 2a3140bf72
2012-11-26 13:24:37 -06:00
Bryan Kowal
da6b3656bd Issue #1318 - re-order dependencies; the core feature is now dependent on the event feature
Change-Id: I6639323fc3d3afaef85b35ab6693986d9e4243b0

Former-commit-id: 95efa5f0e0 [formerly 06241d95e0] [formerly 95efa5f0e0 [formerly 06241d95e0] [formerly f645f60a75 [formerly 31df15583f3b0182736728654b6131fd7d6bc9a8]]]
Former-commit-id: f645f60a75
Former-commit-id: 87e0c08179 [formerly f68c9873b7]
Former-commit-id: 55ac52ff6e
2012-11-26 13:06:33 -06:00
Richard Peter
0506b05950 Merge "Issue #1316 pass original constraints through when doing time queries in derived parameters." into development
Former-commit-id: c8d397e2be [formerly a605638948] [formerly c8d397e2be [formerly a605638948] [formerly 847abb1ce0 [formerly db7957b642327ee7a3e592467d75cb776e7fb522]]]
Former-commit-id: 847abb1ce0
Former-commit-id: 3782d441e8 [formerly 11babce68c]
Former-commit-id: d4e7b02f05
2012-11-21 15:49:11 -06:00
Richard Peter
9fbabfde61 Issue #1332: Update pypies to create/use condensed group structure
Change-Id: I2e7311b063df1a217a2fe37c0e470272e4e85e92

Former-commit-id: 768ed3b2ed [formerly c72c0b9f98] [formerly 768ed3b2ed [formerly c72c0b9f98] [formerly dbe4290f45 [formerly 90f3cac62473c66dcdef73a6a605becf08868316]]]
Former-commit-id: dbe4290f45
Former-commit-id: 9e51ff1b8a [formerly 2b3f0a2938]
Former-commit-id: a0827f476e
2012-11-21 15:27:31 -06:00
Ben Steffensmeier
ce495bd549 Issue #1316 pass original constraints through when doing time queries in derived parameters.
Former-commit-id: a1fc232a19 [formerly 7061c6db78] [formerly a1fc232a19 [formerly 7061c6db78] [formerly f6a502fb78 [formerly 5f67639bdd24711dc6f77b41163f49bf8626b7d3]]]
Former-commit-id: f6a502fb78
Former-commit-id: 27b77f735d [formerly 59a00a75f9]
Former-commit-id: d08d71d471
2012-11-21 14:21:01 -06:00
Richard Peter
64efa971f6 Merge "Issue #1343: Fix Derived Parameter clean up of global map performance" into development
Former-commit-id: 1f4591a861 [formerly a8b691b11e] [formerly 1f4591a861 [formerly a8b691b11e] [formerly d276bf25df [formerly 7ca68476dd30a056223d4b1b8788640cae245ca9]]]
Former-commit-id: d276bf25df
Former-commit-id: e709143e10 [formerly a482cd3f17]
Former-commit-id: 55c6fa7bb7
2012-11-20 16:58:13 -06:00
Richard Peter
42850516da Issue #1343: Fix Derived Parameter clean up of global map performance
Change-Id: Id5a37b16ffe311891a39acd21dab792d6c62fb29

Former-commit-id: 3fb4137264 [formerly a4ca44195e] [formerly 3fb4137264 [formerly a4ca44195e] [formerly 94ff0868d8 [formerly eeed667765a9da192ba4d28923fa447d8ea81437]]]
Former-commit-id: 94ff0868d8
Former-commit-id: 1ee2e40970 [formerly 57b23523dc]
Former-commit-id: c3e4b81c7c
2012-11-20 16:42:27 -06:00
Dustin Johnson
5e480196a4 Issue #1322 Add IDisplay
Change-Id: I0f20b5e2e4544c2a984c317a812855f92e935b92

Former-commit-id: 973ffa6f71 [formerly 4425d25c71] [formerly 973ffa6f71 [formerly 4425d25c71] [formerly d68c1f84f2 [formerly 039c475445ca8f049c46547dba63d413f3019817]]]
Former-commit-id: d68c1f84f2
Former-commit-id: bd77ea1c11 [formerly fe187f62f7]
Former-commit-id: 5ca7396d38
2012-11-20 15:22:52 -06:00
Richard Peter
a34caf2edf Merge "Issue #189 grid retrieval api. Change-Id: Ice9432ab703420c8d441860de085a8d34a2610c8" into development
Former-commit-id: 92ff920171 [formerly 0b4f2bd666] [formerly 92ff920171 [formerly 0b4f2bd666] [formerly 1cd1f8b793 [formerly dbaf10dc2036589e21245a7166182ee01e401717]]]
Former-commit-id: 1cd1f8b793
Former-commit-id: 78cad6b0e1 [formerly 24e21a3e48]
Former-commit-id: a0327c25fb
2012-11-20 11:37:58 -06:00
Ben Steffensmeier
775ab284c8 Issue #189 grid retrieval api.
Change-Id: Ice9432ab703420c8d441860de085a8d34a2610c8

Former-commit-id: 93ac9ccaf2 [formerly 9bccb6ac7c] [formerly 93ac9ccaf2 [formerly 9bccb6ac7c] [formerly 56d375da86 [formerly e0b91523c54227ef15588f5dd672b2450a9dd8ac]]]
Former-commit-id: 56d375da86
Former-commit-id: 98cab0f2b3 [formerly dd1a3154e5]
Former-commit-id: 6f844cc7e2
2012-11-20 11:32:29 -06:00
Richard Peter
392b68ea83 Merge "Issue #1340 Updates to statistics for common baseline, data delivery stats gathering" into development
Former-commit-id: 4916961d3e [formerly 5a2ba01a49] [formerly 4916961d3e [formerly 5a2ba01a49] [formerly b48635490a [formerly 6176f3ef90779a5b99c99b1cfd8f0ffc60a6f316]]]
Former-commit-id: b48635490a
Former-commit-id: cb99915ea1 [formerly ffd6fd3e5e]
Former-commit-id: e1bd326ef0
2012-11-20 10:25:57 -06:00
Dave Hladky
2912941ad7 Issue #1340 Updates to statistics for common baseline, data delivery stats gathering
Change-Id: I0b59f1db8579900c7eb50939d60acfeef2db44b8

Former-commit-id: a2a27224c4 [formerly 44a7fffe3e] [formerly a2a27224c4 [formerly 44a7fffe3e] [formerly a2106c7cbf [formerly 4571b0066a103973184a8d5732d4a945e95d9638]]]
Former-commit-id: a2106c7cbf
Former-commit-id: 1e16e81c9e [formerly 9722f92d5e]
Former-commit-id: 6e6b5d72b4
2012-11-20 10:22:50 -06:00
Richard Peter
a63f796be5 Merge "Issue #189 clean up unneeded references to grib." into development
Former-commit-id: 42ce93afa8 [formerly b68a8d986f] [formerly 42ce93afa8 [formerly b68a8d986f] [formerly 48e33e05e7 [formerly 6cb68df37fd22b45abcaee309f9f364456905191]]]
Former-commit-id: 48e33e05e7
Former-commit-id: d695c10d87 [formerly 36ce487edc]
Former-commit-id: dfa27ccab6
2012-11-19 17:16:08 -06:00
Richard Peter
3f48932678 Merge "Issue #189 add some more catch blocks to contour subgridding so it works in more odd cases." into development
Former-commit-id: cee57ad2c1 [formerly 8bb1e1675d] [formerly cee57ad2c1 [formerly 8bb1e1675d] [formerly 625141ffb3 [formerly 6570ee57790d482a212ee65dc2ed9482ba8de8b6]]]
Former-commit-id: 625141ffb3
Former-commit-id: c063e130f1 [formerly 379b303985]
Former-commit-id: 9f3c913d32
2012-11-19 17:15:07 -06:00
Ben Steffensmeier
63f751fa7b Issue #189 clean up unneeded references to grib.
Former-commit-id: 9dd5c8d545 [formerly 7226decbe2] [formerly 9dd5c8d545 [formerly 7226decbe2] [formerly 7e1463f328 [formerly b25e86c8f369297b8e21efe7cdc0a9874c0cc470]]]
Former-commit-id: 7e1463f328
Former-commit-id: f0c1fcae31 [formerly 9b1b658f42]
Former-commit-id: 08df92cccd
2012-11-19 13:33:02 -06:00
Dustin Johnson
5b64ddb7ba Issue #1322 Move router registry to edex.xml
Amend:
  Add requestRouterRegistry to viz Spring file.

Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864

Former-commit-id: dd82a472e5 [formerly 13b1683458] [formerly dd82a472e5 [formerly 13b1683458] [formerly a9d01486ed [formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]]
Former-commit-id: a9d01486ed
Former-commit-id: dd03bf9bd5 [formerly 1bb69653af]
Former-commit-id: f91817813d
2012-11-19 13:21:03 -06:00
Ben Steffensmeier
c12aa2f438 Issue #189 add some more catch blocks to contour subgridding so it works in more odd cases.
Former-commit-id: 7bb12231f6 [formerly 43d506d8eb] [formerly 7bb12231f6 [formerly 43d506d8eb] [formerly 6c875b276a [formerly 6670aaff36bca8df4f6b841dc288199e69b5843d]]]
Former-commit-id: 6c875b276a
Former-commit-id: 688c5b6119 [formerly 6758415123]
Former-commit-id: c6af2e27c9
2012-11-19 12:30:44 -06:00
Richard Peter
05ab674cdd Merge "Issue #1322 Fix ingestGrib modes.xml to include router spring file" into development
Former-commit-id: ac10bd4c27 [formerly b71c022247] [formerly ac10bd4c27 [formerly b71c022247] [formerly 657c7a35c5 [formerly d846e934736d3e68f65620640ae2699dfb3c7530]]]
Former-commit-id: 657c7a35c5
Former-commit-id: dc5b3410eb [formerly e2f026a6a8]
Former-commit-id: 0fec5febc9
2012-11-19 12:14:16 -06:00
Dustin Johnson
80622f912d Issue #1322 Fix ingestGrib modes.xml to include router spring file
Amend:
  Add correct bean name.

Change-Id: Ia210fcc0b9299f5b207c16d5c12b363447c31349

Former-commit-id: 9cfb406675 [formerly ea7e8ac946] [formerly 9cfb406675 [formerly ea7e8ac946] [formerly 63db1ce6f8 [formerly a7d9c3ab2b7d1ae5cc1a71ccf1f4a2f76e1a0bc0]]]
Former-commit-id: 63db1ce6f8
Former-commit-id: 75feca3cd0 [formerly 56ea981db7]
Former-commit-id: 167e11671b
2012-11-19 12:03:31 -06:00
Steve Harris
e92c60d902 Merge "Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed" into development
Former-commit-id: 264dc4bc43 [formerly 0d16c0c0df] [formerly 264dc4bc43 [formerly 0d16c0c0df] [formerly 63cdc32988 [formerly 4dac2ba9a01b36885188f93fdaf974099cbc9d0c]]]
Former-commit-id: 63cdc32988
Former-commit-id: 082e1cbd09 [formerly 91bc36fda3]
Former-commit-id: 1173d7fd8e
2012-11-16 15:35:47 -06:00
Steve Harris
950e6f7ad7 Merge "Issue #1151 fix radar updates to use levels" into development
Former-commit-id: 601eb746d1 [formerly 5c71f2551b] [formerly 601eb746d1 [formerly 5c71f2551b] [formerly 152c06a718 [formerly 939d9031e4bc1107333f066321ec28ea93cfd3c3]]]
Former-commit-id: 152c06a718
Former-commit-id: 3d628abebe [formerly b04797de6f]
Former-commit-id: 03e30d568f
2012-11-16 15:35:26 -06:00
Dustin Johnson
08f3910ece Issue #1322 Add server keyed routing
Amend:
  Remove ServiceLoader files for RequestRouter.
  Resolve peer review comments.

Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b

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

Former-commit-id: 34c4ec44c3 [formerly 0daa22064b] [formerly 34c4ec44c3 [formerly 0daa22064b] [formerly 71367ef5bb [formerly a7386c6570455fe6f9175eaeae1225923124cce8]]]
Former-commit-id: 71367ef5bb
Former-commit-id: afc4de9a1a [formerly 102c2dbaa1]
Former-commit-id: 755c64bfdc
2012-11-16 14:12:27 -06:00
Ben Steffensmeier
07cae7c217 Issue #1151 fix radar updates to use levels
Former-commit-id: f04ac9f7b0 [formerly 9efd40dfd0] [formerly f04ac9f7b0 [formerly 9efd40dfd0] [formerly 8ac1373035 [formerly 7666bee12af83d195fccd845e874df19eabd94f6]]]
Former-commit-id: 8ac1373035
Former-commit-id: 956b6ecfdb [formerly a1d70499eb]
Former-commit-id: 060aed7ce2
2012-11-16 13:53:05 -06:00
Lee Venable
97ce309e3a Merge "Issue #189 fix modes for gridcoverage to include converter registration" into development
Former-commit-id: 2ce90a79cb [formerly 998cbc25d3] [formerly 2ce90a79cb [formerly 998cbc25d3] [formerly b745b95643 [formerly 7e4649185aa94d3191773a08d9e0673fad71ddb7]]]
Former-commit-id: b745b95643
Former-commit-id: 6c283693e4 [formerly cbe9bc5e76]
Former-commit-id: 25d56be2a4
2012-11-16 12:28:49 -06:00
Ben Steffensmeier
268f7cb64d Issue #189 fix modes for gridcoverage to include converter registration
Former-commit-id: 1082b1b51d [formerly 1a7560b8a3] [formerly 1082b1b51d [formerly 1a7560b8a3] [formerly 6b0ed3fa50 [formerly 0c521bea12f61d70ee144149a83cd9f8a492b891]]]
Former-commit-id: 6b0ed3fa50
Former-commit-id: 5126024a6b [formerly 2a0769d094]
Former-commit-id: 13f8f28c2e
2012-11-16 12:25:00 -06:00
Slav Korolev
5c09c11912 Issue #1297. Changed non-blocking ZoneTableDlg. Next patch.
Changes from reviewers comments.

Change-Id: Ie812ef1167fa6b1ea78ee615190bd3059285a682

Former-commit-id: 487a9eabb8 [formerly d220f74018] [formerly 487a9eabb8 [formerly d220f74018] [formerly 4560efe149 [formerly 8f002a71cb688fe8fbf7378ef53398dfecb0354e]]]
Former-commit-id: 4560efe149
Former-commit-id: 063c155818 [formerly 765dbd8766]
Former-commit-id: 711ba6b2b5
2012-11-16 11:08:42 -05:00
Lee Venable
84ac6354e8 Merge "Issue #1298 Changes for non-blocking GhgAlertDlg." into development
Former-commit-id: eb297f00fc [formerly 0540d84e4e] [formerly eb297f00fc [formerly 0540d84e4e] [formerly 40f11cfba5 [formerly e96cd422716fc6da7c0007b58fa75659c7600ad7]]]
Former-commit-id: 40f11cfba5
Former-commit-id: 247a2859ca [formerly aa4b1f4970]
Former-commit-id: 9bef16f8ab
2012-11-15 17:43:31 -06:00
Max Schenkelberg
a94b9c173d 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: a472f5535b [formerly 655f54b098] [formerly a472f5535b [formerly 655f54b098] [formerly f540f65fd7 [formerly 4648ab539b37a0608ab7ebab5080317bbf618504]]]
Former-commit-id: f540f65fd7
Former-commit-id: db2fe0b5e8 [formerly f1866b2e49]
Former-commit-id: 7ffce5cd45
2012-11-15 16:21:42 -06:00
Roger Ferrel
f805c4cccd Issue #1298 Changes for non-blocking GhgAlertDlg.
Change-Id: I1da7317ad69203a4160c806458fdbf99a7d9108d

Former-commit-id: b66bc0210a [formerly 800c1a6908] [formerly b66bc0210a [formerly 800c1a6908] [formerly c0554d9686 [formerly b3c640da3fad8d1ce07e348b075b9b1a0468da37]]]
Former-commit-id: c0554d9686
Former-commit-id: 0a11332193 [formerly 05f32527bd]
Former-commit-id: 342a35599b
2012-11-15 15:51:46 -06:00
Roger Ferrel
64ae20f4a9 Issue #1298 Changes for non-blocking GhgMonitorDlg.
Change-Id: I69a05b6d62e8d75c998b6cb9059c9f45e6cf39d3

Former-commit-id: a29b52ca8c [formerly dc82ad820b] [formerly a29b52ca8c [formerly dc82ad820b] [formerly 109dea21e1 [formerly 782113272c208a32e6165c02404138fcaa79d523]]]
Former-commit-id: 109dea21e1
Former-commit-id: e35d7b3f15 [formerly 2206167b00]
Former-commit-id: 418dd35a9d
2012-11-15 14:37:29 -06:00
Lee Venable
c1e08c8468 Merge "Issue #1298 Changes for non-blocking SelectionDlg." into development
Former-commit-id: ba019bf3f6 [formerly ba95731387] [formerly ba019bf3f6 [formerly ba95731387] [formerly 2dee27fbf3 [formerly a1d258382de88af5c139e22d2efb6183261d1e3b]]]
Former-commit-id: 2dee27fbf3
Former-commit-id: a4a5c89fa8 [formerly ed64d2f97a]
Former-commit-id: a883fd2e08
2012-11-15 13:47:46 -06:00
Benjamin Phillippe
debdd584fd Issue #1335 Fixed EHCache warnings. Changes to necessary config files
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8

Former-commit-id: 44519995ee [formerly 5bf46d468d] [formerly 44519995ee [formerly 5bf46d468d] [formerly 5c31b34e12 [formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]]]
Former-commit-id: 5c31b34e12
Former-commit-id: 43b94988c8 [formerly 6b1b73429b]
Former-commit-id: 688e19acc1
2012-11-15 13:35:25 -06:00
Roger Ferrel
619197cbb2 Issue #1298 Changes for non-blocking SelectionDlg.
Change-Id: I9829945037f8f5ce268eb3731302ae77e83d837b

Former-commit-id: 5f3fab4677 [formerly 00693d83bb] [formerly 5f3fab4677 [formerly 00693d83bb] [formerly 59181213a0 [formerly cd85c4e60fd3863c39a7c61ad73848207e196a05]]]
Former-commit-id: 59181213a0
Former-commit-id: d0cdc594f8 [formerly fdfcb2ebea]
Former-commit-id: e424cb4bf2
2012-11-15 12:55:49 -06:00
Nate Jensen
cabeee008a Merge "Issue #1325 add missing sourcepath for jts" into development
Former-commit-id: 397c71cb00 [formerly 19d74235d9] [formerly 397c71cb00 [formerly 19d74235d9] [formerly c4e1d26056 [formerly ecff6dc0484b6dc65e2c043be4a2b6a7fbb3a503]]]
Former-commit-id: c4e1d26056
Former-commit-id: 72a741c6a3 [formerly 84e98e2364]
Former-commit-id: e76a412fb4
2012-11-15 11:02:35 -06:00