Commit graph

3137 commits

Author SHA1 Message Date
Richard Peter
e20c238886 Merge "Issue #2874 RTOFS temperature unit correction and style enhancements" into development
Former-commit-id: 024ba3b887 [formerly 68559ad7ef] [formerly f4a5c3ac93] [formerly 05756d272c [formerly f4a5c3ac93 [formerly de9e3602df90b1a90c352b356a8880103e61acaf]]]
Former-commit-id: 05756d272c
Former-commit-id: 89fa60f9b60f7238a49d76af4b9f07d1146823c7 [formerly 3c5d3fe932]
Former-commit-id: 878cc797db
2014-04-03 16:52:46 -05:00
Ben Steffensmeier
12d697fc1c Issue #2874 RTOFS temperature unit correction and style enhancements
Former-commit-id: dae20b905a [formerly f2c605f6d3] [formerly a846430a84] [formerly 3baaf6543d [formerly a846430a84 [formerly 129dff2511c50abe9367e233fb64b5ca923db258]]]
Former-commit-id: 3baaf6543d
Former-commit-id: 34465f247844dc3904337e65921ee04c89a51fef [formerly 6125fee4e8]
Former-commit-id: 92beb626b4
2014-04-03 16:42:45 -05:00
Nate Jensen
5059473b5e Issue #2967 fix error when erasing the last piece of a telestrator line
Change-Id: I51a3a07848dfa8639f553f86a831f15e9965bf84

Former-commit-id: 0498ff757b [formerly 4d0b0495fe] [formerly 3e6de492ec] [formerly 6b3504a39c [formerly 3e6de492ec [formerly d152fa62494ae9b2880a94de92587df0db1bad6c]]]
Former-commit-id: 6b3504a39c
Former-commit-id: 3de3bf102a92af52452844e38c9dbcaa83cb90c3 [formerly 64dde02001]
Former-commit-id: 64731a98cb
2014-04-03 15:08:40 -05:00
Dave Hladky
7138f246cc Issue #2974 added DD id to sub dialogs
Change-Id: I2392f4ef1736edd940998a83b4ecba43829f92e7

Former-commit-id: 246dfa699f [formerly 030541d701] [formerly 5b6c972210] [formerly ef337f77d2 [formerly 5b6c972210 [formerly d86b847689c3843a8b49f30a2f0613a34e70167a]]]
Former-commit-id: ef337f77d2
Former-commit-id: 185884f62e58f4ad15cd3dbaacca1889be318a36 [formerly 729cc25047]
Former-commit-id: 48d96c7a19
2014-04-03 14:48:42 -05:00
Ron Anderson
11df67c9f4 Merge "Issue #2961 Fixed issue where ISC grids are selected based on the start time of the Fcst and not the grid that overlaps the spatial editor time." into development
Former-commit-id: 946a3857f9 [formerly 39bcb64c7f] [formerly 90429229f7] [formerly 52c2092e1c [formerly 90429229f7 [formerly 4e57b93f72b9e73a4ac2e1205393b3cae8e21958]]]
Former-commit-id: 52c2092e1c
Former-commit-id: 6fa5ea130dedea2082686ac70b1f9913fc8f6110 [formerly 2bee12cb02]
Former-commit-id: 3e144c80a6
2014-04-03 14:27:41 -05:00
Richard Peter
ca4bf07f79 Merge "Issue #2889 user who issued change now shows in notification center Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc" into development
Former-commit-id: bef54117fd [formerly ba37332585] [formerly ae13682598a53998b23637ec80a5c8ade97d6551 [formerly f0330daea2]] [formerly b7bd68b3e7 [formerly f0330daea2 [formerly 06e08d77b5c2f57d30d0e12e2e9f2800020447d3]]]
Former-commit-id: b7bd68b3e7
Former-commit-id: dce34ccb75a84f0d0fb52584e274ca8a6b93b7c9 [formerly 1dc927034c]
Former-commit-id: 695bb0c91e
2014-04-03 13:07:36 -05:00
Ron Anderson
5d84747472 Issue #2961 Fixed issue where ISC grids are selected based on the start time of the
Fcst and not the grid that overlaps the spatial editor time.

Change-Id: Ifb89fc1305db8a654067185064c3d570dfecd3b2

