Commit graph

2127 commits

Author SHA1 Message Date
Matt Nash
529e15bf44 Issue #2227 Fix issue with swapping of melting layer product.
Change-Id: Ibb67b53ba29f5a24714e2852602fd0b54d811b6d

Former-commit-id: 411bb7bef9 [formerly 3c0eb24d51] [formerly 91afb50333] [formerly b308e86105 [formerly 91afb50333 [formerly fc6ff0d7e60d82c8ca0d67cf96f26cde23ad0f02]]]
Former-commit-id: b308e86105
Former-commit-id: 253e6c7e43e23ad4a1926485184a895f118c99ca [formerly 855671b490]
Former-commit-id: 1acd38ced6
2013-07-30 10:47:37 -05:00
Ron Anderson
b407c24483 Merge "Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay." into development
Former-commit-id: a5b4564bf4 [formerly d569641f3e] [formerly ca94d4ffac] [formerly 43b5d2193b [formerly ca94d4ffac [formerly b286c654293e9b7bc11930953118b1d86da946dc]]]
Former-commit-id: 43b5d2193b
Former-commit-id: 9325a6cfb92f4c6f3ed0e145dbd8e2e7fb061d80 [formerly 8b1eb58de9]
Former-commit-id: 129040ce9b
2013-07-30 08:35:06 -05:00
Ron Anderson
8302ca2e4c Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay.
Change-Id: I3d2541a057440a3813837a91bef4e86172d73e4c

Former-commit-id: 7cbf6290b7 [formerly a5da46c360] [formerly ebdfbebcfc] [formerly 4aceedceb5 [formerly ebdfbebcfc [formerly 0f490c934d197bc45fea1fad2c034c47a2556988]]]
Former-commit-id: 4aceedceb5
Former-commit-id: 74a9faa9f68a1d5677b8f681b73ca7605d1907ac [formerly b4de3f23a6]
Former-commit-id: ddecdbf0b8
2013-07-29 18:12:24 -05:00
Ron Anderson
8c8be0441e Merge "Issue #1907 and #1908 fixed sampling a attribute dispaly when DataStoreResource is cropped" into development
Former-commit-id: 1d834d8d2f [formerly 9574e1237e] [formerly 35f5b04522] [formerly fd43f74212 [formerly 35f5b04522 [formerly 5188a208a6b66eb024db64efeb8a6409c57d4a64]]]
Former-commit-id: fd43f74212
Former-commit-id: 32ddad57d2fb004dabb2608d41dde4b5a0348dd6 [formerly 890bb4d832]
Former-commit-id: 972f1b02fc
2013-07-29 18:11:30 -05:00
Ron Anderson
a6b9fbb808 Issue #1907 and #1908 fixed sampling a attribute dispaly when DataStoreResource is cropped
Change-Id: I8700442003c686916a926509b76ca9dd96d42b1b

Former-commit-id: 681492f139 [formerly 19d38c48c5] [formerly f028f111b0] [formerly f3a8ccf158 [formerly f028f111b0 [formerly 7a9efa6a0b9ca848a9f8445f1aeef9a278c09ee7]]]
Former-commit-id: f3a8ccf158
Former-commit-id: c81dcca785585c8d2a5eca4e0c836bcfe52ee5f2 [formerly 3841c55a28]
Former-commit-id: 1de5b051e2
2013-07-29 17:19:07 -05:00
Bryan Kowal
be6c3ef08b Issue #2164 - remove unnecessary junit dependency
Former-commit-id: 45b945e3be [formerly 204fa65c8f] [formerly a0f1944796] [formerly 77473d75b5 [formerly a0f1944796 [formerly 8e7229a41ec6b5816a27f86a37e5d183cd0d1925]]]
Former-commit-id: 77473d75b5
Former-commit-id: fe8947abdbbfbad364cff667293097397b9f31fa [formerly 686affce01]
Former-commit-id: 02bba2ae9c
2013-07-29 16:31:15 -05:00
Lee Venable
300fec364a Merge "Issue #2227 Fix issue with changing scales for melting layer. Small refactor to make things more logical" into development
Former-commit-id: 85997c99ec [formerly c59237a292] [formerly f246c961a2] [formerly 80a147990e [formerly f246c961a2 [formerly 1f7a3d63a890934875a59a454e910bac94cdc671]]]
Former-commit-id: 80a147990e
Former-commit-id: 55a8a98aca4bdb2abe9c662cd9400379e4187e45 [formerly c78a13d744]
Former-commit-id: 8dcbc5d137
2013-07-29 15:06:42 -05:00
Matt Nash
799c643595 Issue #2227 Fix issue with changing scales for melting layer. Small refactor to make things more logical
Change-Id: I37269b4dd9e09ea6f4a8ad5c95f1620a462f3f5d

