Commit graph

3264 commits

Author SHA1 Message Date
Nate Jensen
96a50b7460 Merge "Issue #2903 added connection tests to session close methods" into development
Former-commit-id: a24262b3a9 [formerly c88597b6c2] [formerly 9ec6169646] [formerly a24262b3a9 [formerly c88597b6c2] [formerly 9ec6169646] [formerly 4a04662972 [formerly 9ec6169646 [formerly 81b95799744bd155cc0df1147bb8a5372ea2fee4]]]]
Former-commit-id: 4a04662972
Former-commit-id: 439e345f98 [formerly d60701a264] [formerly efae253c5ad86a47ac5d792c2c5124876253603d [formerly e9456b4ab7]]
Former-commit-id: e57876d32e52b9a0f6aaf566c21bbf1ec20b15c6 [formerly 455f4385aa]
Former-commit-id: f4cefbc459
2014-04-22 12:53:08 -05:00
Nate Jensen
c93aa94cde Merge "Issue #3056 made venue participant equals method case insensitive" into development
Former-commit-id: bf06389b9e [formerly cc1da5fb88] [formerly fe3ff669a7] [formerly bf06389b9e [formerly cc1da5fb88] [formerly fe3ff669a7] [formerly 8df505325c [formerly fe3ff669a7 [formerly d6f1435a902615724aed2ff0279a6deb29933ce1]]]]
Former-commit-id: 8df505325c
Former-commit-id: 9ca82ebdd7 [formerly 484b197a56] [formerly 58158f2fd8ff32145cf4fa8dd05d47988bbcbd10 [formerly be6818e96b]]
Former-commit-id: 5eea4c11b89c95940f50903c81294fd99a1657b7 [formerly ad96f9d128]
Former-commit-id: 2b71b60b2e
2014-04-22 12:50:27 -05:00
Nate Jensen
3f35f90072 Merge "Issue #3038 added initialized flag to session feed view" into development
Former-commit-id: a9f0d3f6ee [formerly 963a848f90] [formerly 42d0d7681d] [formerly a9f0d3f6ee [formerly 963a848f90] [formerly 42d0d7681d] [formerly fc2be9521a [formerly 42d0d7681d [formerly a7f36cd46b29887c3210f45e83f83fd24f52b314]]]]
Former-commit-id: fc2be9521a
Former-commit-id: 7434d299fa [formerly 7f777e6fb9] [formerly 4cf54574a3262851c041d42381722c70bb079ea0 [formerly ca8eab399f]]
Former-commit-id: 0f8a1a8db148068df138f332d41e084cfb501fd9 [formerly 5f35eedfb1]
Former-commit-id: a3036cee45
2014-04-22 12:49:02 -05:00
Brian Clements
797a972930 Issue #2903 added connection tests to session close methods
fixes illegal state exception problem when booted from xmpp server


Former-commit-id: 053136ccbb [formerly f9ab4f9cfe] [formerly 50f3f420eb] [formerly 053136ccbb [formerly f9ab4f9cfe] [formerly 50f3f420eb] [formerly 49f86e4153 [formerly 50f3f420eb [formerly d570c81caed35576e867df15c2a8d900135fef5f]]]]
Former-commit-id: 49f86e4153
Former-commit-id: 15279b35c9 [formerly 9ef018dbe8] [formerly 6540ea31c93aa2adc8f9e805932f31f84eb11dec [formerly c9453a2440]]
Former-commit-id: ed03eb93f51618d2292a99e0f95dfd295b769184 [formerly 9ea5430774]
Former-commit-id: d2b2106f4c
2014-04-22 12:36:40 -05:00
Nate Jensen
7dd0078ead Issue #2984 remove unnecessary dependencies
Change-Id: I2066a1e903680068e0d25f7faa99bc7bda2b8877

