Commit graph

296 commits

Author SHA1 Message Date
Zihou Wang
e9f78d8f52 VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; closes #3990
Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce

Former-commit-id: f61e935c0372ee19768f2080da1f8fa21fb9aeb1
2014-08-15 11:04:39 -05:00
Mark Peters
46a7c253cf Omaha #3523 Replace Raytheon usage of IGraphicsTarget.TextStyle.NORMAL and directly assigning the text style
Change-Id: Idcc31d11251df8de949bd1bd9bf8c402a5d47f4f

Former-commit-id: 3b4f4394be [formerly f6799659ea] [formerly 308ada356b] [formerly 3b4f4394be [formerly f6799659ea] [formerly 308ada356b] [formerly 4011a4392c [formerly 308ada356b [formerly e409b578fcb15caadf28da57d2cb1860e1ea246c]]]]
Former-commit-id: 4011a4392c
Former-commit-id: d44f96faf7 [formerly c36257683c] [formerly 36239d6a2b4b192a959b7634eec27016d32ed009 [formerly 03229efe86]]
Former-commit-id: 7bf2fb8b62683087abeeff26f6dac51b1f68e787 [formerly b7209bee6e]
Former-commit-id: d63684feaa
2014-08-14 15:43:17 -05:00
Mark Peters
308ada356b Omaha #3523 Replace Raytheon usage of IGraphicsTarget.TextStyle.NORMAL and directly assigning the text style
Change-Id: Idcc31d11251df8de949bd1bd9bf8c402a5d47f4f

Former-commit-id: e409b578fcb15caadf28da57d2cb1860e1ea246c
2014-08-14 15:43:17 -05:00
Mark Peters
ad25464a52 Omaha #3504 Replace Raytheon references to IODataPreparer
Change-Id: I376f430154996944bd49c2e72d89e57537b68084

Former-commit-id: 4ab3b14b30 [formerly 70a7f2215f] [formerly ca0df210d9] [formerly 4ab3b14b30 [formerly 70a7f2215f] [formerly ca0df210d9] [formerly 5b3893c56f [formerly ca0df210d9 [formerly 08621067f8046b4260e87583d16950fee1e741de]]]]
Former-commit-id: 5b3893c56f
Former-commit-id: 7a20ac041a [formerly 4140e1cc8c] [formerly f8ddd5f2b8efb749fc2d5859b0f53ae36bcb2e3d [formerly 1ae1220e4a]]
Former-commit-id: 00c5eaac58b471bfab35dde3477af837703421af [formerly 02814f3400]
Former-commit-id: ac75dda420
2014-08-12 12:15:35 -05:00
Mark Peters
ca0df210d9 Omaha #3504 Replace Raytheon references to IODataPreparer
Change-Id: I376f430154996944bd49c2e72d89e57537b68084

Former-commit-id: 08621067f8046b4260e87583d16950fee1e741de
2014-08-12 12:15:35 -05:00
Baoyu Yin
835f0ad6cd VLab Issue #4404 - DR_17348 RADAR: no data on radar mosaic Hybrid Scan Refl; closes #4404
Change-Id: I70e6ee57f545ddfbde4cd5d97e358aad571879c8

Former-commit-id: 2647bcfc68 [formerly ffca276f44] [formerly 13fff5d6fa] [formerly 2647bcfc68 [formerly ffca276f44] [formerly 13fff5d6fa] [formerly 4b0552c297 [formerly 13fff5d6fa [formerly 3a9b882cad70cdffd0de70ccb11a25e8b16a4dff]]]]
Former-commit-id: 4b0552c297
Former-commit-id: bf14da0e5a [formerly 6713050be6] [formerly b87bfd0f7319de6fa2e7563d60e5c9ff8a027aa9 [formerly 2e2828d30e]]
Former-commit-id: deaaa2d3ad047c70cd4b96b09bda589a08399528 [formerly b8ee6e2cc7]
Former-commit-id: f44021d40f
2014-08-11 15:21:26 -04:00
Baoyu Yin
13fff5d6fa VLab Issue #4404 - DR_17348 RADAR: no data on radar mosaic Hybrid Scan Refl; closes #4404
Change-Id: I70e6ee57f545ddfbde4cd5d97e358aad571879c8

Former-commit-id: 3a9b882cad70cdffd0de70ccb11a25e8b16a4dff
2014-08-11 15:21:26 -04:00
Brian Clements
78f80b3057 Omaha #3477 changed plot info locations to floats
Change-Id: I592ba9d4b514aaed8902f3e8fba33b58200e1c61

