Commit graph

3139 commits

Author SHA1 Message Date
Ron Anderson
bcc66dc18e Merge "Issue #3030 Avoid GeoTools Resampler2D infinite recursion." into development
Former-commit-id: 8f3b8c9bdf [formerly dd362ec359] [formerly c2a1533ff8] [formerly 8f3b8c9bdf [formerly dd362ec359] [formerly c2a1533ff8] [formerly 536ec2790a [formerly c2a1533ff8 [formerly a74c24200e9911ff4f2023d9fb1be77516b4c09a]]]]
Former-commit-id: 536ec2790a
Former-commit-id: 91a90d44e0 [formerly 4ac5fd90f4] [formerly c6dab31639d3dfc9ab7163fe5b8b72ec9ca0af2a [formerly d34a8c9753]]
Former-commit-id: 39503eb1283387f8ca31dae05fbc0c70830cc1a6 [formerly c0f6a951c4]
Former-commit-id: c7378e6125
2014-04-21 11:44:10 -05:00
Nate Jensen
f84adac681 Issue #2984 remove unnecessary dependencies on edex
Change-Id: Iad6ebd93d0ec6cd3823042f8ef2653dac963c746

Former-commit-id: 2561050293 [formerly ef43b2d325] [formerly 2253938ed5] [formerly 2561050293 [formerly ef43b2d325] [formerly 2253938ed5] [formerly df4171b29d [formerly 2253938ed5 [formerly 39d1f72292414d008c0899dac616e76c8c0f2512]]]]
Former-commit-id: df4171b29d
Former-commit-id: d6a968cac2 [formerly 4011b1351f] [formerly 024b55876a4025da8b49a4ff3d68557b772e23a5 [formerly 24c8b0a327]]
Former-commit-id: 25c60d2192a236220a6b597edaac8c5cc4d3c07b [formerly 5795254827]
Former-commit-id: cc150c8a1a
2014-04-21 11:32:41 -05:00
Mike Duff
c4bd67693f Issue #2891 - Fix refresh of Utilization Graph
Change-Id: Ib5fb5cb5a367459ab306dc223ab11172310d6cd8

Former-commit-id: de82aa7359 [formerly 3a71c05caa] [formerly 59241fed1d] [formerly de82aa7359 [formerly 3a71c05caa] [formerly 59241fed1d] [formerly 892330a89c [formerly 59241fed1d [formerly acb92afe49544fc0a1d9f5b08c7ec2d2e8016c16]]]]
Former-commit-id: 892330a89c
Former-commit-id: e40a69a415 [formerly ca76217776] [formerly 74522e1d5d94453632db42633b60036f571579aa [formerly 0f39afb4de]]
Former-commit-id: 83ae09f0d69fa9b7d6c1db22a12f16fd4b004b62 [formerly 3d5feda17c]
Former-commit-id: 8364fb4977
2014-04-21 10:55:43 -05:00
Brad Gonzales
21214319f5 Issue #3001 Changed ccfp-common.xml to used common. Fixed version in com.raytheon.viz.aviation/META-INF/MANIFEST.MF.
Change-Id: I118afa785fff93251950f0f10e72979174de35cb

Former-commit-id: 1e1a8e76bd [formerly ab5481218d] [formerly 3fb2835dd3] [formerly 1e1a8e76bd [formerly ab5481218d] [formerly 3fb2835dd3] [formerly 44ada20a68 [formerly 3fb2835dd3 [formerly cd85b148b6b267779d1fe8b510f14f63c45db77a]]]]
Former-commit-id: 44ada20a68
Former-commit-id: 8a7acc9442 [formerly 40e1214776] [formerly 92ad6759c57e75cfbff18396170bbbfcd7952bdd [formerly dd237ea8ff]]
Former-commit-id: 5a49ac8a4dba34c0186c5f2841464e0a47c72eb5 [formerly 4303081919]
Former-commit-id: 7f946c41d1
2014-04-21 10:22:57 -05:00
Mike Duff
b4e489d0e1 Issue #3000 - Split bufrmos plugin into common and edex.
Change-Id: Id3142b8746cfb28966e7378a522e4db775dfcf37

Former-commit-id: 8250c23357 [formerly a729b8b8a5] [formerly b288bd46de] [formerly 8250c23357 [formerly a729b8b8a5] [formerly b288bd46de] [formerly 0be8ad31d1 [formerly b288bd46de [formerly 3fd04e796b7c409c67c06517265648e576852352]]]]
Former-commit-id: 0be8ad31d1
Former-commit-id: 5efd5741f7 [formerly ad034ab285] [formerly 08a545b76f857a2a41c798d80966021fe535f72a [formerly 50a65c5a31]]
Former-commit-id: 03c26a584892cadebd4a033fa839ec012164e1c0 [formerly 1ceb378d0b]
Former-commit-id: 4bde76c765
2014-04-21 09:50:18 -05:00
Nate Jensen
22612b0fda Merge "Issue #2955 - Made chat invitation dialogs non-modal" into development
Former-commit-id: 98bd36ee38 [formerly d265706c90] [formerly cdd56443f0] [formerly 98bd36ee38 [formerly d265706c90] [formerly cdd56443f0] [formerly db6fba6f75 [formerly cdd56443f0 [formerly f4ced5dc67106d959dd97a35e589a266fe8089ce]]]]
Former-commit-id: db6fba6f75
Former-commit-id: ce3e1793cd [formerly 339f68fa9b] [formerly 522c875e651b5a312c176729c7d6dfa6c3eb0050 [formerly 897133a27a]]
Former-commit-id: 886e5fa99946b75185cfac1ac8c59df414fe10d9 [formerly 474612939c]
Former-commit-id: 24b3163c37
2014-04-21 09:29:23 -05:00
Mike Duff
326b17ce50 Issue #2955 - Made chat invitation dialogs non-modal
Change-Id: Ib7294e8149996715b6a247a1e04335dc1a0c7023