Former-commit-id: 660bc974e9 [formerly a9be0658e4] [formerly eb90c1f216] [formerly db080f3eba [formerly eb90c1f216 [formerly 131f9c0933280d25f61458e270b5bb9715c2d67b]]]
Former-commit-id: db080f3eba
Former-commit-id: f40c2938a553a6bd3809588d95bac2b3641d2765 [formerly c7b392e36b]
Former-commit-id: c880002b1e
2014-04-03 13:04:55 -05:00
Ron Anderson
2a0c06c814 Merge "Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py" into development
Former-commit-id: dd532a6edb [formerly bbecf3d2da] [formerly b67c36c08b] [formerly 822acbb32b [formerly b67c36c08b [formerly dc953f5285a2fb5c56148b78c5db31c4ccdda3a7]]]
Former-commit-id: 822acbb32b
Former-commit-id: 2376fd5832ad8d1cfd61ec7ab3b9ba1df3cefd08 [formerly f7910616ca]
Former-commit-id: b5680ce7f3
2014-04-03 12:57:16 -05:00
Ron Anderson
f35fcf7c6f Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py
Change-Id: I75d37583d15decaeb50db0d70fc0ba1f3a8a7b7c

Former-commit-id: 426d0fcdd7 [formerly bd7e411653] [formerly 11c8529862] [formerly 2abfe6de77 [formerly 11c8529862 [formerly 552c3e9485ee03c552851c98455e57f12a8f033f]]]
Former-commit-id: 2abfe6de77
Former-commit-id: 2d2d6d92129690dc9335d9253ddd5235606cc9bd [formerly bd502fbe07]
Former-commit-id: 8dcbe3a815
2014-04-03 12:42:42 -05:00
Ron Anderson
048d7d363b Merge "Issue #2847: Add option to export only selected parms to GFE KML export dialog." into development
Former-commit-id: 6d94c0be65 [formerly 6fa61adbd4] [formerly b61a1b346d] [formerly 60f3ad27e2 [formerly b61a1b346d [formerly 17ab17280bc6e4c990edec44a40f78f1f36f5ced]]]
Former-commit-id: 60f3ad27e2
Former-commit-id: 62d6e4880917155c00a538024e1217517051a84e [formerly d1e5fdd365]
Former-commit-id: 6f9cadafa7
2014-04-03 11:47:15 -05:00
David Gillingham
87ce104d67 Issue #2847: Add option to export only selected parms to GFE KML export dialog.
Change-Id: I6f0111d0f8eaed302c18dcd08e4433a7e544e669

Former-commit-id: f32b34b736 [formerly 7e165846d2] [formerly 965d76c139] [formerly 7f36b8ba9c [formerly 965d76c139 [formerly cdb6f07f0a514c159e792e3bb911ef93a8354b2d]]]
Former-commit-id: 7f36b8ba9c
Former-commit-id: aa5f9f82bfce0e52bd621bb6427bfb10d3b1447a [formerly 017ea69812]
Former-commit-id: 9fcb3f6920
2014-04-03 11:30:59 -05:00
Ron Anderson
ec74556c48 Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py
Change-Id: Ic01c265f792d855751aeac9890953600d531c12c

Former-commit-id: ee8d561f81 [formerly 7e58a73dbf] [formerly 8da64048e7] [formerly 69cd6a1598 [formerly 8da64048e7 [formerly cfec08f8c4ac8552699e9387148ba2e9d0dc9558]]]
Former-commit-id: 69cd6a1598
Former-commit-id: ef0141d58da5e73da45520afce6c1175f7c71496 [formerly dde9253f15]
Former-commit-id: b16405ecb3
2014-04-02 18:22:51 -05:00
Ron Anderson
8463514df0 Issue #2961 Code clean up. Issue was fixed under #2703
Added listener to redo time matching when ISC mode changes

Change-Id: Ic2a883c6255a81cac1316d268225fb6078921cb1

Former-commit-id: 82062553f0 [formerly 51ffcd7ce8] [formerly f4b31b336a] [formerly efb27793f4 [formerly f4b31b336a [formerly afbab6d1d0b4f1aad80e5a082f536f608f523380]]]
Former-commit-id: efb27793f4
Former-commit-id: 3dc1bbaea04ff0ad7927eabe00966a8cca040dc6 [formerly bfed3dc521]
Former-commit-id: c1e5e2fd18
2014-04-02 16:55:02 -05:00
Dave Hladky
b908654a83 Issue #2889 user who issued change now shows in notification center
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc

Former-commit-id: ec2c3b4af2 [formerly 2d18b657a8] [formerly 1671baaf10] [formerly 9479219b73 [formerly 1671baaf10 [formerly adc364d92a7fcb2a255a2f448efb56ef48492280]]]
Former-commit-id: 9479219b73
Former-commit-id: 6f17881da511134df9f83e5fdfe37fa16d15481a [formerly f26450c40d]
Former-commit-id: 86287bb5df
2014-04-02 14:06:25 -05:00
Nate Jensen
5821a0e0e0 Merge "Issue #2632 - Remove user from list on sign-off. Fixed check for available" into development
Former-commit-id: 72c8f1d844 [formerly c0704488cc] [formerly 6b20d38b1a] [formerly 579d2416cb [formerly 6b20d38b1a [formerly 8f25c8c9f9e47cbff07e8ac39dfb6ab672adb611]]]
Former-commit-id: 579d2416cb
Former-commit-id: b937a5eaf68a15c6804ca9d1bfabddacdd99ff79 [formerly 19560ebc7c]
Former-commit-id: d5d42f2f6b
2014-04-02 11:23:02 -05:00
Mike Duff
378909ad2c Issue #2632 - Remove user from list on sign-off. Fixed check for available
Change-Id: I2a389e290b697dfe06be9b4fef8d5957676f3cbe

Former-commit-id: ac9678dc6e [formerly 2a9b434883] [formerly 538261f6d5] [formerly d5df936431 [formerly 538261f6d5 [formerly 2f9981c5173f0c2523b586ce10147f738028b907]]]
Former-commit-id: d5df936431
Former-commit-id: 42269ff35b4c62e12785ae2a916e17bf654fe7c6 [formerly 92f1a3a9aa]
Former-commit-id: 7aa5cebfb0
2014-04-02 10:08:45 -05:00
Nate Jensen
2b7a95598e Merge "Issue #2938 - Fix site/role change logic for messages" into development
Former-commit-id: 4ec98ab846 [formerly 654d5abb57] [formerly 6637623c4f] [formerly eab75cab11 [formerly 6637623c4f [formerly 8fe6aa419874d54755836fa44e252d53b32b7f8c]]]
Former-commit-id: eab75cab11
Former-commit-id: 2db9cd45dbb0b28cc1547e80c8c6e446eb551909 [formerly a9e2e856d6]
Former-commit-id: 4494674310
2014-04-02 09:55:19 -05:00
Nate Jensen
427ded7bcf Merge "Issue #2952 - Change MPE fieldgen to use thriftSrv" into development
Former-commit-id: 6e7b3d21a1 [formerly 8040bcd68d] [formerly df2ccad2d0599321f36ad1d0cd527bea37e9fc17 [formerly 0b25f77fe8]] [formerly 862d1de6c4 [formerly 0b25f77fe8 [formerly 8efaad8250215b687ae9286358cdd30148cdc366]]]
Former-commit-id: 862d1de6c4
Former-commit-id: aa40824139fb68908b53530f21471f11b8574ff6 [formerly 2534fb0ab1]
Former-commit-id: e1a62c357f
2014-04-02 09:54:53 -05:00
Ron Anderson
5001c1f2be Issue #2969 Fixed error when Topo parm is unloaded.
Fixed check state of Topography menu item.

Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b

Former-commit-id: 4bb7f13198 [formerly 346984b8ab] [formerly 11fbd86558] [formerly d556055299 [formerly 11fbd86558 [formerly 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5]]]
Former-commit-id: d556055299
Former-commit-id: dec5605ca65dcc7794d7aa2a917294e93e71160b [formerly ac7c5460f6]
Former-commit-id: 3ac3d5de1b
2014-04-02 09:07:22 -05:00
Mike Duff
fe8961bb24 Issue #2938 - Fix site/role change logic for messages
Change-Id: I5a08020f28b986c7815bb5ab2b71a34d9e105500