Former-commit-id: 73b2585d80 [formerly 3b97fd15a7] [formerly f8a1e79288] [formerly 73b2585d80 [formerly 3b97fd15a7] [formerly f8a1e79288] [formerly 8738e9cece [formerly f8a1e79288 [formerly 00504d6aa7fefd7b6d28701aae777c0fb7d5ace5]]]]
Former-commit-id: 8738e9cece
Former-commit-id: 393659ece8 [formerly 90a17fa5a6] [formerly cc959db02bdac9bc65cd7a6ddad09207c1ce1224 [formerly a180c212c9]]
Former-commit-id: c98315075490f91f8cf521ed63c62b0940c10bfc [formerly fd5c0ea481]
Former-commit-id: 8b8ad6e45e
2014-08-11 13:43:22 -05:00
Brian Clements
f8a1e79288 Omaha #3477 changed plot info locations to floats
Change-Id: I592ba9d4b514aaed8902f3e8fba33b58200e1c61

Former-commit-id: 00504d6aa7fefd7b6d28701aae777c0fb7d5ace5
2014-08-11 13:43:22 -05:00
Baoyu Yin
b8211d62f4 VLab Issue #4396 - AWIPS2_DR_16265 minor typo in KXXX Menu; closes #4396
Change-Id: I44c1ad9968117233c16cb8082d07b9aa233e0d6d

Former-commit-id: 74aa456388 [formerly 02e926f569] [formerly dafff40283] [formerly 74aa456388 [formerly 02e926f569] [formerly dafff40283] [formerly f355240287 [formerly dafff40283 [formerly 35283455a8562c02e888d5d955f739fcb7adbf3f]]]]
Former-commit-id: f355240287
Former-commit-id: 4a76876a7c [formerly 5a36cdf28d] [formerly ac03c4035ee904d1777c0c99f020a7ec8ee6ed7e [formerly 107f00180f]]
Former-commit-id: 9913fd26a77a94bf23b0ce27f51a84279b1d7bcf [formerly 27c9e487ec]
Former-commit-id: eb779d6877
2014-08-08 14:55:59 -04:00
Baoyu Yin
dafff40283 VLab Issue #4396 - AWIPS2_DR_16265 minor typo in KXXX Menu; closes #4396
Change-Id: I44c1ad9968117233c16cb8082d07b9aa233e0d6d

Former-commit-id: 35283455a8562c02e888d5d955f739fcb7adbf3f
2014-08-08 14:55:59 -04:00
Mark Peters
bb9e374258 Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
Change-Id: If0ada7c887b532e98c7d0d6df56c5b1b195c9d8b

Former-commit-id: 96da09a65a [formerly 22f86459ae] [formerly b15b09ee50] [formerly 96da09a65a [formerly 22f86459ae] [formerly b15b09ee50] [formerly dbc0015671 [formerly b15b09ee50 [formerly 3bae11d54bee5bf3b4a650bce02b85902ced1cbc]]]]
Former-commit-id: dbc0015671
Former-commit-id: ec2e579f31 [formerly 90ae0ac085] [formerly d1c2097a45d711f52c49cc271cb6f46c12acdde6 [formerly 5fcbd767bf]]
Former-commit-id: 343090506ce8779b093d7dfedc511d4378df4f77 [formerly 069691fa0c]
Former-commit-id: b5f329e3ba
2014-08-04 12:10:02 -05:00
Mark Peters
b15b09ee50 Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
Change-Id: If0ada7c887b532e98c7d0d6df56c5b1b195c9d8b

Former-commit-id: 3bae11d54bee5bf3b4a650bce02b85902ced1cbc
2014-08-04 12:10:02 -05:00
Mark Peters
de295d1c7c Omaha #3465 Replace plugin calls to deprecated IGraphicsTarget.drawStrings()
Change-Id: Ib72cf8806852aff718af56c5f2c2cf4e07f9f548

Former-commit-id: 90a74cb89b [formerly b40e589488] [formerly ad794f8fba] [formerly 90a74cb89b [formerly b40e589488] [formerly ad794f8fba] [formerly 47aec2aae3 [formerly ad794f8fba [formerly 29d170af7a0c36e614a84923c2fb5054db73c390]]]]
Former-commit-id: 47aec2aae3
Former-commit-id: 661b68cfc7 [formerly 776d62c5f9] [formerly 0e60c6aac1c5a6eccbb49b9c14a4b97cb0ee8748 [formerly 6103909706]]
Former-commit-id: d63f7c0d0c2d2c2632f8c39a5a674d29401fed39 [formerly 79b4f922ec]
Former-commit-id: fcdb86686d
2014-07-30 16:03:57 -05:00
Mark Peters
ad794f8fba Omaha #3465 Replace plugin calls to deprecated IGraphicsTarget.drawStrings()
Change-Id: Ib72cf8806852aff718af56c5f2c2cf4e07f9f548