Former-commit-id: 6da65fe71a [formerly 71cf0d04e7] [formerly ead90bc794] [formerly 6da65fe71a [formerly 71cf0d04e7] [formerly ead90bc794] [formerly b507739637 [formerly ead90bc794 [formerly bb61e3c39d5dabf7e698726f0a093d8cf4f7088a]]]]
Former-commit-id: b507739637
Former-commit-id: ebbb721787 [formerly 75f794d54d] [formerly 5c415e155bfe7e16d70fc0b35ad0574fc7085261 [formerly 9a082a1588]]
Former-commit-id: 6157e38ab3e1698599dadf55b906513f06b68612 [formerly ae984e4c16]
Former-commit-id: 6c4490b08c
2014-04-21 09:00:42 -05:00
Ron Anderson
4dbd9ddf97 Issue #3030 Avoid GeoTools Resampler2D infinite recursion.
Change-Id: Ie2dc0a66e8f15648b1a76a0d54efb36795223345

Former-commit-id: ab83f0ec0f [formerly 581e1a95dd] [formerly 76c5bb67a5] [formerly ab83f0ec0f [formerly 581e1a95dd] [formerly 76c5bb67a5] [formerly d7e6ab67d6 [formerly 76c5bb67a5 [formerly 123ddd451854e93063f518b0ece746b1109df9d1]]]]
Former-commit-id: d7e6ab67d6
Former-commit-id: b2ea6031ce [formerly 941b6d9109] [formerly 8ea06d4f50652b41024861c0cde7cbd76f67046d [formerly 8583e0fb64]]
Former-commit-id: d9505cf91eb5072e4cab3692885e3cfcd546efc4 [formerly 281ffc1ecc]
Former-commit-id: 6a73cd7d31
2014-04-21 08:38:52 -05:00
Brad Gonzales
7e57799f28 Issue #3001 Renamed com.raytheon.edex.plugin.ccfp to com.raytheon.uf.edex.plugin.ccfp.
Amend: Updates from peer review.

Change-Id: Ib5719f711234005e021bc4d8dec899289d8b447b

