Commit graph

2114 commits

Author SHA1 Message Date
Max Schenkelberg
c8941ac314 Issue #2189 Set size properly on GLFont
Change-Id: Ib7321dfada582f4cbb05416428bd0c9639a905f7

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

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

Former-commit-id: b429fdd192 [formerly fd14405886] [formerly 185296c67d] [formerly b429fdd192 [formerly fd14405886] [formerly 185296c67d] [formerly 4ccfc5be82 [formerly 185296c67d [formerly ae869b69c5a648205d4d0cd7275b4a6c1e82054d]]]]
Former-commit-id: 4ccfc5be82
Former-commit-id: 1f3f5ace25 [formerly 93976753df] [formerly 732c085e88be485c5665de3436f4d63820939a50 [formerly a3fd5fa3ee]]
Former-commit-id: 22483908ee1d82807ddfff8307bf138123ebbb9d [formerly 2e5b04450e]
Former-commit-id: ed3a464cdf
2013-07-25 16:48:18 -05:00
Nate Jensen
f25baafe68 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 213de77806 [formerly 3958edbdae] [formerly b7c4087765] [formerly 88c0b989ef [formerly b7c4087765 [formerly 6db335a5fda51c1d501e7a5d6b1fc58eba77160a]]]]
Former-commit-id: 88c0b989ef
Former-commit-id: 202540928f [formerly 38501a83d5] [formerly 745f9b39418c3db9493696dfb639abab24c1fee3 [formerly a7cadf0388]]
Former-commit-id: 0e5ac41d4997c50e3650291caf5b157a804efadb [formerly 1cc5422213]
Former-commit-id: db3456c04d
2013-07-25 16:04:22 -05:00
Nate Jensen
f32313b6a2 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 37b332864d [formerly 25b78917ff] [formerly cf656dddc6] [formerly d364cfe32e [formerly cf656dddc6 [formerly a53ff5142d15461a595adb8a6e8d6b96aee3a878]]]]
Former-commit-id: d364cfe32e
Former-commit-id: 44795095a4 [formerly f110fe5f6f] [formerly c3a9606c2218691935816ad67207a547e1d9ab53 [formerly dc7c2fd063]]
Former-commit-id: 8543575d14e7cd2b4a3450133c48990eda4cfc72 [formerly 070fa38093]
Former-commit-id: 63ac241687
2013-07-25 14:59:01 -05:00
Ron Anderson
5fcf50976f Merge "Issue #2044 Refactor of GFE Server code" into development
Former-commit-id: d31300ae2d [formerly b3619c1ba4] [formerly 604cfd2070] [formerly d31300ae2d [formerly b3619c1ba4] [formerly 604cfd2070] [formerly 0428b8fb7b [formerly 604cfd2070 [formerly 3720bf498346073343d0dff7a6949d3f7f0d5f62]]]]
Former-commit-id: 0428b8fb7b
Former-commit-id: 8f1392adb2 [formerly 9e10143fb2] [formerly fdede04caaf020efc425615ddb25f1baf3096304 [formerly b084626454]]
Former-commit-id: 518fb9e06a2a1cc7e3c87159590a2757a57c6e93 [formerly 68de87a472]
Former-commit-id: 584e4946f9
2013-07-25 13:59:17 -05:00
Richard Peter
2017021334 Merge "Issue #2176 Implemented emergency warning products." into development
Former-commit-id: 111c060d8d [formerly f031871351] [formerly 5d192e263f] [formerly 111c060d8d [formerly f031871351] [formerly 5d192e263f] [formerly 89823b3681 [formerly 5d192e263f [formerly 717a1f81ecc323e4e1cc10e923956befb99e3e04]]]]
Former-commit-id: 89823b3681
Former-commit-id: 8072d130ec [formerly ac030d4e71] [formerly 02d3965a7c379b1cddac22a76c18e4d0f63b2604 [formerly d98c33cfbc]]
Former-commit-id: 5e063b609a57ab0f923227a20e5bcd94787f7c39 [formerly 5f54d104a2]
Former-commit-id: b49ba6b44b
2013-07-25 13:54:48 -05:00
Jonathan Sanchez
1690636b23 Issue #2176 Implemented emergency warning products.
Change-Id: Icde169adbcfc5c409319649d63d222044a35dae2