Former-commit-id: 29d170af7a0c36e614a84923c2fb5054db73c390
2014-07-30 16:03:57 -05:00
Mark Peters
5cbe006dc9 Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf

Former-commit-id: 6376572795 [formerly 11abefd4de] [formerly 437e127ebc] [formerly 6376572795 [formerly 11abefd4de] [formerly 437e127ebc] [formerly bac12d844b [formerly 437e127ebc [formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]]]]
Former-commit-id: bac12d844b
Former-commit-id: 88edbdafea [formerly 95886b5ded] [formerly 1492820d8873fe4e06b826ecddbb5536f26a2abc [formerly 6edd39cc9e]]
Former-commit-id: cdffd110dc0c39f2afadf75b08b0881b15b96f9a [formerly baecaaaca0]
Former-commit-id: 011ef40360
2014-07-29 11:20:53 -05:00
Mark Peters
437e127ebc Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf

Former-commit-id: a222b29ff24bf81d1c8aefd54fa33f52461c9c25
2014-07-29 11:20:53 -05:00
Mark Peters
0411b26ec6 Omaha #3412 Replace drawCircle calls
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca

Former-commit-id: d04f7dd252 [formerly b5a25e7372] [formerly e638d2f41b] [formerly d04f7dd252 [formerly b5a25e7372] [formerly e638d2f41b] [formerly e4c455f5c0 [formerly e638d2f41b [formerly c176ef7e45f8ad9e8273dd1a74ace2075aacdddd]]]]
Former-commit-id: e4c455f5c0
Former-commit-id: 66fafe363b [formerly 30a6e96d7c] [formerly a4e5ff382cd813f911beab0fb26c8f30196d7ec9 [formerly e48c2b7116]]
Former-commit-id: 781f6322906c1d4bfd6979543164111cd6386e57 [formerly 3aee17fbb5]
Former-commit-id: 969c6a4685
2014-07-21 17:07:02 -05:00
Mark Peters
e638d2f41b Omaha #3412 Replace drawCircle calls
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca

Former-commit-id: c176ef7e45f8ad9e8273dd1a74ace2075aacdddd
2014-07-21 17:07:02 -05:00
Zihou Wang
c1cff8b205 VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; closes #3990
Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce

Former-commit-id: 0407d9da83 [formerly 5d614a78d1] [formerly ea54766486] [formerly 0407d9da83 [formerly 5d614a78d1] [formerly ea54766486] [formerly dc0c340094 [formerly ea54766486 [formerly f2c9fc4ba6e9c91dffb2c34b72b4a6b36e872571]]]]
Former-commit-id: dc0c340094
Former-commit-id: 01ec8386b8 [formerly 4dcf43f024] [formerly ada9aa0941b621c15d55be376b8762e3a686cd87 [formerly b8133858e7]]
Former-commit-id: ca7754314ff8a6d44d2d27717ab16c58b9f35ae7 [formerly 42b8872cb3]
Former-commit-id: b6f00bc118
2014-07-11 13:46:05 -04:00
Zihou Wang
ea54766486 VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; closes #3990
Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce

Former-commit-id: f2c9fc4ba6e9c91dffb2c34b72b4a6b36e872571
2014-07-11 13:46:05 -04:00
Zihou Wang
72e51eafa8 VLab Issue #3979 - DR17399 Add PPS products to ASR/ARSR menu; closes #3979
Change-Id: Iecc209b153b812995d5586683869afb9dffaf678

Former-commit-id: 90ca2ba554 [formerly 42a1188670] [formerly baaf5b234b] [formerly 90ca2ba554 [formerly 42a1188670] [formerly baaf5b234b] [formerly fb8220a4d2 [formerly baaf5b234b [formerly b9c5e26a5d9d6f012a6fe507f9f7d7d85245c918]]]]
Former-commit-id: fb8220a4d2
Former-commit-id: 323cd1ee02 [formerly b2d980776c] [formerly 84a08cdeaad562ed9634250b4534f283d0c8a760 [formerly 37b0023ce0]]
Former-commit-id: 0b1c7fe0e53d8bbcbca047116a1968eb4dcf55c5 [formerly d35f9e6eef]
Former-commit-id: ec7f3075b6
2014-07-11 13:40:16 -04:00
Zihou Wang
baaf5b234b VLab Issue #3979 - DR17399 Add PPS products to ASR/ARSR menu; closes #3979
Change-Id: Iecc209b153b812995d5586683869afb9dffaf678