Former-commit-id: c04dfe7490 [formerly 8e75837289] [formerly 74ccbf163d] [formerly 0c98b5e9de [formerly 74ccbf163d [formerly 06fe93289dd6832fe7b2b78e6d15f15f229c2532]]]
Former-commit-id: 0c98b5e9de
Former-commit-id: 410563425e46c9739e4ae4400673f00e318d3e9a [formerly e7fddc8df0]
Former-commit-id: 65c3bb4ba4
2013-07-29 14:47:19 -05:00
Brad Gonzales
645d36f98f Issue #2196 changed wfoRegistry mode to devWfoRegistry mode. exclude crawler and harvester from wfo modes.
Change-Id: I3239daa25a4bc2116ff3423bfa71afe3947faff0

Former-commit-id: 7ad2b1c953 [formerly a053fc85f7] [formerly 8a6ab05561] [formerly 18201a0153 [formerly 8a6ab05561 [formerly 9bea23cc83e7262721efa4fef9b573d4dd540502]]]
Former-commit-id: 18201a0153
Former-commit-id: df7ab4ff8c4d4e0fc3ec4b4ec3223eb60f7bf884 [formerly 22c62b6982]
Former-commit-id: 02bb327341
2013-07-29 11:56:10 -05:00
Lee Venable
d340bb792b Merge "Issue #2232 - Fix index out of bounds exception in Sub Manager Table" into development
Former-commit-id: 6698d5d65f [formerly 5d32fd30df] [formerly a42d4bb0cc] [formerly 30baa25afa [formerly a42d4bb0cc [formerly d49617f4acec37ddbaa0ec1d91306687a35531b0]]]
Former-commit-id: 30baa25afa
Former-commit-id: 04d138d3d113b1e2230601f125d0cb7b9687aa4a [formerly 2af73d09f9]
Former-commit-id: 8f3b40e732
2013-07-29 11:52:16 -05:00
Lee Venable
4d36f90396 Merge "Issue #2217 - Added better error handling" into development
Former-commit-id: c71c388b1c [formerly d97698519d] [formerly f3c4306987] [formerly ccf6962224 [formerly f3c4306987 [formerly 880308a45215aba37e9f6fa367f0848cdbb0da51]]]
Former-commit-id: ccf6962224
Former-commit-id: df76bd2f6d088b036ea13625efcf10dec752bfc4 [formerly e2002c1d7e]
Former-commit-id: 824b855490
2013-07-29 11:44:59 -05:00
Mike Duff
180e113d2d Issue #2232 - Fix index out of bounds exception in Sub Manager Table
Change-Id: Id61f6c2ddccb965a236bf9a99412e6f6cca8cae0