Former-commit-id: 3e583eaa7a [formerly 48d4759371] [formerly d03afcdcba] [formerly 3e583eaa7a [formerly 48d4759371] [formerly d03afcdcba] [formerly be21c41512 [formerly d03afcdcba [formerly 290ec544e38e71332be2072435aff3b933c649ab]]]]
Former-commit-id: be21c41512
Former-commit-id: 6f504176ea [formerly 8eb74232df] [formerly d216f1bdf02ec5de7389774511663158b90f5596 [formerly 8f893545f1]]
Former-commit-id: 1dbd3633b825494ce55c96762634c824acff5866 [formerly 57e5bbfe84]
Former-commit-id: 75cc9ecbfc
2014-04-22 12:03:44 -05:00
Brian Clements
e750a1e5a5 Issue #3056 made venue participant equals method case insensitive
needed since collaboration server lower cases room names
lower cased on creation so in memory matches what is on the server


Former-commit-id: a5730ca7bd [formerly bfd88f3e14] [formerly 1adbf6253a] [formerly a5730ca7bd [formerly bfd88f3e14] [formerly 1adbf6253a] [formerly 2a9d341910 [formerly 1adbf6253a [formerly 7a2423f4a90597706e52ce0f89bacb1a0e10f067]]]]
Former-commit-id: 2a9d341910
Former-commit-id: 38fbf8048e [formerly 19c2695dca] [formerly a85a4bc02f2dd752ca54943517184b9bdbf83b43 [formerly 8677a9f359]]
Former-commit-id: f678746e9629ae3e37e221f399d19883fbdc4848 [formerly 97c5fe6d4a]
Former-commit-id: d74f192819
2014-04-22 11:55:36 -05:00
Nate Jensen
5e88e2e8bf Merge "Issue #2060 dropping grid dataURI column" into development
Former-commit-id: 17945fcbef [formerly 96268f1d35] [formerly c161a2ba50] [formerly 17945fcbef [formerly 96268f1d35] [formerly c161a2ba50] [formerly ffaa7d8f58 [formerly c161a2ba50 [formerly d9876133fcb3975c8c7e58ff2ee75ca90dc8a0dd]]]]
Former-commit-id: ffaa7d8f58
Former-commit-id: a0095992e1 [formerly c65e827d4e] [formerly 19c714125fe5658e7f57714616e9191ebd8cfaa0 [formerly 0b25aebbb1]]
Former-commit-id: f79a4e9f19839ad7d8324397c8db1297a5552799 [formerly 8a7e16be50]
Former-commit-id: f93a81d2f6
2014-04-22 10:42:11 -05:00
Brian Clements
95e4effdc3 Issue #3038 added initialized flag to session feed view
differentiates between roster population and new joins


Former-commit-id: 1665175d35 [formerly cdf3aa90e9] [formerly 717cdf4280] [formerly 1665175d35 [formerly cdf3aa90e9] [formerly 717cdf4280] [formerly ef61a7c281 [formerly 717cdf4280 [formerly 9b6c20ac39765120efc523c03a3d11d4b21c1748]]]]
Former-commit-id: ef61a7c281
Former-commit-id: 001e0b030b [formerly e7005953eb] [formerly 80e474ab1d11f23309bd83f864334950b90dc4ac [formerly 295ff106b6]]
Former-commit-id: 2047ae5bb2050dbdf619f1a51871a47a0ff3718e [formerly fb24e315bf]
Former-commit-id: fb74637aa8
2014-04-22 10:01:27 -05:00
Ron Anderson
260706f1cc Merge "Issue #2998 Fix regression made in earlier check in." into development
Former-commit-id: b9f41e3108 [formerly 447ff809a3] [formerly 8026973c95] [formerly b9f41e3108 [formerly 447ff809a3] [formerly 8026973c95] [formerly a6b5997663 [formerly 8026973c95 [formerly 2a78a1d70ab05322a8a69f96865cb3eba0fa6397]]]]
Former-commit-id: a6b5997663
Former-commit-id: 2afa2d0cda [formerly b389398c95] [formerly 406a14e47fd69c8d2b25bdc3aab2841b0b42ace9 [formerly 5f8ac71e11]]
Former-commit-id: b87085fbb9f53a32bb6e8fedbe6a3f5febe509d8 [formerly 04e617706c]
Former-commit-id: abfc0c3ba3
2014-04-21 17:55:22 -05:00
Nate Jensen
43bb667c30 Issue #2060 dropping grid dataURI column
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e