Former-commit-id: b9c5e26a5d9d6f012a6fe507f9f7d7d85245c918
2014-07-11 13:40:16 -04:00
Zihou Wang
0c62b1ed84 VLab Issue #3989 - DR_15324 Radar Menu - Dual Pol Mosaic Products; closes #3989
Change-Id: I622781291d2b46df8587d27adbcb759287ab3c21

Former-commit-id: b2ee4929e6 [formerly 3f9671241f] [formerly 9c26829ff9] [formerly b2ee4929e6 [formerly 3f9671241f] [formerly 9c26829ff9] [formerly 7fdd3e28d5 [formerly 9c26829ff9 [formerly 1c22067f8750f51820a1b55c7ac4df42d0fc631d]]]]
Former-commit-id: 7fdd3e28d5
Former-commit-id: e55a3be21c [formerly c21a27eeb3] [formerly 0af135025c2038736fb7f9f264559b78fca52dfa [formerly f5eb2ffabb]]
Former-commit-id: 86ed075fa6918b2dd3ed4d6b7df1d57cc26718b2 [formerly b4c00968b5]
Former-commit-id: 826260f370
2014-07-11 13:33:42 -04:00
Zihou Wang
9c26829ff9 VLab Issue #3989 - DR_15324 Radar Menu - Dual Pol Mosaic Products; closes #3989
Change-Id: I622781291d2b46df8587d27adbcb759287ab3c21

Former-commit-id: 1c22067f8750f51820a1b55c7ac4df42d0fc631d
2014-07-11 13:33:42 -04:00
Nate Jensen
7f5285bf96 Omaha #3165 remove deprecated buildColorMap()
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed

Former-commit-id: b7c6ab2386 [formerly a393ad429a] [formerly 766d3323d3] [formerly b7c6ab2386 [formerly a393ad429a] [formerly 766d3323d3] [formerly 128950ec19 [formerly 766d3323d3 [formerly 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c]]]]
Former-commit-id: 128950ec19
Former-commit-id: c8d32368ee [formerly 4ac06c06ee] [formerly d73b0a686415d6d641d233bfd24d10daefab34d7 [formerly 2bf3449e00]]
Former-commit-id: f3f1fbc5a2e3ec9b02255dccd1989db205cdb8ee [formerly 345de597a6]
Former-commit-id: 25b2c1fa3e
2014-06-30 13:22:57 -05:00
Nate Jensen
766d3323d3 Omaha #3165 remove deprecated buildColorMap()
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed

Former-commit-id: 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c
2014-06-30 13:22:57 -05:00
mjames-upc
71c729d01a added HHC colortable for UCAR NEXRCOMP gini product, added NEXRCOMP menu entries to D2D radar menu. added DefaultRadarComposite.xml template to to viz.radar localization. finally, changed Volume menu name to Models.
Former-commit-id: 69a7fa8a13
2014-06-25 17:02:35 -06:00
mjames-upc
c93db16ccd minor edits to menus and build scripts
Former-commit-id: f8c6c69819
2014-06-25 11:13:27 -06:00
Ben Steffensmeier
ac910bf48f Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
Former-commit-id: 0a9e0932ce [formerly 08fe257daa] [formerly e244664b7d] [formerly 0a9e0932ce [formerly 08fe257daa] [formerly e244664b7d] [formerly 5c4f89644c [formerly e244664b7d [formerly 664ae8372cd7df344ae66dfec599646b31dbd27b]]]]
Former-commit-id: 5c4f89644c
Former-commit-id: 216f6615df [formerly d52b2254f5] [formerly cdfe226fd4f2936b8857ca657cf932d134dc0f2f [formerly 4d22a3c58e]]
Former-commit-id: 0238336c4ba4ce650a90647685bf7af41b2168f5 [formerly 397f83b2da]
Former-commit-id: 8dbd523f44
2014-06-24 18:16:09 -05:00
Ben Steffensmeier
e244664b7d Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
Former-commit-id: 664ae8372cd7df344ae66dfec599646b31dbd27b
2014-06-24 18:16:09 -05:00
Nate Jensen
c0851e8750 Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1
Former-commit-id: 40c2a6c486 [formerly 95b2e262a0] [formerly b1acd1709a] [formerly 40c2a6c486 [formerly 95b2e262a0] [formerly b1acd1709a] [formerly 9b7ed95e6b [formerly b1acd1709a [formerly 2ee54c1f78136332f1cd2c40da0c2e7953510e7f]]]]
Former-commit-id: 9b7ed95e6b
Former-commit-id: 3e520231e7 [formerly 99b46cfbcf] [formerly 3ab762d979230aedd7fdd4120f726266218ba049 [formerly 521065548d]]
Former-commit-id: 545f0284af8fb337409397018eab8ceeb811c24b [formerly ea80faede7]
Former-commit-id: 19383cbf10
2014-06-16 09:26:30 -05:00
Nate Jensen
b1acd1709a Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1
Former-commit-id: 2ee54c1f78136332f1cd2c40da0c2e7953510e7f
2014-06-16 09:26:30 -05:00
Ben Steffensmeier
3ec23a665b Omaha #3263 Check for null when mosaic time matches.
Former-commit-id: 0016b16e61 [formerly c105de1a4c] [formerly 5355ca8c1c] [formerly 0016b16e61 [formerly c105de1a4c] [formerly 5355ca8c1c] [formerly df2fed2be3 [formerly 5355ca8c1c [formerly 913d70b860c1f129d1632dfd1d84e5fbcca5e2d9]]]]
Former-commit-id: df2fed2be3
Former-commit-id: 9b4a68da6a [formerly 6309145495] [formerly d5d5ea212b4485c552aa4ab09ab99a2291039c5b [formerly ab616254bf]]
Former-commit-id: cc241cbc94795a69fda0a400d9836465d759ad61 [formerly 5e433c9871]
Former-commit-id: c73ec7db64
2014-06-12 15:00:26 -05:00
Ben Steffensmeier
5355ca8c1c Omaha #3263 Check for null when mosaic time matches.
Former-commit-id: 913d70b860c1f129d1632dfd1d84e5fbcca5e2d9
2014-06-12 15:00:26 -05:00
Ben Steffensmeier
ed865c330a Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings.
Former-commit-id: db668f8b63 [formerly 5a4f7a1fd4] [formerly f292f204c9] [formerly db668f8b63 [formerly 5a4f7a1fd4] [formerly f292f204c9] [formerly fc25774506 [formerly f292f204c9 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]]]]
Former-commit-id: fc25774506
Former-commit-id: c9b474afb9 [formerly 217734a2ba] [formerly f401961b28b14a7264ad7debe15758c82f45e504 [formerly 94b465fa15]]
Former-commit-id: 0558994679c2da78da91ba8ad2e4c69c953ea5d5 [formerly 3c8b94e08a]
Former-commit-id: 2aebff4f06
2014-06-11 13:45:42 -05:00
Ben Steffensmeier
f292f204c9 Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings.
Former-commit-id: e267e8b0bae314abf3396db6072c6ff8adc732bf
2014-06-11 13:45:42 -05:00
Nate Jensen
2e96094926 Omaha #3266 remove unused attributes and elements from baseline menu xml
files

Change-Id: I1a1f75f2b2a314679487ddf719f4f0055bdf8d01

Former-commit-id: 7783919a76 [formerly 23f3a15f31] [formerly 205e491d71] [formerly 7783919a76 [formerly 23f3a15f31] [formerly 205e491d71] [formerly 955e115c00 [formerly 205e491d71 [formerly 797504a970ec39c4fd56c9e0d51b292acfceea1b]]]]
Former-commit-id: 955e115c00
Former-commit-id: 090e92c5a9 [formerly f9d4da37b1] [formerly e7972d10e8e9f8d2d57b2115e4f5431b97c32a6a [formerly f634182937]]
Former-commit-id: 656899700d1a93fd86eeabfea200d00c94ba1839 [formerly 70589056d1]
Former-commit-id: fa9e075a44
2014-06-10 18:30:14 -05:00
Nate Jensen
205e491d71 Omaha #3266 remove unused attributes and elements from baseline menu xml
files

Change-Id: I1a1f75f2b2a314679487ddf719f4f0055bdf8d01

