xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3301 commits 31 branches 40 tags 3.8 GiB
Commit graph

1980 commits

Author SHA1 Message Date
Richard Peter
c50dee200f Merge "Issue #2196 changed wfoRegistry mode to devWfoRegistry mode. exclude crawler and harvester from wfo modes." into development 
Former-commit-id: 1a4c887b6f [formerly 42248850a6] [formerly 1a4c887b6f [formerly 42248850a6] [formerly 6223ee42de [formerly d85dd6c0b1c657bc2ff23c461370fbc480656229]]]
Former-commit-id: 6223ee42de
Former-commit-id: 5b3944835a [formerly eb0e4c9a70]
Former-commit-id: 0e0b92003b
 2013-07-31 13:40:49 -05:00
Richard Peter
33d4f95c3e Merge branch 'omaha_13.5.1' (13.5.1-8) into development 
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java

Former-commit-id: 464352f731 [formerly 26df62db53] [formerly 464352f731 [formerly 26df62db53] [formerly f97a27796d [formerly d72693a1db1cd55392c7d171a67918e2bbe5daed]]]
Former-commit-id: f97a27796d
Former-commit-id: a67f0bf2da [formerly 3f1e17765a]
Former-commit-id: 5314b90720
 2013-07-31 12:54:12 -05:00
Richard Peter
6edb257ca5 Merge changes Ibb67b53b,I376f2970,Ie4dee73b into development 
* changes:
  Issue #2227 Fix issue with swapping of melting layer product.
  Issue #1726 add swt to unit tests project for use when we need it
  Issue #2148 moved all registering of radar products to spring files instead of static methods in Java classes


Former-commit-id: d5e0eadb2a [formerly 57a57ad677] [formerly d5e0eadb2a [formerly 57a57ad677] [formerly 618fabe94f [formerly a454e0e19a3f4eca2c6b0a797de0aacb3d2934c8]]]
Former-commit-id: 618fabe94f
Former-commit-id: e82bec7b87 [formerly 4a668cf47d]
Former-commit-id: 9bd980541d
 2013-07-30 21:32:42 -05:00
Matt Nash
bc3fc824d3 Issue #2227 Fix issue with swapping of melting layer product. 
Change-Id: Ibb67b53ba29f5a24714e2852602fd0b54d811b6d

Former-commit-id: 3c0eb24d51 [formerly 91afb50333] [formerly 3c0eb24d51 [formerly 91afb50333] [formerly b308e86105 [formerly fc6ff0d7e60d82c8ca0d67cf96f26cde23ad0f02]]]
Former-commit-id: b308e86105
Former-commit-id: 1acd38ced6 [formerly 855671b490]
Former-commit-id: 32bdbdab0f
 2013-07-30 10:47:37 -05:00
Ron Anderson
9e8a94ae4f Merge "Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay." into development 
Former-commit-id: d569641f3e [formerly ca94d4ffac] [formerly d569641f3e [formerly ca94d4ffac] [formerly 43b5d2193b [formerly b286c654293e9b7bc11930953118b1d86da946dc]]]
Former-commit-id: 43b5d2193b
Former-commit-id: 129040ce9b [formerly 8b1eb58de9]
Former-commit-id: 201d9542fe
 2013-07-30 08:35:06 -05:00
Ron Anderson
1c1340fe37 Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay. 
Change-Id: I3d2541a057440a3813837a91bef4e86172d73e4c

Former-commit-id: a5da46c360 [formerly ebdfbebcfc] [formerly a5da46c360 [formerly ebdfbebcfc] [formerly 4aceedceb5 [formerly 0f490c934d197bc45fea1fad2c034c47a2556988]]]
Former-commit-id: 4aceedceb5
Former-commit-id: ddecdbf0b8 [formerly b4de3f23a6]
Former-commit-id: 493d497091
 2013-07-29 18:12:24 -05:00
Ron Anderson
c4b1d81365 Merge "Issue #1907 and #1908 fixed sampling a attribute dispaly when DataStoreResource is cropped" into development 
Former-commit-id: 9574e1237e [formerly 35f5b04522] [formerly 9574e1237e [formerly 35f5b04522] [formerly fd43f74212 [formerly 5188a208a6b66eb024db64efeb8a6409c57d4a64]]]
Former-commit-id: fd43f74212
Former-commit-id: 972f1b02fc [formerly 890bb4d832]
Former-commit-id: 247372ad8f
 2013-07-29 18:11:30 -05:00