Former-commit-id: 46a39fd7bb [formerly 83c79750af] [formerly 974d5a05b2] [formerly 3ab275aea4 [formerly 974d5a05b2 [formerly baa8d402efb4aeff839e06fd180a73a857fd0766]]]
Former-commit-id: 3ab275aea4
Former-commit-id: 9c0ed0e446be1daad57db09fc0150b4cdaca314f [formerly 579daeaebb]
Former-commit-id: df83cf2ffe
2013-07-29 09:55:51 -05:00
Richard Peter
b40512d805 Merge "Issue #2189 Set size properly on GLFont" into development
Former-commit-id: fc5c8fe510 [formerly 951484545a] [formerly 30c92f3fc7] [formerly 196f5f4a5d [formerly 30c92f3fc7 [formerly 7f7762b889e7b86231f22abb89dd94d630c0d291]]]
Former-commit-id: 196f5f4a5d
Former-commit-id: 435dcb24e4fa3b4b4a8e2c90d6f0485a3757375d [formerly 8ba5944134]
Former-commit-id: 44bcd7145d
2013-07-26 14:34:46 -05:00
Max Schenkelberg
f3f82761a0 Issue #2189 Set size properly on GLFont
Change-Id: Ib7321dfada582f4cbb05416428bd0c9639a905f7

Former-commit-id: dcd0242c3a [formerly 1e4fe87002] [formerly 970f2c1373] [formerly 564d6ee664 [formerly 970f2c1373 [formerly 77d6ace9b601558ece1bf5ea724ef2f08df0112a]]]
Former-commit-id: 564d6ee664
Former-commit-id: 0dccb9e07f90ef5a8f408098b1747f15fc92c249 [formerly ef01f6db81]
Former-commit-id: e1c5959762
2013-07-26 13:14:48 -05:00
Richard Peter
426003a524 Merge "Issue #2112 Fix volume browser sounding errors." into development
Former-commit-id: 22b017edfa [formerly 008f2f98ad] [formerly 8a4506e794] [formerly c57aa39ddd [formerly 8a4506e794 [formerly 019b1d63f11c9d1d57593e26f939d6b089730693]]]
Former-commit-id: c57aa39ddd
Former-commit-id: fd60a0ca22c8a42ac41c45ecab3700ce2597539c [formerly 5d53ab253d]
Former-commit-id: 5c59b1257c
2013-07-26 10:23:08 -05:00
Greg Armendariz
f6794acf79 Issue #2207 - Additional test fixes
Former-commit-id: 76b0a2da3d [formerly 0f4595d842] [formerly afe9191fea] [formerly b5d509fc4a [formerly afe9191fea [formerly 38531ca3d8336801663d7d664d0578497dff8911]]]
Former-commit-id: b5d509fc4a
Former-commit-id: ec0c985279a053426670da8dd11bade116fad500 [formerly 56881355ed]
Former-commit-id: 599458dbb5
2013-07-26 09:24:43 -05:00
Greg Armendariz
344ee588b3 Merge "Issue #2207 - Remove reference to missing tests directory" into development
Former-commit-id: 1762662c99 [formerly d83157b9d1] [formerly 69b346a195] [formerly 66caca12a4 [formerly 69b346a195 [formerly 3cf75f2b1a2fe5c2b94fcabf0b54038fccfa1724]]]
Former-commit-id: 66caca12a4
Former-commit-id: 12218db6b46469b81fc6897d0641bccf755a679c [formerly 8a5d9e4c70]
Former-commit-id: c232be59ff
2013-07-26 09:05:53 -05:00
Greg Armendariz
6232c7ea05 Issue #2207 - Remove reference to missing tests directory
Former-commit-id: f69ecb69f0 [formerly 7861a026b2] [formerly 8be27acdf2] [formerly f3d82d8e82 [formerly 8be27acdf2 [formerly 2f7e8e5d498fd96f60ddf3ae192cadc705abaf5c]]]
Former-commit-id: f3d82d8e82
Former-commit-id: 6fb040e680da0c52a9b6f09d40a36ce982300998 [formerly fedae5495f]
Former-commit-id: a8ed77b11a
2013-07-26 08:59:41 -05:00
Lee Venable
21d13f942a Merge "Issue #2218 - improve error handling and performance in SCANMonitor" into development
Former-commit-id: f1df84fe95 [formerly 877730ad19] [formerly 48a1404221] [formerly 4635a88d54 [formerly 48a1404221 [formerly bfbe879b22697ca7c8558ee94c49137a7787cfc9]]]
Former-commit-id: 4635a88d54
Former-commit-id: c50c94098d568e993c9762b97dd6420c536de33c [formerly 2357c7725a]
Former-commit-id: 995175c247
2013-07-26 08:48:56 -05:00
Nate Jensen
e60e5dba08 Issue #2223 fix melting layer memory leak
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec

Former-commit-id: 68fbcf5bb2 [formerly 7fc047102b] [formerly 5e29be3d1f] [formerly 1c765670ea [formerly 5e29be3d1f [formerly 49299504331c730ffe8a94f490f88337baf12233]]]
Former-commit-id: 1c765670ea
Former-commit-id: 293b692d6b0250e935d8663ee184a7d26bdf62fd [formerly 97c71fc9dc]
Former-commit-id: 5cc5818af7
2013-07-26 08:43:29 -05:00
Steve Harris
340e7bab60 13.5.1-8 baseline
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]
Former-commit-id: a7d4c6274e
2013-07-26 09:02:34 -04:00
Ben Steffensmeier
615b2bde63 Issue #2112 Fix volume browser sounding errors.
Former-commit-id: 4c2abb67c6 [formerly 08f6b60d23] [formerly c4cb6d24ba6a319ec7be0f585a21825b237271e1 [formerly 74f854634f]] [formerly 2680d6ddbc [formerly 74f854634f [formerly f2999e84c430e98a4f1a4a1808b61d6810dac463]]]
Former-commit-id: 2680d6ddbc
Former-commit-id: d61ac4495d4b09d455c3bd553486b3f02b4add0e [formerly 5e39fce827]
Former-commit-id: 7db3d4722c
2013-07-25 17:58:49 -05:00
Nate Jensen
1f3f5ace25 Issue #2207 removing custom org.junit
Change-Id: I6b65719c0b48a3430b9318aa6dbbf4718f98df7b

Former-commit-id: b429fdd192 [formerly fd14405886] [formerly 185296c67d] [formerly 4ccfc5be82 [formerly 185296c67d [formerly ae869b69c5a648205d4d0cd7275b4a6c1e82054d]]]
Former-commit-id: 4ccfc5be82
Former-commit-id: 732c085e88be485c5665de3436f4d63820939a50 [formerly a3fd5fa3ee]
Former-commit-id: 93976753df
2013-07-25 16:48:18 -05:00
Nate Jensen
202540928f Merge "Issue #2208 move remainder of unit-tests to tests project, disable building ones dependent on eclipse/swt, ignore ones that are failing" into development
Former-commit-id: 213de77806 [formerly 3958edbdae] [formerly b7c4087765] [formerly 88c0b989ef [formerly b7c4087765 [formerly 6db335a5fda51c1d501e7a5d6b1fc58eba77160a]]]
Former-commit-id: 88c0b989ef
Former-commit-id: 745f9b39418c3db9493696dfb639abab24c1fee3 [formerly a7cadf0388]
Former-commit-id: 38501a83d5
2013-07-25 16:04:22 -05:00
Nate Jensen
44795095a4 Issue #2208 move remainder of unit-tests to tests project, disable building ones dependent on eclipse/swt, ignore ones that are failing
Change-Id: I49467fe6e9425a73985f729bc1ea4b10eb139c16