Former-commit-id: 03451ab6b2 [formerly 263611f905] [formerly a37a2afe18] [formerly 03451ab6b2 [formerly 263611f905] [formerly a37a2afe18] [formerly 5dfb652775 [formerly a37a2afe18 [formerly 1aab87d9572089a09351ebdfb8fbcef884866feb]]]]
Former-commit-id: 5dfb652775
Former-commit-id: c4819a4e95 [formerly 3eddbf452d] [formerly 6295d04b083ae6cd109f1c2f595fb1922420e2a1 [formerly cdb932cc4d]]
Former-commit-id: c56097498f5f6539bb58e0c60cabc43139bd2578 [formerly 9ef0154104]
Former-commit-id: 403f4c3195
2014-04-21 17:34:39 -05:00
Ron Anderson
db4b6b617d Issue #2998 Fix regression made in earlier check in.
Change-Id: Ic7c915fef09b3398e2946d8e7688e5d2997acc71

Former-commit-id: 5570193f21 [formerly 2a819003c5] [formerly ed99abbb9d] [formerly 5570193f21 [formerly 2a819003c5] [formerly ed99abbb9d] [formerly 04467d51dd [formerly ed99abbb9d [formerly 8c48d369b3b6af0222b541ccfa9230495d4cb0f9]]]]
Former-commit-id: 04467d51dd
Former-commit-id: b1b0dcf75f [formerly 243c929fc1] [formerly f335a0dab919cc88d957bc2df62452c5a76437b7 [formerly 04a7c2d8cd]]
Former-commit-id: be57c5312eedc7a4f6cc05fa42e91b7ae1557417 [formerly d6990dd0b8]
Former-commit-id: 62056f6eff
2014-04-21 17:26:29 -05:00
Nate Jensen
db8d725d94 Merge "Issue #2997 Fix Geostationary projection to work with GeoTools 10.5" into development
Former-commit-id: f0cdb9e8ad [formerly 1651a79187] [formerly 1a617796cb] [formerly f0cdb9e8ad [formerly 1651a79187] [formerly 1a617796cb] [formerly ec82e51d28 [formerly 1a617796cb [formerly 1fde0217948dad64221d0348f9e45a8e1430cdd7]]]]
Former-commit-id: ec82e51d28
Former-commit-id: 9c7e88211f [formerly efc5dba997] [formerly 31f7dac3240712ec81e5f3265ec55796ae1240a7 [formerly 0d7ae042d5]]
Former-commit-id: 760d2635f49f93fd0789ed0173bf4a285deaa866 [formerly 2cf79494bc]
Former-commit-id: 0972f4e3f1
2014-04-21 17:08:17 -05:00
Nate Jensen
a444f97aa8 Merge "Issue #2822 fixed check for topic subscription before leader transfer" into development
Former-commit-id: 7530137f38 [formerly 535a5f836d] [formerly e401fca661] [formerly 7530137f38 [formerly 535a5f836d] [formerly e401fca661] [formerly cb7d485004 [formerly e401fca661 [formerly 74946a00033737aae24aabbfc333d661598cd6f2]]]]
Former-commit-id: cb7d485004
Former-commit-id: 9e6ca096e7 [formerly f75fc8da0c] [formerly 1f516d923aaa0e50bc15f2399e7e29a856f577ad [formerly 87457f26fc]]
Former-commit-id: 853ff7a10f00c036adc59be94d00d1aa55d96597 [formerly 252fb2a3a7]
Former-commit-id: f685ade735
2014-04-21 15:13:53 -05:00
Ron Anderson
ec78a52086 Issue #2997 Fix Geostationary projection to work with GeoTools 10.5
Change-Id: Id9f3dc3af07548039509e4121cafd2e02a01453c

Former-commit-id: 0097799e2c [formerly 8aac4d32b1] [formerly 665246d72e] [formerly 0097799e2c [formerly 8aac4d32b1] [formerly 665246d72e] [formerly c4a0a4ef6e [formerly 665246d72e [formerly 2b67417e6128e3cd4cafa5c8f2ac23c10be2b300]]]]
Former-commit-id: c4a0a4ef6e
Former-commit-id: d851b549ef [formerly b5dc730fea] [formerly 9ccb16c1887bb7f23193c421183a85e48e5cb136 [formerly e515f42b94]]
Former-commit-id: 1fe57e954c23ec9694d882a83316be137c064cd2 [formerly d728020a70]
Former-commit-id: 0cbbc279f0
2014-04-21 14:25:53 -05:00
Lee Venable
69a239a78a Issue #3041 - added dispose check to runAsync call and cleaned up code.
Change-Id: I50e6ce1a214a884221fbc256a133e57e579862da