Ron Anderson
c4829c0c4c Issue #1907 and #1908 fixed sampling a attribute dispaly when DataStoreResource is cropped 
Change-Id: I8700442003c686916a926509b76ca9dd96d42b1b

Former-commit-id: 19d38c48c5 [formerly f028f111b0] [formerly 19d38c48c5 [formerly f028f111b0] [formerly f3a8ccf158 [formerly 7a9efa6a0b9ca848a9f8445f1aeef9a278c09ee7]]]
Former-commit-id: f3a8ccf158
Former-commit-id: 1de5b051e2 [formerly 3841c55a28]
Former-commit-id: c5ad5b1143
 2013-07-29 17:19:07 -05:00
Bryan Kowal
03e6faba0f Issue #2164 - remove unnecessary junit dependency 
Former-commit-id: 204fa65c8f [formerly a0f1944796] [formerly 204fa65c8f [formerly a0f1944796] [formerly 77473d75b5 [formerly 8e7229a41ec6b5816a27f86a37e5d183cd0d1925]]]
Former-commit-id: 77473d75b5
Former-commit-id: 02bba2ae9c [formerly 686affce01]
Former-commit-id: 892b3e6126
 2013-07-29 16:31:15 -05:00
Lee Venable
a7a15945df Merge "Issue #2227 Fix issue with changing scales for melting layer. Small refactor to make things more logical" into development 
Former-commit-id: c59237a292 [formerly f246c961a2] [formerly c59237a292 [formerly f246c961a2] [formerly 80a147990e [formerly 1f7a3d63a890934875a59a454e910bac94cdc671]]]
Former-commit-id: 80a147990e
Former-commit-id: 8dcbc5d137 [formerly c78a13d744]
Former-commit-id: 5aaece8f93
 2013-07-29 15:06:42 -05:00
Matt Nash
644f958dc1 Issue #2227 Fix issue with changing scales for melting layer. Small refactor to make things more logical 
Change-Id: I37269b4dd9e09ea6f4a8ad5c95f1620a462f3f5d

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

Former-commit-id: a053fc85f7 [formerly 8a6ab05561] [formerly a053fc85f7 [formerly 8a6ab05561] [formerly 18201a0153 [formerly 9bea23cc83e7262721efa4fef9b573d4dd540502]]]
Former-commit-id: 18201a0153
Former-commit-id: 02bb327341 [formerly 22c62b6982]
Former-commit-id: 95c15b253d
 2013-07-29 11:56:10 -05:00
Lee Venable
7fe76ccf80 Merge "Issue #2232 - Fix index out of bounds exception in Sub Manager Table" into development 
Former-commit-id: 5d32fd30df [formerly a42d4bb0cc] [formerly 5d32fd30df [formerly a42d4bb0cc] [formerly 30baa25afa [formerly d49617f4acec37ddbaa0ec1d91306687a35531b0]]]
Former-commit-id: 30baa25afa
Former-commit-id: 8f3b40e732 [formerly 2af73d09f9]
Former-commit-id: d4c75a38fd
 2013-07-29 11:52:16 -05:00
Lee Venable
83193a51e7 Merge "Issue #2217 - Added better error handling" into development 
Former-commit-id: d97698519d [formerly f3c4306987] [formerly d97698519d [formerly f3c4306987] [formerly ccf6962224 [formerly 880308a45215aba37e9f6fa367f0848cdbb0da51]]]
Former-commit-id: ccf6962224
Former-commit-id: 824b855490 [formerly e2002c1d7e]
Former-commit-id: 68b0385add
 2013-07-29 11:44:59 -05:00
Mike Duff
e01702f842 Issue #2232 - Fix index out of bounds exception in Sub Manager Table 
Change-Id: Id61f6c2ddccb965a236bf9a99412e6f6cca8cae0

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

Former-commit-id: 1e4fe87002 [formerly 970f2c1373] [formerly 1e4fe87002 [formerly 970f2c1373] [formerly 564d6ee664 [formerly 77d6ace9b601558ece1bf5ea724ef2f08df0112a]]]
Former-commit-id: 564d6ee664
Former-commit-id: e1c5959762 [formerly ef01f6db81]
Former-commit-id: 9101a9e190
 2013-07-26 13:14:48 -05:00
Richard Peter
a81eb7c908 Merge "Issue #2112 Fix volume browser sounding errors." into development 
Former-commit-id: 008f2f98ad [formerly 8a4506e794] [formerly 008f2f98ad [formerly 8a4506e794] [formerly c57aa39ddd [formerly 019b1d63f11c9d1d57593e26f939d6b089730693]]]
Former-commit-id: c57aa39ddd
Former-commit-id: 5c59b1257c [formerly 5d53ab253d]
Former-commit-id: 33129350c8
 2013-07-26 10:23:08 -05:00