Former-commit-id: 656966669d [formerly 66181ca3a5] [formerly 8967ddd94a] [formerly 169ad502de [formerly 8967ddd94a [formerly 9ffc540c21245b308334040234be03d78a501656]]]
Former-commit-id: 169ad502de
Former-commit-id: f6d2ebf70d78eeca18274f66c05c2ad2791f600b [formerly f117f575eb]
Former-commit-id: 3686e50328
2014-04-02 08:12:53 -05:00
Lee Venable
1574e8a3b0 Issue #2979 - added dispose check to runAsync call.
Former-commit-id: fed1709f40 [formerly 6a5754b403] [formerly c0d95865f2] [formerly 4a81165239 [formerly c0d95865f2 [formerly d590cbe1508e1dfc1557e558a4a55aa7388e1d40]]]
Former-commit-id: 4a81165239
Former-commit-id: e418656bdca96cb73e044ab17808764c7423d8c0 [formerly d97d0bc29d]
Former-commit-id: 3cf97272ca
2014-04-01 16:36:22 -05:00
Brian.Dyke
f5ed39a8d9 Merge branch 'omaha_14.2.2' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.2 into master_14.2.2
Former-commit-id: 411457248b [formerly 3186434368] [formerly 6e515eb334] [formerly 1f5c6139e3 [formerly 6e515eb334 [formerly 5dbe50379db1558323dff2ffdc541cd81adfea4b]]]
Former-commit-id: 1f5c6139e3
Former-commit-id: d9da3cc373b8f207d487dbe28227905b8a81846e [formerly c013460db1]
Former-commit-id: d163d9d190
2014-04-01 14:29:33 -04:00
Lee Venable
961c8cf1fa Issue #2976 - added SWT widget dispose check in runAsync call.
Former-commit-id: 9187c4ccf4 [formerly 311337f5fc] [formerly 64905717e2] [formerly e6c9f4870e [formerly 64905717e2 [formerly 8617d57ea899877ba3f0149059a439d5dc60c5a2]]]
Former-commit-id: e6c9f4870e
Former-commit-id: 98b1ee3341a955bdfd361a9c85746fc1e941720d [formerly d4279a4390]
Former-commit-id: 1eed6a7ec6
2014-04-01 11:19:41 -05:00
Nate Jensen
43896bf040 Merge "Issue #2937 Separate room logging into a subdirectory to separate room logs from other logging. Updated abstract_setup.xml to check the javaUtilities baseline directory and the cots directory for dependency jars so that symbolic links are not needed in order to build. Fixes for Archive log access and search." into development
Former-commit-id: abc7cd02ff [formerly 449b28f4b9] [formerly 700269993a] [formerly a373345f6e [formerly 700269993a [formerly 4bcf4eac3618baa1d92c57b5984ff72ebf8d3dbc]]]
Former-commit-id: a373345f6e
Former-commit-id: b059d767e05b95533bb39256f2380c2f1f0573f0 [formerly 93ca04828d]
Former-commit-id: 008f7693c9
2014-04-01 10:01:35 -05:00
Richard Peter
cbd9ce9df3 Merge "Issue #2791 Fix streamlines that were broken in conversion to data source." into development
Former-commit-id: 472d4a213f [formerly 584c8d2fc3] [formerly 609e574825] [formerly e0af16feed [formerly 609e574825 [formerly 045e498e5d6a47bc35fc7d26b8d8b431dcd4b492]]]
Former-commit-id: e0af16feed
Former-commit-id: 0b26cd285b56f196e8054113c3a18f6c2f904098 [formerly 42d745e515]
Former-commit-id: 088b1ebcc0
2014-04-01 09:38:23 -05:00
Nate Jensen
a6497bb55d Merge "Issue #2899 - Improve error messages." into development
Former-commit-id: 65f7ef9290 [formerly 651b40e423] [formerly fe56feaa74] [formerly b9aae5b0f2 [formerly fe56feaa74 [formerly f24a44ac9db6d1f1339aeaf3f0071656847b0d36]]]
Former-commit-id: b9aae5b0f2
Former-commit-id: 253abdca80717dff3140bda2f1a2de3138cf2346 [formerly b5461e0ddb]
Former-commit-id: addd8031b1
2014-04-01 08:46:25 -05:00
Lee Venable
2cea1633be Issue #2970 - added SWT dispose checks to runAsync methods.
Former-commit-id: bd8d4feea2 [formerly 91c1cc0e2a] [formerly c43379b9168e0214803047217dc368064546dd53 [formerly 64f5da88ff]] [formerly 4714913a8c [formerly 64f5da88ff [formerly b07ebb73405c3421c6afa3e45db57162a7ca622b]]]
Former-commit-id: 4714913a8c
Former-commit-id: 399d430b6568ed3139d21a7f38ca7481ea493a92 [formerly 198785dc0c]
Former-commit-id: b95ff2aa5c
2014-03-31 16:06:59 -05:00
Mike Duff
2b67428bb8 Issue #2899 - Improve error messages.
Change-Id: Iba298e66d1b889fce8cde9103674c86558bd222c

