Commit graph

3025 commits

Author SHA1 Message Date
Nate Jensen
355fe1f5f1 Merge "Issue #2947 Improve support for Satellite combined products." into development
Former-commit-id: a61e0dff2e [formerly 2eba6b705e] [formerly 5c223a8ce3] [formerly 35891b2dcd [formerly 5c223a8ce3 [formerly 4f1ca4c4dfeb84b582bfe7fe8375fb9f619cdd94]]]
Former-commit-id: 35891b2dcd
Former-commit-id: 46064df15844f46a8ec4d9674773f826e2cd2908 [formerly 91698d222b]
Former-commit-id: 648df0eead
2014-04-21 12:39:56 -05:00
Ben Steffensmeier
f16fab0d68 Issue #2947 Improve support for Satellite combined products.
Former-commit-id: 4abdb898f4 [formerly 87adc0e3c5] [formerly 043d9c8b8d] [formerly c3cd473158 [formerly 043d9c8b8d [formerly 891422a7d324514d5ee82d3d195e923c27fc58ef]]]
Former-commit-id: c3cd473158
Former-commit-id: c84842cbdc7ae780b96dc50e92fdeb467f64bad1 [formerly b05e2a22b8]
Former-commit-id: 8b80c6d8fa
2014-04-21 11:57:01 -05:00
Nate Jensen
69e45bdfbd Merge "Issue #2984 remove unnecessary dependencies on edex" into development
Former-commit-id: d566c3cafc [formerly f91c4d1c26] [formerly 327e1ab78b] [formerly b3aa1392dd [formerly 327e1ab78b [formerly 7de7469b6fa8acc42bf15a60f5096506d1cfc215]]]
Former-commit-id: b3aa1392dd
Former-commit-id: b76bb1108addd41e95f96f1bfde5900bd9eefe27 [formerly 5c81a3b897]
Former-commit-id: e4ed440f5a
2014-04-21 11:47:10 -05:00
Ron Anderson
91a90d44e0 Merge "Issue #3030 Avoid GeoTools Resampler2D infinite recursion." into development
Former-commit-id: 8f3b8c9bdf [formerly dd362ec359] [formerly c2a1533ff8] [formerly 536ec2790a [formerly c2a1533ff8 [formerly a74c24200e9911ff4f2023d9fb1be77516b4c09a]]]
Former-commit-id: 536ec2790a
Former-commit-id: c6dab31639d3dfc9ab7163fe5b8b72ec9ca0af2a [formerly d34a8c9753]
Former-commit-id: 4ac5fd90f4
2014-04-21 11:44:10 -05:00
Nate Jensen
d6a968cac2 Issue #2984 remove unnecessary dependencies on edex
Change-Id: Iad6ebd93d0ec6cd3823042f8ef2653dac963c746

Former-commit-id: 2561050293 [formerly ef43b2d325] [formerly 2253938ed5] [formerly df4171b29d [formerly 2253938ed5 [formerly 39d1f72292414d008c0899dac616e76c8c0f2512]]]
Former-commit-id: df4171b29d
Former-commit-id: 024b55876a4025da8b49a4ff3d68557b772e23a5 [formerly 24c8b0a327]
Former-commit-id: 4011b1351f
2014-04-21 11:32:41 -05:00
Brad Gonzales
8a7acc9442 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 44ada20a68 [formerly 3fb2835dd3 [formerly cd85b148b6b267779d1fe8b510f14f63c45db77a]]]
Former-commit-id: 44ada20a68
Former-commit-id: 92ad6759c57e75cfbff18396170bbbfcd7952bdd [formerly dd237ea8ff]
Former-commit-id: 40e1214776
2014-04-21 10:22:57 -05:00
Mike Duff
5efd5741f7 Issue #3000 - Split bufrmos plugin into common and edex.
Change-Id: Id3142b8746cfb28966e7378a522e4db775dfcf37