Greg Armendariz
89a582f766 Issue #2207 - Additional test fixes 
Former-commit-id: 0f4595d842 [formerly afe9191fea] [formerly 0f4595d842 [formerly afe9191fea] [formerly b5d509fc4a [formerly 38531ca3d8336801663d7d664d0578497dff8911]]]
Former-commit-id: b5d509fc4a
Former-commit-id: 599458dbb5 [formerly 56881355ed]
Former-commit-id: 06f3e23394
 2013-07-26 09:24:43 -05:00
Greg Armendariz
4336f1b889 Merge "Issue #2207 - Remove reference to missing tests directory" into development 
Former-commit-id: d83157b9d1 [formerly 69b346a195] [formerly d83157b9d1 [formerly 69b346a195] [formerly 66caca12a4 [formerly 3cf75f2b1a2fe5c2b94fcabf0b54038fccfa1724]]]
Former-commit-id: 66caca12a4
Former-commit-id: c232be59ff [formerly 8a5d9e4c70]
Former-commit-id: f9a5b107d4
 2013-07-26 09:05:53 -05:00
Greg Armendariz
004ffdc505 Issue #2207 - Remove reference to missing tests directory 
Former-commit-id: 7861a026b2 [formerly 8be27acdf2] [formerly 7861a026b2 [formerly 8be27acdf2] [formerly f3d82d8e82 [formerly 2f7e8e5d498fd96f60ddf3ae192cadc705abaf5c]]]
Former-commit-id: f3d82d8e82
Former-commit-id: a8ed77b11a [formerly fedae5495f]
Former-commit-id: 482275acb7
 2013-07-26 08:59:41 -05:00
Lee Venable
4443ca3a7e Merge "Issue #2218 - improve error handling and performance in SCANMonitor" into development 
Former-commit-id: 877730ad19 [formerly 48a1404221] [formerly 877730ad19 [formerly 48a1404221] [formerly 4635a88d54 [formerly bfbe879b22697ca7c8558ee94c49137a7787cfc9]]]
Former-commit-id: 4635a88d54
Former-commit-id: 995175c247 [formerly 2357c7725a]
Former-commit-id: 3069158dcc
 2013-07-26 08:48:56 -05:00
Nate Jensen
60b3c042e7 Issue #2223 fix melting layer memory leak 
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec

Former-commit-id: 7fc047102b [formerly 5e29be3d1f] [formerly 7fc047102b [formerly 5e29be3d1f] [formerly 1c765670ea [formerly 49299504331c730ffe8a94f490f88337baf12233]]]
Former-commit-id: 1c765670ea
Former-commit-id: 5cc5818af7 [formerly 97c71fc9dc]
Former-commit-id: 91d5ab7554
 2013-07-26 08:43:29 -05:00
