Richard Peter
4a7642c44e
Merge "Issue #2947 Fixes for derived products with multiple records per frame." into development
...
Former-commit-id: 99036341f3
[formerly 026575b202
] [formerly 99036341f3
[formerly 026575b202
] [formerly e10434a727
[formerly 820dfe6db6a1a7abf3c753aebe3d51ead31cd3cc]]]
Former-commit-id: e10434a727
Former-commit-id: 4d2ee42fc9
[formerly b4226666be
]
Former-commit-id: bf8b504942
2014-04-23 17:25:25 -05:00
Ben Steffensmeier
fbb4703fe3
Issue #2947 Fixes for derived products with multiple records per frame.
...
Former-commit-id: c6fc0fd4b1
[formerly c19d52db72
] [formerly c6fc0fd4b1
[formerly c19d52db72
] [formerly 01fc21b6f2
[formerly f47911308acb9d0a90304233da304bdbd0d002e4]]]
Former-commit-id: 01fc21b6f2
Former-commit-id: e3e78283dd
[formerly 0cde4689fa
]
Former-commit-id: bae8296507
2014-04-23 17:14:02 -05:00
Ron Anderson
dd5c3bf2fd
Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour.
...
Fixed Wx parsing for AvnFPS
Change-Id: I34286a7cc46f6116aaa4026d22fd41223cc16f73
Former-commit-id: 2f68fb8f2c
[formerly 221a06e467
] [formerly 2f68fb8f2c
[formerly 221a06e467
] [formerly f3185dd206
[formerly e636563052042d2dbfab6a4e476b71004b28c165]]]
Former-commit-id: f3185dd206
Former-commit-id: 00f2f374cd
[formerly 3e37419dc6
]
Former-commit-id: 78ef1d5c4c
2014-04-23 17:04:16 -05:00
Nate Jensen
61eca0980f
Merge "Issue #2822 shared display invitations always go to cave" into development
...
Former-commit-id: 827112349a
[formerly ad6e4712d6
] [formerly 827112349a
[formerly ad6e4712d6
] [formerly 2b20cf5440
[formerly 2a61b602d55922e5b7f5002f794449880c2cc1a7]]]
Former-commit-id: 2b20cf5440
Former-commit-id: 418741ce55
[formerly a0423843b3
]
Former-commit-id: 1abd65120e
2014-04-23 15:30:44 -05:00
Nate Jensen
ba32067353
Merge "Issue #3060 safety checks for SWT widgets being disposed" into development
...
Former-commit-id: 547bcafdb6
[formerly c193eac6e8
] [formerly 547bcafdb6
[formerly c193eac6e8
] [formerly 1067e4b09c
[formerly 0f33d8dfe65574db7cfbf37f7fc34393707538d3]]]
Former-commit-id: 1067e4b09c
Former-commit-id: a2df4a7ec5
[formerly d1c581aed6
]
Former-commit-id: c1aa647d6d
2014-04-23 14:24:33 -05:00
Brian Clements
8cdeb571f3
Issue #2822 shared display invitations always go to cave
...
if user is logged in to a client that supports shared displays, invites always go there
behaviour unchanged if not logged into a client that supports shared displays
added better resource name than 'Smack' for cave clients
Former-commit-id: 117eeca83a
[formerly f3ee7b453a
] [formerly 117eeca83a
[formerly f3ee7b453a
] [formerly 6969321db0
[formerly 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3]]]
Former-commit-id: 6969321db0
Former-commit-id: 50acaac149
[formerly 5d2ec9b909
]
Former-commit-id: d9a1bba4c8
2014-04-23 14:16:42 -05:00
Lee Venable
711d471f3e
Issue #3053 - updated list selection dialog to be more configurable and fixed subset action.
...
Change-Id: Ib65472679cf5c04f8c11b8fe3fe552058d9e6986
Former-commit-id: 41cd3242f5
[formerly 331dc3397f
] [formerly 41cd3242f5
[formerly 331dc3397f
] [formerly 765d2e80bc
[formerly 4554f647e0f6de78f5ade64e1371fc8d9ba6a65c]]]
Former-commit-id: 765d2e80bc
Former-commit-id: 029de4a1b1
[formerly 26e8c1ecf6
]
Former-commit-id: 906340fb07
2014-04-23 14:07:29 -05:00
Brian.Dyke
2161c569ea
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: 88d44a3129
[formerly 2a4fe3dbae
] [formerly 88d44a3129
[formerly 2a4fe3dbae
] [formerly a7c9ddc05e
[formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: 953236aad8
[formerly 911c0c6c17
]
Former-commit-id: 26cb172a04
2014-04-23 14:05:50 -04:00
Nate Jensen
7c349e268e
Issue #3060 safety checks for SWT widgets being disposed
...
Change-Id: I85c56318452a31122ee7f144e5500d089aa614e2
Former-commit-id: fbecf66f79
[formerly 426f103e7b
] [formerly fbecf66f79
[formerly 426f103e7b
] [formerly 38d493ff1b
[formerly 0c391f8c7f1694c6939419b5fcc4a6a963092ae3]]]
Former-commit-id: 38d493ff1b
Former-commit-id: 2b68a49a43
[formerly 20f3f8ffa2
]
Former-commit-id: ff9101c057
2014-04-23 12:26:27 -05:00
Nate Jensen
f4cefbc459
Merge "Issue #2903 added connection tests to session close methods" into development
...
Former-commit-id: c88597b6c2
[formerly 9ec6169646
] [formerly c88597b6c2
[formerly 9ec6169646
] [formerly 4a04662972
[formerly 81b95799744bd155cc0df1147bb8a5372ea2fee4]]]
Former-commit-id: 4a04662972
Former-commit-id: d60701a264
[formerly e9456b4ab7
]
Former-commit-id: 455f4385aa
2014-04-22 12:53:08 -05:00
Nate Jensen
2b71b60b2e
Merge "Issue #3056 made venue participant equals method case insensitive" into development
...
Former-commit-id: cc1da5fb88
[formerly fe3ff669a7
] [formerly cc1da5fb88
[formerly fe3ff669a7
] [formerly 8df505325c
[formerly d6f1435a902615724aed2ff0279a6deb29933ce1]]]
Former-commit-id: 8df505325c
Former-commit-id: 484b197a56
[formerly be6818e96b
]
Former-commit-id: ad96f9d128
2014-04-22 12:50:27 -05:00
Nate Jensen
a3036cee45
Merge "Issue #3038 added initialized flag to session feed view" into development
...
Former-commit-id: 963a848f90
[formerly 42d0d7681d
] [formerly 963a848f90
[formerly 42d0d7681d
] [formerly fc2be9521a
[formerly a7f36cd46b29887c3210f45e83f83fd24f52b314]]]
Former-commit-id: fc2be9521a
Former-commit-id: 7f777e6fb9
[formerly ca8eab399f
]
Former-commit-id: 5f35eedfb1
2014-04-22 12:49:02 -05:00
Brian Clements
d2b2106f4c
Issue #2903 added connection tests to session close methods
...
fixes illegal state exception problem when booted from xmpp server
Former-commit-id: f9ab4f9cfe
[formerly 50f3f420eb
] [formerly f9ab4f9cfe
[formerly 50f3f420eb
] [formerly 49f86e4153
[formerly d570c81caed35576e867df15c2a8d900135fef5f]]]
Former-commit-id: 49f86e4153
Former-commit-id: 9ef018dbe8
[formerly c9453a2440
]
Former-commit-id: 9ea5430774
2014-04-22 12:36:40 -05:00
Nate Jensen
75cc9ecbfc
Issue #2984 remove unnecessary dependencies
...
Change-Id: I2066a1e903680068e0d25f7faa99bc7bda2b8877
Former-commit-id: 48d4759371
[formerly d03afcdcba
] [formerly 48d4759371
[formerly d03afcdcba
] [formerly be21c41512
[formerly 290ec544e38e71332be2072435aff3b933c649ab]]]
Former-commit-id: be21c41512
Former-commit-id: 8eb74232df
[formerly 8f893545f1
]
Former-commit-id: 57e5bbfe84
2014-04-22 12:03:44 -05:00
Brian Clements
d74f192819
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: bfd88f3e14
[formerly 1adbf6253a
] [formerly bfd88f3e14
[formerly 1adbf6253a
] [formerly 2a9d341910
[formerly 7a2423f4a90597706e52ce0f89bacb1a0e10f067]]]
Former-commit-id: 2a9d341910
Former-commit-id: 19c2695dca
[formerly 8677a9f359
]
Former-commit-id: 97c5fe6d4a
2014-04-22 11:55:36 -05:00
Nate Jensen
f93a81d2f6
Merge "Issue #2060 dropping grid dataURI column" into development
...
Former-commit-id: 96268f1d35
[formerly c161a2ba50
] [formerly 96268f1d35
[formerly c161a2ba50
] [formerly ffaa7d8f58
[formerly d9876133fcb3975c8c7e58ff2ee75ca90dc8a0dd]]]
Former-commit-id: ffaa7d8f58
Former-commit-id: c65e827d4e
[formerly 0b25aebbb1
]
Former-commit-id: 8a7e16be50
2014-04-22 10:42:11 -05:00
Brian Clements
fb74637aa8
Issue #3038 added initialized flag to session feed view
...
differentiates between roster population and new joins
Former-commit-id: cdf3aa90e9
[formerly 717cdf4280
] [formerly cdf3aa90e9
[formerly 717cdf4280
] [formerly ef61a7c281
[formerly 9b6c20ac39765120efc523c03a3d11d4b21c1748]]]
Former-commit-id: ef61a7c281
Former-commit-id: e7005953eb
[formerly 295ff106b6
]
Former-commit-id: fb24e315bf
2014-04-22 10:01:27 -05:00
Ron Anderson
abfc0c3ba3
Merge "Issue #2998 Fix regression made in earlier check in." into development
...
Former-commit-id: 447ff809a3
[formerly 8026973c95
] [formerly 447ff809a3
[formerly 8026973c95
] [formerly a6b5997663
[formerly 2a78a1d70ab05322a8a69f96865cb3eba0fa6397]]]
Former-commit-id: a6b5997663
Former-commit-id: b389398c95
[formerly 5f8ac71e11
]
Former-commit-id: 04e617706c
2014-04-21 17:55:22 -05:00
Nate Jensen
403f4c3195
Issue #2060 dropping grid dataURI column
...
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e
Former-commit-id: 263611f905
[formerly a37a2afe18
] [formerly 263611f905
[formerly a37a2afe18
] [formerly 5dfb652775
[formerly 1aab87d9572089a09351ebdfb8fbcef884866feb]]]
Former-commit-id: 5dfb652775
Former-commit-id: 3eddbf452d
[formerly cdb932cc4d
]
Former-commit-id: 9ef0154104
2014-04-21 17:34:39 -05:00
Ron Anderson
62056f6eff
Issue #2998 Fix regression made in earlier check in.
...
Change-Id: Ic7c915fef09b3398e2946d8e7688e5d2997acc71
Former-commit-id: 2a819003c5
[formerly ed99abbb9d
] [formerly 2a819003c5
[formerly ed99abbb9d
] [formerly 04467d51dd
[formerly 8c48d369b3b6af0222b541ccfa9230495d4cb0f9]]]
Former-commit-id: 04467d51dd
Former-commit-id: 243c929fc1
[formerly 04a7c2d8cd
]
Former-commit-id: d6990dd0b8
2014-04-21 17:26:29 -05:00
Nate Jensen
0972f4e3f1
Merge "Issue #2997 Fix Geostationary projection to work with GeoTools 10.5" into development
...
Former-commit-id: 1651a79187
[formerly 1a617796cb
] [formerly 1651a79187
[formerly 1a617796cb
] [formerly ec82e51d28
[formerly 1fde0217948dad64221d0348f9e45a8e1430cdd7]]]
Former-commit-id: ec82e51d28
Former-commit-id: efc5dba997
[formerly 0d7ae042d5
]
Former-commit-id: 2cf79494bc
2014-04-21 17:08:17 -05:00
Nate Jensen
f685ade735
Merge "Issue #2822 fixed check for topic subscription before leader transfer" into development
...
Former-commit-id: 535a5f836d
[formerly e401fca661
] [formerly 535a5f836d
[formerly e401fca661
] [formerly cb7d485004
[formerly 74946a00033737aae24aabbfc333d661598cd6f2]]]
Former-commit-id: cb7d485004
Former-commit-id: f75fc8da0c
[formerly 87457f26fc
]
Former-commit-id: 252fb2a3a7
2014-04-21 15:13:53 -05:00
Ron Anderson
0cbbc279f0
Issue #2997 Fix Geostationary projection to work with GeoTools 10.5
...
Change-Id: Id9f3dc3af07548039509e4121cafd2e02a01453c
Former-commit-id: 8aac4d32b1
[formerly 665246d72e
] [formerly 8aac4d32b1
[formerly 665246d72e
] [formerly c4a0a4ef6e
[formerly 2b67417e6128e3cd4cafa5c8f2ac23c10be2b300]]]
Former-commit-id: c4a0a4ef6e
Former-commit-id: b5dc730fea
[formerly e515f42b94
]
Former-commit-id: d728020a70
2014-04-21 14:25:53 -05:00
Lee Venable
d6e34a221f
Issue #3041 - added dispose check to runAsync call and cleaned up code.
...
Change-Id: I50e6ce1a214a884221fbc256a133e57e579862da
Former-commit-id: ac914e72e7
[formerly 3c45a24efb
] [formerly ac914e72e7
[formerly 3c45a24efb
] [formerly dcb7e697e8
[formerly ed2fc05f61861efe6c70b8fc73ad10d27bb73c12]]]
Former-commit-id: dcb7e697e8
Former-commit-id: 91d37d783c
[formerly 20764b1d97
]
Former-commit-id: 294d8ff917
2014-04-21 13:47:31 -05:00
Ron Anderson
d52b56aa2a
Merge "Issue #2998 Fixed null pointer in AttributeViewer. Improved sizing of displayAttributes." into development
...
Former-commit-id: efdd37b012
[formerly 750c054ab0
] [formerly efdd37b012
[formerly 750c054ab0
] [formerly 5f82bb7cc8
[formerly 3038cbecf8efc76c76cdc86702986069788b6a02]]]
Former-commit-id: 5f82bb7cc8
Former-commit-id: 020045fee3
[formerly 1df03eb2dc
]
Former-commit-id: 83062cb3d5
2014-04-21 13:25:11 -05:00
Brian Clements
24b594529a
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: c4a38d1f68
[formerly 6c47c78038
] [formerly c4a38d1f68
[formerly 6c47c78038
] [formerly aed25eeb61
[formerly 09d7a1113a6254d8f01cf42d863e9365aac23cc7]]]
Former-commit-id: aed25eeb61
Former-commit-id: 56e0dad5ff
[formerly 474255ed29
]
Former-commit-id: a0871fad9a
2014-04-21 13:07:14 -05:00
Ron Anderson
841a48b86e
Issue #2998 Fixed null pointer in AttributeViewer.
...
Improved sizing of displayAttributes.
Change-Id: I40b3dc486a713f6ba6ce6f5075ffce1eb6555f93
Former-commit-id: a3a8a1ebb4
[formerly 811f05f164
] [formerly a3a8a1ebb4
[formerly 811f05f164
] [formerly 541a908a41
[formerly 0fac12a4f17de189a88e6dd4415f6364afc4f459]]]
Former-commit-id: 541a908a41
Former-commit-id: d4fcdb0851
[formerly a5cea97c6f
]
Former-commit-id: 899785875f
2014-04-21 13:03:50 -05:00
Lee Venable
369246903f
Merge "Issue #2891 - Fix refresh of Utilization Graph" into development
...
Former-commit-id: b01eac4cc3
[formerly dd7f0a82f9
] [formerly b01eac4cc3
[formerly dd7f0a82f9
] [formerly 370ff09548
[formerly 194b601d5938ba599abc5dd9e29f0a62a7713cb0]]]
Former-commit-id: 370ff09548
Former-commit-id: a8cb00e2c6
[formerly 74df7202b0
]
Former-commit-id: 3d17b7eddb
2014-04-21 12:59:00 -05:00
Nate Jensen
311b6fb729
Merge "Issue #2947 Improve support for Satellite combined products." into development
...
Former-commit-id: 2eba6b705e
[formerly 5c223a8ce3
] [formerly 2eba6b705e
[formerly 5c223a8ce3
] [formerly 35891b2dcd
[formerly 4f1ca4c4dfeb84b582bfe7fe8375fb9f619cdd94]]]
Former-commit-id: 35891b2dcd
Former-commit-id: 648df0eead
[formerly 91698d222b
]
Former-commit-id: 56776a7ee2
2014-04-21 12:39:56 -05:00
Dave Hladky
4ce5dfcd92
Issue #3012 Various fixes.
...
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 91bd735d47
[formerly 61fc2fea51
] [formerly 91bd735d47
[formerly 61fc2fea51
] [formerly 45059e722a
[formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]
Former-commit-id: 45059e722a
Former-commit-id: 117a3953af
[formerly ae84d2991e
]
Former-commit-id: 6c83fd0929
2014-04-21 12:26:47 -05:00
Ben Steffensmeier
a531487982
Issue #2947 Improve support for Satellite combined products.
...
Former-commit-id: 87adc0e3c5
[formerly 043d9c8b8d
] [formerly 87adc0e3c5
[formerly 043d9c8b8d
] [formerly c3cd473158
[formerly 891422a7d324514d5ee82d3d195e923c27fc58ef]]]
Former-commit-id: c3cd473158
Former-commit-id: 8b80c6d8fa
[formerly b05e2a22b8
]
Former-commit-id: d4b73c4531
2014-04-21 11:57:01 -05:00
Nate Jensen
3236175a84
Merge "Issue #2984 remove unnecessary dependencies on edex" into development
...
Former-commit-id: f91c4d1c26
[formerly 327e1ab78b
] [formerly f91c4d1c26
[formerly 327e1ab78b
] [formerly b3aa1392dd
[formerly 7de7469b6fa8acc42bf15a60f5096506d1cfc215]]]
Former-commit-id: b3aa1392dd
Former-commit-id: e4ed440f5a
[formerly 5c81a3b897
]
Former-commit-id: 6b0b7eefcd
2014-04-21 11:47:10 -05:00
Ron Anderson
c7378e6125
Merge "Issue #3030 Avoid GeoTools Resampler2D infinite recursion." into development
...
Former-commit-id: dd362ec359
[formerly c2a1533ff8
] [formerly dd362ec359
[formerly c2a1533ff8
] [formerly 536ec2790a
[formerly a74c24200e9911ff4f2023d9fb1be77516b4c09a]]]
Former-commit-id: 536ec2790a
Former-commit-id: 4ac5fd90f4
[formerly d34a8c9753
]
Former-commit-id: c0f6a951c4
2014-04-21 11:44:10 -05:00
Nate Jensen
cc150c8a1a
Issue #2984 remove unnecessary dependencies on edex
...
Change-Id: Iad6ebd93d0ec6cd3823042f8ef2653dac963c746
Former-commit-id: ef43b2d325
[formerly 2253938ed5
] [formerly ef43b2d325
[formerly 2253938ed5
] [formerly df4171b29d
[formerly 39d1f72292414d008c0899dac616e76c8c0f2512]]]
Former-commit-id: df4171b29d
Former-commit-id: 4011b1351f
[formerly 24c8b0a327
]
Former-commit-id: 5795254827
2014-04-21 11:32:41 -05:00
Mike Duff
8364fb4977
Issue #2891 - Fix refresh of Utilization Graph
...
Change-Id: Ib5fb5cb5a367459ab306dc223ab11172310d6cd8
Former-commit-id: 3a71c05caa
[formerly 59241fed1d
] [formerly 3a71c05caa
[formerly 59241fed1d
] [formerly 892330a89c
[formerly acb92afe49544fc0a1d9f5b08c7ec2d2e8016c16]]]
Former-commit-id: 892330a89c
Former-commit-id: ca76217776
[formerly 0f39afb4de
]
Former-commit-id: 3d5feda17c
2014-04-21 10:55:43 -05:00
Brad Gonzales
7f946c41d1
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: ab5481218d
[formerly 3fb2835dd3
] [formerly ab5481218d
[formerly 3fb2835dd3
] [formerly 44ada20a68
[formerly cd85b148b6b267779d1fe8b510f14f63c45db77a]]]
Former-commit-id: 44ada20a68
Former-commit-id: 40e1214776
[formerly dd237ea8ff
]
Former-commit-id: 4303081919
2014-04-21 10:22:57 -05:00
Mike Duff
4bde76c765
Issue #3000 - Split bufrmos plugin into common and edex.
...
Change-Id: Id3142b8746cfb28966e7378a522e4db775dfcf37
Former-commit-id: a729b8b8a5
[formerly b288bd46de
] [formerly a729b8b8a5
[formerly b288bd46de
] [formerly 0be8ad31d1
[formerly 3fd04e796b7c409c67c06517265648e576852352]]]
Former-commit-id: 0be8ad31d1
Former-commit-id: ad034ab285
[formerly 50a65c5a31
]
Former-commit-id: 1ceb378d0b
2014-04-21 09:50:18 -05:00
Nate Jensen
24b3163c37
Merge "Issue #2955 - Made chat invitation dialogs non-modal" into development
...
Former-commit-id: d265706c90
[formerly cdd56443f0
] [formerly d265706c90
[formerly cdd56443f0
] [formerly db6fba6f75
[formerly f4ced5dc67106d959dd97a35e589a266fe8089ce]]]
Former-commit-id: db6fba6f75
Former-commit-id: 339f68fa9b
[formerly 897133a27a
]
Former-commit-id: 474612939c
2014-04-21 09:29:23 -05:00
Mike Duff
6c4490b08c
Issue #2955 - Made chat invitation dialogs non-modal
...
Change-Id: Ib7294e8149996715b6a247a1e04335dc1a0c7023
Former-commit-id: 71cf0d04e7
[formerly ead90bc794
] [formerly 71cf0d04e7
[formerly ead90bc794
] [formerly b507739637
[formerly bb61e3c39d5dabf7e698726f0a093d8cf4f7088a]]]
Former-commit-id: b507739637
Former-commit-id: 75f794d54d
[formerly 9a082a1588
]
Former-commit-id: ae984e4c16
2014-04-21 09:00:42 -05:00
Ron Anderson
6a73cd7d31
Issue #3030 Avoid GeoTools Resampler2D infinite recursion.
...
Change-Id: Ie2dc0a66e8f15648b1a76a0d54efb36795223345
Former-commit-id: 581e1a95dd
[formerly 76c5bb67a5
] [formerly 581e1a95dd
[formerly 76c5bb67a5
] [formerly d7e6ab67d6
[formerly 123ddd451854e93063f518b0ece746b1109df9d1]]]
Former-commit-id: d7e6ab67d6
Former-commit-id: 941b6d9109
[formerly 8583e0fb64
]
Former-commit-id: 281ffc1ecc
2014-04-21 08:38:52 -05:00
Brad Gonzales
e0245983cf
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: c267d077c3
[formerly 1a43f04b16
] [formerly c267d077c3
[formerly 1a43f04b16
] [formerly 6c7e2ac2a7
[formerly 9374912aeb3e3a642d34a0aec75bcda7c707bcf9]]]
Former-commit-id: 6c7e2ac2a7
Former-commit-id: b2a95e4f12
[formerly b796120ec9
]
Former-commit-id: 2a7aae659c
2014-04-18 15:16:41 -05:00
Brian.Dyke
8275f3907f
Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: 53ce26a9b6
[formerly 1aec3b3698
] [formerly 53ce26a9b6
[formerly 1aec3b3698
] [formerly 645fe64a4a
[formerly 178acb792036869e903beea636c7216e1d3a4f58]]]
Former-commit-id: 645fe64a4a
Former-commit-id: 66974e17b9
[formerly 4eb3317f80
]
Former-commit-id: 59cbfdf093
2014-04-17 14:42:44 -04:00
Brian.Dyke
de500c093f
Merged 14.2.1 -17, -18 into 1422-3
...
Former-commit-id: 9df6fb2d4d
[formerly 12a482e1d7
] [formerly 9df6fb2d4d
[formerly 12a482e1d7
] [formerly b8829139a2
[formerly 712064db471de93da585f9c765bb4dfbe510df53]]]
Former-commit-id: b8829139a2
Former-commit-id: 6f35818917
[formerly 0ea7c51ad7
]
Former-commit-id: a925ba6219
2014-04-17 14:42:35 -04:00
Ron Anderson
3b177c01ce
Merge "Issue #2664 Fix NullPointerException when no .prj file present" into development
...
Former-commit-id: 3806a1fd05
[formerly 6b226db27c
] [formerly 3806a1fd05
[formerly 6b226db27c
] [formerly 66929690c7
[formerly de57933506ad588c8da38a49de6a2cd5530e2091]]]
Former-commit-id: 66929690c7
Former-commit-id: 55f31328af
[formerly cacff76564
]
Former-commit-id: 07f66078a4
2014-04-17 13:13:03 -05:00
Ron Anderson
a2ec4af060
Issue #2664 Fix NullPointerException when no .prj file present
...
Change-Id: I2716eca6b71d79657f19feadb931a23ee3e44f4d
Former-commit-id: ddf45d649c
[formerly f4823976f3
] [formerly ddf45d649c
[formerly f4823976f3
] [formerly f30c29bfbd
[formerly 66db062f94a5136902bac5cd5df8cbf30305a30a]]]
Former-commit-id: f30c29bfbd
Former-commit-id: 5a8d4be559
[formerly ba88a0836d
]
Former-commit-id: ab1f3acde9
2014-04-17 11:38:40 -05:00
Nate Jensen
2880b20ee1
Merge "Issue #3025 - Fix incorrect sort algorithm." into development
...
Former-commit-id: adcc7ac6b5
[formerly be79b04b59
] [formerly adcc7ac6b5
[formerly be79b04b59
] [formerly c36a5f7272
[formerly 7ad033ab9c35ea2a169f5041ed2ed1dfae7c63b2]]]
Former-commit-id: c36a5f7272
Former-commit-id: d237113d35
[formerly 7d8f18ef18
]
Former-commit-id: 76bd257011
2014-04-17 09:56:54 -05:00
Mike Duff
cfadb576e6
Issue #3025 - Fix incorrect sort algorithm.
...
Change-Id: Ied1ec59a8703c1f7476793d3896a253ec6aa2707
Former-commit-id: a17f187929
[formerly 0b9f8ce7f1
] [formerly a17f187929
[formerly 0b9f8ce7f1
] [formerly b1a4f69578
[formerly 9c275288183b93ba5cac991dbbdf72bdf122ad0a]]]
Former-commit-id: b1a4f69578
Former-commit-id: 989fcfb42f
[formerly 54e95e399b
]
Former-commit-id: ce6d95bd3c
2014-04-17 09:55:45 -05:00
Nate Jensen
f607630d72
Issue #3018 addressing code review comments
...
Former-commit-id: 54951100af
[formerly e327f5e0bf
] [formerly 54951100af
[formerly e327f5e0bf
] [formerly 8ba6b2722d
[formerly 85d9dd0158ab873e1e9b76805853c712bb0c7c2c]]]
Former-commit-id: 8ba6b2722d
Former-commit-id: 81f8f6f328
[formerly 8b6650c898
]
Former-commit-id: 3737ad85b6
2014-04-17 09:28:47 -05:00
Nate Jensen
7b01116623
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: df1b5183c1
[formerly 6e49d78e0d
] [formerly df1b5183c1
[formerly 6e49d78e0d
] [formerly d26c150aa9
[formerly 6d713f6a8a563b49bd1e2fa8151591657bd6735c]]]
Former-commit-id: d26c150aa9
Former-commit-id: 23082fd637
[formerly 8bf12cc32a
]
Former-commit-id: e28da969c6
2014-04-17 09:04:52 -05:00
Roger Ferrel
25c92e4b11
Issue #3023 Configurable available disk thresholds and unit test fixes
...
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0
Former-commit-id: dc25ece75f
[formerly 8ce590c31c
] [formerly dc25ece75f
[formerly 8ce590c31c
] [formerly 3af564a653
[formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]]
Former-commit-id: 3af564a653
Former-commit-id: 56da257816
[formerly 1214aac2a2
]
Former-commit-id: 2e98b24e91
2014-04-17 08:57:15 -05:00