Former-commit-id: 8250c23357 [formerly a729b8b8a5] [formerly b288bd46de] [formerly 0be8ad31d1 [formerly b288bd46de [formerly 3fd04e796b7c409c67c06517265648e576852352]]]
Former-commit-id: 0be8ad31d1
Former-commit-id: 08a545b76f857a2a41c798d80966021fe535f72a [formerly 50a65c5a31]
Former-commit-id: ad034ab285
2014-04-21 09:50:18 -05:00
Nate Jensen
ce3e1793cd Merge "Issue #2955 - Made chat invitation dialogs non-modal" into development
Former-commit-id: 98bd36ee38 [formerly d265706c90] [formerly cdd56443f0] [formerly db6fba6f75 [formerly cdd56443f0 [formerly f4ced5dc67106d959dd97a35e589a266fe8089ce]]]
Former-commit-id: db6fba6f75
Former-commit-id: 522c875e651b5a312c176729c7d6dfa6c3eb0050 [formerly 897133a27a]
Former-commit-id: 339f68fa9b
2014-04-21 09:29:23 -05:00
Mike Duff
ebbb721787 Issue #2955 - Made chat invitation dialogs non-modal
Change-Id: Ib7294e8149996715b6a247a1e04335dc1a0c7023

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

Former-commit-id: ab83f0ec0f [formerly 581e1a95dd] [formerly 76c5bb67a5] [formerly d7e6ab67d6 [formerly 76c5bb67a5 [formerly 123ddd451854e93063f518b0ece746b1109df9d1]]]
Former-commit-id: d7e6ab67d6
Former-commit-id: 8ea06d4f50652b41024861c0cde7cbd76f67046d [formerly 8583e0fb64]
Former-commit-id: 941b6d9109
2014-04-21 08:38:52 -05:00
Brad Gonzales
4c463adc7e 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 6c7e2ac2a7 [formerly 1a43f04b16 [formerly 9374912aeb3e3a642d34a0aec75bcda7c707bcf9]]]
Former-commit-id: 6c7e2ac2a7
Former-commit-id: f7b416cc828835e0d7166283f219d0f260c3e42e [formerly b796120ec9]
Former-commit-id: b2a95e4f12
2014-04-18 15:16:41 -05:00
Ron Anderson
9b5d743027 Merge "Issue #2664 Fix NullPointerException when no .prj file present" into development
Former-commit-id: 77cf9b366c [formerly 3806a1fd05] [formerly 6b226db27c] [formerly 66929690c7 [formerly 6b226db27c [formerly de57933506ad588c8da38a49de6a2cd5530e2091]]]
Former-commit-id: 66929690c7
Former-commit-id: 8b68cd3c4868310fe8a550a72548e02fe12db72e [formerly cacff76564]
Former-commit-id: 55f31328af
2014-04-17 13:13:03 -05:00
Ron Anderson
8de698fb5b Issue #2664 Fix NullPointerException when no .prj file present
Change-Id: I2716eca6b71d79657f19feadb931a23ee3e44f4d

Former-commit-id: f27f84e50f [formerly ddf45d649c] [formerly f4823976f3] [formerly f30c29bfbd [formerly f4823976f3 [formerly 66db062f94a5136902bac5cd5df8cbf30305a30a]]]
Former-commit-id: f30c29bfbd
Former-commit-id: 7eef58459f9ae3bb450f759c1b276249d81df227 [formerly ba88a0836d]
Former-commit-id: 5a8d4be559
2014-04-17 11:38:40 -05:00
Nate Jensen
a48dd9ab1f Merge "Issue #3025 - Fix incorrect sort algorithm." into development
Former-commit-id: b4717280de [formerly adcc7ac6b5] [formerly be79b04b59] [formerly c36a5f7272 [formerly be79b04b59 [formerly 7ad033ab9c35ea2a169f5041ed2ed1dfae7c63b2]]]
Former-commit-id: c36a5f7272
Former-commit-id: db5c7deed79d8cc758597e151da3c968a990ad9a [formerly 7d8f18ef18]
Former-commit-id: d237113d35
2014-04-17 09:56:54 -05:00
Mike Duff
a700a1a1dc Issue #3025 - Fix incorrect sort algorithm.
Change-Id: Ied1ec59a8703c1f7476793d3896a253ec6aa2707