Steve Harris
767b7fdb4d 13.5.1-8 baseline 
Former-commit-id: 392faf86e7 [formerly 3bece5e5d0] [formerly 392faf86e7 [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: a7d4c6274e [formerly 2afb46f814]
Former-commit-id: 1a3197efdf
 2013-07-26 09:02:34 -04:00
Ben Steffensmeier
2d716a2266 Issue #2112 Fix volume browser sounding errors. 
Former-commit-id: 08f6b60d23 [formerly 74f854634f] [formerly 08f6b60d23 [formerly 74f854634f] [formerly 2680d6ddbc [formerly f2999e84c430e98a4f1a4a1808b61d6810dac463]]]
Former-commit-id: 2680d6ddbc
Former-commit-id: 7db3d4722c [formerly 5e39fce827]
Former-commit-id: abe7ac623e
 2013-07-25 17:58:49 -05:00
Nate Jensen
ed3a464cdf Issue #2207 removing custom org.junit 
Change-Id: I6b65719c0b48a3430b9318aa6dbbf4718f98df7b

Former-commit-id: fd14405886 [formerly 185296c67d] [formerly fd14405886 [formerly 185296c67d] [formerly 4ccfc5be82 [formerly ae869b69c5a648205d4d0cd7275b4a6c1e82054d]]]
Former-commit-id: 4ccfc5be82
Former-commit-id: 93976753df [formerly a3fd5fa3ee]
Former-commit-id: 2e5b04450e
 2013-07-25 16:48:18 -05:00
Nate Jensen
db3456c04d 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: 3958edbdae [formerly b7c4087765] [formerly 3958edbdae [formerly b7c4087765] [formerly 88c0b989ef [formerly 6db335a5fda51c1d501e7a5d6b1fc58eba77160a]]]
Former-commit-id: 88c0b989ef
Former-commit-id: 38501a83d5 [formerly a7cadf0388]
Former-commit-id: 1cc5422213
 2013-07-25 16:04:22 -05:00
Nate Jensen
63ac241687 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: 25b78917ff [formerly cf656dddc6] [formerly 25b78917ff [formerly cf656dddc6] [formerly d364cfe32e [formerly a53ff5142d15461a595adb8a6e8d6b96aee3a878]]]
Former-commit-id: d364cfe32e
Former-commit-id: f110fe5f6f [formerly dc7c2fd063]
Former-commit-id: 070fa38093
 2013-07-25 14:59:01 -05:00
Ron Anderson
584e4946f9 Merge "Issue #2044 Refactor of GFE Server code" into development 
Former-commit-id: b3619c1ba4 [formerly 604cfd2070] [formerly b3619c1ba4 [formerly 604cfd2070] [formerly 0428b8fb7b [formerly 3720bf498346073343d0dff7a6949d3f7f0d5f62]]]
Former-commit-id: 0428b8fb7b
Former-commit-id: 9e10143fb2 [formerly b084626454]
Former-commit-id: 68de87a472
 2013-07-25 13:59:17 -05:00
Richard Peter
b49ba6b44b Merge "Issue #2176 Implemented emergency warning products." into development 
Former-commit-id: f031871351 [formerly 5d192e263f] [formerly f031871351 [formerly 5d192e263f] [formerly 89823b3681 [formerly 717a1f81ecc323e4e1cc10e923956befb99e3e04]]]
Former-commit-id: 89823b3681
Former-commit-id: ac030d4e71 [formerly d98c33cfbc]
Former-commit-id: 5f54d104a2
 2013-07-25 13:54:48 -05:00
Jonathan Sanchez
bef870b822 Issue #2176 Implemented emergency warning products. 
Change-Id: Icde169adbcfc5c409319649d63d222044a35dae2

Former-commit-id: c62de0d75f [formerly 7d74ba5ee1] [formerly c62de0d75f [formerly 7d74ba5ee1] [formerly 67ce90c14a [formerly 36df6339cc00afc5935746a4a47b0e9e8c641f85]]]
Former-commit-id: 67ce90c14a
Former-commit-id: a9fccb3e9d [formerly 4b38e3786d]
Former-commit-id: 869fbdc7fc
 2013-07-25 13:47:44 -05:00
Nate Jensen
a31a515ede Merge "Issue #2199 Fixed subgridding calculation and made so data smoothing is done once instead of every paint" into development 
Former-commit-id: 1c564eeaad [formerly d5158a3fd5] [formerly 1c564eeaad [formerly d5158a3fd5] [formerly 4f8cf1230f [formerly 3d3e29b59fdac2e97d9783e1b102fe3227c4197d]]]
Former-commit-id: 4f8cf1230f
Former-commit-id: a8b2d95ba0 [formerly 65dc8671f7]
Former-commit-id: 17d5768f7b
 2013-07-25 13:22:37 -05:00
Max Schenkelberg
f79466a524 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: 439c8040c9 [formerly d3df3e97c8] [formerly 439c8040c9 [formerly d3df3e97c8] [formerly 3506c5d38d [formerly 2cc61515015e125816b76c560900744258dbd2f1]]]
Former-commit-id: 3506c5d38d
Former-commit-id: b4807c9831 [formerly dafbad884d]
Former-commit-id: b557b5d141
 2013-07-25 13:18:46 -05:00
Ron Anderson
13e808b34d Issue #2044 Refactor of GFE Server code 
Change-Id: I2c6dde3ba9646f6b36a3f74657dc0d21cbcf3f35

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

Former-commit-id: 7afce29a35 [formerly e23aaedada] [formerly 7afce29a35 [formerly e23aaedada] [formerly 4034146e23 [formerly cff253a5eb779a2f5e156d5802dc9bb8afc2e7e0]]]
Former-commit-id: 4034146e23
Former-commit-id: 6537c9c20d [formerly 075cd28b9c]
Former-commit-id: 1eb1718b19
 2013-07-25 08:35:30 -05:00
Nate Jensen
a229db50f0 Merge "Issue #2189 Added a FontType option when initializing a font from a file." into development 
Former-commit-id: ca729f1c49 [formerly c8d7c9cdf9] [formerly ca729f1c49 [formerly c8d7c9cdf9] [formerly 7b1d8cb576 [formerly a17330cc596961b4b3630579631de438f971c884]]]
Former-commit-id: 7b1d8cb576
Former-commit-id: 94cb066d8c [formerly 29e7454a4f]
Former-commit-id: 90866d6c06
 2013-07-24 17:01:06 -05:00
Max Schenkelberg
fddc9ce779 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: 52110961b4 [formerly c386533867] [formerly 52110961b4 [formerly c386533867] [formerly 3381c0016e [formerly 9250700e425983156dd2d226556647d6a2bf43af]]]
Former-commit-id: 3381c0016e
Former-commit-id: 473c2f2659 [formerly a8972da606]
Former-commit-id: 2efabffe80
 2013-07-24 16:35:50 -05:00
Nate Jensen
027acec4ab Issue #2203 synchronize init and dispose of frames 
Change-Id: I94504a039f321ff40830b3bb7e21d31bf586a0d0

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

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

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

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


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

Former-commit-id: bcdaae1922 [formerly 22438766b4] [formerly bcdaae1922 [formerly 22438766b4] [formerly 4c9cc211ec [formerly 399d44a62df1c54e94d93d4e0b198db976104143]]]
Former-commit-id: 4c9cc211ec
Former-commit-id: a51d424851 [formerly 797760bb71]
Former-commit-id: c28a52bee8
 2013-07-22 12:20:43 -05:00
Ron Anderson
d9df33da78 Merge "Issue #2185 Cache computed grid reprojections." into development 
Former-commit-id: 1a479e848f [formerly ecce97701f] [formerly 1a479e848f [formerly ecce97701f] [formerly cd639e0220 [formerly 4f75c44b4dccb1cde093e32605dae809aa7a351c]]]
Former-commit-id: cd639e0220
Former-commit-id: 95a153d410 [formerly 61e947ba76]
Former-commit-id: 8bff2be5dc
 2013-07-22 11:43:48 -05:00
Richard Peter
2a9cfe51af 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: 401ed88e44 [formerly 15d1a6eab0] [formerly 401ed88e44 [formerly 15d1a6eab0] [formerly c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]
Former-commit-id: c6386e306f
Former-commit-id: e7ec068c7e [formerly 12993d9539]
Former-commit-id: 85fc9c773b
 2013-07-22 09:40:18 -05:00
Richard Peter
6ba6248d49 Merge "Issue #1655 - Implement the framework for DD system status messaging" into development 
Former-commit-id: d075546952 [formerly 51a097fb8d] [formerly d075546952 [formerly 51a097fb8d] [formerly 7ceaed43c3 [formerly 638b708123bb5a89292cc7778ed8211102718d28]]]
Former-commit-id: 7ceaed43c3
Former-commit-id: ce7e6eeeed [formerly 5026801885]
Former-commit-id: 7fc81195f0
 2013-07-21 22:54:14 -05:00
Richard Peter
56eac084b5 Merge "Issue #1653 - Add a subscription summary" into development 
Former-commit-id: c926f71281 [formerly 73c2547981] [formerly c926f71281 [formerly 73c2547981] [formerly 68e565fdd9 [formerly 74351187e3b7061ecfdfd040ff88b81823055889]]]
Former-commit-id: 68e565fdd9
Former-commit-id: d922c86c26 [formerly 992b544e33]
Former-commit-id: 64adb6ec6c
 2013-07-21 22:04:02 -05:00
Greg Armendariz
6c35eb215a Merge "Issue #2205 Fix cancelling adhoc queries" into omaha_13.5.1 
Former-commit-id: fda3ba6d5b [formerly a3b77f2623] [formerly fda3ba6d5b [formerly a3b77f2623] [formerly d5ea12d97f [formerly d60e75576a5f80f8838330789c97e89788c7a057]]]
Former-commit-id: d5ea12d97f
Former-commit-id: c8c2a3d636 [formerly 3947baa02d]
Former-commit-id: e1092b5725
 2013-07-19 14:15:24 -05:00
Richard Peter
374879df01 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: 85fb4c3940 [formerly 7e08c04383] [formerly 85fb4c3940 [formerly 7e08c04383] [formerly cc7189fcb7 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]
Former-commit-id: cc7189fcb7
Former-commit-id: eefaf2c836 [formerly ea2b372343]
Former-commit-id: 3a573f4256
 2013-07-18 21:46:25 -05:00