Former-commit-id: 46d5bd4f0a [formerly c62de0d75f] [formerly 7d74ba5ee1] [formerly 46d5bd4f0a [formerly c62de0d75f] [formerly 7d74ba5ee1] [formerly 67ce90c14a [formerly 7d74ba5ee1 [formerly 36df6339cc00afc5935746a4a47b0e9e8c641f85]]]]
Former-commit-id: 67ce90c14a
Former-commit-id: 04db8f74f2 [formerly a9fccb3e9d] [formerly 5fed586cc6728d3bc60caa721d6692540f8131c5 [formerly 4b38e3786d]]
Former-commit-id: 396b77af1d8578538a3534407b3fad47ae09c0d5 [formerly 869fbdc7fc]
Former-commit-id: bef870b822
2013-07-25 13:47:44 -05:00
Nate Jensen
929dfcd79a 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 78b463f5b0 [formerly 1c564eeaad] [formerly d5158a3fd5] [formerly 4f8cf1230f [formerly d5158a3fd5 [formerly 3d3e29b59fdac2e97d9783e1b102fe3227c4197d]]]]
Former-commit-id: 4f8cf1230f
Former-commit-id: 4a54a4a6e3 [formerly a8b2d95ba0] [formerly 19669ca32f38fac58b8710a7e750bc946f36af75 [formerly 65dc8671f7]]
Former-commit-id: de189d4c112278783a0d96cb0ad3fa95903df205 [formerly 17d5768f7b]
Former-commit-id: a31a515ede
2013-07-25 13:22:37 -05:00
Max Schenkelberg
0e38f199d1 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 ada5aca6fb [formerly 439c8040c9] [formerly d3df3e97c8] [formerly 3506c5d38d [formerly d3df3e97c8 [formerly 2cc61515015e125816b76c560900744258dbd2f1]]]]
Former-commit-id: 3506c5d38d
Former-commit-id: 480c65b247 [formerly b4807c9831] [formerly 908b39930b95e040938a6d7a91f66ed331c72e70 [formerly dafbad884d]]
Former-commit-id: 5c2449c5d3e064578cae042de49952b1af014336 [formerly b557b5d141]
Former-commit-id: f79466a524
2013-07-25 13:18:46 -05:00
Ron Anderson
cd69e79fa3 Issue #2044 Refactor of GFE Server code
Change-Id: I2c6dde3ba9646f6b36a3f74657dc0d21cbcf3f35

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

Former-commit-id: 8670b85ea4 [formerly 7afce29a35] [formerly e23aaedada] [formerly 8670b85ea4 [formerly 7afce29a35] [formerly e23aaedada] [formerly 4034146e23 [formerly e23aaedada [formerly cff253a5eb779a2f5e156d5802dc9bb8afc2e7e0]]]]
Former-commit-id: 4034146e23
Former-commit-id: 44b3e40e2a [formerly 6537c9c20d] [formerly ea697eb7db5f03b27b9a0b4844ed5e66f4cf8181 [formerly 075cd28b9c]]
Former-commit-id: 96723a59f8ee108f4fdb3273df962cf096e9a290 [formerly 1eb1718b19]
Former-commit-id: e174f07f79
2013-07-25 08:35:30 -05:00
Nate Jensen
fa5d4a4e97 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 a25f442ddc [formerly ca729f1c49] [formerly c8d7c9cdf9] [formerly 7b1d8cb576 [formerly c8d7c9cdf9 [formerly a17330cc596961b4b3630579631de438f971c884]]]]
Former-commit-id: 7b1d8cb576
Former-commit-id: d20b7f17c0 [formerly 94cb066d8c] [formerly b29e7a9876349d4e309e91c0af2186dfa94e3345 [formerly 29e7454a4f]]
Former-commit-id: c8bbe5a922a5a4c5b5f734b1fe72c559a423615f [formerly 90866d6c06]
Former-commit-id: a229db50f0
2013-07-24 17:01:06 -05:00
Max Schenkelberg
5f1471a8b5 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 723332e20a [formerly 52110961b4] [formerly c386533867] [formerly 3381c0016e [formerly c386533867 [formerly 9250700e425983156dd2d226556647d6a2bf43af]]]]
Former-commit-id: 3381c0016e
Former-commit-id: 4ce2412501 [formerly 473c2f2659] [formerly 580e0daa3b16e5dda092a1efbc79fd49e8c80aa2 [formerly a8972da606]]
Former-commit-id: 7b400c02727905cbbaf1ea1ef32aadd53bb6b658 [formerly 2efabffe80]
Former-commit-id: fddc9ce779
2013-07-24 16:35:50 -05:00
Nate Jensen
252d7c95b9 Issue #2203 synchronize init and dispose of frames
Change-Id: I94504a039f321ff40830b3bb7e21d31bf586a0d0