Former-commit-id: ed407b11c6 [formerly ac914e72e7] [formerly 3c45a24efb] [formerly ed407b11c6 [formerly ac914e72e7] [formerly 3c45a24efb] [formerly dcb7e697e8 [formerly 3c45a24efb [formerly ed2fc05f61861efe6c70b8fc73ad10d27bb73c12]]]]
Former-commit-id: dcb7e697e8
Former-commit-id: e5d73f64ac [formerly 91d37d783c] [formerly dcaad16ef8d601c796b1e22040cf86806d2002cf [formerly 20764b1d97]]
Former-commit-id: af8a618de055822348d6ef19a4bba61729b5bc48 [formerly 294d8ff917]
Former-commit-id: d6e34a221f
2014-04-21 13:47:31 -05:00
Ron Anderson
93600c3a1e Merge "Issue #2998 Fixed null pointer in AttributeViewer. Improved sizing of displayAttributes." into development
Former-commit-id: 0bf7593ccd [formerly efdd37b012] [formerly 750c054ab0] [formerly 0bf7593ccd [formerly efdd37b012] [formerly 750c054ab0] [formerly 5f82bb7cc8 [formerly 750c054ab0 [formerly 3038cbecf8efc76c76cdc86702986069788b6a02]]]]
Former-commit-id: 5f82bb7cc8
Former-commit-id: 2c67fd60b4 [formerly 020045fee3] [formerly 75334e768d73f39e084bb28d84fc8f55e8865a82 [formerly 1df03eb2dc]]
Former-commit-id: daeec98ce7f5f306f31178a1bd10bbeda3706b6c [formerly 83062cb3d5]
Former-commit-id: d52b56aa2a
2014-04-21 13:25:11 -05:00
Brian Clements
d63adaa204 Issue #2822 fixed check for topic subscription before leader transfer
now only checks if the bare ID (no resource) is subscribed to topic
added method to check for same ID using multiple handles


Former-commit-id: 833d693098 [formerly c4a38d1f68] [formerly 6c47c78038] [formerly 833d693098 [formerly c4a38d1f68] [formerly 6c47c78038] [formerly aed25eeb61 [formerly 6c47c78038 [formerly 09d7a1113a6254d8f01cf42d863e9365aac23cc7]]]]
Former-commit-id: aed25eeb61
Former-commit-id: 79c5884e45 [formerly 56e0dad5ff] [formerly 7ac0692b2d053f58ada13699f7e27bac3e23b62c [formerly 474255ed29]]
Former-commit-id: 778db02d4e8fb661b0a05f4714ec15da74898449 [formerly a0871fad9a]
Former-commit-id: 24b594529a
2014-04-21 13:07:14 -05:00
Ron Anderson
73abf67139 Issue #2998 Fixed null pointer in AttributeViewer.
Improved sizing of displayAttributes.

Change-Id: I40b3dc486a713f6ba6ce6f5075ffce1eb6555f93