Former-commit-id: 37b332864d [formerly 25b78917ff] [formerly cf656dddc6] [formerly d364cfe32e [formerly cf656dddc6 [formerly a53ff5142d15461a595adb8a6e8d6b96aee3a878]]]
Former-commit-id: d364cfe32e
Former-commit-id: c3a9606c2218691935816ad67207a547e1d9ab53 [formerly dc7c2fd063]
Former-commit-id: f110fe5f6f
2013-07-25 14:59:01 -05:00
Ron Anderson
8f1392adb2 Merge "Issue #2044 Refactor of GFE Server code" into development
Former-commit-id: d31300ae2d [formerly b3619c1ba4] [formerly 604cfd2070] [formerly 0428b8fb7b [formerly 604cfd2070 [formerly 3720bf498346073343d0dff7a6949d3f7f0d5f62]]]
Former-commit-id: 0428b8fb7b
Former-commit-id: fdede04caaf020efc425615ddb25f1baf3096304 [formerly b084626454]
Former-commit-id: 9e10143fb2
2013-07-25 13:59:17 -05:00
Richard Peter
8072d130ec Merge "Issue #2176 Implemented emergency warning products." into development
Former-commit-id: 111c060d8d [formerly f031871351] [formerly 5d192e263f] [formerly 89823b3681 [formerly 5d192e263f [formerly 717a1f81ecc323e4e1cc10e923956befb99e3e04]]]
Former-commit-id: 89823b3681
Former-commit-id: 02d3965a7c379b1cddac22a76c18e4d0f63b2604 [formerly d98c33cfbc]
Former-commit-id: ac030d4e71
2013-07-25 13:54:48 -05:00
Jonathan Sanchez
04db8f74f2 Issue #2176 Implemented emergency warning products.
Change-Id: Icde169adbcfc5c409319649d63d222044a35dae2

Former-commit-id: 46d5bd4f0a [formerly c62de0d75f] [formerly 7d74ba5ee1] [formerly 67ce90c14a [formerly 7d74ba5ee1 [formerly 36df6339cc00afc5935746a4a47b0e9e8c641f85]]]
Former-commit-id: 67ce90c14a
Former-commit-id: 5fed586cc6728d3bc60caa721d6692540f8131c5 [formerly 4b38e3786d]
Former-commit-id: a9fccb3e9d
2013-07-25 13:47:44 -05:00
Nate Jensen
4a54a4a6e3 Merge "Issue #2199 Fixed subgridding calculation and made so data smoothing is done once instead of every paint" into development
Former-commit-id: 78b463f5b0 [formerly 1c564eeaad] [formerly d5158a3fd5] [formerly 4f8cf1230f [formerly d5158a3fd5 [formerly 3d3e29b59fdac2e97d9783e1b102fe3227c4197d]]]
Former-commit-id: 4f8cf1230f
Former-commit-id: 19669ca32f38fac58b8710a7e750bc946f36af75 [formerly 65dc8671f7]
Former-commit-id: a8b2d95ba0
2013-07-25 13:22:37 -05:00
Max Schenkelberg
480c65b247 Issue #2199 Fixed subgridding calculation and made so data smoothing is done once instead of every paint
Amend: Added comments

Change-Id: Ieb045b1a8f8271adba804cacd6f47996ffae4cf5

Former-commit-id: ada5aca6fb [formerly 439c8040c9] [formerly d3df3e97c8] [formerly 3506c5d38d [formerly d3df3e97c8 [formerly 2cc61515015e125816b76c560900744258dbd2f1]]]
Former-commit-id: 3506c5d38d
Former-commit-id: 908b39930b95e040938a6d7a91f66ed331c72e70 [formerly dafbad884d]
Former-commit-id: b4807c9831
2013-07-25 13:18:46 -05:00
Ron Anderson
57332aa94a Issue #2044 Refactor of GFE Server code
Change-Id: I2c6dde3ba9646f6b36a3f74657dc0d21cbcf3f35