Former-commit-id: f213ead41f [formerly f556c7191b] [formerly b053fea59b] [formerly f213ead41f [formerly f556c7191b] [formerly b053fea59b] [formerly 162a1ba48f [formerly b053fea59b [formerly ed75a28d871dc1e97717fa44636df635eed8b4fc]]]]
Former-commit-id: 162a1ba48f
Former-commit-id: 23b6c0281a [formerly 52e1262094] [formerly 9eb75c7c0a2d21497d1472054a78c53207337705 [formerly ac310f7bbf]]
Former-commit-id: 22fd125412835eed2ba3653c592ca78ff893f6c6 [formerly a6943514a7]
Former-commit-id: 027acec4ab
2013-07-24 16:17:43 -05:00
Mike Duff
9bdf1eb9e5 Issue #2217 - Added better error handling
Change-Id: Ia15b57fbee9e3cecb93ac711ca3d99529df3ac00

Former-commit-id: 3b7ec84774 [formerly 45b0119059] [formerly 8ac8e405ec] [formerly 3b7ec84774 [formerly 45b0119059] [formerly 8ac8e405ec] [formerly e584ddbf45 [formerly 8ac8e405ec [formerly b7a602066d1c01a9b6399d2dade3ed3dd487103e]]]]
Former-commit-id: e584ddbf45
Former-commit-id: 19fdfa9655 [formerly b808324f11] [formerly cd3153bdacc28457d75378b4d7f0899581c112ca [formerly f98a232c8b]]
Former-commit-id: 7377ae15c7c8e8b584268d48d0648e69f4bf279c [formerly 31ec8c5118]
Former-commit-id: e3b763b990
2013-07-24 13:54:33 -05:00
Nate Jensen
48adc9f5e4 Issue #2223 fix melting layer memory leak
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec

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

Former-commit-id: 8707633263 [formerly 7197e75c15] [formerly 7b4938a999] [formerly 8707633263 [formerly 7197e75c15] [formerly 7b4938a999] [formerly 8898a6d2ba [formerly 7b4938a999 [formerly ab2e3f3e8910043b117887712258fc689f2e9445]]]]
Former-commit-id: 8898a6d2ba
Former-commit-id: c869207445 [formerly 7c438bd944] [formerly 4fe140d3706a9bb93c749820c213f4a95dd40dbc [formerly 375ad89ac8]]
Former-commit-id: 03082558b26f67648b804696198cf0f48e47ed8f [formerly fa24302a76]
Former-commit-id: 3aba42df34
2013-07-23 12:28:07 -05:00
David Gillingham
e4f0a337db 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 b850630912 [formerly 5bfa13b5bf] [formerly cf21fb8fb3] [formerly 2281f4abc5 [formerly cf21fb8fb3 [formerly e6ad90e07a4af553edcb79ce71790f339b3f4ed5]]]]
Former-commit-id: 2281f4abc5
Former-commit-id: 10adecfece [formerly c14ab8225f] [formerly be091cc35bece18942bed5dda679b7f3418ec640 [formerly ea42ffa3e5]]
Former-commit-id: 55d4815f4196cac812ca0c080cbe3fe51324069b [formerly 6b49330d25]
Former-commit-id: 683298b43b
2013-07-22 16:37:42 -05:00
Nate Jensen
325654d640 Issue #2142 removing some viz dependencies on edex.common
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c