Former-commit-id: b1aae9256c [formerly dc81b79eca] [formerly c19b2d4567c30baa6b72a28cba83737044113f54 [formerly bcdfd5a0c9]] [formerly d6ce901a3a [formerly bcdfd5a0c9 [formerly e83da0adee12900da03cb4b273a90d13fc5fc327]]]
Former-commit-id: d6ce901a3a
Former-commit-id: d9ffb6af27ebcb9dc33b400820eb8e9b7a36691a [formerly 6453a46d96]
Former-commit-id: be5eeafeb7
2014-03-31 16:01:44 -05:00
Mike Duff
f753a3bb03 Issue #2952 - Change MPE fieldgen to use thriftSrv
Change-Id: Ibd0ed87582a6374db1e49bc66093705436f6d5d3

Former-commit-id: 5d44d7d470 [formerly d1a705822c] [formerly 2cb92e6039] [formerly 235080c256 [formerly 2cb92e6039 [formerly 182b9f69c72332e73cdda26ebbebedb4abc059b0]]]
Former-commit-id: 235080c256
Former-commit-id: c7fdcb88f6d17b73071e2cd4f40334515c7187d6 [formerly b4f0f5c5b0]
Former-commit-id: 7bb2c5535a
2014-03-31 15:08:33 -05:00
Brad Gonzales
c12c4cf7e2 Issue #2937 Separate room logging into a subdirectory to separate room logs from
other logging. Updated abstract_setup.xml to check the javaUtilities baseline directory and the cots directory
for dependency jars so that symbolic links are not needed in order to build.  Fixes for Archive log access
and search.

Change-Id: I7ca111cebb4dae998ce1390f3bb73b0f48eb7174

Former-commit-id: 85911a9d01 [formerly d4659c48a6] [formerly 404faeeca0] [formerly 15e1b7a7f6 [formerly 404faeeca0 [formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]]]
Former-commit-id: 15e1b7a7f6
Former-commit-id: f8fc71ad10a4d9dbd3464113660b2d2d68675fd5 [formerly 2f56fd3c9d]
Former-commit-id: 1c685a9eb6
2014-03-31 11:45:22 -05:00
Mike Duff
5dd6bad115 Issue #2689 - Add input values to log statement on LL to HRAP conversion failure.
Fix error in HRAP overlay resource.

Change-Id: If6fcb23a839323e4541e8ff28c0d702bf3066273

Former-commit-id: 43f7e3307a [formerly d5c3ddcef8] [formerly be9cf109b1] [formerly 5f1f931c64 [formerly be9cf109b1 [formerly ee88ab32961525d74a227cccec615c0610dc9525]]]
Former-commit-id: 5f1f931c64
Former-commit-id: e1dad5245b047c7e36a1a34a412afe2bccff0886 [formerly da5a3bf858]
Former-commit-id: c518a6710b
2014-03-31 11:35:06 -05:00
Lee Venable
5ffe5c01f6 Issue #2960 - added checks for SashForm weights
Former-commit-id: 0b8d762f4b [formerly bdb18ea85b] [formerly 19dd95ba24] [formerly 3018ff1f5f [formerly 19dd95ba24 [formerly 1a3c0743b773f695fa881f83a9773a899a2ef111]]]
Former-commit-id: 3018ff1f5f
Former-commit-id: 8994df39c007e35516677413a4a7d0c0f74e7bc6 [formerly 1504b3532e]
Former-commit-id: f7e1ee666b
2014-03-28 15:30:11 -05:00
Nate Jensen
b9a24788bc Merge "Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions" into development
Former-commit-id: 95710fff2a [formerly a69165b4db] [formerly e7882b1409] [formerly 5af9c9113c [formerly e7882b1409 [formerly 723d44e31b8aad30428a3c1fd024b05555b4e9af]]]
Former-commit-id: 5af9c9113c
Former-commit-id: 1196279dfcb99aa5ff7ca86319c6b157a1e5fc53 [formerly ca19d00b1d]
Former-commit-id: 219be3e2e3
2014-03-27 17:25:55 -05:00
Mike Duff
cd626d0555 Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions
Change-Id: I9af93c4935c5d9dc6777be0e0435bb71be5f613b