Former-commit-id: e97351d981 [formerly d32f777957] [formerly cfa2d38a32] [formerly a915cdab25 [formerly cfa2d38a32 [formerly 03c62b606659be0cf81c8401a1c52c5fe5c52b1b]]]
Former-commit-id: a915cdab25
Former-commit-id: 050757a603a935e3e7b340b3f32becba5adb5f15 [formerly 46d47d61e7]
Former-commit-id: a40cde69de
2013-07-25 13:05:56 -05:00
Nate Jensen
6bf5baf7ca Merge "Issue #2203 synchronize init and dispose of frames" into development
Former-commit-id: 50368c8cea [formerly 989ce29e03] [formerly 9ad16f084a] [formerly 1bb0208372 [formerly 9ad16f084a [formerly dff57efeb2c54cffc5caf61a50bf954cc39bdc37]]]
Former-commit-id: 1bb0208372
Former-commit-id: bdf55c4a6c6ec81907b7ed4ae831d427e72f1c20 [formerly 294a8d0d38]
Former-commit-id: f84d36038c
2013-07-25 10:02:42 -05:00
Mike Duff
44b3e40e2a Issue #2218 - improve error handling and performance in SCANMonitor
Change-Id: I0b65dcb372c69ad736b3a550392299507dbcedeb

Former-commit-id: 8670b85ea4 [formerly 7afce29a35] [formerly e23aaedada] [formerly 4034146e23 [formerly e23aaedada [formerly cff253a5eb779a2f5e156d5802dc9bb8afc2e7e0]]]
Former-commit-id: 4034146e23
Former-commit-id: ea697eb7db5f03b27b9a0b4844ed5e66f4cf8181 [formerly 075cd28b9c]
Former-commit-id: 6537c9c20d
2013-07-25 08:35:30 -05:00
Nate Jensen
d20b7f17c0 Merge "Issue #2189 Added a FontType option when initializing a font from a file." into development
Former-commit-id: a25f442ddc [formerly ca729f1c49] [formerly c8d7c9cdf9] [formerly 7b1d8cb576 [formerly c8d7c9cdf9 [formerly a17330cc596961b4b3630579631de438f971c884]]]
Former-commit-id: 7b1d8cb576
Former-commit-id: b29e7a9876349d4e309e91c0af2186dfa94e3345 [formerly 29e7454a4f]
Former-commit-id: 94cb066d8c
2013-07-24 17:01:06 -05:00
Max Schenkelberg
4ce2412501 Issue #2189 Added a FontType option when initializing a font from a file.
Amend: Added abstract awt font class, deprecated initializeFont not specifying FontType, added comments

Change-Id: Ia5608cb7ffd0b760b3922e65107e66c971fa3e63

Former-commit-id: 723332e20a [formerly 52110961b4] [formerly c386533867] [formerly 3381c0016e [formerly c386533867 [formerly 9250700e425983156dd2d226556647d6a2bf43af]]]
Former-commit-id: 3381c0016e
Former-commit-id: 580e0daa3b16e5dda092a1efbc79fd49e8c80aa2 [formerly a8972da606]
Former-commit-id: 473c2f2659
2013-07-24 16:35:50 -05:00
Nate Jensen
23b6c0281a Issue #2203 synchronize init and dispose of frames
Change-Id: I94504a039f321ff40830b3bb7e21d31bf586a0d0

Former-commit-id: f213ead41f [formerly f556c7191b] [formerly b053fea59b] [formerly 162a1ba48f [formerly b053fea59b [formerly ed75a28d871dc1e97717fa44636df635eed8b4fc]]]
Former-commit-id: 162a1ba48f
Former-commit-id: 9eb75c7c0a2d21497d1472054a78c53207337705 [formerly ac310f7bbf]
Former-commit-id: 52e1262094
2013-07-24 16:17:43 -05:00
Mike Duff
19fdfa9655 Issue #2217 - Added better error handling
Change-Id: Ia15b57fbee9e3cecb93ac711ca3d99529df3ac00