Former-commit-id: 178107c128 [formerly bcdaae1922] [formerly 22438766b4] [formerly 178107c128 [formerly bcdaae1922] [formerly 22438766b4] [formerly 4c9cc211ec [formerly 22438766b4 [formerly 399d44a62df1c54e94d93d4e0b198db976104143]]]]
Former-commit-id: 4c9cc211ec
Former-commit-id: 78e718122d [formerly a51d424851] [formerly 3dc4b88484b3a717a07e85e47dd00b4cd0dcaaee [formerly 797760bb71]]
Former-commit-id: c97be13fa7db2191a5a8ef2ef39d349d3dc46e1b [formerly c28a52bee8]
Former-commit-id: 3e7f3c66a8
2013-07-22 12:20:43 -05:00
Ron Anderson
68865236c0 Merge "Issue #2185 Cache computed grid reprojections." into development
Former-commit-id: ddf5165267 [formerly 1a479e848f] [formerly ecce97701f] [formerly ddf5165267 [formerly 1a479e848f] [formerly ecce97701f] [formerly cd639e0220 [formerly ecce97701f [formerly 4f75c44b4dccb1cde093e32605dae809aa7a351c]]]]
Former-commit-id: cd639e0220
Former-commit-id: dbb6dccf32 [formerly 95a153d410] [formerly 5eebb28a1dedb2ebe2a2eea184eb9d3992c79673 [formerly 61e947ba76]]
Former-commit-id: 1840803adffc759f326493517607dd5a041b4786 [formerly 8bff2be5dc]
Former-commit-id: d9df33da78
2013-07-22 11:43:48 -05:00
Richard Peter
1d08e54d43 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 15d1a6eab0] [formerly 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]]
Former-commit-id: c6386e306f
Former-commit-id: 4c53471f8e [formerly e7ec068c7e] [formerly e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539]]
Former-commit-id: 468a024f2957450aa44633c7888eb3aad2011b85 [formerly 85fc9c773b]
Former-commit-id: 2a9cfe51af
2013-07-22 09:40:18 -05:00
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
Greg Armendariz
723d0a4806 Merge "Issue #2205 Fix cancelling adhoc queries" into omaha_13.5.1
Former-commit-id: 16cb7d3737 [formerly fda3ba6d5b] [formerly a3b77f2623] [formerly 16cb7d3737 [formerly fda3ba6d5b] [formerly a3b77f2623] [formerly d5ea12d97f [formerly a3b77f2623 [formerly d60e75576a5f80f8838330789c97e89788c7a057]]]]
Former-commit-id: d5ea12d97f
Former-commit-id: 4c26ff845a [formerly c8c2a3d636] [formerly 6a070220b5d10249ff1b492f7b2e28dd9dd2b76e [formerly 3947baa02d]]
Former-commit-id: f1f5602f12e8568c08454a071de154890cb220bf [formerly e1092b5725]
Former-commit-id: 6c35eb215a
2013-07-19 14:15:24 -05:00
Richard Peter
69af3f93ca 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 8e3a28636c [formerly 85fb4c3940] [formerly 7e08c04383] [formerly cc7189fcb7 [formerly 7e08c04383 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]]
Former-commit-id: cc7189fcb7
Former-commit-id: e46425cd8d [formerly eefaf2c836] [formerly d1139e995fdb6ae17e30ada823c7426e3f31cab7 [formerly ea2b372343]]
Former-commit-id: fcddfd2ee1c278a22544ea6d0efd7a301de67fff [formerly 3a573f4256]
Former-commit-id: 374879df01
2013-07-18 21:46:25 -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
Steve Harris
adf2f89d57 13.5.1-7 baseline
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 0fe8173b7b [formerly cb50a0028d] [formerly 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]]
Former-commit-id: bc809e3e0a77e3fbc4971821c0a9d912bb8a28a4 [formerly eff4fb29dd]
Former-commit-id: 513c089375
2013-07-18 12:07:22 -04:00
Dustin Johnson
ba4e0041a9 Issue #2205 Fix cancelling adhoc queries
Change-Id: I81207fe9c68a111e9894a7a25b83d9f0b4c03317