Former-commit-id: dd24e15b53 [formerly a17f187929] [formerly 0b9f8ce7f1] [formerly b1a4f69578 [formerly 0b9f8ce7f1 [formerly 9c275288183b93ba5cac991dbbdf72bdf122ad0a]]]
Former-commit-id: b1a4f69578
Former-commit-id: 70adbb0b80aadc062137a471048c29cdebf395e7 [formerly 54e95e399b]
Former-commit-id: 989fcfb42f
2014-04-17 09:55:45 -05:00
Nate Jensen
00766a599c 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 d26c150aa9 [formerly 6e49d78e0d [formerly 6d713f6a8a563b49bd1e2fa8151591657bd6735c]]]
Former-commit-id: d26c150aa9
Former-commit-id: c7b3b9828876e046db7ef21c197c4bffcbc75692 [formerly 8bf12cc32a]
Former-commit-id: 23082fd637
2014-04-17 09:04:52 -05:00
Roger Ferrel
c1a0504758 Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0

Former-commit-id: 84c10d3cd2 [formerly dc25ece75f] [formerly 8ce590c31c] [formerly 3af564a653 [formerly 8ce590c31c [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]]
Former-commit-id: 3af564a653
Former-commit-id: 927fe825a123966e78c6c609abe7894b1787733e [formerly 1214aac2a2]
Former-commit-id: 56da257816
2014-04-17 08:57:15 -05:00
Brad Gonzales
d6ecf7a63e 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 975a088945 [formerly ab2488b2db [formerly b80a3b8d1c90b7fb8720171f16529edc81bc30a8]]]
Former-commit-id: 975a088945
Former-commit-id: 7aa4e12f54f97b61e748a6950c8f532ae66df86b [formerly 72b4b07fb4]
Former-commit-id: 4ad01be9e1
2014-04-16 17:07:49 -05:00
Nate Jensen
b225b05ab1 Merge "Issue #3037 - Add dispose check in runAsync call." into development
Former-commit-id: 89bb03eb12 [formerly 5ea27f270f] [formerly 7b1f93fdfc27b35ff9a504cac0a005636fbd3df1 [formerly 8ad4b26151]] [formerly 70d132c59a [formerly 8ad4b26151 [formerly b44bb9043a002e0749f6bcda41158a56d047c5af]]]
Former-commit-id: 70d132c59a
Former-commit-id: 0b25ff12454689632fcd64e7d50c32163364f247 [formerly 82267f8b0b]
Former-commit-id: 65ee834371
2014-04-16 16:31:18 -05:00
Nate Jensen
026bdba6d5 Merge "Issue #3020 fixed error message when attempting to create already accessible room" into development
Former-commit-id: b8403476ee [formerly 27c9ee561e] [formerly f313f2f20c] [formerly 2ea1878403 [formerly f313f2f20c [formerly fc8880c642201685feefbf3eb14cb4f1a7c962b1]]]
Former-commit-id: 2ea1878403
Former-commit-id: 84856846656ce3174e03d59de632d5d282fc7ab1 [formerly 05e1aa10a8]
Former-commit-id: ecf9a4e671
2014-04-16 16:30:46 -05:00
Nate Jensen
f1152bca2f Merge "Issue #3021 increased width of create session dialog to fit error msg" into development
Former-commit-id: 23fdfcf11f [formerly 109051a061] [formerly d96b75ca13] [formerly 52b9060f7a [formerly d96b75ca13 [formerly e59d579fc51125b7805c22dfea26b31f17d1be97]]]
Former-commit-id: 52b9060f7a
Former-commit-id: 2f1f0573a1ee55e7a82ce91d3141d8f88fd2a4b9 [formerly 78a240fded]
Former-commit-id: d29f4091ca
2014-04-16 16:30:39 -05:00
Lee Venable
acd88d1d38 Issue #3037 - Add dispose check in runAsync call.
Change-Id: I13c7475f8c56f677f3dbdfab8d6000061db86f9f