Former-commit-id: 3b7ec84774 [formerly 45b0119059] [formerly 8ac8e405ec] [formerly e584ddbf45 [formerly 8ac8e405ec [formerly b7a602066d1c01a9b6399d2dade3ed3dd487103e]]]
Former-commit-id: e584ddbf45
Former-commit-id: cd3153bdacc28457d75378b4d7f0899581c112ca [formerly f98a232c8b]
Former-commit-id: b808324f11
2013-07-24 13:54:33 -05:00
Nate Jensen
23113b9799 Issue #2223 fix melting layer memory leak
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec

Former-commit-id: bf0ff5eb76 [formerly 194db9a9f9] [formerly 88b2dd18e6] [formerly 7b5dcc09fa [formerly 88b2dd18e6 [formerly 3909f42ee097dac541328f8dc85330c618583b3f]]]
Former-commit-id: 7b5dcc09fa
Former-commit-id: 565ae6820431b40a925d369d31213973fbb0fab4 [formerly 8db7b7b5f6]
Former-commit-id: 95aeee2fe6
2013-07-23 14:27:29 -05:00
Nate Jensen
c869207445 Issue #2215 upgrade thrift to version 0.9.0
Change-Id: I9cf910a75c25f1d97a711a9088c3b496ceb2be70

Former-commit-id: 8707633263 [formerly 7197e75c15] [formerly 7b4938a999] [formerly 8898a6d2ba [formerly 7b4938a999 [formerly ab2e3f3e8910043b117887712258fc689f2e9445]]]
Former-commit-id: 8898a6d2ba
Former-commit-id: 4fe140d3706a9bb93c749820c213f4a95dd40dbc [formerly 375ad89ac8]
Former-commit-id: 7c438bd944
2013-07-23 12:28:07 -05:00
David Gillingham
10adecfece Issue #1842: Fix issue where start time of in progress VTEC events was being set
to 991130T0000Z.


Former-commit-id: b850630912 [formerly 5bfa13b5bf] [formerly cf21fb8fb3] [formerly 2281f4abc5 [formerly cf21fb8fb3 [formerly e6ad90e07a4af553edcb79ce71790f339b3f4ed5]]]
Former-commit-id: 2281f4abc5
Former-commit-id: be091cc35bece18942bed5dda679b7f3418ec640 [formerly ea42ffa3e5]
Former-commit-id: c14ab8225f
2013-07-22 16:37:42 -05:00
Nate Jensen
78e718122d Issue #2142 removing some viz dependencies on edex.common
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c