Former-commit-id: ed50793d64 [formerly 584e427e81] [formerly 58ab4e5cfc] [formerly ed50793d64 [formerly 584e427e81] [formerly 58ab4e5cfc] [formerly 9aadc61ea5 [formerly 58ab4e5cfc [formerly dd05e6c8f9c17ac331b137b9eb3d486c459144fb]]]]
Former-commit-id: 9aadc61ea5
Former-commit-id: 47b5f3aa73 [formerly 520d539a44] [formerly 34a268fe658d39e9111d17c052060bbb36bf86e0 [formerly 54ff2b87c6]]
Former-commit-id: 5c1de511e41dbc8984c9686a7ae60f25c05944fa [formerly 865d1d88fc]
Former-commit-id: f342d10b14
2013-07-18 11:06:42 -05:00
Roger Ferrel
df37274974 Issue #1966 Relocation of configuration files and checks for bad configuration files.
Change-Id: I1e26806cfc27eb25d0f3b8c1ad6ed21bfaebfc9c

Former-commit-id: e5cd0e7599 [formerly e225bd674b] [formerly c002045a87] [formerly e5cd0e7599 [formerly e225bd674b] [formerly c002045a87] [formerly 91ee1d36bf [formerly c002045a87 [formerly d8b89bcf2bb65e3e54730e58ab7529f03fcbbaad]]]]
Former-commit-id: 91ee1d36bf
Former-commit-id: 1f56a1179e [formerly 97e4dc3633] [formerly e674edd4dd9db03d4b9f31499b37657af33debd7 [formerly 95cb3439a4]]
Former-commit-id: 4285173926a19c787c964793fdd7bd9e860c0e29 [formerly 47ac9a9147]
Former-commit-id: 8d6092bbf0
2013-07-18 10:02:05 -05:00
Ben Steffensmeier
a1e87d64d0 Issue #2185 Cache computed grid reprojections.
Former-commit-id: db4a331ea9 [formerly d9d18683f1] [formerly b5542309b3] [formerly db4a331ea9 [formerly d9d18683f1] [formerly b5542309b3] [formerly ae8110acf6 [formerly b5542309b3 [formerly 891f2241dd238b2901f8c1daee8f2236558f42e0]]]]
Former-commit-id: ae8110acf6
Former-commit-id: eb5726821f [formerly 69c3c7527e] [formerly 4f5d44fe45130ae8b4f798ea1c686ac5c2d2e215 [formerly 6febd20a1c]]
Former-commit-id: d90fd6108372ba1c0f1269096fdbdba2adad0386 [formerly e6e2a2d619]
Former-commit-id: 66ab85e41d
2013-07-17 17:34:34 -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
ded426050e Merge "Issue #2184 Removed all other HUCs other than ALL from storage" into omaha_13.5.1
Former-commit-id: c04357a0b6 [formerly 96ae856660] [formerly 09cae0cba3] [formerly c04357a0b6 [formerly 96ae856660] [formerly 09cae0cba3] [formerly 3649af1b71 [formerly 09cae0cba3 [formerly 7f9e83b42df42c1bec7946833e88a8916fc0c12d]]]]
Former-commit-id: 3649af1b71
Former-commit-id: afb7f93c21 [formerly a9f0243e01] [formerly 171ed9b9a2486eb3a9ba6e19cecfe9daeced6126 [formerly cb9b26a380]]
Former-commit-id: c4212ac6ccdd498b29f780728ef4250b940f63d7 [formerly c6c8c3c2d0]
Former-commit-id: 1df8a39cd9
2013-07-17 16:34:25 -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
Dave Hladky
ffe58606fe Issue #2184 Removed all other HUCs other than ALL from storage
Change-Id: I04885f5162cbe25b4345fe797da5a6f7ac246cc5

Former-commit-id: 361dd5113f [formerly 840b44b1e1] [formerly 84dae0a6b8] [formerly 361dd5113f [formerly 840b44b1e1] [formerly 84dae0a6b8] [formerly bd03085f8d [formerly 84dae0a6b8 [formerly 251cf3cca7c6653300f115083aa860444fee0ea9]]]]
Former-commit-id: bd03085f8d
Former-commit-id: 6f43853101 [formerly 4556798697] [formerly a1bddfe6f6215adf6084c27a5107f0fcd314b75b [formerly 15738a4d30]]
Former-commit-id: 1d2fbac9ecdf8c1c0fa1cc39f8c710dab63ba6bc [formerly f5ea1f0327]
Former-commit-id: 779ebd5db3
2013-07-17 15:18:49 -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