Former-commit-id: 797504a970ec39c4fd56c9e0d51b292acfceea1b
2014-06-10 18:30:14 -05:00
Ben Steffensmeier
6dd09f3b8d Omaha #3232 Radar code improvements.
Former-commit-id: d2587a7d57 [formerly 3eb6b79c56] [formerly 8587b9b43b] [formerly d2587a7d57 [formerly 3eb6b79c56] [formerly 8587b9b43b] [formerly 26325b57be [formerly 8587b9b43b [formerly 696f45d67c5e5b02183f97cfcc139db017f01848]]]]
Former-commit-id: 26325b57be
Former-commit-id: cdd8eb2d9e [formerly 4f83edfa72] [formerly a96d770a2e60482e10653300e2065d1100acb73d [formerly b8fe181c9a]]
Former-commit-id: fe8e7c1d08bafbe62409a3a17d56f49166d9b87c [formerly 9e97750df2]
Former-commit-id: dc5a927bb8
2014-06-05 14:53:25 -05:00
Ben Steffensmeier
8587b9b43b Omaha #3232 Radar code improvements.
Former-commit-id: 696f45d67c5e5b02183f97cfcc139db017f01848
2014-06-05 14:53:25 -05:00
Ben Steffensmeier
eb45b78812 Omaha #2918 Synchronize mosaic dataTimes.
Former-commit-id: 8aff2fc4a1 [formerly 93ce7ddb33] [formerly 8a117864d8] [formerly 8aff2fc4a1 [formerly 93ce7ddb33] [formerly 8a117864d8] [formerly b078baf67d [formerly 8a117864d8 [formerly c4d8ed9d0d7eb4c17d8a0922302a3fc50a0ae383]]]]
Former-commit-id: b078baf67d
Former-commit-id: 669c4e0745 [formerly a97f9cd7e6] [formerly cbd57f8d6748ba12892e46cd85d33d887aa145c9 [formerly b4e1a98e23]]
Former-commit-id: c5d60e84cf3fe1eb4e53e28f3cca0abf7736b7e2 [formerly cbe8c64e73]
Former-commit-id: 25b2aeeed2
2014-06-02 10:41:45 -05:00
Ben Steffensmeier
8a117864d8 Omaha #2918 Synchronize mosaic dataTimes.
Former-commit-id: c4d8ed9d0d7eb4c17d8a0922302a3fc50a0ae383
2014-06-02 10:41:45 -05:00
mjames-upc
039594684b radar apps menu putback
Former-commit-id: ff82fdd07f
2014-05-29 15:56:57 -06:00
Steve Harris
cf2950abdb Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml

Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66

Former-commit-id: 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9458ea3648 [formerly bfa4255eea] [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc [formerly 9b98b41cd4]]
Former-commit-id: a54e34e905540883ccd6d6eb5c78370ac905f651 [formerly 144354c369]
Former-commit-id: 172cca39d9
2014-05-27 14:48:24 -04:00
Steve Harris
99bc6f990c Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml

Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66

Former-commit-id: 117fa26f537131552bbe51b2c5fe12405a26db32
2014-05-27 14:48:24 -04:00
mjames-upc
3a12d1dcc6 removed com.raytheon.edex.rpgenvdata, removed RCM menu items, remove RCM elevation from monitor.scan TrendGraphCanvas.java
Former-commit-id: ea235e823a
2014-05-15 17:36:30 -06:00
Steve Harris
24df80c520 Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
	edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
	tests/.classpath
	tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
	tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java

Former-commit-id: 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: ae2d525c8a [formerly 32f255cada] [formerly a8635bd2e1fdd0fe84e47c2435e9f0073d86e4e2 [formerly 233922471a]]
Former-commit-id: d12e1920a9ce76da64ae45fed23fe5b2ed9fa884 [formerly 74a325ce74]
Former-commit-id: 82045e2409
2014-05-12 16:13:19 -05:00
Steve Harris
cf62cf4a6e Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
	edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
	tests/.classpath
	tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
	tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java

Former-commit-id: a830db2a282e6a29d119fc0d3357c2223c48d175
2014-05-12 16:13:19 -05:00
Brian.Dyke
9bc1055c87 CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]]
Former-commit-id: 41ba5fc348
Former-commit-id: 4004b627e2 [formerly dc5bc1d2a4] [formerly 3193dce8b50276edb5c6e0829236339aa91b9172 [formerly 2f704c898d]]
Former-commit-id: 4b5ff1e5a8372daadb66b3b58132714ed0a54eae [formerly 82663c0ab6]
Former-commit-id: 464cc1a479
2014-05-12 14:07:11 -04:00