Former-commit-id: 680f607c18 [formerly 6b0468f07e] [formerly 33fc376f33] [formerly 7386d4b318 [formerly 33fc376f33 [formerly c511ef6d5566f0e1d9ae3d5ea886abbf1159d41a]]]
Former-commit-id: 7386d4b318
Former-commit-id: 414f3accd00b50fb116af44bd4097d3b89b5cb69 [formerly 98e9912a94]
Former-commit-id: cc6380ba33
2014-04-16 15:40:46 -05:00
Richard Peter
d6359fa404 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 8c190bd158 [formerly 852cb3cd46 [formerly 326b9ef83021ce71f715b6f352401dd936e992c7]]]
Former-commit-id: 8c190bd158
Former-commit-id: 7f1e29571c0c37d84320ad1a27dfc62471139ce5 [formerly f8c75819bb]
Former-commit-id: bed7035a67
2014-04-16 15:11:07 -05:00
Ben Steffensmeier
858deeaef5 Issue #2947 Redo satellite derived parameters to use an inventory to determine availability.
Former-commit-id: 2d8106bc5b [formerly bb51fb299a] [formerly 709e3411c4] [formerly a8bb2c0dfd [formerly 709e3411c4 [formerly 1a041cb3be1141f4af116335e5b9540beda817cb]]]
Former-commit-id: a8bb2c0dfd
Former-commit-id: 4a7f1c2296d79b72f15c1dafa088a798fe5a813e [formerly 119ced4a01]
Former-commit-id: a51b965c4f
2014-04-16 14:54:59 -05:00
Brian Clements
b8f40429ec Issue #3021 increased width of create session dialog to fit error msg
Former-commit-id: 78c1b34cdf [formerly ef791fe481] [formerly 1112ca621e] [formerly bb915796ad [formerly 1112ca621e [formerly f0bcc20987d814a716994f712c6132bb79963457]]]
Former-commit-id: bb915796ad
Former-commit-id: fd6c03748bfb24190c526a992357f258a7c91630 [formerly 5c46c768d2]
Former-commit-id: 549941882e
2014-04-16 14:33:02 -05:00
Brian Clements
89741a1e62 Issue #3020 fixed error message when attempting to create already accessible room
Former-commit-id: 0c203cfd07 [formerly 57d2f28d54] [formerly bfafb0d055] [formerly 4a8ee65cca [formerly bfafb0d055 [formerly 738e4cb06a549e6067274af033cc7ba725b1a8e2]]]
Former-commit-id: 4a8ee65cca
Former-commit-id: 58b38675284b585270d0e5118c40f102fbfd1852 [formerly 8861489810]
Former-commit-id: 4829ef25bc
2014-04-16 14:26:17 -05:00
Lee Venable
8380646a7a Issue #3034 - added widget dispose checks in runAsync methods.
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e

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

Former-commit-id: 796efabc3b [formerly 66f4ce250a] [formerly 726c122dc7] [formerly 8b93dffb4f [formerly 726c122dc7 [formerly 1249c06521c5575960605176dcd46b77cbe1a1bc]]]
Former-commit-id: 8b93dffb4f
Former-commit-id: da7df5c1cb8add048021783ebafe66b2d4afe16b [formerly 56f645bbc7]
Former-commit-id: 2cf5941fe1
2014-04-15 17:38:17 -05:00
Lee Venable
1c0b3bf7f7 Merge "Issue #3031 - Added dispose check in the runAsync calls." into development
Former-commit-id: 30c5233ae4 [formerly 14f0dc298e] [formerly cde3cdeed1] [formerly 2a93e03117 [formerly cde3cdeed1 [formerly 05afe0e610860eca39453ddf12180466b48e43ea]]]
Former-commit-id: 2a93e03117
Former-commit-id: 78f80c2eced18a183f677dcd92efee78aa09ec9c [formerly c9c845d5f2]
Former-commit-id: a34e169792
2014-04-15 17:37:13 -05:00
Everett Kladstrup
2456ee3a86 Issue #2725 Move viirs derivparam python package to common_static
Former-commit-id: bc40caa959 [formerly 08dfcd9bd9] [formerly 5dbedee47a] [formerly 200f8f461d [formerly 5dbedee47a [formerly e89895b8448e3eeb70f2850f84773e8345114c38]]]
Former-commit-id: 200f8f461d
Former-commit-id: 1eb42c2f057f83a9554ddd2f1f5814896fb645b5 [formerly fd2ddd24a7]
Former-commit-id: 158e1fd086
2014-04-15 16:53:07 -05:00
Lee Venable
9e662e2a21 Issue #3031 - Added dispose check in the runAsync calls.
Change-Id: I7996f58995aa261a1a66acc755768c3489130d43