Former-commit-id: 5476afd095 [formerly d2eed9891a] [formerly d803986440] [formerly 98b5fd762e [formerly d803986440 [formerly a50bd58e95a929fe569f5df68dd4d4a8b6625807]]]
Former-commit-id: 98b5fd762e
Former-commit-id: 7b61ae882d35a9231f7bff856832af42ae2f309a [formerly b1d74f855e]
Former-commit-id: f92754f752
2014-03-27 16:31:30 -05:00
Roger Ferrel
84af47197e Issue #2879 Code clean up.
Former-commit-id: 131f48b094 [formerly 4a306121bd] [formerly dd09032119] [formerly f6fe26d3de [formerly dd09032119 [formerly 6fbb95beec25582f577dc3547f8f3424eb92cdf2]]]
Former-commit-id: f6fe26d3de
Former-commit-id: 6ccd977daf48d3ec39f823e632c44c3cf519092d [formerly 867d85e17d]
Former-commit-id: ba38afeeb9
2014-03-27 16:17:02 -05:00
Roger Ferrel
7a33681851 Issue #2879 Loading case no longer changes start/end time.
Former-commit-id: db88893eac [formerly 6e2d462052] [formerly 2f9c62bd0c] [formerly b78a05658d [formerly 2f9c62bd0c [formerly 60275732b2abcecf671a8338c8f87334baad3702]]]
Former-commit-id: b78a05658d
Former-commit-id: c545ff124a95b3a99150b9de93f0f583ad152243 [formerly 16ade55cb6]
Former-commit-id: 394e8fcbcf
2014-03-27 15:52:31 -05:00
Ben Steffensmeier
0efa412e99 Issue #2791 Fix streamlines that were broken in conversion to data source.
Former-commit-id: 288621fd9c [formerly 4289b416c0] [formerly b4c30292f8] [formerly 3c6fa3bfc8 [formerly b4c30292f8 [formerly 644ceb3fb7a4f01f74a0259043b23e4d01ce16c0]]]
Former-commit-id: 3c6fa3bfc8
Former-commit-id: a8575e0c50ea7854743176738e8faefc64b768b6 [formerly 2589749b76]
Former-commit-id: 83d17a138e
2014-03-27 15:09:00 -05:00
Ron Anderson
6264fd681d Merge "Issue #2664 Added support for non-WGS84 shape files" into development
Former-commit-id: e7ec80c0ca [formerly a97734c786] [formerly 21e3eeca05] [formerly 86c0fe78f2 [formerly 21e3eeca05 [formerly 6ec350a33b6f5bca31906ff2f7b5b76911f33973]]]
Former-commit-id: 86c0fe78f2
Former-commit-id: 277e90770a5c5453a1ebffc7aa107e33b2fb38a6 [formerly c318aa6547]
Former-commit-id: 374f012e85
2014-03-27 14:35:34 -05:00
David Friedman
1e4ac84f99 Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]
Former-commit-id: 1168a3eae5
2014-03-27 19:17:03 +00:00
Ron Anderson
fb564d8275 Issue #2664 Added support for non-WGS84 shape files
Change-Id: Id7ec05ddd6c8ff8b144ef4208db3e052e9693951