Former-commit-id: 8a6655cb35 [formerly c267d077c3] [formerly 1a43f04b16] [formerly 8a6655cb35 [formerly c267d077c3] [formerly 1a43f04b16] [formerly 6c7e2ac2a7 [formerly 1a43f04b16 [formerly 9374912aeb3e3a642d34a0aec75bcda7c707bcf9]]]]
Former-commit-id: 6c7e2ac2a7
Former-commit-id: 4c463adc7e [formerly b2a95e4f12] [formerly f7b416cc828835e0d7166283f219d0f260c3e42e [formerly b796120ec9]]
Former-commit-id: bd7ac9c4128007fd4aa7a72e720880171ea0abd3 [formerly 2a7aae659c]
Former-commit-id: e0245983cf
2014-04-18 15:16:41 -05:00
Brian.Dyke
abdefb3233 Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
Former-commit-id: 55d7d8dadb [formerly 53ce26a9b6] [formerly 1aec3b3698] [formerly 55d7d8dadb [formerly 53ce26a9b6] [formerly 1aec3b3698] [formerly 645fe64a4a [formerly 1aec3b3698 [formerly 178acb792036869e903beea636c7216e1d3a4f58]]]]
Former-commit-id: 645fe64a4a
Former-commit-id: ec3c3b4bbe [formerly 66974e17b9] [formerly 02f862c461e30bc6f080ca3c5fa4bbbfae2b54a2 [formerly 4eb3317f80]]
Former-commit-id: 8defec1e49367a8a6ccd9f240a592024a450e538 [formerly 59cbfdf093]
Former-commit-id: 8275f3907f
2014-04-17 14:42:44 -04:00
Brian.Dyke
143d9a143a Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 735801a7e7 [formerly 9df6fb2d4d] [formerly 12a482e1d7] [formerly 735801a7e7 [formerly 9df6fb2d4d] [formerly 12a482e1d7] [formerly b8829139a2 [formerly 12a482e1d7 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]]
Former-commit-id: b8829139a2
Former-commit-id: 9c4385efbe [formerly 6f35818917] [formerly 007cb5daf20362de356dbfbefce51ee972d9ab3a [formerly 0ea7c51ad7]]
Former-commit-id: 286e1b30c773c91540e1e54ed0825014dadb3b10 [formerly a925ba6219]
Former-commit-id: de500c093f
2014-04-17 14:42:35 -04:00
Ron Anderson
4e278d2b6b Merge "Issue #2664 Fix NullPointerException when no .prj file present" into development
Former-commit-id: 77cf9b366c [formerly 3806a1fd05] [formerly 6b226db27c] [formerly 77cf9b366c [formerly 3806a1fd05] [formerly 6b226db27c] [formerly 66929690c7 [formerly 6b226db27c [formerly de57933506ad588c8da38a49de6a2cd5530e2091]]]]
Former-commit-id: 66929690c7
Former-commit-id: 9b5d743027 [formerly 55f31328af] [formerly 8b68cd3c4868310fe8a550a72548e02fe12db72e [formerly cacff76564]]
Former-commit-id: 2d7f18701d5f63bb89fef645311fce21064cd3d0 [formerly 07f66078a4]
Former-commit-id: 3b177c01ce
2014-04-17 13:13:03 -05:00
Ron Anderson
5531e3b97c Issue #2664 Fix NullPointerException when no .prj file present
Change-Id: I2716eca6b71d79657f19feadb931a23ee3e44f4d

Former-commit-id: f27f84e50f [formerly ddf45d649c] [formerly f4823976f3] [formerly f27f84e50f [formerly ddf45d649c] [formerly f4823976f3] [formerly f30c29bfbd [formerly f4823976f3 [formerly 66db062f94a5136902bac5cd5df8cbf30305a30a]]]]
Former-commit-id: f30c29bfbd
Former-commit-id: 8de698fb5b [formerly 5a8d4be559] [formerly 7eef58459f9ae3bb450f759c1b276249d81df227 [formerly ba88a0836d]]
Former-commit-id: 59b9ac899c65d2b660c099ad7812637131917c66 [formerly ab1f3acde9]
Former-commit-id: a2ec4af060
2014-04-17 11:38:40 -05:00
Nate Jensen
a213690e6e Merge "Issue #3025 - Fix incorrect sort algorithm." into development
Former-commit-id: b4717280de [formerly adcc7ac6b5] [formerly be79b04b59] [formerly b4717280de [formerly adcc7ac6b5] [formerly be79b04b59] [formerly c36a5f7272 [formerly be79b04b59 [formerly 7ad033ab9c35ea2a169f5041ed2ed1dfae7c63b2]]]]
Former-commit-id: c36a5f7272
Former-commit-id: a48dd9ab1f [formerly d237113d35] [formerly db5c7deed79d8cc758597e151da3c968a990ad9a [formerly 7d8f18ef18]]
Former-commit-id: 59599ab9c0a7b75428d187dac06fe7b4e5fcfaa8 [formerly 76bd257011]
Former-commit-id: 2880b20ee1
2014-04-17 09:56:54 -05:00
Mike Duff
8edc6095c9 Issue #3025 - Fix incorrect sort algorithm.
Change-Id: Ied1ec59a8703c1f7476793d3896a253ec6aa2707

Former-commit-id: dd24e15b53 [formerly a17f187929] [formerly 0b9f8ce7f1] [formerly dd24e15b53 [formerly a17f187929] [formerly 0b9f8ce7f1] [formerly b1a4f69578 [formerly 0b9f8ce7f1 [formerly 9c275288183b93ba5cac991dbbdf72bdf122ad0a]]]]
Former-commit-id: b1a4f69578
Former-commit-id: a700a1a1dc [formerly 989fcfb42f] [formerly 70adbb0b80aadc062137a471048c29cdebf395e7 [formerly 54e95e399b]]
Former-commit-id: b1484391d4b5870a0203b19b92e6167d49ab4423 [formerly ce6d95bd3c]
Former-commit-id: cfadb576e6
2014-04-17 09:55:45 -05:00
Nate Jensen
7c83f534f0 Issue #3018 addressing code review comments
Former-commit-id: f8f47a8bf7 [formerly 54951100af] [formerly e327f5e0bf] [formerly f8f47a8bf7 [formerly 54951100af] [formerly e327f5e0bf] [formerly 8ba6b2722d [formerly e327f5e0bf [formerly 85d9dd0158ab873e1e9b76805853c712bb0c7c2c]]]]
Former-commit-id: 8ba6b2722d
Former-commit-id: 88231d9166 [formerly 81f8f6f328] [formerly febf7868548bff0878f5de8197de931a5e194ca9 [formerly 8b6650c898]]
Former-commit-id: 04508ffd1ec150ee6f778136f2f7c1f5cffc1632 [formerly 3737ad85b6]
Former-commit-id: f607630d72
2014-04-17 09:28:47 -05:00
Nate Jensen
694b4a0e86 Merge "Issue #3001 Created com.raytheon.uf.common.dataplugin.ccfp. Moved CcfpLocation and CcfpRecord to that project. Updated feature and manifest references." into development
Former-commit-id: 2cbe701f82 [formerly df1b5183c1] [formerly 6e49d78e0d] [formerly 2cbe701f82 [formerly df1b5183c1] [formerly 6e49d78e0d] [formerly d26c150aa9 [formerly 6e49d78e0d [formerly 6d713f6a8a563b49bd1e2fa8151591657bd6735c]]]]
Former-commit-id: d26c150aa9
Former-commit-id: 00766a599c [formerly 23082fd637] [formerly c7b3b9828876e046db7ef21c197c4bffcbc75692 [formerly 8bf12cc32a]]
Former-commit-id: 53ba01851e73db63df0cf2a18d73c38915ad0aba [formerly e28da969c6]
Former-commit-id: 7b01116623
2014-04-17 09:04:52 -05:00
Roger Ferrel
a05ca67230 Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0

Former-commit-id: 84c10d3cd2 [formerly dc25ece75f] [formerly 8ce590c31c] [formerly 84c10d3cd2 [formerly dc25ece75f] [formerly 8ce590c31c] [formerly 3af564a653 [formerly 8ce590c31c [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]]]
Former-commit-id: 3af564a653
Former-commit-id: c1a0504758 [formerly 56da257816] [formerly 927fe825a123966e78c6c609abe7894b1787733e [formerly 1214aac2a2]]
Former-commit-id: 5ee188363d05f8c09d1fef8033e5b13d60428d1d [formerly 2e98b24e91]
Former-commit-id: 25c92e4b11
2014-04-17 08:57:15 -05:00
Ron Anderson
3c27a1e1ab Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
Former-commit-id: ef02928b92 [formerly 85a1f55ea0] [formerly f9a393172f] [formerly ef02928b92 [formerly 85a1f55ea0] [formerly f9a393172f] [formerly 1ba72371be [formerly f9a393172f [formerly 6813b32786289503950322c02e32803299566c5d]]]]
Former-commit-id: 1ba72371be
Former-commit-id: 8851b335fc [formerly 2139c2308e] [formerly 502045c662b12074a1036d22f9c1951ee22f1f8b [formerly 7d09397faa]]
Former-commit-id: 79b374e8ea7c63223f6f6f0f65a1234cdf694b0c [formerly 94f852cda7]
Former-commit-id: d704f90445
2014-04-16 18:02:11 -05:00
Nate Jensen
5e855a156a Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
Former-commit-id: 97c48103d7 [formerly 781ec3ecd6] [formerly a085b71c81] [formerly 97c48103d7 [formerly 781ec3ecd6] [formerly a085b71c81] [formerly c362af04f3 [formerly a085b71c81 [formerly 7384a2d32ef554362a0693038e9b60a589afb86a]]]]
Former-commit-id: c362af04f3
Former-commit-id: e4b0a48ace [formerly 1a40bc4824] [formerly 93fd911a8ce5140273cf8b6b105888dd69b75fea [formerly e1caa66625]]
Former-commit-id: caf2c5d766cd237a3542238be6f9bfec14088db0 [formerly e4aeb8394d]
Former-commit-id: de32624fdf
2014-04-16 17:25:09 -05:00
Brad Gonzales
062e2fa017 Issue #3001 Created com.raytheon.uf.common.dataplugin.ccfp. Moved CcfpLocation and
CcfpRecord to that project.  Updated feature and manifest references.

Amend: Updates from peer review.

Change-Id: I5606bbf3ba1dc3d5ad7bdcf3341c57436f9485b3

Former-commit-id: 09accb6fc3 [formerly fd0bb35109] [formerly ab2488b2db] [formerly 09accb6fc3 [formerly fd0bb35109] [formerly ab2488b2db] [formerly 975a088945 [formerly ab2488b2db [formerly b80a3b8d1c90b7fb8720171f16529edc81bc30a8]]]]
Former-commit-id: 975a088945
Former-commit-id: d6ecf7a63e [formerly 4ad01be9e1] [formerly 7aa4e12f54f97b61e748a6950c8f532ae66df86b [formerly 72b4b07fb4]]
Former-commit-id: b349a8b7b2c176b8c81674fd46397ac4634bb4c9 [formerly e06b46c765]
Former-commit-id: 3081ab6276
2014-04-16 17:07:49 -05:00
Nate Jensen
98f191b630 Merge "Issue #3037 - Add dispose check in runAsync call." into development
Former-commit-id: 89bb03eb12 [formerly 5ea27f270f] [formerly 8ad4b26151] [formerly 89bb03eb12 [formerly 5ea27f270f] [formerly 8ad4b26151] [formerly 70d132c59a [formerly 8ad4b26151 [formerly b44bb9043a002e0749f6bcda41158a56d047c5af]]]]
Former-commit-id: 70d132c59a
Former-commit-id: b225b05ab1 [formerly 65ee834371] [formerly 0b25ff12454689632fcd64e7d50c32163364f247 [formerly 82267f8b0b]]
Former-commit-id: aed94cf9824e53a53e67b8415efa16194177d250 [formerly 2438a08648]
Former-commit-id: 33b397e461
2014-04-16 16:31:18 -05:00
Nate Jensen
3452824abd Merge "Issue #3020 fixed error message when attempting to create already accessible room" into development
Former-commit-id: b8403476ee [formerly 27c9ee561e] [formerly f313f2f20c] [formerly b8403476ee [formerly 27c9ee561e] [formerly f313f2f20c] [formerly 2ea1878403 [formerly f313f2f20c [formerly fc8880c642201685feefbf3eb14cb4f1a7c962b1]]]]
Former-commit-id: 2ea1878403
Former-commit-id: 026bdba6d5 [formerly ecf9a4e671] [formerly 84856846656ce3174e03d59de632d5d282fc7ab1 [formerly 05e1aa10a8]]
Former-commit-id: b758e7658d2660ebcd1b56623a62569d97d72280 [formerly 2f348d60e6]
Former-commit-id: 77208c0507
2014-04-16 16:30:46 -05:00
Nate Jensen
bab3e19a22 Merge "Issue #3021 increased width of create session dialog to fit error msg" into development
Former-commit-id: 23fdfcf11f [formerly 109051a061] [formerly d96b75ca13] [formerly 23fdfcf11f [formerly 109051a061] [formerly d96b75ca13] [formerly 52b9060f7a [formerly d96b75ca13 [formerly e59d579fc51125b7805c22dfea26b31f17d1be97]]]]
Former-commit-id: 52b9060f7a
Former-commit-id: f1152bca2f [formerly d29f4091ca] [formerly 2f1f0573a1ee55e7a82ce91d3141d8f88fd2a4b9 [formerly 78a240fded]]
Former-commit-id: e3bc062e8999f2b1876cee2ea5798b2b195c9aab [formerly ff1df44da0]
Former-commit-id: 4cfdfae410
2014-04-16 16:30:39 -05:00
Nate Jensen
0382243dfe Issue #3039 fix ifpImage class cast exception
Former-commit-id: 68d61fe16b [formerly a5edace073] [formerly 2b6db445c0] [formerly 68d61fe16b [formerly a5edace073] [formerly 2b6db445c0] [formerly 31fb61e824 [formerly 2b6db445c0 [formerly a2fd849c603aebacce09662557bf1f008d379982]]]]
Former-commit-id: 31fb61e824
Former-commit-id: 17544a32ba [formerly 19f0be6afc] [formerly ab6962b9080189e0cbac802398d99762ae5982e2 [formerly a1dd7f24fa]]
Former-commit-id: 59458bd25850cd5eb277eabb12c6fc5b515b5cb1 [formerly 7e7bbfd784]
Former-commit-id: 64e7ac4225
2014-04-16 16:17:05 -05:00
Lee Venable
01c77f464c Issue #3037 - Add dispose check in runAsync call.
Change-Id: I13c7475f8c56f677f3dbdfab8d6000061db86f9f

Former-commit-id: 680f607c18 [formerly 6b0468f07e] [formerly 33fc376f33] [formerly 680f607c18 [formerly 6b0468f07e] [formerly 33fc376f33] [formerly 7386d4b318 [formerly 33fc376f33 [formerly c511ef6d5566f0e1d9ae3d5ea886abbf1159d41a]]]]
Former-commit-id: 7386d4b318
Former-commit-id: acd88d1d38 [formerly cc6380ba33] [formerly 414f3accd00b50fb116af44bd4097d3b89b5cb69 [formerly 98e9912a94]]
Former-commit-id: 9dd0222d16453b8a576d06adb41fb3abe19a8169 [formerly b47e0f7e87]
Former-commit-id: ea2db1a45d
2014-04-16 15:40:46 -05:00
Richard Peter
9fad9c06db Merge "Issue #2947 Redo satellite derived parameters to use an inventory to determine availability." into development
Former-commit-id: 825757e217 [formerly 0b82df7ad0] [formerly 852cb3cd46] [formerly 825757e217 [formerly 0b82df7ad0] [formerly 852cb3cd46] [formerly 8c190bd158 [formerly 852cb3cd46 [formerly 326b9ef83021ce71f715b6f352401dd936e992c7]]]]
Former-commit-id: 8c190bd158
Former-commit-id: d6359fa404 [formerly bed7035a67] [formerly 7f1e29571c0c37d84320ad1a27dfc62471139ce5 [formerly f8c75819bb]]
Former-commit-id: ee299c9b3060dd33427153a633a36284fe5fd6ee [formerly f6ec3782b6]
Former-commit-id: 56ee6e0240
2014-04-16 15:11:07 -05:00
Ben Steffensmeier
f1d28d027f Issue #2947 Redo satellite derived parameters to use an inventory to determine availability.
Former-commit-id: 2d8106bc5b [formerly bb51fb299a] [formerly 709e3411c4] [formerly 2d8106bc5b [formerly bb51fb299a] [formerly 709e3411c4] [formerly a8bb2c0dfd [formerly 709e3411c4 [formerly 1a041cb3be1141f4af116335e5b9540beda817cb]]]]
Former-commit-id: a8bb2c0dfd
Former-commit-id: 858deeaef5 [formerly a51b965c4f] [formerly 4a7f1c2296d79b72f15c1dafa088a798fe5a813e [formerly 119ced4a01]]
Former-commit-id: fc1291a1e39fed83821a2edd5ba3bf44aa962f2a [formerly cc6d858f47]
Former-commit-id: 3c1adead47
2014-04-16 14:54:59 -05:00
Brian Clements
cdd2dc4286 Issue #3021 increased width of create session dialog to fit error msg
Former-commit-id: 78c1b34cdf [formerly ef791fe481] [formerly 1112ca621e] [formerly 78c1b34cdf [formerly ef791fe481] [formerly 1112ca621e] [formerly bb915796ad [formerly 1112ca621e [formerly f0bcc20987d814a716994f712c6132bb79963457]]]]
Former-commit-id: bb915796ad
Former-commit-id: b8f40429ec [formerly 549941882e] [formerly fd6c03748bfb24190c526a992357f258a7c91630 [formerly 5c46c768d2]]
Former-commit-id: df9e17c1cd4d0111d5fb577725292b44c1b93fd4 [formerly f674aa07d7]
Former-commit-id: 9a8c3231c6
2014-04-16 14:33:02 -05:00
Brian Clements
40f77bde75 Issue #3020 fixed error message when attempting to create already accessible room
Former-commit-id: 0c203cfd07 [formerly 57d2f28d54] [formerly bfafb0d055] [formerly 0c203cfd07 [formerly 57d2f28d54] [formerly bfafb0d055] [formerly 4a8ee65cca [formerly bfafb0d055 [formerly 738e4cb06a549e6067274af033cc7ba725b1a8e2]]]]
Former-commit-id: 4a8ee65cca
Former-commit-id: 89741a1e62 [formerly 4829ef25bc] [formerly 58b38675284b585270d0e5118c40f102fbfd1852 [formerly 8861489810]]
Former-commit-id: e066a19d168bc05248c62b6e2648254969595cfd [formerly 63b9349843]
Former-commit-id: 0b7e067d96
2014-04-16 14:26:17 -05:00
Lee Venable
3f3a5c1241 Issue #3034 - added widget dispose checks in runAsync methods.
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e

Former-commit-id: 27b5524848 [formerly f4fb7b24f6] [formerly 7f068f164c] [formerly 27b5524848 [formerly f4fb7b24f6] [formerly 7f068f164c] [formerly ff3b42468f [formerly 7f068f164c [formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0]]]]
Former-commit-id: ff3b42468f
Former-commit-id: 8380646a7a [formerly 885e17788d] [formerly aa35106e2bcb598175d4b13f4c68868a8f657f1d [formerly 4cdbf301f3]]
Former-commit-id: 65faea903b549640ea3eabe710a072be16df26cd [formerly 31c8e61cb6]
Former-commit-id: 9b085066c0
2014-04-16 13:15:31 -05:00
Brian Clements
572b7c221a Issue #2981 fixed NPE when cached shared group deleted on server
Former-commit-id: 9473f1f799 [formerly 8a4f212fdb] [formerly 7afb1e66f5] [formerly 9473f1f799 [formerly 8a4f212fdb] [formerly 7afb1e66f5] [formerly 7fd7817af4 [formerly 7afb1e66f5 [formerly 8ee453e3f5256d3ffed255aaebc792155001bc8e]]]]
Former-commit-id: 7fd7817af4
Former-commit-id: 3a6bb9f43c [formerly 1daf03844c] [formerly bd2ff121fc86675239805e4cf8a2decb18f093b2 [formerly 007ba2ae4d]]
Former-commit-id: ee4a3f153aa82d79e70068a61b4aa1d9c0a99965 [formerly 14084ee128]
Former-commit-id: 4979fe13df
2014-04-16 09:23:26 -05:00
Nate Jensen
8695c7b8d1 Merge "Issue #2956 safety checks for GLShadedShapeBase" into development
Former-commit-id: 0b85a99337 [formerly 2fba1f36ef] [formerly 80434db98d] [formerly 0b85a99337 [formerly 2fba1f36ef] [formerly 80434db98d] [formerly 120d8429a7 [formerly 80434db98d [formerly 85aa7d53fdbbad696aa86e4fc992ff6288d199e3]]]]
Former-commit-id: 120d8429a7
Former-commit-id: 76f191192c [formerly 2e23ae75f4] [formerly ba3109c60afbaff247b963019ac0ea3cfd8248fb [formerly 62613ab33d]]
Former-commit-id: 4d4b944a581d2f1a4a6e54dea1d40dd9e991378e [formerly 2f2d965833]
Former-commit-id: 0e6fdab306
2014-04-16 08:41:43 -05:00
Nate Jensen
5d1e9f013a Merge "Issue #2822 only allow transfer leader if participant is using shared display" into development
Former-commit-id: 9dc2c1187c [formerly c723ec0bda] [formerly 771885f9a5] [formerly 9dc2c1187c [formerly c723ec0bda] [formerly 771885f9a5] [formerly c16bbb52e4 [formerly 771885f9a5 [formerly fb0c92951904565dbde6763cad15c6925265ccb2]]]]
Former-commit-id: c16bbb52e4
Former-commit-id: dc74920834 [formerly 79c3f5f3a8] [formerly 337b6a7e826170373ae4e133ca9ba41486c415c1 [formerly 550577806f]]
Former-commit-id: 8a9148b9de0b31de30312b69e0295eb4264e42de [formerly 267258647e]
Former-commit-id: baafe7f7da
2014-04-15 17:55:21 -05:00
Nate Jensen
a91ae99a19 Issue #2956 safety checks for GLShadedShapeBase
Change-Id: I7ec226af0de46ee3c7dffc34e82da9cf6846e451

Former-commit-id: 796efabc3b [formerly 66f4ce250a] [formerly 726c122dc7] [formerly 796efabc3b [formerly 66f4ce250a] [formerly 726c122dc7] [formerly 8b93dffb4f [formerly 726c122dc7 [formerly 1249c06521c5575960605176dcd46b77cbe1a1bc]]]]
Former-commit-id: 8b93dffb4f
Former-commit-id: e1b9c91df1 [formerly 2cf5941fe1] [formerly da7df5c1cb8add048021783ebafe66b2d4afe16b [formerly 56f645bbc7]]
Former-commit-id: a887e41953c30e6eb7aa46832fa3c060d21c5ddc [formerly 77cf2d682f]
Former-commit-id: c9a79bc2d5
2014-04-15 17:38:17 -05:00
Lee Venable
c846ae51fd Merge "Issue #3031 - Added dispose check in the runAsync calls." into development
Former-commit-id: 30c5233ae4 [formerly 14f0dc298e] [formerly cde3cdeed1] [formerly 30c5233ae4 [formerly 14f0dc298e] [formerly cde3cdeed1] [formerly 2a93e03117 [formerly cde3cdeed1 [formerly 05afe0e610860eca39453ddf12180466b48e43ea]]]]
Former-commit-id: 2a93e03117
Former-commit-id: 1c0b3bf7f7 [formerly a34e169792] [formerly 78f80c2eced18a183f677dcd92efee78aa09ec9c [formerly c9c845d5f2]]
Former-commit-id: 72a708eb716d8c1a86179fea9352c1c001b3261d [formerly 195a4dacfa]
Former-commit-id: 4d0bead6bd
2014-04-15 17:37:13 -05:00
Ron Anderson
861aaf0dfa Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b

Former-commit-id: d2b4d70702 [formerly 2a68e875a5] [formerly 6e0147169f] [formerly d2b4d70702 [formerly 2a68e875a5] [formerly 6e0147169f] [formerly 9f085a0856 [formerly 6e0147169f [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]]]
Former-commit-id: 9f085a0856
Former-commit-id: c263058e63 [formerly a6fa60f40d] [formerly 4b1dcfa5f1e94d0867e4b137f8e3643f96ecc196 [formerly 4622ad9b8a]]
Former-commit-id: c311f1a789e254f3b8d8c63514a373eb8b409c06 [formerly 56a1b8b682]
Former-commit-id: 072102dff0
2014-04-15 17:22:12 -05:00
Everett Kladstrup
7835bf98c7 Issue #2725 Move viirs derivparam python package to common_static
Former-commit-id: bc40caa959 [formerly 08dfcd9bd9] [formerly 5dbedee47a] [formerly bc40caa959 [formerly 08dfcd9bd9] [formerly 5dbedee47a] [formerly 200f8f461d [formerly 5dbedee47a [formerly e89895b8448e3eeb70f2850f84773e8345114c38]]]]
Former-commit-id: 200f8f461d
Former-commit-id: 2456ee3a86 [formerly 158e1fd086] [formerly 1eb42c2f057f83a9554ddd2f1f5814896fb645b5 [formerly fd2ddd24a7]]
Former-commit-id: bfa7660df47762c13223973354091f1711aa46e8 [formerly 6a2a88f75f]
Former-commit-id: 2470d81179
2014-04-15 16:53:07 -05:00
Lee Venable
fc2b4b81fa Issue #3031 - Added dispose check in the runAsync calls.
Change-Id: I7996f58995aa261a1a66acc755768c3489130d43

Former-commit-id: cdc1edef6b [formerly 39b9d94dc1] [formerly d4aafc69d9] [formerly cdc1edef6b [formerly 39b9d94dc1] [formerly d4aafc69d9] [formerly 2122b79416 [formerly d4aafc69d9 [formerly 72f2908000301dd025a2c801b1ab129460d8cdf9]]]]
Former-commit-id: 2122b79416
Former-commit-id: 9e662e2a21 [formerly e30c910657] [formerly 171f7d971779860672bb25dbda78f2ce0c6f989b [formerly c3f4bccbf9]]
Former-commit-id: a806a228ced048123098a238f08e3fc72641e725 [formerly ee78554540]
Former-commit-id: f51d2bf46d
2014-04-15 16:49:42 -05:00
Everett Kladstrup
7e7c1a8263 Issue #2725 Fix localization type for DerivParamLocalizationAdapter
Former-commit-id: 9f3f3f2b69 [formerly 4f1c7281d3] [formerly 27885c8296] [formerly 9f3f3f2b69 [formerly 4f1c7281d3] [formerly 27885c8296] [formerly 54db6ad9af [formerly 27885c8296 [formerly d9bd028d94f802e346a5396e9ae84a13b00691e3]]]]
Former-commit-id: 54db6ad9af
Former-commit-id: 133dff106f [formerly c2dfdf8cae] [formerly 5eaecc4538d5563c1f6b15d1ab3f3819ede97fdb [formerly ca7b672b52]]
Former-commit-id: 1f6d5efe6b8e28eb631f3e66355fbe46e41ec94c [formerly 6b1d0e6aa2]
Former-commit-id: 241387ba19
2014-04-15 15:18:09 -05:00
Brian Clements
2a8d66a9f7 Issue #2822 only allow transfer leader if participant is using shared display
Former-commit-id: dc1d2d39f8 [formerly db67c03382] [formerly 5250f7a442] [formerly dc1d2d39f8 [formerly db67c03382] [formerly 5250f7a442] [formerly 6ccedc1182 [formerly 5250f7a442 [formerly af9577548e40397c67f72eb60485ee8de48f169b]]]]
Former-commit-id: 6ccedc1182
Former-commit-id: 602794b56d [formerly 6f9ef9a515] [formerly fffe96d7c192b1e0ed78a1625828ff61c7efe072 [formerly e8907aa729]]
Former-commit-id: 05d59da434ed10fbd0f9d1601a73552672294e6c [formerly 9acb5a4a5b]
Former-commit-id: 8945b26e9b
2014-04-15 15:15:11 -05:00
Brian Clements
19d7cef419 Issue #2903 made xmpp reconnect an explicit action by user
moved non-session classes out of session package
connection classes moved to connection package
made separate classes for connection listeners
removed password from heap
login dialog remembers last server used
added reconnect handler to prompt user to re-login after disconnect


Former-commit-id: 3d8bcb8701 [formerly 6f7851d8c4] [formerly 8ab1bab974] [formerly 3d8bcb8701 [formerly 6f7851d8c4] [formerly 8ab1bab974] [formerly 6b22374046 [formerly 8ab1bab974 [formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]]]
Former-commit-id: 6b22374046
Former-commit-id: 5b5669e1e1 [formerly ca5909e222] [formerly 3329c6cc7af41bc830f1a278385881ed9ff2d11c [formerly 7cf5f06f2a]]
Former-commit-id: 54da4997513795ce82cf53a0964eb73eee1095d9 [formerly 054b47951d]
Former-commit-id: 86081dda91
2014-04-15 15:12:33 -05:00
Mike Duff
a2316806a5 Issue #2785 - Fix loading of groups in sub request dialog
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722

Former-commit-id: c70da23f91 [formerly 3a6e718ff0] [formerly 81e4c9b05d] [formerly c70da23f91 [formerly 3a6e718ff0] [formerly 81e4c9b05d] [formerly d2a80ca966 [formerly 81e4c9b05d [formerly e72a852935dcb519604b37dc873645d4b419ee43]]]]
Former-commit-id: d2a80ca966
Former-commit-id: dceb75c423 [formerly 0bf14203ff] [formerly 97976d43b384551d73f379695ead9b9d54c82cb5 [formerly 4773c3722c]]
Former-commit-id: 8b2b23ba29774d082ea5cf0ea4bc20efdf754a73 [formerly ddeb7fe4d2]
Former-commit-id: 78a0ad33ef
2014-04-15 10:10:18 -05:00
Nate Jensen
148a31d3ad Issue #2984 remove unnecessary plugins from features
remove unnecessary uengine dependencies from manifests

Change-Id: Ic76eb5faa4b14cb4ea133ab74532bacd1a05c23d

Former-commit-id: c0df96e085 [formerly e24940ead6] [formerly 6e2d68e102] [formerly c0df96e085 [formerly e24940ead6] [formerly 6e2d68e102] [formerly 57f2357f10 [formerly 6e2d68e102 [formerly c59a5d99ce31464bacd7c266543f10f523719a07]]]]
Former-commit-id: 57f2357f10
Former-commit-id: dacc1d5996 [formerly 97f09968b3] [formerly dad31d1699bb36bcaccd3d7e306c1af3e1f8b973 [formerly d435258fce]]
Former-commit-id: 08b4ba0f6890ecc9a2f8f524712a671b0d736980 [formerly 9ad8236b8d]
Former-commit-id: 697a7f5b9b
2014-04-14 16:50:54 -05:00
Nate Jensen
c1ac719aa5 Merge "Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe plugin" into development
Former-commit-id: 7c58c1262a [formerly d741f996c6] [formerly c71205eb89] [formerly 7c58c1262a [formerly d741f996c6] [formerly c71205eb89] [formerly 111b7f4283 [formerly c71205eb89 [formerly bdc1863a9413301bb78c6e0ffdd630b62c48d627]]]]
Former-commit-id: 111b7f4283
Former-commit-id: b9be7343bf [formerly 9593960e9f] [formerly c249e01da13dd43a2a49740d644cfa02fc5f32ca [formerly 9917a8ef62]]
Former-commit-id: 47cef9e0d35252c6982470f4960c5885684930bf [formerly 37a6c292f7]
Former-commit-id: 9972baa000
2014-04-14 15:46:14 -05:00
Ron Anderson
96817b5c1f Merge changes Ic5c0dcaa,Iae10909e into development
* changes:
  Issue #2947 Switch derived parameter space amtching to use IGridGeometryProvider.
  Issue #2947 Make GridCoverage implement IGridGeometryProvider.


Former-commit-id: 6063cdd984 [formerly d5ebb5a800] [formerly 46d5349940] [formerly 6063cdd984 [formerly d5ebb5a800] [formerly 46d5349940] [formerly fd79bd354b [formerly 46d5349940 [formerly 79a18e9077167087a9a3dce952f71a0c7e021e23]]]]
Former-commit-id: fd79bd354b
Former-commit-id: 9b2cd2d486 [formerly d2346699bb] [formerly 5456b75aa7d4a323625c887f487c61c54177d524 [formerly 5ab1b1b95c]]
Former-commit-id: 9e2c16b8d6d9d09c2266c603212fe89f59dd606d [formerly c7e1797dd4]
Former-commit-id: 07e6998fc6
2014-04-14 14:45:03 -05:00
Nate Jensen
805ff08819 Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe
plugin

Change-Id: I8fcd61af003366405b4b40661bb7e471bf03c64a

Former-commit-id: 33fb2c2e0d [formerly 40d1fda798] [formerly f086bb0c9b] [formerly 33fb2c2e0d [formerly 40d1fda798] [formerly f086bb0c9b] [formerly ceec3d48f0 [formerly f086bb0c9b [formerly e2feed87185e15d9e681ca0155b03d1d9ff29e25]]]]
Former-commit-id: ceec3d48f0
Former-commit-id: 134f34c4df [formerly dfe50ee038] [formerly d97211d5385681fec6abca63498e85889f803dd8 [formerly 715932091e]]
Former-commit-id: 3e07e40b8dcad3da2eb07fe1e1fd1960476568c1 [formerly 1e5433c9c3]
Former-commit-id: c8c25d9224
2014-04-14 14:28:11 -05:00
Lee Venable
ecef71ec21 Merge "Issue #2892 - Fix problems loading saved configs for data browser dialog." into development
Former-commit-id: 09afdba1fe [formerly 1a3738c8fd] [formerly f6601d6bcc] [formerly 09afdba1fe [formerly 1a3738c8fd] [formerly f6601d6bcc] [formerly d4a6ce546d [formerly f6601d6bcc [formerly 96361fa3cd86627ef633c5421a2434c930c3b85c]]]]
Former-commit-id: d4a6ce546d
Former-commit-id: 70cc279e37 [formerly bf4f3c75ef] [formerly 3f0a4ef9f6a2a757d0bd3de95cef502c549c0dff [formerly caf31402d7]]
Former-commit-id: 525e3c272c666f8be3dfe17b0a157dadb7e8b835 [formerly de242e3e91]
Former-commit-id: 4978a231eb
2014-04-14 14:09:03 -05:00
Richard Peter
ab5a8be1d1 Merge "Issue #2862 Implements locks on case creation." into development
Former-commit-id: 50624b548a [formerly 22a01edbb7] [formerly 19755418f8] [formerly 50624b548a [formerly 22a01edbb7] [formerly 19755418f8] [formerly 181ffee3db [formerly 19755418f8 [formerly e2c246299716bc2eba90a16c2c69cf1e0a9a6913]]]]
Former-commit-id: 181ffee3db
Former-commit-id: 4aad8cf61c [formerly c4853e7982] [formerly 94d21459e635974814c625195c69afdafdc4a867 [formerly 0abb97820b]]
Former-commit-id: 826901d8bde3b9fb74b3e68a86ac9a9431a4cb34 [formerly 48c8415382]
Former-commit-id: 6ef84cf3c4
2014-04-14 13:28:26 -05:00
Richard Peter
5350b3eac8 Issue #2726: Edex graceful shutdown.
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]]
Former-commit-id: 17196b5dcd
Former-commit-id: b5fa843960 [formerly ff87317bd4] [formerly f202d7fc11f48792bac7d10cbb20d9ba9077aa8f [formerly 8b279966d1]]
Former-commit-id: b1349363c5b25965107de3827211c7bcc6b9e98b [formerly b3fd8e5480]
Former-commit-id: de624d87d3
2014-04-14 13:10:11 -05:00