Former-commit-id: cdc1edef6b [formerly 39b9d94dc1] [formerly d4aafc69d9] [formerly 2122b79416 [formerly d4aafc69d9 [formerly 72f2908000301dd025a2c801b1ab129460d8cdf9]]]
Former-commit-id: 2122b79416
Former-commit-id: 171f7d971779860672bb25dbda78f2ce0c6f989b [formerly c3f4bccbf9]
Former-commit-id: e30c910657
2014-04-15 16:49:42 -05:00
Everett Kladstrup
133dff106f Issue #2725 Fix localization type for DerivParamLocalizationAdapter
Former-commit-id: 9f3f3f2b69 [formerly 4f1c7281d3] [formerly 27885c8296] [formerly 54db6ad9af [formerly 27885c8296 [formerly d9bd028d94f802e346a5396e9ae84a13b00691e3]]]
Former-commit-id: 54db6ad9af
Former-commit-id: 5eaecc4538d5563c1f6b15d1ab3f3819ede97fdb [formerly ca7b672b52]
Former-commit-id: c2dfdf8cae
2014-04-15 15:18:09 -05:00
Brian Clements
602794b56d Issue #2822 only allow transfer leader if participant is using shared display
Former-commit-id: dc1d2d39f8 [formerly db67c03382] [formerly 5e13503b9abb63ac2a2c246e1d0e4eba40c2ad52 [formerly 5250f7a442]] [formerly 6ccedc1182 [formerly 5250f7a442 [formerly af9577548e40397c67f72eb60485ee8de48f169b]]]
Former-commit-id: 6ccedc1182
Former-commit-id: fffe96d7c192b1e0ed78a1625828ff61c7efe072 [formerly e8907aa729]
Former-commit-id: 6f9ef9a515
2014-04-15 15:15:11 -05:00
Brian Clements
5b5669e1e1 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 6b22374046 [formerly 8ab1bab974 [formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]]
Former-commit-id: 6b22374046
Former-commit-id: 3329c6cc7af41bc830f1a278385881ed9ff2d11c [formerly 7cf5f06f2a]
Former-commit-id: ca5909e222
2014-04-15 15:12:33 -05:00
Mike Duff
dceb75c423 Issue #2785 - Fix loading of groups in sub request dialog
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722

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

Change-Id: Ic76eb5faa4b14cb4ea133ab74532bacd1a05c23d