Former-commit-id: b08d5dfe21 [formerly c9e456983b] [formerly 1b39ed7771] [formerly 4c6cddc7d4 [formerly 1b39ed7771 [formerly 143017d2a61b242a7fa5d9ad596cd958cea1df3a]]]
Former-commit-id: 4c6cddc7d4
Former-commit-id: 4fef82c9075c140b26c17875dcbc2c745ae87cba [formerly 65d4400471]
Former-commit-id: 527399107f
2014-03-27 13:04:44 -05:00
Bryan Kowal
fad5502b49 Merge "Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts" into development
Former-commit-id: b55006b39a [formerly 5b563bf870] [formerly e0d15b8e29] [formerly faa7604827 [formerly e0d15b8e29 [formerly cd8b9072bf3c0e5c4c29f6656bb1a65c406fd5d1]]]
Former-commit-id: faa7604827
Former-commit-id: 55c97eebe8665cd8a5690127e9024a4759ccbf78 [formerly 7d68836b88]
Former-commit-id: 5ce208ec73
2014-03-27 09:25:14 -05:00
Brian.Dyke
bded86a35f Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 7ca114f7f1 [formerly a1b980a15d] [formerly 6346c9776b] [formerly 3b639347f8 [formerly 6346c9776b [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]]]
Former-commit-id: 3b639347f8
Former-commit-id: 38694ae3f3f4b7b74544ffa190d887b7c937b26b [formerly 76625c2238]
Former-commit-id: 519ec3071a
2014-03-27 10:22:26 -04:00
Steve Harris
4cc478e83b Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development
Former-commit-id: 883244fa2e [formerly 29f4f53d27] [formerly a70710b467] [formerly 656ae897c1 [formerly a70710b467 [formerly eeb50c8acbe727769ed7f14b63b94af5b14bbf3f]]]
Former-commit-id: 656ae897c1
Former-commit-id: c89d11e09dd409255cf1e5daff026439aa00fab2 [formerly b1d31f21bc]
Former-commit-id: b99ed0cce6
2014-03-26 16:19:26 -05:00
Steve Harris
46efda0c29 Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: ef7ebd22b4 [formerly d940427408] [formerly 53f91fdeea] [formerly e5910b6c60 [formerly 53f91fdeea [formerly b0b18895aa445ee9b29674443529558b2141c042]]]
Former-commit-id: e5910b6c60
Former-commit-id: 81756753feb5c4701663ee447ac1a92dcfa9676d [formerly 1b9ebbddcc]
Former-commit-id: 9d4f24da7b
2014-03-26 16:13:59 -05:00
Steve Harris
3b8569a1ac Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
Former-commit-id: e621e81f20 [formerly 9cf3600ff6] [formerly 4879520391] [formerly a7efde7cf4 [formerly 4879520391 [formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]]]
Former-commit-id: a7efde7cf4
Former-commit-id: 9e1c5536bf5208e6e617f1b651bab6961954548a [formerly 55440888fd]
Former-commit-id: 311c8d67af
2014-03-26 15:51:32 -05:00
Bryan Kowal
718bbc47f4 Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts
Former-commit-id: d455d71216 [formerly 911c0a99c9] [formerly a554dc8c20] [formerly 286051cbb9 [formerly a554dc8c20 [formerly 386723d9048f6d6b6bd0281f273210949672acd2]]]
Former-commit-id: 286051cbb9
Former-commit-id: 92b3111cb9f6f27db1c947559a4696fd1d1b0a4b [formerly 6b28f08242]
Former-commit-id: f0f10e2544
2014-03-26 14:57:46 -05:00
Bryan Kowal
1a1c33b8c8 Merge "Issue #2851 - 64-bit gridslice library for Windows" into development
Former-commit-id: 3821e13dcd [formerly 3f06c30135] [formerly 386e85fce9] [formerly 6df224e171 [formerly 386e85fce9 [formerly c28104c670e68296662a2d81def52d1122a7ef98]]]
Former-commit-id: 6df224e171
Former-commit-id: b1fdb0c4cb169ca5eddb0cdb3e8bfdb6ee9a3dbb [formerly 70fdc03a5c]
Former-commit-id: d8b088392b
2014-03-26 09:19:05 -05:00
Brian.Dyke
6476c4fb85 Fixed comment merge conflicts added .gitignore
Former-commit-id: 642cdfe2e6 [formerly 027cca8673] [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 7cc471a9c9 [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 47a683ae6b10ecfc1cda91acf0f3b856b0a8977f [formerly d8256c4226]
Former-commit-id: 412a7eb2c2
2014-03-25 15:41:58 -04:00
Ron Anderson
ac0f8c1339 Merge "Issue #2874 Initial implementation of RTOFS data." into development
Former-commit-id: 1715102f26 [formerly c8b2da72ee] [formerly 1cad7c8ea7] [formerly fdbb505679 [formerly 1cad7c8ea7 [formerly 8cabd826bb4aa4af699ac674dad5323a030926c4]]]
Former-commit-id: fdbb505679
Former-commit-id: 1ac36120a099b3b2a502909144590734aecf5303 [formerly bbbf19c72e]
Former-commit-id: b154755f33
2014-03-25 13:20:02 -05:00
Richard Peter
e5dc574b44 Merge "Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text" into development
Former-commit-id: 4188281e8b [formerly c37a55b552] [formerly 3e2f280091] [formerly 3221310454 [formerly 3e2f280091 [formerly 4ba995c11c3c67215821c582eeb91d2ed3e17f19]]]
Former-commit-id: 3221310454
Former-commit-id: dd67ae29188f830e505220cad6a9914b86728cf8 [formerly 6ebd2444ef]
Former-commit-id: 457e51a4ee
2014-03-25 13:11:36 -05:00