Former-commit-id: 178107c128 [formerly bcdaae1922] [formerly 22438766b4] [formerly 4c9cc211ec [formerly 22438766b4 [formerly 399d44a62df1c54e94d93d4e0b198db976104143]]]
Former-commit-id: 4c9cc211ec
Former-commit-id: 3dc4b88484b3a717a07e85e47dd00b4cd0dcaaee [formerly 797760bb71]
Former-commit-id: a51d424851
2013-07-22 12:20:43 -05:00
Ron Anderson
dbb6dccf32 Merge "Issue #2185 Cache computed grid reprojections." into development
Former-commit-id: ddf5165267 [formerly 1a479e848f] [formerly ecce97701f] [formerly cd639e0220 [formerly ecce97701f [formerly 4f75c44b4dccb1cde093e32605dae809aa7a351c]]]
Former-commit-id: cd639e0220
Former-commit-id: 5eebb28a1dedb2ebe2a2eea184eb9d3992c79673 [formerly 61e947ba76]
Former-commit-id: 95a153d410
2013-07-22 11:43:48 -05:00
Richard Peter
4c53471f8e Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 19dacc32c1 [formerly 401ed88e44] [formerly 8c66430f15bae97a44ce97acd0a8c896a7b3aa22 [formerly 15d1a6eab0]] [formerly c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]
Former-commit-id: c6386e306f
Former-commit-id: e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539]
Former-commit-id: e7ec068c7e
2013-07-22 09:40:18 -05:00
Richard Peter
bbd3b18d5f Merge "Issue #1655 - Implement the framework for DD system status messaging" into development
Former-commit-id: e0564b3b6c [formerly d075546952] [formerly 51a097fb8d] [formerly 7ceaed43c3 [formerly 51a097fb8d [formerly 638b708123bb5a89292cc7778ed8211102718d28]]]
Former-commit-id: 7ceaed43c3
Former-commit-id: d38a47bc4241e93cb847b7f2b7c520baf5764f92 [formerly 5026801885]
Former-commit-id: ce7e6eeeed
2013-07-21 22:54:14 -05:00
Richard Peter
0845c5e3d1 Merge "Issue #1653 - Add a subscription summary" into development
Former-commit-id: f5040c96b7 [formerly c926f71281] [formerly 73c2547981] [formerly 68e565fdd9 [formerly 73c2547981 [formerly 74351187e3b7061ecfdfd040ff88b81823055889]]]
Former-commit-id: 68e565fdd9
Former-commit-id: 94ee77045edc6a368692dfc25e52a4a8f9104a06 [formerly 992b544e33]
Former-commit-id: d922c86c26
2013-07-21 22:04:02 -05:00
Greg Armendariz
4c26ff845a Merge "Issue #2205 Fix cancelling adhoc queries" into omaha_13.5.1
Former-commit-id: 16cb7d3737 [formerly fda3ba6d5b] [formerly a3b77f2623] [formerly d5ea12d97f [formerly a3b77f2623 [formerly d60e75576a5f80f8838330789c97e89788c7a057]]]
Former-commit-id: d5ea12d97f
Former-commit-id: 6a070220b5d10249ff1b492f7b2e28dd9dd2b76e [formerly 3947baa02d]
Former-commit-id: c8c2a3d636
2013-07-19 14:15:24 -05:00
Richard Peter
e46425cd8d Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 8e3a28636c [formerly 85fb4c3940] [formerly 7e08c04383] [formerly cc7189fcb7 [formerly 7e08c04383 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]
Former-commit-id: cc7189fcb7
Former-commit-id: d1139e995fdb6ae17e30ada823c7426e3f31cab7 [formerly ea2b372343]
Former-commit-id: eefaf2c836
2013-07-18 21:46:25 -05:00
Mike Duff
b8b8adfe89 Issue #1653 - Add a subscription summary
Change-Id: I677ae6d472a4de5bd8905650b2e13ffc1e2af149

Former-commit-id: 271959462c [formerly 3cac2bd4ba] [formerly 823f064ef8] [formerly d5ef7f056f [formerly 823f064ef8 [formerly d64a7895e08df47feedfb95edec033d0c87384c1]]]
Former-commit-id: d5ef7f056f
Former-commit-id: 8dcb19154786aa426856c5a801762302c07e0dc2 [formerly b4c9a0066a]
Former-commit-id: efea9b3739
2013-07-18 14:53:10 -05:00
Steve Harris
0fe8173b7b 13.5.1-7 baseline
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]
Former-commit-id: cb50a0028d
2013-07-18 12:07:22 -04:00
Dustin Johnson
47b5f3aa73 Issue #2205 Fix cancelling adhoc queries
Change-Id: I81207fe9c68a111e9894a7a25b83d9f0b4c03317

Former-commit-id: ed50793d64 [formerly 584e427e81] [formerly 58ab4e5cfc] [formerly 9aadc61ea5 [formerly 58ab4e5cfc [formerly dd05e6c8f9c17ac331b137b9eb3d486c459144fb]]]
Former-commit-id: 9aadc61ea5
Former-commit-id: 34a268fe658d39e9111d17c052060bbb36bf86e0 [formerly 54ff2b87c6]
Former-commit-id: 520d539a44
2013-07-18 11:06:42 -05:00