Former-commit-id: c0df96e085 [formerly e24940ead6] [formerly 56280c47faa8df4c130fc7ca68cdcf59c00e6094 [formerly 6e2d68e102]] [formerly 57f2357f10 [formerly 6e2d68e102 [formerly c59a5d99ce31464bacd7c266543f10f523719a07]]]
Former-commit-id: 57f2357f10
Former-commit-id: dad31d1699bb36bcaccd3d7e306c1af3e1f8b973 [formerly d435258fce]
Former-commit-id: 97f09968b3
2014-04-14 16:50:54 -05:00
Nate Jensen
b9be7343bf 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 111b7f4283 [formerly c71205eb89 [formerly bdc1863a9413301bb78c6e0ffdd630b62c48d627]]]
Former-commit-id: 111b7f4283
Former-commit-id: c249e01da13dd43a2a49740d644cfa02fc5f32ca [formerly 9917a8ef62]
Former-commit-id: 9593960e9f
2014-04-14 15:46:14 -05:00
Ron Anderson
9b2cd2d486 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 fd79bd354b [formerly 46d5349940 [formerly 79a18e9077167087a9a3dce952f71a0c7e021e23]]]
Former-commit-id: fd79bd354b
Former-commit-id: 5456b75aa7d4a323625c887f487c61c54177d524 [formerly 5ab1b1b95c]
Former-commit-id: d2346699bb
2014-04-14 14:45:03 -05:00
Nate Jensen
134f34c4df 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 ceec3d48f0 [formerly f086bb0c9b [formerly e2feed87185e15d9e681ca0155b03d1d9ff29e25]]]
Former-commit-id: ceec3d48f0
Former-commit-id: d97211d5385681fec6abca63498e85889f803dd8 [formerly 715932091e]
Former-commit-id: dfe50ee038
2014-04-14 14:28:11 -05:00
Lee Venable
70cc279e37 Merge "Issue #2892 - Fix problems loading saved configs for data browser dialog." into development
Former-commit-id: 09afdba1fe [formerly 1a3738c8fd] [formerly f6601d6bcc] [formerly d4a6ce546d [formerly f6601d6bcc [formerly 96361fa3cd86627ef633c5421a2434c930c3b85c]]]
Former-commit-id: d4a6ce546d
Former-commit-id: 3f0a4ef9f6a2a757d0bd3de95cef502c549c0dff [formerly caf31402d7]
Former-commit-id: bf4f3c75ef
2014-04-14 14:09:03 -05:00
Richard Peter
4aad8cf61c Merge "Issue #2862 Implements locks on case creation." into development
Former-commit-id: 50624b548a [formerly 22a01edbb7] [formerly 19755418f8] [formerly 181ffee3db [formerly 19755418f8 [formerly e2c246299716bc2eba90a16c2c69cf1e0a9a6913]]]
Former-commit-id: 181ffee3db
Former-commit-id: 94d21459e635974814c625195c69afdafdc4a867 [formerly 0abb97820b]
Former-commit-id: c4853e7982
2014-04-14 13:28:26 -05:00
Richard Peter
b5fa843960 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 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]
Former-commit-id: 17196b5dcd
Former-commit-id: f202d7fc11f48792bac7d10cbb20d9ba9077aa8f [formerly 8b279966d1]
Former-commit-id: ff87317bd4
2014-04-14 13:10:11 -05:00
Nate Jensen
28455b8d42 Merge "Issue #2241 fix tear off menus in practice mode" into development
Former-commit-id: 1882acee98 [formerly 2a0c73fb25] [formerly 47eb9ecb0a] [formerly 5fe4c08ab6 [formerly 47eb9ecb0a [formerly 4fedbaacf54b5194afb9548101badc4619347638]]]
Former-commit-id: 5fe4c08ab6
Former-commit-id: d47a5b14445159c53f75e0aafca11164146f6133 [formerly f77b99b51c]
Former-commit-id: 60ee75d3df
2014-04-14 09:28:34 -05:00
Richard Peter
d5149f4409 Merge "Issue #2947 Minor satellite and derived parameter improvements." into development
Former-commit-id: 84bb4e5e32 [formerly 97fb03df02] [formerly 91e941f60a] [formerly 9ef8347f23 [formerly 91e941f60a [formerly 5bd4eed36c6d7c69b8fb70c6c7e021cbdd5d3b52]]]
Former-commit-id: 9ef8347f23
Former-commit-id: 0189c0a9c6497ecc36bfd9e74f6935af94b96c99 [formerly ffd74e6787]
Former-commit-id: a4eba6e6df
2014-04-11 19:33:31 -05:00
Ben Steffensmeier
a224105467 Issue #2947 Minor satellite and derived parameter improvements.
Former-commit-id: 4004fe2d18 [formerly 2d66e58671] [formerly dd794a3c12] [formerly 428f3a2d8b [formerly dd794a3c12 [formerly d5fe527ff45e02cbbba3a92f2031d500db879839]]]
Former-commit-id: 428f3a2d8b
Former-commit-id: 8166890980b160e863adea23a121042b57a2fc64 [formerly 6c92b645f0]
Former-commit-id: b120feab6f
2014-04-11 17:37:59 -05:00
Ben Steffensmeier
48a6b0fdf8 Issue #2947 Switch derived parameter space amtching to use IGridGeometryProvider.
Former-commit-id: 3efa47aafd [formerly ca78a04d95] [formerly d5b91d8846] [formerly 1ad8396366 [formerly d5b91d8846 [formerly c5c0dcaab8e495970438f134625ac2847f9bcf9f]]]
Former-commit-id: 1ad8396366
Former-commit-id: 210e31e5660405a56e7296c949aac3ee05d190f4 [formerly fb85857ff5]
Former-commit-id: b707e3b6db
2014-04-11 17:34:38 -05:00
Richard Peter
56089894f2 Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: 9b12d9ddaf [formerly cd51f3fa87] [formerly a65804787550135ce5e8efc80b04f65f82ceff22 [formerly 3575d6586f]] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]
Former-commit-id: d65b11d404
2014-04-11 16:23:09 -05:00