Former-commit-id: a506479e56 [formerly a3a8a1ebb4] [formerly 811f05f164] [formerly a506479e56 [formerly a3a8a1ebb4] [formerly 811f05f164] [formerly 541a908a41 [formerly 811f05f164 [formerly 0fac12a4f17de189a88e6dd4415f6364afc4f459]]]]
Former-commit-id: 541a908a41
Former-commit-id: 0a9cfdea1a [formerly d4fcdb0851] [formerly 6f390a352c1b816539d9422ef8bd0ec4832c766f [formerly a5cea97c6f]]
Former-commit-id: b753d7d0a61fb837cb7a2de284807b1d9d74b781 [formerly 899785875f]
Former-commit-id: 841a48b86e
2014-04-21 13:03:50 -05:00
Lee Venable
dfcfc497ac Merge "Issue #2891 - Fix refresh of Utilization Graph" into development
Former-commit-id: 13c46b95a7 [formerly b01eac4cc3] [formerly dd7f0a82f9] [formerly 13c46b95a7 [formerly b01eac4cc3] [formerly dd7f0a82f9] [formerly 370ff09548 [formerly dd7f0a82f9 [formerly 194b601d5938ba599abc5dd9e29f0a62a7713cb0]]]]
Former-commit-id: 370ff09548
Former-commit-id: e70c07c29d [formerly a8cb00e2c6] [formerly 82cb64c66e31fa00648fe582e7f00b4040f23e2f [formerly 74df7202b0]]
Former-commit-id: 8024db846de8c386f2beea8ed83b9c525eda8aa7 [formerly 3d17b7eddb]
Former-commit-id: 369246903f
2014-04-21 12:59:00 -05:00
Nate Jensen
25b32bb86b Merge "Issue #2947 Improve support for Satellite combined products." into development
Former-commit-id: a61e0dff2e [formerly 2eba6b705e] [formerly 5c223a8ce3] [formerly a61e0dff2e [formerly 2eba6b705e] [formerly 5c223a8ce3] [formerly 35891b2dcd [formerly 5c223a8ce3 [formerly 4f1ca4c4dfeb84b582bfe7fe8375fb9f619cdd94]]]]
Former-commit-id: 35891b2dcd
Former-commit-id: 355fe1f5f1 [formerly 648df0eead] [formerly 46064df15844f46a8ec4d9674773f826e2cd2908 [formerly 91698d222b]]
Former-commit-id: af461ab3862086e6bd25fa8286bc0ec7fc74a6b8 [formerly 56776a7ee2]
Former-commit-id: 311b6fb729
2014-04-21 12:39:56 -05:00
Dave Hladky
13137a0a9a Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded

Former-commit-id: 7295635379 [formerly 91bd735d47] [formerly 61fc2fea51] [formerly 7295635379 [formerly 91bd735d47] [formerly 61fc2fea51] [formerly 45059e722a [formerly 61fc2fea51 [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]]
Former-commit-id: 45059e722a
Former-commit-id: 883febe498 [formerly 117a3953af] [formerly 28cb7341b151f55976a91b298b2eaf8e4e117a17 [formerly ae84d2991e]]
Former-commit-id: 5061f97fcc5146801882be2758be31c8f5835bed [formerly 6c83fd0929]
Former-commit-id: 4ce5dfcd92
2014-04-21 12:26:47 -05:00
Ben Steffensmeier
3213e65be9 Issue #2947 Improve support for Satellite combined products.
Former-commit-id: 4abdb898f4 [formerly 87adc0e3c5] [formerly 043d9c8b8d] [formerly 4abdb898f4 [formerly 87adc0e3c5] [formerly 043d9c8b8d] [formerly c3cd473158 [formerly 043d9c8b8d [formerly 891422a7d324514d5ee82d3d195e923c27fc58ef]]]]
Former-commit-id: c3cd473158
Former-commit-id: f16fab0d68 [formerly 8b80c6d8fa] [formerly c84842cbdc7ae780b96dc50e92fdeb467f64bad1 [formerly b05e2a22b8]]
Former-commit-id: 8ce6646b67eadab2a871c638fe96530e56b964f4 [formerly d4b73c4531]
Former-commit-id: a531487982
2014-04-21 11:57:01 -05:00
Nate Jensen
c416c971e3 Merge "Issue #2984 remove unnecessary dependencies on edex" into development
Former-commit-id: d566c3cafc [formerly f91c4d1c26] [formerly 327e1ab78b] [formerly d566c3cafc [formerly f91c4d1c26] [formerly 327e1ab78b] [formerly b3aa1392dd [formerly 327e1ab78b [formerly 7de7469b6fa8acc42bf15a60f5096506d1cfc215]]]]
Former-commit-id: b3aa1392dd
Former-commit-id: 69e45bdfbd [formerly e4ed440f5a] [formerly b76bb1108addd41e95f96f1bfde5900bd9eefe27 [formerly 5c81a3b897]]
Former-commit-id: 028eb64477acb9db112a933123aaf78d58aa223a [formerly 6b0b7eefcd]
Former-commit-id: 3236175a84
2014-04-21 11:47:10 -05:00
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